X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=onboarding%2Fpom.xml;h=5d19b3990519170d38d199ff901673b687dec838;hb=8af1780de45b17bac1619765acf056e2d3c231f4;hp=0e18c2d3cf9d30b81f3cde0a8ca0f0377ea8154f;hpb=7381994de250aac82522c2bdd32768bff4f869a8;p=sdc.git

diff --git a/onboarding/pom.xml b/onboarding/pom.xml
index 0e18c2d3cf..5d19b39905 100644
--- a/onboarding/pom.xml
+++ b/onboarding/pom.xml
@@ -1,3 +1,19 @@
+<!--
+  ~ 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">
@@ -10,28 +26,24 @@
     <parent>
         <groupId>org.openecomp.sdc</groupId>
         <artifactId>sdc-main</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.6.2-SNAPSHOT</version>
     </parent>
 
     <modules>
-        <module>../openecomp-be/tools/artifact-copy-plugin</module>
-        <module>../openecomp-be/tools/compile-helper-plugin</module>
-        <module>../openecomp-be/tools/pmd-helper-plugin</module>
         <module>../common</module>
         <module>../openecomp-be</module>
-        <module>../openecomp-be/tools/build-data-installer</module>
-        <module>../openecomp-be/tools/snapshot-signature-plugin</module>
         <module>../openecomp-ui</module>
     </modules>
 
     <properties>
 
-        <maven.test.redirectTestOutputToFile>false</maven.test.redirectTestOutputToFile>
+        <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.targer>1.8</maven.compiler.targer>
         <jacoco.skip>true</jacoco.skip>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- Maven plugin versions -->
-        <jacoco.version>0.7.9</jacoco.version>
         <mvn.assembly.version>2.1</mvn.assembly.version>
         <mvn.compiler.version>3.7.0</mvn.compiler.version>
         <mvn.clean.version>2.5</mvn.clean.version>
@@ -55,41 +67,39 @@
         <!-- Onboarding 3rd party versions -->
         <aspectj.version>1.8.9</aspectj.version>
         <aspectjrt.version>${aspectj.version}</aspectjrt.version>
-        <bsh.version>2.0b5</bsh.version>
+        <bsh.version>2.0b6</bsh.version>
         <cglib.nodep.version>3.2.4</cglib.nodep.version>
         <classmate.version>1.3.3</classmate.version>
-        <commons.beanutils.version>1.9.3</commons.beanutils.version>
         <commons.codec.version>1.10</commons.codec.version>
         <commons.collections.version>4.1</commons.collections.version>
         <commons.digester.version>2.1</commons.digester.version>
         <commons.io.version>2.5</commons.io.version>
         <commons.lang.version>2.6</commons.lang.version>
         <commons.lang3.version>3.4</commons.lang3.version>
-        <cxf.version>3.1.8</cxf.version>
+        <cxf.version>3.1.16</cxf.version>
         <datastax.cassandra.version>3.4.0</datastax.cassandra.version>
         <easymock.version>3.4</easymock.version>
-        <groovy.version>2.4.7</groovy.version>
+        <groovy.version>2.4.8</groovy.version>
+        <groovy.minimal.version>1.5.8</groovy.minimal.version>
         <gson.version>2.3.1</gson.version>
         <fop.version>2.2</fop.version>
         <freemarker.version>2.3.26-incubating</freemarker.version>
-        <hibernate.validator.version>5.3.3.Final</hibernate.validator.version>
+        <hibernate.validator.version>5.3.6.Final</hibernate.validator.version>
         <http.client.version>4.5.3</http.client.version>
         <http.core.version>4.4.1</http.core.version>
         <httpasyncclient.version>4.1.2</httpasyncclient.version>
         <janino.version>2.7.7</janino.version>
         <jaxb.impl.version>2.2.11</jaxb.impl.version>
-        <java.source>1.8</java.source>
-        <java.target>1.8</java.target>
         <javax.el.version>2.2.4</javax.el.version>
         <javax.el-api.version>3.0.1-b04</javax.el-api.version>
         <javax.inject.version>1</javax.inject.version>
         <javax.servlet.version>2.5</javax.servlet.version>
-        <jackson.version>2.8.1</jackson.version>
+        <jackson.version>2.9.9</jackson.version>
         <jackson.annotations.version>${jackson.version}</jackson.annotations.version>
         <jackson.dataformat.version>${jackson.version}</jackson.dataformat.version>
         <jackson.mapper.version>1.9.13</jackson.mapper.version>
         <jcommander.version>1.58</jcommander.version>
-        <jetty.servlets.version>9.0.6.v20130930</jetty.servlets.version>
+        <jetty.servlets.version>9.4.11.v20180605</jetty.servlets.version>
         <jersey.core.version>1.19.1</jersey.core.version>
         <jersey.multipart.version>1.18.1</jersey.multipart.version>
         <junit.version>4.12</junit.version>
@@ -102,21 +112,19 @@
         <servlet.version>2.5</servlet.version>
         <slf4j.version>1.7.21</slf4j.version>
         <snakeyaml.version>1.17</snakeyaml.version>
-        <spring.framework.version>4.3.15.RELEASE</spring.framework.version>
-        <swagger.version>1.5.3</swagger.version>
-        <testng.version>6.9.10</testng.version>
+        <spring.framework.version>4.3.18.RELEASE</spring.framework.version>
+        <swagger.version>2.0.8</swagger.version>
+        <testng.version>6.14.3</testng.version>
         <woodstox.version>4.4.1</woodstox.version>
         <ws.rs.version>2.0.1</ws.rs.version>
         <zusammen.version>1.0.1</zusammen.version>
-        <zusammen-state-store.version>1.0.1</zusammen-state-store.version>
-        <zusammen-collaboration-store.version>1.0.1</zusammen-collaboration-store.version>
+        <zusammen-state-store.version>1.0.2</zusammen-state-store.version>
+        <zusammen-collaboration-store.version>1.0.2</zusammen-collaboration-store.version>
         <zusammen-index-store.version>1.0.0</zusammen-index-store.version>
-        <pmd.version>5.8.1</pmd.version>
         <build.tools.version>${project.version}</build.tools.version>
         <togglz.version>2.4.1.Final</togglz.version>
-        <maven.pmd.plugin.version>3.9.0</maven.pmd.plugin.version>
-        <pmd.java.version>6.3.0</pmd.java.version>
-        <pmd.core.version>6.3.0</pmd.core.version>
+        <bouncycastle.version>1.61</bouncycastle.version>
+        <onap.logging.version>1.6.1</onap.logging.version>
     </properties>
 
     <dependencyManagement>
@@ -124,7 +132,7 @@
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
-                <version>1.16.20</version>
+                <version>${lombok.version}</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -179,8 +187,8 @@
             </dependency>
             <dependency>
                 <groupId>org.codehaus.groovy</groupId>
-                <artifactId>groovy-all</artifactId>
-                <version>${groovy.version}</version>
+                <artifactId>groovy-all-minimal</artifactId>
+                <version>${groovy.minimal.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.codehaus.janino</groupId>
@@ -212,7 +220,7 @@
             <dependency>
                 <groupId>commons-beanutils</groupId>
                 <artifactId>commons-beanutils</artifactId>
-                <version>${commons.beanutils.version}</version>
+                <version>${commons-beanutils}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.code.findbugs</groupId>
@@ -280,10 +288,15 @@
                 <version>${commons.lang3.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.swagger</groupId>
+                <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-annotations</artifactId>
                 <version>${swagger.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.github.tomakehurst</groupId>
+                <artifactId>wiremock</artifactId>
+                <version>${wire-mock.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.testng</groupId>
                 <artifactId>testng</artifactId>
@@ -311,34 +324,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>${mvn.jar.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                        <phase>none</phase>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
                 <version>${mvn.clean.version}</version>
-                <configuration>
-                    <excludeDefaultDirectories>true</excludeDefaultDirectories>
-                    <filesets>
-                        <fileset>
-                            <directory>${project.build.directory}</directory>
-                            <excludes>
-                                <exclude>${classes}</exclude>
-                                <exclude>${testClasses}</exclude>
-                                <exclude>${mavenStatus}</exclude>
-                                <exclude>${customGeneratedSources}</exclude>
-                                <exclude>build-data/**</exclude>
-                            </excludes>
-                        </fileset>
-                    </filesets>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -353,30 +343,20 @@
                     </additionalClasspathElements>
                     <systemPropertyVariables>
                         <logback.configurationFile>src/test/resources/logback-test.xml</logback.configurationFile>
-                        <artifactgenerator.config>
-                            ${project.basedir}/src/test/resources/config/Artifact-Generator.properties
-                        </artifactgenerator.config>
                         <config.location>${project.basedir}/configuration</config.location>
                     </systemPropertyVariables>
                     <useSystemClassLoader>${useSystemClassLoader}</useSystemClassLoader>
-                    <skip>${skipTestRun}</skip>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
                 <version>${mvn.install.version}</version>
-                <configuration>
-                    <skip>${skipInstall}</skip>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>${mvn.resource.version}</version>
-                <configuration>
-                    <skip>${skipResourceCollection}</skip>
-                </configuration>
             </plugin>
         </plugins>
         <testResources>