Update version to 1.13.6-SNAPSHOT

[sdc.git] / asdctool / pom.xml

diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 166ea15..7f0437e 100644 (file)
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -9,9 +9,13 @@
   <parent>
     <groupId>org.openecomp.sdc</groupId>
     <artifactId>sdc-main</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.6-SNAPSHOT</version>
   </parent>
 
+  <properties>
+    <apache-poi.version>5.2.3</apache-poi.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -159,10 +163,25 @@
           <artifactId>log4j</artifactId>
           <groupId>log4j</groupId>
         </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>javax.servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.onap.aaf.authz</groupId>
+          <artifactId>aaf-cadi-aaf</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.onap.aaf.authz</groupId>
+          <artifactId>aaf-cadi-client</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.onap.aaf.authz</groupId>
+          <artifactId>aaf-cadi-core</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
-
     <!-- ASDC dependencies end -->
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -174,6 +193,10 @@
           <groupId>org.eclipse.jetty</groupId>
           <artifactId>jetty-http</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>javax.servlet-api</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -184,20 +207,6 @@
       <scope>compile</scope>
     </dependency>
 
-    <!-- listen to file changes -->
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-jci-core</artifactId>
-      <version>${commons-jci-core.version}</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-io</groupId>
-          <artifactId>commons-io</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
@@ -258,14 +267,7 @@
       <scope>compile</scope>
     </dependency>
 
-    <!-- slf4j + logback -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>${slf4j-api.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
+    <!-- logback -->
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
@@ -282,9 +284,9 @@
 
     <!-- groovy -->
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy</artifactId>
-      <scope>compile</scope>
+      <version>${groovy.version}</version>
     </dependency>
 
     <dependency>
@@ -352,19 +354,16 @@
       <version>${org.dom4j.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>com.googlecode.json-simple</groupId>
-      <artifactId>json-simple</artifactId>
-      <version>${json-simple.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.janusgraph</groupId>
       <artifactId>janusgraph-cassandra</artifactId>
       <version>${janusgraph.version}</version>
       <scope>compile</scope>
       <exclusions>
+        <exclusion>
+          <groupId>joda-time</groupId>
+          <artifactId>joda-time</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-log4j12</artifactId>
@@ -385,16 +384,13 @@
           <groupId>org.apache.cassandra</groupId>
           <artifactId>cassandra-all</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>javax.validation</groupId>
+          <artifactId>validation-api</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>${commons-logging}</version>
-      <scope>compile</scope>
-    </dependency>
-
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
@@ -429,8 +425,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
+      <groupId>org.apache.httpcomponents.client5</groupId>
+      <artifactId>httpclient5</artifactId>
       <version>${httpclient.version}</version>
       <scope>compile</scope>
       <exclusions>
@@ -647,6 +643,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
+        <version>${mvn.assembly.version}</version>
         <executions>
           <execution>
             <configuration>