diff options
| -rw-r--r-- | champ-lib/champ-core/pom.xml | 32 | ||||
| -rw-r--r-- | champ-lib/champ-janus/pom.xml | 16 | ||||
| -rw-r--r-- | champ-lib/champ-titan/pom.xml | 14 | ||||
| -rw-r--r-- | champ-lib/pom.xml | 76 | ||||
| -rw-r--r-- | champ-service-deps-janus/pom.xml | 26 | ||||
| -rw-r--r-- | champ-service-deps-titan/pom.xml | 14 | ||||
| -rw-r--r-- | champ-service/pom.xml | 88 | ||||
| -rwxr-xr-x | pom.xml | 89 |
8 files changed, 205 insertions, 150 deletions
diff --git a/champ-lib/champ-core/pom.xml b/champ-lib/champ-core/pom.xml index dbbb2b7..ee65310 100644 --- a/champ-lib/champ-core/pom.xml +++ b/champ-lib/champ-core/pom.xml @@ -25,8 +25,8 @@ limitations under the License. <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>champ-lib</artifactId> <groupId>org.onap.aai</groupId> + <artifactId>champ-lib</artifactId> <version>1.2.0-SNAPSHOT</version> </parent> @@ -37,17 +37,16 @@ limitations under the License. <dependency> <groupId>org.onap.aai.event-client</groupId> <artifactId>event-client-api</artifactId> - <version>${event.client.version}</version> </dependency> + <dependency> <groupId>org.onap.aai.event-client</groupId> <artifactId>event-client-dmaap</artifactId> - <version>${event.client.version}</version> </dependency> + <dependency> <groupId>org.onap.aai.event-client</groupId> <artifactId>event-client-kafka</artifactId> - <version>${event.client.version}</version> </dependency> <!-- Event Bus Library - END --> @@ -56,11 +55,13 @@ limitations under the License. <artifactId>groovy</artifactId> <version>2.4.12</version> </dependency> + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> <version>2.5.3</version> </dependency> + <dependency> <groupId>org.apache.tinkerpop</groupId> <artifactId>gremlin-core</artifactId> @@ -77,17 +78,34 @@ limitations under the License. </exclusion> </exclusions> </dependency> + <dependency> <groupId>org.apache.tinkerpop</groupId> <artifactId>tinkergraph-gremlin</artifactId> <version>3.2.3</version> <optional>true</optional> </dependency> + <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> <version>2.8.2</version> </dependency> + + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-client</artifactId> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> <build> @@ -111,7 +129,6 @@ limitations under the License. <skip>true</skip> </configuration> </plugin> - <!-- Uncomment to add a license header to source files <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> @@ -132,17 +149,18 @@ limitations under the License. <include>**/*aaiconfig*.properties</include> <include>**/*titan*.properties</include> </includes> + <skipExistingHeaders>true</skipExistingHeaders> </configuration> <executions> <execution> <goals> - <goal>format</goal> + <!-- Set goal to "format" to auto update license headers --> + <goal>check</goal> </goals> <phase>process-sources</phase> </execution> </executions> </plugin> - --> </plugins> </build> </project> diff --git a/champ-lib/champ-janus/pom.xml b/champ-lib/champ-janus/pom.xml index 7d1532b..b316c27 100644 --- a/champ-lib/champ-janus/pom.xml +++ b/champ-lib/champ-janus/pom.xml @@ -25,8 +25,8 @@ limitations under the License. <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>champ-lib</artifactId> <groupId>org.onap.aai</groupId> + <artifactId>champ-lib</artifactId> <version>1.2.0-SNAPSHOT</version> </parent> @@ -42,11 +42,13 @@ limitations under the License. <artifactId>tinkergraph-gremlin</artifactId> <version>${tinkerpop.version}</version> </dependency> + <dependency> <groupId>org.onap.aai</groupId> <artifactId>champ-core</artifactId> <version>1.2.0-SNAPSHOT</version> </dependency> + <dependency> <groupId>org.onap.aai</groupId> <artifactId>champ-core</artifactId> @@ -54,6 +56,7 @@ limitations under the License. <type>test-jar</type> <scope>test</scope> </dependency> + <dependency> <groupId>org.janusgraph</groupId> <artifactId>janusgraph-cassandra</artifactId> @@ -78,6 +81,7 @@ limitations under the License. </exclusion> </exclusions> </dependency> + <dependency> <groupId>org.janusgraph</groupId> <artifactId>janusgraph-hbase</artifactId> @@ -93,10 +97,6 @@ limitations under the License. <artifactId>slf4j-log4j12</artifactId> </exclusion> <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </exclusion> - <exclusion> <groupId>org.apache.tinkerpop</groupId> <artifactId>gremlin-core</artifactId> </exclusion> @@ -180,7 +180,6 @@ limitations under the License. <skip>true</skip> </configuration> </plugin> - <!-- Uncomment to add a license header to source files <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> @@ -201,17 +200,18 @@ limitations under the License. <include>**/*aaiconfig*.properties</include> <include>**/*titan*.properties</include> </includes> + <skipExistingHeaders>true</skipExistingHeaders> </configuration> <executions> <execution> <goals> - <goal>format</goal> + <!-- Set goal to "format" to auto update license headers --> + <goal>check</goal> </goals> <phase>process-sources</phase> </execution> </executions> </plugin> - --> </plugins> </build> </project> diff --git a/champ-lib/champ-titan/pom.xml b/champ-lib/champ-titan/pom.xml index 5bfc860..05d862c 100644 --- a/champ-lib/champ-titan/pom.xml +++ b/champ-lib/champ-titan/pom.xml @@ -41,11 +41,13 @@ limitations under the License. <artifactId>tinkergraph-gremlin</artifactId> <version>${tinkerpop.version}</version> </dependency> + <dependency> <groupId>org.onap.aai</groupId> <artifactId>champ-core</artifactId> <version>1.2.0-SNAPSHOT</version> </dependency> + <dependency> <groupId>org.onap.aai</groupId> <artifactId>champ-core</artifactId> @@ -53,6 +55,7 @@ limitations under the License. <type>test-jar</type> <scope>test</scope> </dependency> + <dependency> <groupId>com.thinkaurelius.titan</groupId> <artifactId>titan-cassandra</artifactId> @@ -75,8 +78,13 @@ limitations under the License. <groupId>org.apache.tinkerpop</groupId> <artifactId>gremlin-core</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> </exclusions> </dependency> + <dependency> <groupId>com.thinkaurelius.titan</groupId> <artifactId>titan-hbase</artifactId> @@ -179,7 +187,6 @@ limitations under the License. <skip>true</skip> </configuration> </plugin> - <!-- Uncomment to add a license header to source files <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> @@ -200,17 +207,18 @@ limitations under the License. <include>**/*aaiconfig*.properties</include> <include>**/*titan*.properties</include> </includes> + <skipExistingHeaders>true</skipExistingHeaders> </configuration> <executions> <execution> <goals> - <goal>format</goal> + <!-- Set goal to "format" to auto update license headers --> + <goal>check</goal> </goals> <phase>process-sources</phase> </execution> </executions> </plugin> - --> </plugins> </build> </project> diff --git a/champ-lib/pom.xml b/champ-lib/pom.xml index 4f82dff..d69f971 100644 --- a/champ-lib/pom.xml +++ b/champ-lib/pom.xml @@ -22,17 +22,15 @@ limitations under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.onap.aai</groupId> - <artifactId>champ-lib</artifactId> - <packaging>pom</packaging> - <version>1.2.0-SNAPSHOT</version> - <parent> <groupId>org.onap.aai</groupId> <artifactId>champ</artifactId> <version>1.2.0-SNAPSHOT</version> </parent> + <artifactId>champ-lib</artifactId> + <packaging>pom</packaging> + <modules> <module>champ-core</module> <module>champ-titan</module> @@ -41,8 +39,6 @@ limitations under the License. <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <event.client.version>1.2.1</event.client.version> - <!--<absoluteDistFilesRoot>/appl/${project.artifactId}</absoluteDistFilesRoot>--> <!--<!– For NO Versioning, REMOVE the /${project.version} from the <distFilesRoot>--> @@ -53,26 +49,6 @@ limitations under the License. <!--<distFilesRoot>/appl/${project.artifactId}/${project.version}</distFilesRoot>--> </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.onap.aai.event-client</groupId> - <artifactId>event-client-api</artifactId> - <version>${event.client.version}</version> - </dependency> - <dependency> - <groupId>org.onap.aai.event-client</groupId> - <artifactId>event-client-dmaap</artifactId> - <version>${event.client.version}</version> - </dependency> - <dependency> - <groupId>org.onap.aai.event-client</groupId> - <artifactId>event-client-kafka</artifactId> - <version>${event.client.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <dependency> <groupId>junit</groupId> @@ -81,27 +57,6 @@ limitations under the License. <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>1.2.1</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-client</artifactId> - <version>0.98.4-hadoop2</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>jdk.tools</groupId> <artifactId>jdk.tools</artifactId> <version>1.8</version> @@ -198,25 +153,6 @@ limitations under the License. </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>3.0.0</version> - <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - </configuration> - <executions> - <execution> - <id>make-jar-with-dependencies</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>3.6.1</version> <configuration> @@ -278,7 +214,6 @@ limitations under the License. <skip>true</skip> </configuration> </plugin> - <!-- Uncomment to add a license header to source files <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> @@ -299,17 +234,18 @@ limitations under the License. <include>**/*aaiconfig*.properties</include> <include>**/*titan*.properties</include> </includes> + <skipExistingHeaders>true</skipExistingHeaders> </configuration> <executions> <execution> <goals> - <goal>format</goal> + <!-- Set goal to "format" to auto update license headers --> + <goal>check</goal> </goals> <phase>process-sources</phase> </execution> </executions> </plugin> - --> </plugins> </build> </project> diff --git a/champ-service-deps-janus/pom.xml b/champ-service-deps-janus/pom.xml index 398437f..9b1dd5e 100644 --- a/champ-service-deps-janus/pom.xml +++ b/champ-service-deps-janus/pom.xml @@ -22,17 +22,15 @@ limitations under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.onap.aai</groupId> - <artifactId>champ-service-deps-janus</artifactId> - <packaging>pom</packaging> - <version>1.2.0-SNAPSHOT</version> - <parent> <groupId>org.onap.aai</groupId> <artifactId>champ</artifactId> <version>1.2.0-SNAPSHOT</version> </parent> + <artifactId>champ-service-deps-janus</artifactId> + <packaging>pom</packaging> + <dependencies> <dependency> <groupId>org.onap.aai</groupId> @@ -48,14 +46,6 @@ limitations under the License. <artifactId>logback-core</artifactId> </exclusion> <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient-cache</artifactId> - </exclusion> - <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </exclusion> @@ -127,8 +117,17 @@ limitations under the License. <groupId>org.onap.aai.event-client</groupId> <artifactId>event-client-kafka</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </exclusion> </exclusions> </dependency> + <dependency> <groupId>org.janusgraph</groupId> <artifactId>janusgraph-cassandra</artifactId> @@ -193,6 +192,7 @@ limitations under the License. </exclusion> </exclusions> </dependency> + <dependency> <groupId>org.janusgraph</groupId> <artifactId>janusgraph-hbase</artifactId> diff --git a/champ-service-deps-titan/pom.xml b/champ-service-deps-titan/pom.xml index f979969..a67af1e 100644 --- a/champ-service-deps-titan/pom.xml +++ b/champ-service-deps-titan/pom.xml @@ -22,17 +22,15 @@ limitations under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.onap.aai</groupId> - <artifactId>champ-service-deps-titan</artifactId> - <packaging>pom</packaging> - <version>1.2.0-SNAPSHOT</version> - <parent> <groupId>org.onap.aai</groupId> <artifactId>champ</artifactId> <version>1.2.0-SNAPSHOT</version> </parent> + <artifactId>champ-service-deps-titan</artifactId> + <packaging>pom</packaging> + <dependencies> <dependency> <groupId>org.onap.aai</groupId> @@ -139,8 +137,13 @@ limitations under the License. <groupId>org.onap.aai.event-client</groupId> <artifactId>event-client-kafka</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </exclusion> </exclusions> </dependency> + <dependency> <groupId>com.thinkaurelius.titan</groupId> <artifactId>titan-cassandra</artifactId> @@ -216,6 +219,7 @@ limitations under the License. </exclusion> </exclusions> </dependency> + <dependency> <groupId>com.thinkaurelius.titan</groupId> <artifactId>titan-hbase</artifactId> diff --git a/champ-service/pom.xml b/champ-service/pom.xml index 77e4680..2738dc5 100644 --- a/champ-service/pom.xml +++ b/champ-service/pom.xml @@ -67,6 +67,10 @@ limitations under the License. <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> </exclusions> </dependency> @@ -87,7 +91,6 @@ limitations under the License. <scope>provided</scope> </dependency> - <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> @@ -145,24 +148,6 @@ limitations under the License. </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.5.5</version> - </dependency> - - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient-cache</artifactId> - <version>4.5.5</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> <groupId>org.onap.aai</groupId> <artifactId>champ-core</artifactId> <version>1.2.0-SNAPSHOT</version> @@ -173,10 +158,6 @@ limitations under the License. <artifactId>hbase-client</artifactId> </exclusion> <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> - <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> @@ -203,6 +184,46 @@ limitations under the License. <version>1.5.0</version> <scope>test</scope> </dependency> + + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>1.2.3</version> + </dependency> + + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + <version>1.2.3</version> + </dependency> + + <dependency> + <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> + <artifactId>dmaapClient</artifactId> + <version>1.1.5</version> + <exclusions> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient-cache</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.5.3</version> + </dependency> + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient-cache</artifactId> + <version>4.5.3</version> + </dependency> </dependencies> <distributionManagement> @@ -334,27 +355,6 @@ limitations under the License. <forceTags>true</forceTags> </configuration> </plugin> - - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.9</version> - <executions> - <execution> - <id>default-prepare-agent</id> - <goals> - <goal>prepare-agent</goal> - </goals> - </execution> - <execution> - <id>default-report</id> - <phase>prepare-package</phase> - <goals> - <goal>report</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> </project> @@ -30,6 +30,7 @@ limitations under the License. <properties> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> + <event.client.version>1.2.1</event.client.version> </properties> <modules> @@ -39,6 +40,94 @@ limitations under the License. <module>champ-service</module> </modules> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.onap.aai.event-client</groupId> + <artifactId>event-client-api</artifactId> + <version>${event.client.version}</version> + </dependency> + + <dependency> + <groupId>org.onap.aai.event-client</groupId> + <artifactId>event-client-api</artifactId> + <version>${event.client.version}</version> + </dependency> + + <dependency> + <groupId>org.onap.aai.event-client</groupId> + <artifactId>event-client-dmaap</artifactId> + <version>${event.client.version}</version> + </dependency> + + <dependency> + <groupId>org.onap.aai.event-client</groupId> + <artifactId>event-client-kafka</artifactId> + <version>${event.client.version}</version> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>20040616</version> + </dependency> + + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>1.2.3</version> + </dependency> + + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + <version>1.2.3</version> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>2.7.6</version> + </dependency> + + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-client</artifactId> + <version>1.0.2</version> + </dependency> + + <dependency> + <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> + <artifactId>dmaapClient</artifactId> + <version>1.1.5</version> + </dependency> + + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + <version>4.1.24.Final</version> + </dependency> + + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + <version>3.10.6.Final</version> + </dependency> + + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>3.4.12</version> + </dependency> + + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>2.8.11</version> + </dependency> + </dependencies> + </dependencyManagement> + <distributionManagement> <repository> <id>ecomp-releases</id> |