Merge "Remove versions from deps"

2 files changed, 3 insertions, 55 deletions

diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index 6324dba..ce4b2df 100644
--- a/aai-resources/pom.xml
+++ b/aai-resources/pom.xml
@@ -25,7 +25,6 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.aai.resources</groupId>
     <artifactId>aai-resources</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
     <parent>
         <groupId>org.onap.aai.resources</groupId>
         <artifactId>resources</artifactId>
@@ -35,11 +34,7 @@
         <java.version>1.8</java.version>
         <start-class>org.onap.aai.ResourcesApp</start-class>
 
-        <aai.schema.version>1.6.0</aai.schema.version>
-        <aai.core.version>1.6.0</aai.core.version>
-        <aai.schema.ingest.version>1.6.0</aai.schema.ingest.version>
-
-
+    
         <!-- Start of the jacoco plugin properties -->
         <sonar.language>java</sonar.language>
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -49,25 +44,6 @@
         <sonar.projectVersion>${project.version}</sonar.projectVersion>
         <!-- End of the jacoco plugin properties -->
 
-        <jopt.simple.version>4.9</jopt.simple.version>
-
-        <io.swagger.version>1.5.8</io.swagger.version>
-
-        <dmaap.client.version>0.2.12</dmaap.client.version>
-        <httpcore.version>4.4</httpcore.version>
-        <json.path.version>2.2.0</json.path.version>
-        <activemq.version>5.15.8</activemq.version>
-        <httpclient.version>4.5.3</httpclient.version>
-        <spring.jms.version>4.3.21.RELEASE</spring.jms.version>
-        <spotify.docker.version>0.4.11</spotify.docker.version>
-        <spring.security.version>1.0.8.RELEASE</spring.security.version>
-
-        <dme2.version>2.8.5</dme2.version>
-        <async.retry.version>0.0.7</async.retry.version>
-        <jsonassert.version>1.4.0</jsonassert.version>
-
-        <eclipse.jetty.version>9.4.1.v20170120</eclipse.jetty.version>
-
         <!-- 
         	inherit from parent 
         	<docker.fabric.version>0.28.0</docker.fabric.version>
@@ -95,14 +71,8 @@
         <jacoco.line.coverage.limit>0.68</jacoco.line.coverage.limit>
         <license.goal.type>check</license.goal.type>
 
-        <spring.web.version>4.3.21.RELEASE</spring.web.version>
-        <netty.handler.version>4.1.9.Final</netty.handler.version>
-        <netty.version>4.0.56.Final</netty.version>
-        <spring.test.version>4.3.21.RELEASE</spring.test.version>
-
         <!-- This will be used for the docker images as the default format of maven build has issues -->
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-        <javadoc.plugin.version>2.10.4</javadoc.plugin.version>
 
         <!-- Start of Default ONAP Schema Properties -->
         <schema.source.name>onap</schema.source.name>
@@ -164,7 +134,6 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>${docker.fabric.version}</version>
                         <configuration>
                             <verbose>true</verbose>
                             <apiVersion>1.23</apiVersion>
@@ -329,12 +298,10 @@
         <dependency>
             <groupId>net.sf.jopt-simple</groupId>
             <artifactId>jopt-simple</artifactId>
-            <version>${jopt.simple.version}</version>
         </dependency>
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-core</artifactId>
-            <version>${io.swagger.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>javax.ws.rs</groupId>
@@ -345,7 +312,6 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>${io.swagger.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-configuration</groupId>
@@ -360,7 +326,6 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-jersey-jaxrs</artifactId>
-            <version>${io.swagger.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.glassfish.jersey.media</groupId>
@@ -487,7 +452,6 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>${powermock.version}</version>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
@@ -537,9 +501,8 @@
             <artifactId>gson</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.att.nsa</groupId>
+            <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
             <artifactId>dmaapClient</artifactId>
-            <version>${dmaap.client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -554,7 +517,6 @@
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
-            <version>${json.path.version}</version>
         </dependency>
         <!-- Do not use activemq-all because they force you to use a specific logging
             and they shade it so you can't simply exclude it and when you deploy the
@@ -562,17 +524,14 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-broker</artifactId>
-            <version>${activemq.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-client</artifactId>
-            <version>${activemq.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-core</artifactId>
-            <version>${aai.core.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.sun.jersey</groupId>
@@ -599,13 +558,11 @@
         <dependency>
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-schema-ingest</artifactId>
-            <version>${aai.schema.ingest.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jms</artifactId>
-            <version>${spring.jms.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.sun.jersey</groupId>
@@ -619,12 +576,10 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>${httpclient.version}</version>
         </dependency>
         <dependency>
             <groupId>org.skyscreamer</groupId>
             <artifactId>jsonassert</artifactId>
-            <version>${jsonassert.version}</version>
             <scope>test</scope>
         </dependency>
         <!--
@@ -638,7 +593,6 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-rsa</artifactId>
-            <version>${spring.security.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bouncycastle</groupId>
@@ -649,7 +603,6 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>
-            <version>${netty.handler.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -672,7 +625,6 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>${netty.version}</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
@@ -682,7 +634,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${spring.test.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -794,7 +745,6 @@
                                     <artifactItem>
                                         <groupId>org.onap.aai.schema-service</groupId>
                                         <artifactId>aai-schema</artifactId>
-                                        <version>${aai.schema.version}</version>
                                         <outputDirectory>${project.basedir}/src/main/resources/schema/</outputDirectory>
                                         <includes>**/oxm/**/*.xml</includes>
                                     </artifactItem>
@@ -813,7 +763,6 @@
                                     <artifactItem>
                                         <groupId>org.onap.aai.schema-service</groupId>
                                         <artifactId>aai-schema</artifactId>
-                                        <version>${aai.schema.version}</version>
                                         <outputDirectory>${project.basedir}/src/main/resources/schema/</outputDirectory>
                                         <includes>**/dbedgerules/**/*.json</includes>
                                     </artifactItem>
@@ -900,7 +849,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>${javadoc.plugin.version}</version>
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 64082a9..ed9b20b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.6.0</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
     <groupId>org.onap.aai.resources</groupId>
     <artifactId>resources</artifactId>