X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=onboarding%2Fpom.xml;h=7cfd93eeabf9701e052ac693eba5d07db2f183b8;hb=0a0897466ccc94214466e63a8c33cb60c2141f91;hp=21a4d8244ea0a4f38765692cb90ddd4781965ea2;hpb=a1e1776d772f41b9102efee4c5a0b8c2032a83f5;p=sdc.git

diff --git a/onboarding/pom.xml b/onboarding/pom.xml
index 21a4d8244e..454ea6e935 100644
--- a/onboarding/pom.xml
+++ b/onboarding/pom.xml
@@ -1,6 +1,23 @@
+<!--
+  ~ 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>
 
     <artifactId>sdc-onboarding</artifactId>
@@ -9,111 +26,58 @@
     <parent>
         <groupId>org.openecomp.sdc</groupId>
         <artifactId>sdc-main</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.13.7-SNAPSHOT</version>
     </parent>
 
     <modules>
-        <module>../openecomp-be/tools/compile-helper-plugin</module>
         <module>../common</module>
         <module>../openecomp-be</module>
         <module>../openecomp-ui</module>
     </modules>
 
     <properties>
+
+        <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
+        <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>
+        <mvn.resource.version>3.1.0</mvn.resource.version>
         <mvn.deploy.version>2.4</mvn.deploy.version>
-        <mvn.hub.version>1.4.0</mvn.hub.version>
-        <mvn.install.version>2.3.1</mvn.install.version>
-        <mvn.jar.version>2.4</mvn.jar.version>
-        <mvn.jaxb2.version>0.13.3</mvn.jaxb2.version>
-        <mvn.license.version>1.10</mvn.license.version>
-        <mvn.shade.version>2.3</mvn.shade.version>
-        <mvn.surefire.version>2.19.1</mvn.surefire.version>
-        <mvn.swagger.version>3.1.0</mvn.swagger.version>
-        <mvn.war.version>2.1.1</mvn.war.version>
-        <maven-core.version>3.5.3</maven-core.version>
-        <maven-plugin-plugin.version>3.5.1</maven-plugin-plugin.version>
-        <maven-plugin-annotations.version>3.5.1</maven-plugin-annotations.version>
-        <mvn.antrun.version>1.8</mvn.antrun.version>
-
-        <!-- Onboarding artifacts version -->
-        <openecomp.sdc.common.version>${project.version}</openecomp.sdc.common.version>
+        <mvn.install.version>2.4</mvn.install.version>
 
         <!-- Onboarding 3rd party versions -->
-        <aspectj.version>1.8.9</aspectj.version>
-        <bsh.version>2.0b5</bsh.version>
-        <cassandra.version>2.1.9</cassandra.version>
-        <cglib.nodep.version>3.2.4</cglib.nodep.version> <!--old : 2.1_3. new 3.2.4 -->
+        <aspectjrt.version>${aspectj.version}</aspectjrt.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> <!-- orignal 1.6 updated to resolve blackduck violation -->
-        <commons.collections.version>4.1</commons.collections.version>
+        <commons.codec.version>${commons-codec}</commons.codec.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> <!-- orignal 2.5. updated to resolve blackduck violation -->
-        <commons.lang3.version>3.4</commons.lang3.version>
-        <cxf.version>3.1.8</cxf.version>
-        <datasatx.version>2.1.9</datasatx.version>
-        <easymock.version>3.4</easymock.version>
-        <groovy.version>2.4.7</groovy.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> <!--5.3.1.Final changed to 5.3.3.Final to include jboss-logging 3.3.0.Final for 1702 -->
-        <http.client.version>4.5.3</http.client.version>
-        <http.core.version>4.4.1</http.core.version>
+        <commons.lang3.version>${lang3.version}</commons.lang3.version>
+        <datastax.cassandra.version>3.8.0</datastax.cassandra.version>
+        <http.client.version>${httpclient.version}</http.client.version>
+        <http.core.version>${httpcore.version}</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> <!-- orignal 2.2.4 updated to resolve blackduck violation -->
+        <com.sun.xml.version>2.3.3</com.sun.xml.version>
+        <javax.el.version>2.2.6</javax.el.version>
+        <javax.el-api.version>3.0.1-b06</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.annotations.version>2.7.4</jackson.annotations.version>
-        <jackson.dataformat.version>2.7.4</jackson.dataformat.version>
-        <jackson.mapper.version>1.9.13</jackson.mapper.version>
+        <jackson.annotations.version>${jackson.version}</jackson.annotations.version>
+        <jackson.dataformat.version>${jackson.version}</jackson.dataformat.version>
         <jcommander.version>1.58</jcommander.version>
-        <jetty.servlets.version>9.0.6.v20130930</jetty.servlets.version>
         <jersey.core.version>1.19.1</jersey.core.version>
         <jersey.multipart.version>1.18.1</jersey.multipart.version>
-        <junit.version>RELEASE</junit.version>
-        <logback.version>1.1.2</logback.version>
-        <mockito.all.version>1.10.19</mockito.all.version>
-        <org.codehaus.jackson.version>1.9.13</org.codehaus.jackson.version> <!-- orignal 1.9.2 -->
-        <org.everit.json.schema.version>1.3.0
-        </org.everit.json.schema.version> <!--new 1.4.1 orignal 1.3.0 updated to resolve blackduck violation -->
-        <org.reflections.version>0.9.10
-        </org.reflections.version> <!-- orignal 0.9.9 updated to resolve blackduck violation -->
-        <powermock.version>1.6.5</powermock.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <servlet.version>2.5</servlet.version>
-        <slf4j.version>1.7.21</slf4j.version>
-        <snakeyaml.version>1.17</snakeyaml.version>
-        <spring.framework.version>4.3.4.RELEASE</spring.framework.version> <!-- orignal 4.0.7.RELEASE 4.1.3.RELEASE-->
-        <swagger.version>1.5.3</swagger.version>
-        <testng.version>6.9.10</testng.version> <!--new 6.9.13.6 still shows blackduck risk -->
+        <org.everit.json.schema.version>1.5.1</org.everit.json.schema.version>
+        <slf4j.version>${slf4j-api.version}</slf4j.version>
+        <spring.framework.version>${spring.version}</spring.framework.version>
+        <swagger.version>${swagger-core-mvn-plugin.version}</swagger.version>
         <woodstox.version>4.4.1</woodstox.version>
-        <ws.rs.version>2.0.1
-        </ws.rs.version>  <!--  New version 2.0.1 to fix blackduck violation Failing with comiplation issues-->
-        <zusammen.version>0.3.0</zusammen.version>
-        <zusammen-state-store.version>0.3.0</zusammen-state-store.version>
-        <zusammen-collaboration-store.version>0.3.2</zusammen-collaboration-store.version>
-        <zusammen-index-store.version>0.3.0</zusammen-index-store.version>
-        <pmd.version>5.8.1</pmd.version>
+        <zusammen.version>1.0.2</zusammen.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>
+        <zusammen-common-utilities.version>1.0.3</zusammen-common-utilities.version>
         <build.tools.version>${project.version}</build.tools.version>
-        <togglz.version>2.4.1.Final</togglz.version>
-        <jacoco.skip>true</jacoco.skip>
     </properties>
 
     <dependencyManagement>
@@ -121,9 +85,212 @@
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
-                <version>1.16.20</version>
+                <version>${lombok.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-expression</artifactId>
+                <version>${spring.framework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context</artifactId>
+                <version>${spring.framework.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-expression</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-core</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-webmvc</artifactId>
+                <version>${spring.framework.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-expression</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-web</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-text</artifactId>
+                <version>${apache-commons-text.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.beust</groupId>
+                <artifactId>jcommander</artifactId>
+                <version>${jcommander.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpasyncclient</artifactId>
+                <version>${httpasyncclient.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>${com.sun.xml.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.beanshell</groupId>
+                <artifactId>bsh</artifactId>
+                <version>${bsh.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-digester</groupId>
+                <artifactId>commons-digester</artifactId>
+                <version>${commons.digester.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml</groupId>
+                <artifactId>classmate</artifactId>
+                <version>${classmate.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.groovy</groupId>
+                <artifactId>groovy</artifactId>
+                <version>${groovy.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.janino</groupId>
+                <artifactId>janino</artifactId>
+                <version>${janino.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-annotations</artifactId>
+                <version>${jackson.annotations.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.aspectj</groupId>
+                <artifactId>aspectjrt</artifactId>
+                <version>${aspectjrt.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.servlet</groupId>
+                <artifactId>jakarta.servlet-api</artifactId>
+                <version>${servlet-api.version}</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>commons-beanutils</groupId>
+                <artifactId>commons-beanutils</artifactId>
+                <version>${commons-beanutils}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.code.findbugs</groupId>
+                <artifactId>annotations</artifactId>
+                <version>3.0.1u2</version>
+            </dependency>
+            <dependency>
+                <groupId>cglib</groupId>
+                <artifactId>cglib-nodep</artifactId>
+                <version>${cglib.nodep.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-core</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${jackson.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-core</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-yaml</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>${commons.codec.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.datastax.cassandra</groupId>
+                <artifactId>cassandra-driver-core</artifactId>
+                <version>${datastax.cassandra.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.github.jnr</groupId>
+                        <artifactId>jnr-posix</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>com.datastax.cassandra</groupId>
+                <artifactId>cassandra-driver-mapping</artifactId>
+                <version>${datastax.cassandra.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.ws.rs</groupId>
+                <artifactId>jakarta.ws.rs-api</artifactId>
+                <version>${ws.rs.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.code.gson</groupId>
+                <artifactId>gson</artifactId>
+                <version>${gson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons.io.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>${commons.lang3.version}</version>
+            </dependency>
+            <dependency>
+                <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>
         </dependencies>
     </dependencyManagement>
 
@@ -131,90 +298,39 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.8</version>
-                <configuration>
-                    <analysisCache>true</analysisCache>
-                    <analysisCacheLocation>${project.build.directory}/pmd/pmd.cache</analysisCacheLocation>
-                    <aggregate>false</aggregate>
-                    <includeTests>true</includeTests>
-                    <linkXRef>false</linkXRef>
-                    <printFailingErrors>true</printFailingErrors>
-                    <rulesets>
-                        <ruleset>build-pmd-ruleset.xml</ruleset>
-                    </rulesets>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>pmd-check</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <!-- violations fail build -->
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.openecomp.sdc</groupId>
-                        <artifactId>build-tools</artifactId>
-                        <version>${build.tools.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>net.sourceforge.pmd</groupId>
-                        <artifactId>pmd-core</artifactId>
-                        <version>${pmd.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>net.sourceforge.pmd</groupId>
-                        <artifactId>pmd-java</artifactId>
-                        <version>${pmd.version}</version>
-                    </dependency>
-                </dependencies>
+                <artifactId>maven-jar-plugin</artifactId>
             </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>${pmd}</exclude>
-                                <exclude>${mavenStatus}</exclude>
-                                <exclude>${customGeneratedSources}</exclude>
-                                <exclude>build-data/**</exclude>
-                            </excludes>
-                        </fileset>
-                    </filesets>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${mvn.surefire.version}</version>
                 <configuration>
-                    <forkCount>${fork.count}</forkCount>
                     <printSummary>false</printSummary>
-                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
                     <additionalClasspathElements>
-                        <additionalClasspathElement>${project.basedir}/src/test/resources</additionalClasspathElement>
+                        <additionalClasspathElement>${project.basedir}/src/test/resources
+                        </additionalClasspathElement>
                     </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>
+                        <logback.configurationFile>src/test/resources/logback-test.xml
+                        </logback.configurationFile>
                         <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>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>${mvn.resource.version}</version>
+            </plugin>
         </plugins>
         <testResources>
             <testResource>