Step version to 1.12.4-SNAPSHOT

[sdc.git] / asdctool / pom.xml

diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 400ce67..4dba42e 100644 (file)
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.openecomp.sdc</groupId>
     <artifactId>sdc-main</artifactId>
-    <version>1.9.0-SNAPSHOT</version>
+    <version>1.12.4-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -26,12 +26,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>
@@ -107,6 +123,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>
 
@@ -135,10 +159,13 @@
           <artifactId>log4j</artifactId>
           <groupId>log4j</groupId>
         </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>javax.servlet-api</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
-
     <!-- ASDC dependencies end -->
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -150,6 +177,10 @@
           <groupId>org.eclipse.jetty</groupId>
           <artifactId>jetty-http</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>javax.servlet-api</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -186,10 +217,6 @@
       <version>${jetty.version}</version>
       <scope>compile</scope>
       <exclusions>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-server</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>org.eclipse.jetty</groupId>
           <artifactId>jetty-security</artifactId>
@@ -280,8 +307,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>
@@ -315,6 +346,10 @@
           <groupId>dom4j</groupId>
           <artifactId>dom4j</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>jcl-over-slf4j</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -405,6 +440,12 @@
       <artifactId>httpclient</artifactId>
       <version>${httpclient.version}</version>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -427,6 +468,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>
@@ -448,6 +499,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 -->
@@ -491,6 +548,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>
@@ -687,7 +750,6 @@
                 <resource>
                   <directory>${project.parent.basedir}/catalog-be/src/main/resources/import/tosca
                   </directory>
-                  <filtering>true</filtering>
                 </resource>
               </resources>
             </configuration>
@@ -737,6 +799,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>
@@ -751,6 +836,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>
@@ -769,17 +855,17 @@
             <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>
@@ -806,7 +892,7 @@
                 </goals>
                 <configuration>
                   <removeAll>true</removeAll>
-                  <image>onap/sdc-cassandra-init</image>
+                  <image>${docker.namespace}/sdc-cassandra-init</image>
                 </configuration>
               </execution>
 
@@ -825,7 +911,7 @@
                   <goal>push</goal>
                 </goals>
                 <configuration>
-                  <image>onap/sdc-cassandra-init</image>
+                  <image>${docker.namespace}/sdc-cassandra-init</image>
                 </configuration>
               </execution>
             </executions>