X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=openecomp-be%2Ftools%2Fzusammen-tools%2Fpom.xml;h=5b082f56bd0eab0caa49cf5b7179f6851395ece3;hb=9dcb6f393bfc76237cca809b39d5034afecf1c55;hp=432248853fc11cbfc5069551f9a9f83ee9564683;hpb=c108dee7bd25a976dc4fa88eef3ec859facdf5d2;p=sdc.git

diff --git a/openecomp-be/tools/zusammen-tools/pom.xml b/openecomp-be/tools/zusammen-tools/pom.xml
index 432248853f..5b082f56bd 100644
--- a/openecomp-be/tools/zusammen-tools/pom.xml
+++ b/openecomp-be/tools/zusammen-tools/pom.xml
@@ -1,18 +1,38 @@
+<!--
+  ~ Copyright © 2016-2018 European Support Limited
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    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>
 
-    <properties>
+    <artifactId>openecomp-zusammen-tools</artifactId>
+    <groupId>org.openecomp.sdc.core.tools</groupId>
+    <name>openecomp-zusammen-tools</name>
 
-        <groovy.version>2.4.7</groovy.version>
-        <janino.version>2.7.7</janino.version>
+    <parent>
+        <groupId>org.openecomp.sdc</groupId>
+        <artifactId>openecomp-sdc-lib</artifactId>
+        <relativePath>../../lib</relativePath>
+        <version>1.13.4-SNAPSHOT</version>
+    </parent>
 
+    <properties>
     </properties>
 
-
-
-    <name>openecomp-zusammen-tools</name>
     <dependencies>
         <dependency>
             <groupId>org.openecomp.sdc</groupId>
@@ -47,10 +67,10 @@
         <dependency>
             <groupId>com.amdocs.zusammen.plugin</groupId>
             <artifactId>zusammen-state-store-cassandra-plugin</artifactId>
-              <version>${zusammen-state-store.version}</version>
+            <version>${zusammen-state-store.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
             <version>${hibernate.validator.version}</version>
         </dependency>
@@ -63,36 +83,22 @@
             <groupId>org.openecomp.sdc</groupId>
             <artifactId>openecomp-sdc-vendor-software-product-manager</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
             <version>1.4</version>
         </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>${testng.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
-    <artifactId>openecomp-zusammen-tools</artifactId>
-    <groupId>org.openecomp.sdc.core.tools</groupId>
-    <version>1.3.0-SNAPSHOT</version>
-    <parent>
-        <groupId>org.openecomp.sdc</groupId>
-        <artifactId>openecomp-sdc-lib</artifactId>
-        <relativePath>../../lib</relativePath>
-        <version>1.3.0-SNAPSHOT</version>
-    </parent>
-    <!--parent>
-        <groupId>org.openecomp.sdc</groupId>
-        <artifactId>openecomp-sdc</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent-->
+
     <build>
         <plugins>
-
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>license-maven-plugin</artifactId>
@@ -166,7 +172,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
                 <configuration>
                     <outputDirectory>${project.build.directory}/lib</outputDirectory>
                 </configuration>
@@ -175,15 +180,16 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
+                <version>${maven-antrun-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>ant-test</id>
                         <phase>package</phase>
                         <configuration>
-                            <tasks>
+                            <target>
                                 <fixcrlf srcdir="./" eol="unix"
-                                         includes="zusammenMainTool.sh"/>
-                            </tasks>
+                                    includes="zusammenMainTool.sh"/>
+                            </target>
                         </configuration>
                         <goals>
                             <goal>run</goal>
@@ -192,7 +198,9 @@
                 </executions>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
+                <version>${mvn.assembly.version}</version>
                 <executions>
                     <execution>
                         <id>Generate assembly</id>
@@ -211,7 +219,6 @@
                     <finalName>openecomp-zusammen-tools-lib</finalName>
                 </configuration>
             </plugin>
-
         </plugins>
     </build>