X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=asdctool%2Fpom.xml;h=7f0437e4beca8c0d8d4215ef892df74bb00d27e9;hb=0560a3a55dd2ba8fe1af6aeed425dad09c7f7261;hp=623d4e6ea85975bd1e507e7bc9b90f291033f2f6;hpb=00acf3d39898cc712e8f3fd2afb69f26bc922f61;p=sdc.git

diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 623d4e6ea8..7f0437e4be 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -9,9 +9,13 @@
   <parent>
     <groupId>org.openecomp.sdc</groupId>
     <artifactId>sdc-main</artifactId>
-    <version>1.9.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>
@@ -26,12 +30,28 @@
       <artifactId>common-be</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.openecomp.sdc</groupId>
       <artifactId>common-app-api</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.functionaljava</groupId>
+          <artifactId>functionaljava</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -81,6 +101,10 @@
           <groupId>org.eclipse.jetty</groupId>
           <artifactId>jetty-http</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>jetty-servlets</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.openecomp.ecompsdkos</groupId>
           <artifactId>epsdk-fw</artifactId>
@@ -103,6 +127,14 @@
           <artifactId>slf4j-log4j12</artifactId>
           <groupId>org.slf4j</groupId>
         </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-web</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-webmvc</artifactId>
+        </exclusion>
 
       </exclusions>
 
@@ -131,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>
@@ -146,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>
 
@@ -156,14 +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>
-    </dependency>
-
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
@@ -178,7 +221,7 @@
       <exclusions>
         <exclusion>
           <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-server</artifactId>
+          <artifactId>jetty-security</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -224,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>
@@ -248,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>
@@ -266,8 +302,12 @@
       <scope>compile</scope>
       <exclusions>
         <exclusion>
+          <groupId>org.apache.tinkerpop</groupId>
           <artifactId>gremlin-groovy</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>org.apache.tinkerpop</groupId>
+          <artifactId>gremlin-core</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.json</groupId>
@@ -289,14 +329,29 @@
           <groupId>org.apache.thrift</groupId>
           <artifactId>libthrift</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>commons-io</groupId>
+          <artifactId>commons-io</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-codec</groupId>
+          <artifactId>commons-codec</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>dom4j</groupId>
+          <artifactId>dom4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>jcl-over-slf4j</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
     <dependency>
-      <groupId>com.googlecode.json-simple</groupId>
-      <artifactId>json-simple</artifactId>
-      <version>${json-simple.version}</version>
-      <scope>compile</scope>
+      <groupId>org.dom4j</groupId>
+      <artifactId>dom4j</artifactId>
+      <version>${org.dom4j.version}</version>
     </dependency>
 
     <dependency>
@@ -305,20 +360,37 @@
       <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>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.thrift</groupId>
+          <artifactId>libthrift</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.codehaus.jackson</groupId>
+          <artifactId>jackson-mapper-asl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.hibernate</groupId>
+          <artifactId>hibernate-validator</artifactId>
+        </exclusion>
+        <exclusion>
+          <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>
@@ -353,10 +425,16 @@
     </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>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -379,6 +457,16 @@
       <artifactId>spring-context</artifactId>
       <version>${spring.version}</version>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-expression</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -400,6 +488,12 @@
       <artifactId>spring-aop</artifactId>
       <version>${spring.version}</version>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!-- Spring 4 dependencies end -->
@@ -443,6 +537,12 @@
       <artifactId>cassandra-driver-core</artifactId>
       <version>${cassandra.driver.version}</version>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.github.jnr</groupId>
+          <artifactId>jnr-posix</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -468,13 +568,6 @@
       <version>${apache-poi.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.jdom</groupId>
-      <artifactId>jdom</artifactId>
-      <version>2.0.2</version>
-      <scope>compile</scope>
-    </dependency>
-
     <!-- Temporary, till building the populate task which adding all components
       to cache. We will use Serialization Utils. -->
     <dependency>
@@ -550,6 +643,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
+        <version>${mvn.assembly.version}</version>
         <executions>
           <execution>
             <configuration>
@@ -646,7 +740,6 @@
                 <resource>
                   <directory>${project.parent.basedir}/catalog-be/src/main/resources/import/tosca
                   </directory>
-                  <filtering>true</filtering>
                 </resource>
               </resources>
             </configuration>
@@ -696,6 +789,29 @@
       </activation>
       <build>
         <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-clean-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>clean.sdctool.tar</id>
+                <phase>initialize</phase>
+                <goals>
+                  <goal>clean</goal>
+                </goals>
+                <configuration>
+                  <filesets>
+                    <fileset>
+                      <directory>${basedir}/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/files/default</directory>
+                      <includes>
+                        <include>sdctool.tar</include>
+                      </includes>
+                    </fileset>
+                  </filesets>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-resources-plugin</artifactId>
@@ -710,6 +826,7 @@
                   <outputDirectory>
                     ${basedir}/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/files/default
                   </outputDirectory>
+                  <overwrite>true</overwrite>
                   <resources>
                     <resource>
                       <directory>${project.parent.basedir}/asdctool/target</directory>
@@ -726,18 +843,19 @@
             <groupId>io.fabric8</groupId>
             <artifactId>docker-maven-plugin</artifactId>
             <configuration>
+              <verbose>${verbose}</verbose>
               <apiVersion>${docker.api.version}</apiVersion>
-              <registry>nexus3.onap.org:10001</registry>
+              <registry>${docker.registry}</registry>
               <authConfig>
                 <pull>
-                  <username>docker</username>
-                  <password>docker</password>
+                  <username>${docker.username}</username>
+                  <password>${docker.password}</password>
                 </pull>
               </authConfig>
               <images>
                 <!-- Build cassandra-init image -->
                 <image>
-                  <name>onap/sdc-cassandra-init</name>
+                  <name>${docker.namespace}/sdc-cassandra-init</name>
                   <alias>sdc-cassandra-init</alias>
                   <build>
                     <cleanup>try</cleanup>
@@ -747,7 +865,9 @@
                       <tag>
                         ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
                       </tag>
-                      <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
+                      <tag>
+                        ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}
+                      </tag>
                     </tags>
                   </build>
                 </image>
@@ -762,7 +882,7 @@
                 </goals>
                 <configuration>
                   <removeAll>true</removeAll>
-                  <image>onap/sdc-cassandra-init</image>
+                  <image>${docker.namespace}/sdc-cassandra-init</image>
                 </configuration>
               </execution>
 
@@ -781,7 +901,7 @@
                   <goal>push</goal>
                 </goals>
                 <configuration>
-                  <image>onap/sdc-cassandra-init</image>
+                  <image>${docker.namespace}/sdc-cassandra-init</image>
                 </configuration>
               </execution>
             </executions>