From 7d66f1e323cd68f59a109c4ae1b56977a28251f9 Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Fri, 21 Jul 2023 09:36:12 +0100 Subject: [PATCH] Java 17 Upgrade Removing specific dependencies and leaving only ONAP dependencies and shared testing and common dependencies. Issue-ID: POLICY-4666 Change-Id: I32117e4ac260604a46339ca1b72f7c5c06616657 Signed-off-by: adheli.tavares --- .gitreview | 2 +- integration/pom.xml | 555 +++++++++++++++++++--------------------------------- 2 files changed, 201 insertions(+), 356 deletions(-) diff --git a/.gitreview b/.gitreview index 5030d6f1..7456635b 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,4 @@ host=gerrit.onap.org port=29418 project=policy/parent.git -defaultbranch=master +defaultbranch=java-17 diff --git a/integration/pom.xml b/integration/pom.xml index a8fbdda1..c5d04d3b 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -36,77 +36,44 @@ Policy Integration POM Policy Integration POM - 11 + 17 - 3.7.3-SNAPSHOT + 4.0.0-SNAPSHOT ${project.basedir}/../target/code-coverage/jacoco-ut.exec https://nexus3.onap.org/repository/npm.public/npm/-/ nexus3.onap.org:10001 nexus3.onap.org:10003 - 2.1.21 - 3.24.2 - 4.2.0 + 2.7.4 1.4.0 - 1.5.0 - 1.15 - 4.4 - 1.5 - 2.11.0 - 3.12.0 - 3.6.1 - 1.10.0 - 7.11.0 + 7.13.0 1.1.12 - 3.2.14 + 3.3.2 8.33.0.Final - 2.3.8 - 1.7 - 2.10.1 - 2.1.214 - 5.6.15.Final - 1.0.2.Final - 4.4.16 - 1.10.4 - 0.16.0 - 2.14.2 - 2.0.2 - 2.3.1 - 4.0.1 - 2.1.1 - 2.0.2-Final - 2.39 - 10.0.13 - 20230227 - 4.13.2 - 5.9.2 - 5.9.2 - 3.4.0 - 2.19.0 - 1.2.11 - 1.18.26 - 3.1.2 - 1.1.1 - 1.10.19 - 5.1.1 + 1.13.4 + 2.20.0 + 1.4.8 5.15.0 - 4.1.89.Final + 4.1.95.Final 1.2.1-oss 1.3.0-oss - 0.9.1 3.5.0 - 42.5.3 2.0.1 - 1.7.36 - 1.33 - 5.3.25 - 5.8.1 - 2.7.8 - 1.6.14 - 2.2.8 - 1.6.9 - 9.0.71 - 1.5.3 + 2.0.7 + 1.7.0 + 6.0.11 + 6.1.2 + 3.1.2 + 0.16.0 + 2.15.2 + 2.2.15 + 3.1.2 + 11.0.15 + + --add-opens java.base/java.time=ALL-UNNAMED + --add-opens java.base/java.util=ALL-UNNAMED + --add-opens java.sql/java.sql=ALL-UNNAMED + @@ -116,275 +83,153 @@ - - org.onap.policy.parent - policy-parent-resources - ${version.parent.resources} - - - jakarta.validation - jakarta.validation-api - ${version.jakarta.validation-api} - - com.fasterxml.jackson.core - jackson-annotations - ${version.jackson} - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations + jackson-core ${version.jackson} + - com.fasterxml.jackson.module - jackson-module-jsonSchema - ${version.jackson} - - - com.fasterxml.jackson.module - jackson-module-parameter-names - ${version.jackson} - - - com.fasterxml.jackson.module - jackson-module-scala_2.12 - ${version.jackson} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${version.jackson} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${version.jackson} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-csv - ${version.jackson} - - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - ${version.jackson} - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${version.jackson} - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - ${version.jackson} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base - ${version.jackson} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${version.jackson} - - - - org.glassfish.jersey.core - jersey-server - ${version.jersey} + org.glassfish.jersey.containers + jersey-container-servlet + 3.1.2 - org.glassfish.jersey.containers - jersey-container-servlet-core - ${version.jersey} + org.eclipse.jetty + jetty-server + ${version.jetty} - org.glassfish.jersey.containers - jersey-container-jetty-http - ${version.jersey} + org.eclipse.jetty + jetty-security + ${version.jetty} - org.glassfish.jersey.core - jersey-client - ${version.jersey} + org.eclipse.jetty + jetty-util + ${version.jetty} - org.glassfish.jersey.core - jersey-common - ${version.jersey} + org.eclipse.jetty + jetty-http + ${version.jetty} + + - org.glassfish.jersey.inject - jersey-hk2 - ${version.jersey} + io.prometheus + simpleclient + ${version.io.prometheus} - org.glassfish.jersey.containers - jersey-container-grizzly2-http - ${version.jersey} + io.prometheus + simpleclient_hotspot + ${version.io.prometheus} - org.glassfish.jersey.media - jersey-media-moxy - ${version.jersey} + io.prometheus + simpleclient_servlet_jakarta + ${version.io.prometheus} - org.glassfish.jersey.media - jersey-media-json-jackson - ${version.jersey} + io.prometheus + simpleclient_logback + ${version.io.prometheus} + - org.glassfish.jersey.test-framework - jersey-test-framework-core - ${version.jersey} + com.google.re2j + re2j + 1.7 - org.glassfish.jersey.test-framework.providers - jersey-test-framework-provider-grizzly2 - ${version.jersey} + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.0 - org.glassfish.jersey.media - jersey-media-multipart - ${version.jersey} + jakarta.servlet + jakarta.servlet-api + 6.0.0 - - org.eclipse.jetty - jetty-http - ${version.jetty} + jakarta.validation + jakarta.validation-api + 3.0.2 - org.eclipse.jetty - jetty-servlet - ${version.jetty} + io.swagger.core.v3 + swagger-jaxrs2-jakarta + ${version.swagger.v3} - org.eclipse.jetty - jetty-servlets - ${version.jetty} + io.swagger.core.v3 + swagger-jaxrs2-servlet-initializer-v2-jakarta + ${version.swagger.v3} - org.eclipse.jetty - jetty-server - ${version.jetty} + io.swagger.parser.v3 + swagger-parser + 2.1.15 - org.eclipse.jetty - jetty-security - ${version.jetty} + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 - + + - com.google.re2j - re2j - ${version.google-re2j} + org.onap.policy.parent + policy-parent-resources + ${version.parent.resources} org.mariadb.jdbc mariadb-java-client - ${version.mariadb} + 3.1.4 org.postgresql postgresql - ${version.postgresql} + 42.6.0 org.apache.kafka kafka-clients - ${version.kafka} - - - - io.prometheus - simpleclient - ${version.io.prometheus} - - - io.prometheus - simpleclient_hotspot - ${version.io.prometheus} - - - io.prometheus - simpleclient_servlet - ${version.io.prometheus} - - - io.prometheus - simpleclient_logback - ${version.io.prometheus} - - - - io.swagger - swagger-jersey2-jaxrs - ${version.swagger-jersey2-jaxrs} + 3.5.1 io.swagger.core.v3 swagger-annotations - ${version.swagger.core.v3} - - - - javax.servlet - javax.servlet-api - ${version.javax.servlet-api} - - - javax.ws.rs - javax.ws.rs-api - ${version.javax.ws.rs-api} - - - - javax.xml.bind - jaxb-api - ${version.javax.bind-jaxb-api} - - - org.glassfish.jaxb - jaxb-runtime - ${version.glassfish.jaxb-runtime} + 2.2.15 - org.apache.httpcomponents - httpcore - ${version.httpcore} + org.apache.httpcomponents.core5 + httpcore5 + 5.2.2 com.google.code.gson gson - ${version.gson} + 2.10.1 org.json json - ${version.json} - - - com.worldturner.medeia - medeia-validator-gson - ${version.medeia} + 20230618 org.projectlombok lombok - ${version.lombok} + 1.18.28 @@ -480,17 +325,11 @@ saClientLibrary ${version.nsa-sa-client} - - - org.java-websocket - Java-WebSocket - ${version.websocket} - org.yaml snakeyaml - ${version.snakeyaml} + 2.0 com.h2database h2 - ${version.h2} + 2.2.220 test junit junit - ${version.junit} + 4.13.2 test org.junit.vintage junit-vintage-engine - ${version.junit-vintage} + 5.10.0 test @@ -640,33 +475,27 @@ org.assertj assertj-core - ${version.assertj} + 3.24.2 test com.openpojo openpojo - ${version.openpojo} - test - - - org.mockito - mockito-all - ${version.mockito-all} + 0.9.1 test org.mockito mockito-core - ${version.mockito-core} + 5.4.0 test org.awaitility awaitility - ${version.awaitility} + 4.2.0 test @@ -694,42 +523,52 @@ commons-cli commons-cli - ${version.commons-cli} + 1.5.0 commons-codec commons-codec - ${version.commons-codec} + 1.16.0 commons-fileupload commons-fileupload - ${version.commons-fileupload} + 1.5 org.apache.commons commons-collections4 - ${version.commons-collections4} + 4.4 commons-io commons-io - ${version.commons-io} + 2.13.0 org.apache.commons commons-lang3 - ${version.commons-lang3} + 3.12.0 org.apache.commons commons-math3 - ${version.commons-math3} + 3.6.1 org.apache.commons commons-text - ${version.commons-text} + 1.10.0 + + + commons-logging + commons-logging + 1.2 + + + commons-net + commons-net + 3.9.0 @@ -744,6 +583,18 @@ ${version.docker-java} test + + + org.hibernate.orm + hibernate-core + 6.3.0.CR1 + + + org.hibernate + hibernate-core-jakarta + 5.6.15.Final + + org.springframework @@ -757,7 +608,7 @@ org.springframework - spring-expression + spring-jcl ${version.spring} @@ -767,36 +618,36 @@ org.springframework - spring-webmvc + spring-expression ${version.spring} + org.springframework - spring-jdbc + spring-webmvc ${version.spring} org.springframework - spring-webflux + spring-jdbc ${version.spring} org.springframework - spring-test + spring-webflux ${version.spring} - test - - org.springframework.security - spring-security-test - ${version.spring-security} - test - - org.springframework.boot spring-boot-starter-web ${version.springboot} + + + + org.springframework.boot + spring-boot-starter-json + + org.springframework.boot @@ -805,23 +656,22 @@ org.springframework.boot - spring-boot-starter-validation + spring-boot-starter-tomcat ${version.springboot} org.springframework.boot - spring-boot-starter-aop + spring-boot-starter-security ${version.springboot} org.springframework.boot - spring-boot-starter-test + spring-boot-starter-validation ${version.springboot} - test org.springframework.boot - spring-boot-starter-security + spring-boot-starter-actuator ${version.springboot} @@ -831,56 +681,33 @@ org.springframework.boot - spring-boot-starter-tomcat + spring-boot-autoconfigure ${version.springboot} org.springframework.boot - spring-boot-starter-actuator + spring-boot-starter-aop ${version.springboot} org.springframework.boot - spring-boot-autoconfigure + spring-boot-starter-test ${version.springboot} - - - - org.hibernate - hibernate-core - ${version.hibernate} - - - org.hibernate - hibernate-entitymanager - ${version.hibernate} - - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - ${version.hibernate.persistence} - - - - org.apache.tomcat.embed - tomcat-embed-core - ${version.tomcat} - - - org.apache.tomcat - tomcat-annotations-api - ${version.tomcat} + test - org.apache.tomcat.embed - tomcat-embed-el - ${version.tomcat} + org.springframework + spring-test + ${version.spring} + test - org.apache.tomcat.embed - tomcat-embed-websocket - ${version.tomcat} + io.micrometer + micrometer-registry-prometheus + 1.11.2 + runtime + @@ -913,66 +740,66 @@ org.apache.maven.plugins maven-checkstyle-plugin - 2.17,) + 3.3.0 check - + org.apache.maven.plugins maven-remote-resources-plugin - 3.0.0,) + 3.1.0,) bundle process - + org.jacoco jacoco-maven-plugin - [0.7.1.201405082137,) + 0.8.10 prepare-agent - + de.jpdigital hibernate52-ddl-maven-plugin - [2.2.0,) + [2.5.0,) gen-ddl - + org.codehaus.groovy.maven gmaven-plugin - [1.0,) + [1.5,) execute - + @@ -985,33 +812,33 @@ - + org.codehaus.mojo keytool-maven-plugin - [1.5.0,) + [1.7.0,) generateKeyPair - + com.github.eirslett frontend-maven-plugin - [1.11.0,) + ${version.frontend.maven} npm - + @@ -1024,7 +851,7 @@ - + @@ -1054,7 +881,7 @@ com.github.eirslett frontend-maven-plugin - 1.12.1 + ${version.frontend.maven} io.fabric8 @@ -1199,21 +1026,39 @@ spring-boot-maven-plugin ${version.springboot} + + org.apache.maven.plugins + maven-surefire-plugin + 3.1.2 + org.apache.maven.plugins maven-compiler-plugin + 3.11.0 ${project.build.sourceEncoding} ${java.version} ${java.version} + + org.apache.maven.plugins + maven-surefire-plugin + 3.1.2 + + ${surefireArgLine} + + **/IT*.java + + + org.jacoco jacoco-maven-plugin + 0.8.10 pre-unit-test @@ -1265,6 +1110,7 @@ + org.apache.maven.plugins maven-checkstyle-plugin @@ -1303,7 +1149,6 @@ true true true - true true warning -- 2.16.6