SPARK-30160 Split tcp-msg-maven-plugin from appstore-metadata-service

LibertyGlobal · Jan 21, 2021 · 6ea3e00 · 6ea3e00
1 parent f1f397d
commit 6ea3e00
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 263 deletions.
diff --git a/LICENSE-THIRD-PARTY.txt b/LICENSE-THIRD-PARTY.txt
@@ -1,5 +1,5 @@
 
-Lists of 168 third-party dependencies.
+Lists of 156 third-party dependencies.
      (Eclipse Public License - v 1.0) (GNU Lesser General Public License) Logback Classic Module (ch.qos.logback:logback-classic:1.2.3 - http://logback.qos.ch/logback-classic)
      (Eclipse Public License - v 1.0) (GNU Lesser General Public License) Logback Core Module (ch.qos.logback:logback-core:1.2.3 - http://logback.qos.ch/logback-core)
      (The Apache License, Version 2.0) spock-reports (com.athaydes:spock-reports:1.7.1 - https://github.com/renatoathaydes/spock-reports)
@@ -51,9 +51,6 @@ Lists of 168 third-party dependencies.
      (Eclipse Distribution License - v 1.0) Jakarta XML Binding API (jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 - https://github.com/eclipse-ee4j/jaxb-api/jakarta.xml.bind-api)
      (COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0) JavaBeans(TM) Activation Framework (javax.activation:activation:1.1.1 - http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp)
      (CDDL/GPLv2+CE) JavaBeans Activation Framework API jar (javax.activation:javax.activation-api:1.2.0 - http://java.net/all/javax.activation-api/)
-     (COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0) JSR-250 Common Annotations for the JavaTM Platform (javax.annotation:jsr250-api:1.0 - http://jcp.org/aboutJava/communityprocess/final/jsr250/index.html)
-     (Apache License, Version 2.0) CDI APIs (javax.enterprise:cdi-api:1.0 - http://www.seamframework.org/Weld/cdi-api)
-     (The Apache Software License, Version 2.0) javax.inject (javax.inject:javax.inject:1 - http://code.google.com/p/atinject/)
      (CDDL 1.1) (GPL2 w/ CPE) jaxb-api (javax.xml.bind:jaxb-api:2.3.1 - https://github.com/javaee/jaxb-spec/jaxb-api)
      (Eclipse Public License 1.0) JUnit (junit:junit:4.13 - http://junit.org)
      (Apache License, Version 2.0) Byte Buddy (without dependencies) (net.bytebuddy:byte-buddy:1.10.14 - https://bytebuddy.net/byte-buddy)
@@ -69,10 +66,6 @@ Lists of 168 third-party dependencies.
      (Apache License, Version 2.0) Apache HttpClient Mime (org.apache.httpcomponents:httpmime:4.5.12 - http://hc.apache.org/httpcomponents-client)
      (Apache License, Version 2.0) Apache Log4j API (org.apache.logging.log4j:log4j-api:2.13.3 - https://logging.apache.org/log4j/2.x/log4j-api/)
      (Apache License, Version 2.0) Apache Log4j to SLF4J Adapter (org.apache.logging.log4j:log4j-to-slf4j:2.13.3 - https://logging.apache.org/log4j/2.x/log4j-to-slf4j/)
-     (Apache License, Version 2.0) Maven Artifact (org.apache.maven:maven-artifact:3.6.3 - https://maven.apache.org/ref/3.6.3/maven-artifact/)
-     (Apache License, Version 2.0) Maven Model (org.apache.maven:maven-model:3.6.3 - https://maven.apache.org/ref/3.6.3/maven-model/)
-     (Apache License, Version 2.0) Maven Plugin API (org.apache.maven:maven-plugin-api:3.6.3 - https://maven.apache.org/ref/3.6.3/maven-plugin-api/)
-     (Apache License, Version 2.0) Maven Plugin Tools Java Annotations (org.apache.maven.plugin-tools:maven-plugin-annotations:3.6.0 - https://maven.apache.org/plugin-tools/maven-plugin-annotations)
      (The Apache Software License, Version 2.0) Apache Sling javax.activation bundle (org.apache.sling:org.apache.sling.javax.activation:0.1.0 - http://sling.apache.org/org.apache.sling.javax.activation)
      (Apache License, Version 2.0) Apache Tika core (org.apache.tika:tika-core:1.24.1 - http://tika.apache.org/)
      (Apache License, Version 2.0) tomcat-embed-core (org.apache.tomcat.embed:tomcat-embed-core:9.0.38 - https://tomcat.apache.org/)
@@ -90,11 +83,6 @@ Lists of 168 third-party dependencies.
      (The Apache Software License, Version 2.0) Apache Groovy (org.codehaus.groovy:groovy-templates:2.5.13 - https://groovy-lang.org)
      (The Apache Software License, Version 2.0) Apache Groovy (org.codehaus.groovy:groovy-test:2.5.13 - https://groovy-lang.org)
      (The Apache Software License, Version 2.0) Apache Groovy (org.codehaus.groovy:groovy-xml:2.5.13 - https://groovy-lang.org)
-     (Apache License, Version 2.0) Plexus Classworlds (org.codehaus.plexus:plexus-classworlds:2.6.0 - http://codehaus-plexus.github.io/plexus-classworlds/)
-     (The Apache Software License, Version 2.0) Plexus :: Component Annotations (org.codehaus.plexus:plexus-component-annotations:1.5.5 - http://plexus.codehaus.org/plexus-containers/plexus-component-annotations/)
-     (Apache License, Version 2.0) Plexus Common Utilities (org.codehaus.plexus:plexus-utils:3.2.1 - http://codehaus-plexus.github.io/plexus-utils/)
-     (Eclipse Public License, Version 1.0) org.eclipse.sisu.inject (org.eclipse.sisu:org.eclipse.sisu.inject:0.3.4 - http://www.eclipse.org/sisu/org.eclipse.sisu.inject/)
-     (Eclipse Public License, Version 1.0) org.eclipse.sisu.plexus (org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.4 - http://www.eclipse.org/sisu/org.eclipse.sisu.plexus/)
      (Apache License, Version 2.0) flyway-core (org.flywaydb:flyway-core:6.4.4 - https://flywaydb.org/flyway-core)
      (Apache License, Version 2.0) Apache FreeMarker (org.freemarker:freemarker:2.3.30 - https://freemarker.apache.org/)
      (EPL 2.0) (GPL2 w/ CPE) Jakarta Expression Language 3.0 (org.glassfish:jakarta.el:3.0.3 - https://projects.eclipse.org/projects/ee4j.el)

diff --git a/...ata-service-tests/src/test/java/com/lgi/appstore/metadata/test/framework/TestSession.java b/...ata-service-tests/src/test/java/com/lgi/appstore/metadata/test/framework/TestSession.java
@@ -96,8 +96,10 @@ public String getTestedServiceLocation() {
             String urlForSanity = environment.getProperty(ENV_VAR_URL_FOR_SANITY_TESTS);
 
             if (currentTestType == TestType.INTEGRATION_SANITY) {
+                LOG.info("Service location for local/mocked smoke tests (usually on master branch): {}", urlForSmoke);
                 return Optional.ofNullable(urlForSanity).orElseThrow(() -> new AssumptionViolatedException(String.format("There was no var %s specified to locate the service for sanity testing.", ENV_VAR_URL_FOR_SANITY_TESTS)));
             } else if (currentTestType == TestType.INTEGRATION_SMOKE) {
+                LOG.info("Service location for local/mocked sanity tests (usually on PR branch): {}", urlForSmoke);
                 return Optional.ofNullable(urlForSmoke).orElseThrow(() -> new AssumptionViolatedException(String.format("There was no var %s specified to locate the service for smoke testing.", ENV_VAR_URL_FOR_SMOKE_TESTS)));
             } else {
                 throw new NotImplementedException(String.format("Base URL not specified for test type=%s", currentTestType));

diff --git a/appstore-metadata-service/README.md b/appstore-metadata-service/README.md
@@ -3,12 +3,6 @@ AppStore Metadata Service
 
 In order to build the service you need to run:
 
-```
-mvn -pl tcp-msg-maven-plugin clean install plugin:descriptor
-```
-
-Then execute to package it:
-
 ```
 mvn package
 ```

diff --git a/...ice/lib/com/lgi/common/maven/tcp-msg-maven-plugin/0.0.1-SNAPSHOT/maven-metadata-local.xml b/...ice/lib/com/lgi/common/maven/tcp-msg-maven-plugin/0.0.1-SNAPSHOT/maven-metadata-local.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata modelVersion="1.1.0">
+  <groupId>com.lgi.common.maven</groupId>
+  <artifactId>tcp-msg-maven-plugin</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <versioning>
+    <snapshot>
+      <localCopy>true</localCopy>
+    </snapshot>
+    <lastUpdated>20210120152602</lastUpdated>
+    <snapshotVersions>
+      <snapshotVersion>
+        <extension>jar</extension>
+        <value>0.0.1-SNAPSHOT</value>
+        <updated>20210120152602</updated>
+      </snapshotVersion>
+      <snapshotVersion>
+        <extension>pom</extension>
+        <value>0.0.1-SNAPSHOT</value>
+        <updated>20210120152602</updated>
+      </snapshotVersion>
+    </snapshotVersions>
+  </versioning>
+</metadata>
diff --git a/.../common/maven/tcp-msg-maven-plugin/0.0.1-SNAPSHOT/tcp-msg-maven-plugin-0.0.1-SNAPSHOT.jar b/.../common/maven/tcp-msg-maven-plugin/0.0.1-SNAPSHOT/tcp-msg-maven-plugin-0.0.1-SNAPSHOT.jar
diff --git a/tcp-msg-maven-plugin/pom.xml → ...T/tcp-msg-maven-plugin-0.0.1-SNAPSHOT.pom b/tcp-msg-maven-plugin/pom.xml → ...T/tcp-msg-maven-plugin-0.0.1-SNAPSHOT.pom
diff --git a/...e-metadata-service/lib/com/lgi/common/maven/tcp-msg-maven-plugin/maven-metadata-local.xml b/...e-metadata-service/lib/com/lgi/common/maven/tcp-msg-maven-plugin/maven-metadata-local.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>com.lgi.common.maven</groupId>
+  <artifactId>tcp-msg-maven-plugin</artifactId>
+  <versioning>
+    <versions>
+      <version>0.0.1-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20210120152602</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,6 @@
     <modules>
         <module>appstore-metadata-service</module>
         <module>appstore-metadata-service-tests</module>
-        <module>tcp-msg-maven-plugin</module>
     </modules>
 
     <properties>
@@ -81,6 +80,13 @@
         </snapshotRepository>
     </distributionManagement>
 
+    <pluginRepositories>
+        <pluginRepository>
+            <id>local-plugins-repo</id>
+            <url>file://${project.basedir}/lib</url>
+        </pluginRepository>
+    </pluginRepositories>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -134,6 +140,12 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+
+            <dependency>
+                <groupId>com.lgi.common.maven</groupId>
+                <artifactId>tcp-msg-maven-plugin</artifactId>
+                <version>0.0.1-SNAPSHOT</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/tcp-msg-maven-plugin/README.md b/tcp-msg-maven-plugin/README.md
diff --git a/tcp-msg-maven-plugin/src/main/java/com/lgi/commons/maven/TcpMessagingMojo.java b/tcp-msg-maven-plugin/src/main/java/com/lgi/commons/maven/TcpMessagingMojo.java