X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=b1a5de4e218ae0543504f82fd810567e62d59826;hb=91abd701e0e2b6b35c6bc4e42b280c60be23424c;hp=056f19c0325bc5480112cc02261312e28cebe544;hpb=f50b050c7ddc074f5f11ceff075c661c7e58fd0d;p=sdc.git

diff --git a/pom.xml b/pom.xml
index 056f19c032..b1a5de4e21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ Modifications copyright (c) 2018-2019 Nokia
 
     <groupId>org.openecomp.sdc</groupId>
     <artifactId>sdc-main</artifactId>
-    <version>1.10.1-SNAPSHOT</version>
+    <version>1.13.3-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>sdc</name>
 
@@ -43,73 +43,78 @@ Modifications copyright (c) 2018-2019 Nokia
 
         <tosca.datatype.version>${project.version}</tosca.datatype.version>
         <!-- 3rd parties versions -->
-        <bean-matcher.version>0.11</bean-matcher.version>
-        <lang3.version>3.10</lang3.version>
-        <guava.version>30.1-jre</guava.version>
+        <lang3.version>3.12.0</lang3.version>
+        <guava.version>32.1.1-jre</guava.version>
         <janusgraph.version>0.3.3</janusgraph.version>
-        <spring.version>5.3.9</spring.version>
+        <spring.version>5.3.27</spring.version>
+        <mvn.assembly.version>3.6.0</mvn.assembly.version>
+
+        <!-- update to 2.36 bring error-->
+        <!-- java.lang.NoClassDefFoundError: com/fasterxml/jackson/databind/AnnotationIntrospector$XmlExtensions-->
         <jersey-bom.version>2.34</jersey-bom.version>
-        <netty.version>4.1.68.Final</netty.version>
-        <servlet-api.version>4.0.1</servlet-api.version>
+        <jakarta.el.version>3.0.4</jakarta.el.version>
+
+        <netty.version>4.1.92.Final</netty.version>
+        <servlet-api.version>4.0.4</servlet-api.version>
         <wire-mock.version>2.26.3</wire-mock.version>
         <ecomp.version>3.4.0</ecomp.version>
         <cassandra.unit.version>4.3.1.0</cassandra.unit.version>
-        <cadi.version>2.1.8</cadi.version>
-        <lombok.version>1.18.20</lombok.version>
+        <cadi.version>2.1.21</cadi.version>
+        <lombok.version>1.18.24</lombok.version>
         <commons-beanutils>1.9.4</commons-beanutils>
-        <commons.io.version>2.8.0</commons.io.version>
-        <commons-configuration>2.7</commons-configuration>
-        <apache-poi.version>4.1.0</apache-poi.version>
+        <commons.io.version>2.13.0</commons.io.version>
+        <commons-configuration>2.8.0</commons-configuration>
         <onap.logging.version>1.6.1</onap.logging.version>
-        <apache-commons-text.version>1.9</apache-commons-text.version>
+        <apache-commons-text.version>1.10.0</apache-commons-text.version>
         <jaxb-api.version>2.3.1</jaxb-api.version>
         <io.vavr.version>0.10.3</io.vavr.version>
-        <groovy.version>3.0.7</groovy.version>
+        <groovy.version>4.0.13</groovy.version>
         <swagger-core-mvn-plugin.version>2.1.7</swagger-core-mvn-plugin.version>
         <maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
-        <hibernate.validator.version>6.1.6.Final</hibernate.validator.version>
+        <hibernate.validator.version>6.2.5.Final</hibernate.validator.version>
+        <org.json.version>20220320</org.json.version>
 
-        <commons.collections.version>4.1</commons.collections.version>
-        <ws.rs.version>2.1.1</ws.rs.version>
+        <commons.collections.version>4.3</commons.collections.version>
+        <ws.rs.version>2.1.6</ws.rs.version>
         <javax.validation.version>2.0.1.Final</javax.validation.version>
-        <javax.servlet.version>${servlet-api.version}</javax.servlet.version>
 
-        <jetty.version>9.4.41.v20210516</jetty.version>
-        <cxf.version>3.4.4</cxf.version>
+        <jetty.version>9.4.51.v20230217</jetty.version>
+        <jetty-distribution.version>${jetty.version}</jetty-distribution.version>
+        <cxf.version>3.6.1</cxf.version>
 
-        <org.owasp.esapi.version>2.2.0.0</org.owasp.esapi.version>
+        <org.owasp.esapi.version>2.4.0.0</org.owasp.esapi.version>
         <org.dom4j.version>2.1.3</org.dom4j.version>
 
+        <!-- Keycloak authentication-->
+        <keycloak.version>21.1.1</keycloak.version>
+
         <!-- JSON and YAML Parsing -->
-        <jackson.version>2.12.4</jackson.version>
+        <jackson.version>2.14.2</jackson.version>
         <jackson-annotations.version>${jackson.version}</jackson-annotations.version>
 
         <clearspring.version>2.1.1</clearspring.version>
         <skipYamlJsonValidator>false</skipYamlJsonValidator>
 
         <!-- Yaml for properties -->
-        <snakeyaml.version>1.29</snakeyaml.version>
+        <snakeyaml.version>1.33</snakeyaml.version>
         <functionaljava.version>4.9</functionaljava.version>
-        <httpclient.version>4.5.13</httpclient.version>
-        <httpcore.version>4.4.1</httpcore.version>
-        <json-simple.version>1.1</json-simple.version>
+        <httpmime.version>4.5.14</httpmime.version>
+        <httpclient.version>5.2.1</httpclient.version>
+        <httpcore.version>4.4.15</httpcore.version>
 
         <!-- PM Dictionary validation -->
-        <onap.vnfsdk.validation.pmdictionary.version>1.2.15
-        </onap.vnfsdk.validation.pmdictionary.version>
+        <onap.vnfsdk.validation.pmdictionary.version>1.2.15</onap.vnfsdk.validation.pmdictionary.version>
 
         <!-- Logging start -->
         <!-- logback -->
-        <logback.version>1.2.7</logback.version>
-        <slf4j-api.version>1.7.25</slf4j-api.version>
+        <logback.version>1.2.12</logback.version>
+        <slf4j-api.version>1.7.36</slf4j-api.version>
         <commons-codec>1.15</commons-codec>
-        <commons-logging>1.2</commons-logging>
-        <janino.version>3.0.6</janino.version>
-        <log4j.version>2.13.1</log4j.version>
+        <janino.version>3.1.9</janino.version>
 
         <!-- aspects -->
-        <jcabi.version>0.20.1</jcabi.version>
-        <aspectj.version>1.9.7</aspectj.version>
+        <jcabi.version>0.21.1</jcabi.version>
+        <aspectj.version>1.9.19</aspectj.version>
         <aspectjrt.version>${aspectj.version}</aspectjrt.version>
         <jcabi.maven.plugin.version>0.13.2</jcabi.maven.plugin.version>
 
@@ -117,24 +122,19 @@ Modifications copyright (c) 2018-2019 Nokia
         <!-- System Metrics -->
         <sigar.version>1.6.4</sigar.version>
 
-        <regex.version>3.0.3</regex.version>
-
         <!--GSON-->
-        <gson.version>2.8.9</gson.version>
-
-        <!--listen to file changes-->
-        <commons-jci-core.version>1.1</commons-jci-core.version>
+        <gson.version>2.10.1</gson.version>
 
         <!--TESTING-->
-        <mockito.version>3.7.7</mockito.version>
+        <mockito.version>4.10.0</mockito.version>
         <mockitoJupiter.version>${mockito.version}</mockitoJupiter.version>
         <jmockit.version>1.35</jmockit.version>
-        <junit.platform.version>1.7.1</junit.platform.version>
-        <junitJupiter.version>5.7.2</junitJupiter.version>
+        <junit.platform.version>1.9.1</junit.platform.version>
+        <junitJupiter.version>5.9.1</junitJupiter.version>
         <assertj.version>3.16.0</assertj.version>
-        <testng.version>7.4.0</testng.version>
-        <cucumber.version>6.8.1</cucumber.version>
-        <bean-matchers.version>0.11</bean-matchers.version>
+        <testng.version>7.7.0</testng.version>
+        <cucumber.version>7.10.1</cucumber.version>
+        <bean-matchers.version>0.14</bean-matchers.version>
         <hamcrest.version>2.2</hamcrest.version>
         <hamcrest-all.version>1.3</hamcrest-all.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
@@ -165,36 +165,46 @@ Modifications copyright (c) 2018-2019 Nokia
         <sitePath>/content/sites/site/org/openecomp/sdc/${project.version}</sitePath>
         <staging.profile.id>176c31dfe190a</staging.profile.id>
         <!--togglz version-->
-        <togglz.version>2.6.1.Final</togglz.version>
-
-        <joda.time.version>2.9.9</joda.time.version>
+        <togglz.version>3.3.3</togglz.version>
 
         <!--sdc-security-utils-->
-        <security.util.lib.version>1.6.0</security.util.lib.version>
+        <security.util.lib.version>1.8.0</security.util.lib.version>
         <!--jacoco-->
         <jacoco.version>0.8.7</jacoco.version>
 
-        <java.driver.core.version>4.5.1</java.driver.core.version>
+        <java.driver.core.version>4.14.1</java.driver.core.version>
 
         <!-- Surefire parameters  -->
         <surefire.forkCount>1C</surefire.forkCount>
         <surefire.reuseForks>true</surefire.reuseForks>
         <surefire.skip.tests>false</surefire.skip.tests>
 
-        <bouncycastle.version>1.69</bouncycastle.version>
+        <bouncycastle.version>2.73.2</bouncycastle.version>
 
         <!--DOCKER-->
-        <docker.api.version>1.41</docker.api.version>
+        <docker.api.version>1.43</docker.api.version>
         <docker.namespace>onap</docker.namespace>
         <docker.password>docker</docker.password>
         <docker.username>docker</docker.username>
         <docker.registry>nexus3.onap.org:10001</docker.registry>
 
+        <micrometer.version>1.8.4</micrometer.version>
+
+        <minio.version>8.5.4</minio.version>
+        <okhttp.version>4.11.0</okhttp.version>
+
+        <jsoup.version>1.15.3</jsoup.version>
+
         <verbose>false</verbose>
     </properties>
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.apache.kafka</groupId>
+                <artifactId>kafka-clients</artifactId>
+                <version>3.3.1</version>
+            </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
@@ -249,7 +259,7 @@ Modifications copyright (c) 2018-2019 Nokia
                 <version>${lang3.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.groovy</groupId>
+                <groupId>org.apache.groovy</groupId>
                 <artifactId>groovy</artifactId>
                 <version>${groovy.version}</version>
             </dependency>
@@ -307,6 +317,101 @@ Modifications copyright (c) 2018-2019 Nokia
             <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
+
+        <!-- KEYCLOAK Authentication and authorization-->
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-servlet-filter-adapter</artifactId>
+            <version>${keycloak.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-annotations</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-authz-client</artifactId>
+            <version>${keycloak.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-spring-security-adapter</artifactId>
+            <version>${keycloak.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-annotations</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-core</artifactId>
+            <version>${keycloak.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-common</artifactId>
+            <version>${keycloak.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${servlet-api.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core</artifactId>
+            <version>5.6.3</version>
+        </dependency>
     </dependencies>
 
     <reporting>
@@ -340,7 +445,7 @@ Modifications copyright (c) 2018-2019 Nokia
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>${mvn.assembly.version}</version>
                     <configuration>
                         <tarLongFileMode>posix</tarLongFileMode>
                     </configuration>
@@ -366,11 +471,6 @@ Modifications copyright (c) 2018-2019 Nokia
                     <artifactId>write-text-files-maven-plugin</artifactId>
                     <version>1.1</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.codehaus.gmaven</groupId>
-                    <artifactId>gmaven-plugin</artifactId>
-                    <version>1.5</version>
-                </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
@@ -394,7 +494,7 @@ Modifications copyright (c) 2018-2019 Nokia
                 <plugin>
                     <groupId>io.fabric8</groupId>
                     <artifactId>docker-maven-plugin</artifactId>
-                    <version>0.38.0</version>
+                    <version>0.43.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -508,31 +608,6 @@ Modifications copyright (c) 2018-2019 Nokia
                 </dependencies>
             </plugin>
 
-            <!-- Set the deployment repositories properties. -->
-            <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <inherited>false</inherited>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>
-                                pom.properties['deploy.url'] =
-                                    pom.version.contains('-SNAPSHOT') ?
-                                        project.distributionManagement.snapshotRepository.url :
-                                        project.distributionManagement.repository.url;
-                                pom.properties['repo.id'] = pom.version.contains('-SNAPSHOT') ?
-                                    project.distributionManagement.snapshotRepository.id :
-                                    project.distributionManagement.repository.id;
-                            </source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -661,6 +736,8 @@ Modifications copyright (c) 2018-2019 Nokia
             </activation>
             <properties>
                 <checkstyle.skip>true</checkstyle.skip>
+                <maven.antrun.skip>true</maven.antrun.skip>
+                <swagger.skip>true</swagger.skip>
             </properties>
             <modules>
                 <module>onboarding</module>
@@ -689,6 +766,8 @@ Modifications copyright (c) 2018-2019 Nokia
             </activation>
             <properties>
                 <checkstyle.skip>true</checkstyle.skip>
+                <maven.antrun.skip>true</maven.antrun.skip>
+                <swagger.skip>true</swagger.skip>
             </properties>
             <modules>
                 <module>onboarding</module>
@@ -737,6 +816,35 @@ Modifications copyright (c) 2018-2019 Nokia
                 <module>utils/webseal-simulator</module>
             </modules>
         </profile>
+        <profile>
+            <id>fast-build-no-ui</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <maven.test.skip>true</maven.test.skip>
+                <skipYamlJsonValidator>true</skipYamlJsonValidator>
+                <checkstyle.skip>true</checkstyle.skip>
+                <jacoco.skip>true</jacoco.skip>
+                <maven.antrun.skip>true</maven.antrun.skip>
+                <swagger.skip>true</swagger.skip>
+            </properties>
+            <modules>
+                <module>openecomp-be</module>
+                <module>common</module>
+                <module>common-app-logging</module>
+                <module>common-app-api</module>
+                <module>common-be</module>
+                <module>common-be-tests-utils</module>
+                <module>catalog-dao</module>
+                <module>catalog-model</module>
+                <module>catalog-be</module>
+                <module>catalog-be-plugins</module>
+                <module>asdctool</module>
+                <module>sdc-os-chef</module>
+                <module>utils/webseal-simulator</module>
+            </modules>
+        </profile>
         <profile>
             <id>start-sdc</id>
             <activation>
@@ -748,6 +856,7 @@ Modifications copyright (c) 2018-2019 Nokia
                 <checkstyle.skip>true</checkstyle.skip>
                 <jacoco.skip>true</jacoco.skip>
                 <docker.keepRunning>true</docker.keepRunning>
+                <swagger.skip>true</swagger.skip>
             </properties>
             <modules>
                 <module>integration-tests</module>
@@ -764,8 +873,9 @@ Modifications copyright (c) 2018-2019 Nokia
                 <checkstyle.skip>true</checkstyle.skip>
                 <jacoco.skip>true</jacoco.skip>
 
-
                 <docker.skip.run>true</docker.skip.run>
+                <maven.antrun.skip>true</maven.antrun.skip>
+                <swagger.skip>true</swagger.skip>
             </properties>
             <modules>
                 <module>integration-tests</module>
@@ -780,8 +890,66 @@ Modifications copyright (c) 2018-2019 Nokia
                 <skipYamlJsonValidator>true</skipYamlJsonValidator>
                 <checkstyle.skip>true</checkstyle.skip>
                 <docker.skip>true</docker.skip>
+                <maven.antrun.skip>true</maven.antrun.skip>
+                <swagger.skip>true</swagger.skip>
+            </properties>
+            <modules>
+                <module>integration-tests</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>run-integration-tests-api</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <skipYamlJsonValidator>true</skipYamlJsonValidator>
+                <checkstyle.skip>true</checkstyle.skip>
+                <surefire.skip.tests>true</surefire.skip.tests>
+            </properties>
+            <modules>
+                <module>onboarding</module>
+                <module>common-app-logging</module>
+                <module>common-app-api</module>
+                <module>common-be</module>
+                <module>common-be-tests-utils</module>
+                <module>catalog-dao</module>
+                <module>catalog-model</module>
+                <module>catalog-be</module>
+                <module>catalog-be-plugins</module>
+                <module>asdctool</module>
+                <module>catalog-ui</module>
+                <module>catalog-fe</module>
+                <module>sdc-os-chef</module>
+                <module>utils/webseal-simulator</module>
+                <module>integration-tests</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>run-integration-tests-ui</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <skipYamlJsonValidator>true</skipYamlJsonValidator>
+                <checkstyle.skip>true</checkstyle.skip>
+                <surefire.skip.tests>true</surefire.skip.tests>
             </properties>
             <modules>
+                <module>onboarding</module>
+                <module>common-app-logging</module>
+                <module>common-app-api</module>
+                <module>common-be</module>
+                <module>common-be-tests-utils</module>
+                <module>catalog-dao</module>
+                <module>catalog-model</module>
+                <module>catalog-be</module>
+                <module>catalog-be-plugins</module>
+                <module>asdctool</module>
+                <module>catalog-ui</module>
+                <module>catalog-fe</module>
+                <module>sdc-os-chef</module>
+                <module>utils/webseal-simulator</module>
                 <module>integration-tests</module>
             </modules>
         </profile>