X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=c56cd16ac37dc52b1a2d8d8f3caebdec80d0e3e6;hb=08e64b98fc5f2067e596c2c407370612c716f253;hp=e9949866a0033fbf77161337817d7d6625c236f6;hpb=50c1ce6febddcfbe46b936f42b83ed5b23b61f09;p=so.git

diff --git a/pom.xml b/pom.xml
index e9949866a0..c56cd16ac3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   <groupId>org.onap.so</groupId>
   <artifactId>so</artifactId>
   <packaging>pom</packaging>
-  <version>1.7.1-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <name>so</name>
   <description>This Maven project is responsible to build and package all child projects - contributions in the MSO project.
 	This build can be configured to run Functional tests and to start/stop a jboss server + Mysql DB.
@@ -33,9 +33,7 @@
     <module>so-sdn-clients</module>
     <module>bpmn</module>
     <module>cxf-logging</module>
-    <module>so-monitoring</module>
     <module>so-simulator</module>
-    <module>so-etsi-nfvo</module>
     <module>packages</module>
   </modules>
   <properties>
@@ -47,7 +45,6 @@
     <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
     <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
     <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
-    <!--sonar.jacoco.itReportPath>${project.mso.base.folder}/packages/arquillian-unit-tests/target/mso-automated-tests/jacoco-it.exec</sonar.jacoco.itReportPath -->
     <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
     <sonar.projectVersion>${project.version}</sonar.projectVersion>
     <sonar.cpd.exclusions>**/*</sonar.cpd.exclusions>
@@ -67,17 +64,18 @@
     <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
     <publicNexusPath>content/repositories/public/</publicNexusPath>
     <siteNexusPath>content/sites/site/org/onap/so/${project.version}/</siteNexusPath>
-    <cxf.version>3.3.3</cxf.version>
+    <cxf.version>3.4.1</cxf.version>
     <jax.ws.rs>2.1</jax.ws.rs>
-    <springboot.version>2.1.5.RELEASE</springboot.version>
+    <springboot.version>2.3.7.RELEASE</springboot.version>
     <aaf.version>2.1.21</aaf.version>
-    <camunda.springboot.version>3.2.0</camunda.springboot.version>
     <format.skipValidate>false</format.skipValidate>
     <format.skipExecute>true</format.skipExecute>
     <io.fabric8.version>0.33.0</io.fabric8.version>
     <appc.client.version>1.7.2</appc.client.version>
-    <bowman.client.version>0.8.0</bowman.client.version>
+    <bowman.client.version>0.9.0</bowman.client.version>
     <aaf.cadi.version>2.1.15</aaf.cadi.version>
+    <so-etsi-sol003-adapter-version>1.9.0-SNAPSHOT</so-etsi-sol003-adapter-version>
+    <onap-logging-version>1.6.9</onap-logging-version>
   </properties>
   <distributionManagement>
     <repository>
@@ -126,7 +124,7 @@
       <url>http://maven.restlet.com</url>
     </pluginRepository>
     <pluginRepository>
-      <id>ecomp-public</id>
+      <id>onap-public</id>
       <url>${nexusproxy}/${publicNexusPath}</url>
       <snapshots>
         <enabled>false</enabled>
@@ -165,9 +163,9 @@
     <repository>
       <id>ecomp-snapshots</id>
       <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-      <releases>
+      <snapshots>
         <enabled>false</enabled>
-      </releases>
+      </snapshots>
     </repository>
     <repository>
       <id>camunda-bpm</id>
@@ -178,7 +176,6 @@
       <url>https://app.camunda.com/nexus/content/groups/public</url>
     </repository>
     <repository>
-      <!-- TODO: remove from ONAP environemnt -->
       <id>onap-releases</id>
       <url>https://nexus.onap.org/content/repositories/releases/</url>
       <snapshots>
@@ -186,7 +183,6 @@
       </snapshots>
     </repository>
     <repository>
-      <!-- TODO: remove from ONAP environemnt -->
       <id>onap-snapshots</id>
       <url>https://nexus.onap.org/content/repositories/snapshots/</url>
       <releases>
@@ -217,14 +213,9 @@
       </resource>
     </resources>
     <plugins>
-      <!-- <plugin> <groupId>org.sonatype.plugins</groupId> <artifactId>nexus-staging-maven-plugin</artifactId> 
-        <version>1.6.7</version> <extensions>true</extensions> <configuration> <nexusUrl>${nexusproxy}</nexusUrl> 
-        <stagingProfileId>176c31dfe190a</stagingProfileId> <serverId>ecomp-staging</serverId> 
-        </configuration> </plugin> -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
-        <version>2.8</version>
         <!-- This version supports the "deployAtEnd" parameter -->
         <configuration>
           <skip />
@@ -304,7 +295,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.6</version>
         <dependencies>
           <dependency>
             <groupId>org.apache.maven.wagon</groupId>
@@ -498,7 +488,7 @@
           <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.9.8</version>
+            <version>2.12.1</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -711,14 +701,17 @@
     <dependency>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-slf4j</artifactId>
+      <version>${onap-logging-version}</version>
     </dependency>
     <dependency>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-filter-base</artifactId>
+      <version>${onap-logging-version}</version>
     </dependency>
     <dependency>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-filter-spring</artifactId>
+      <version>${onap-logging-version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -752,7 +745,6 @@
     <dependency>
       <groupId>javax.annotation</groupId>
       <artifactId>javax.annotation-api</artifactId>
-      <version>1.3.1</version>
     </dependency>
     <dependency>
       <groupId>javax.inject</groupId>
@@ -874,17 +866,17 @@
       <dependency>
         <groupId>org.onap.logging-analytics</groupId>
         <artifactId>logging-slf4j</artifactId>
-        <version>1.6.9-SNAPSHOT</version>
+        <version>${onap-logging-version}</version>
       </dependency>
       <dependency>
         <groupId>org.onap.logging-analytics</groupId>
         <artifactId>logging-filter-base</artifactId>
-        <version>1.6.9-SNAPSHOT</version>
+        <version>${onap-logging-version}</version>
       </dependency>
       <dependency>
         <groupId>org.onap.logging-analytics</groupId>
         <artifactId>logging-filter-spring</artifactId>
-        <version>1.6.9-SNAPSHOT</version>
+        <version>${onap-logging-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
@@ -895,13 +887,13 @@
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
-        <version>1.12</version>
+        <version>1.15</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.5</version>
+        <version>2.8.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -936,6 +928,18 @@
             <groupId>com.vaadin.external.google</groupId>
             <artifactId>android-json</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -951,7 +955,7 @@
       <dependency>
         <groupId>org.flywaydb</groupId>
         <artifactId>flyway-core</artifactId>
-        <version>5.2.4</version>
+        <version>6.5.7</version>
       </dependency>
       <dependency>
         <groupId>org.json</groupId>
@@ -961,7 +965,7 @@
       <dependency>
         <groupId>org.onap.aai.schema-service</groupId>
         <artifactId>aai-schema</artifactId>
-        <version>1.8.1</version>
+        <version>1.9.2</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
@@ -1020,7 +1024,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-service-description-swagger</artifactId>
+        <artifactId>cxf-rt-rs-service-description-openapi-v3</artifactId>
         <version>${cxf.version}</version>
         <exclusions>
           <exclusion>
@@ -1033,40 +1037,86 @@
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>aaf-cadi-client</artifactId>
         <version>${aaf.version}</version>
-	    </dependency>
-	    <dependency>
-	      <groupId>org.onap.aaf.authz</groupId>
-	      <artifactId>aaf-cadi-aaf</artifactId>
-	      <version>${aaf.version}</version>
-	      <exclusions>
-	        <exclusion>
-	          <groupId>javax.servlet</groupId>
-	          <artifactId>servlet-api</artifactId>
-	        </exclusion>
-	        <exclusion>
-	          <groupId>log4j</groupId>
-	          <artifactId>log4j</artifactId>
-	        </exclusion>
-	      </exclusions>
-	    </dependency>
-	    <dependency>
-	        <groupId>org.onap.aaf.authz</groupId>
-	        <artifactId>aaf-auth-client</artifactId>
-	        <version>${aaf.version}</version>
-	        <scope>runtime</scope>
-	    </dependency>
-	    <dependency>
-	        <groupId>org.onap.aaf.authz</groupId>
-	        <artifactId>aaf-misc-env</artifactId>
-	        <version>${aaf.version}</version>
-	        <scope>runtime</scope>
-	    </dependency>
-	    <dependency>
-	        <groupId>org.onap.aaf.authz</groupId>
-	        <artifactId>aaf-misc-rosetta</artifactId>
-	        <version>${aaf.version}</version>
-	        <scope>runtime</scope>
-	    </dependency>
+      </dependency>
+      <dependency>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>aaf-cadi-aaf</artifactId>
+        <version>${aaf.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>aaf-auth-client</artifactId>
+        <version>${aaf.version}</version>
+        <scope>runtime</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>aaf-misc-env</artifactId>
+        <version>${aaf.version}</version>
+        <scope>runtime</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>aaf-misc-rosetta</artifactId>
+        <version>${aaf.version}</version>
+        <scope>runtime</scope>
+      </dependency>
+      <dependency>
+        <groupId>ch.vorburger.mariaDB4j</groupId>
+        <artifactId>mariaDB4j</artifactId>
+        <version>2.3.0</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-contract-wiremock</artifactId>
+        <version>1.2.4.RELEASE</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.camunda.bpm.assert</groupId>
+        <artifactId>camunda-bpm-assert</artifactId>
+        <version>3.0.0</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>janino</groupId>
+        <artifactId>janino</artifactId>
+        <version>2.5.15</version>
+      </dependency>
+      <dependency>
+        <groupId>org.camunda.bpm</groupId>
+        <artifactId>camunda-external-task-client</artifactId>
+        <version>1.4.0</version>
+      </dependency>
+      <dependency>
+        <groupId>pl.pragmatists</groupId>
+        <artifactId>JUnitParams</artifactId>
+        <version>1.0.5</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.swagger.core.v3</groupId>
+        <artifactId>swagger-jaxrs2</artifactId>
+        <version>2.1.7</version>
+      </dependency>
+      <dependency>
+        <groupId>org.camunda.bpm</groupId>
+        <artifactId>camunda-bom</artifactId>
+        <version>7.14.0</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <profiles>