From: adheli.tavares Date: Fri, 21 Jul 2023 08:36:12 +0000 (+0100) Subject: Java 17 Upgrade X-Git-Tag: 4.0.1~9 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fparent.git;a=commitdiff_plain;h=6ed9bfb5f10b8259f3324b961d2e04dc4919fa27 Java 17 Upgrade Issue-ID: POLICY-4666 Change-Id: Ib3f4020c7598043259017db8733d3cc2634945c9 Signed-off-by: adheli.tavares --- diff --git a/docs/apex/APEX-User-Manual.rst b/docs/apex/APEX-User-Manual.rst index 79232042..8a4996b1 100644 --- a/docs/apex/APEX-User-Manual.rst +++ b/docs/apex/APEX-User-Manual.rst @@ -4830,11 +4830,11 @@ Introduction to APEX Logging All APEX components make extensive use of logging using the logging façade `SLF4J `__ with the - backend `Logback `__. Both are used + backend `Logback `__. Both are used off-the-shelve, so the standard documentation and configuration apply to APEX logging. For details on how to work with logback please see the `logback - manual `__. + manual `__. .. container:: paragraph diff --git a/integration/pom.xml b/integration/pom.xml index a8fbdda1..2be206a0 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -29,84 +29,56 @@ org.onap.policy.parent policy-parent - 4.0.0-SNAPSHOT + 4.0.1-SNAPSHOT integration pom Policy Integration POM Policy Integration POM - 11 + 17 - 3.7.3-SNAPSHOT + 4.0.1-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 - 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 + 3.3.2 + 8.43.0.Final + 1.13.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 + 2.15.2 + 0.8.10 + 3.1.3 + 11.0.16 + 5.10.0 + 2.20.0 + 1.4.8 + 3.1.0 + 1.1.1 + 5.5.0 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 + 6.0.11 + 3.1.2 + 6.1.2 + 3.0.46 + 2.2.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 + @@ -121,188 +93,37 @@ policy-parent-resources ${version.parent.resources} - - jakarta.validation - jakarta.validation-api - ${version.jakarta.validation-api} - - com.fasterxml.jackson.core - jackson-annotations + jackson-core ${version.jackson} - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${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-core - ${version.jersey} - - - org.glassfish.jersey.containers - jersey-container-jetty-http - ${version.jersey} - - - org.glassfish.jersey.core - jersey-client - ${version.jersey} - - - org.glassfish.jersey.core - jersey-common - ${version.jersey} - - - org.glassfish.jersey.inject - jersey-hk2 - ${version.jersey} - org.glassfish.jersey.containers - jersey-container-grizzly2-http - ${version.jersey} - - - org.glassfish.jersey.media - jersey-media-moxy - ${version.jersey} - - - org.glassfish.jersey.media - jersey-media-json-jackson - ${version.jersey} - - - org.glassfish.jersey.test-framework - jersey-test-framework-core - ${version.jersey} - - - org.glassfish.jersey.test-framework.providers - jersey-test-framework-provider-grizzly2 + jersey-container-servlet ${version.jersey} - - org.glassfish.jersey.media - jersey-media-multipart - ${version.jersey} - - - - org.eclipse.jetty - jetty-http - ${version.jetty} - org.eclipse.jetty - jetty-servlet + jetty-server ${version.jetty} org.eclipse.jetty - jetty-servlets + jetty-security ${version.jetty} org.eclipse.jetty - jetty-server + jetty-util ${version.jetty} org.eclipse.jetty - jetty-security + jetty-http ${version.jetty} - - - com.google.re2j - re2j - ${version.google-re2j} - - - - org.mariadb.jdbc - mariadb-java-client - ${version.mariadb} - - - - org.postgresql - postgresql - ${version.postgresql} - - - - org.apache.kafka - kafka-clients - ${version.kafka} - + io.prometheus @@ -316,7 +137,7 @@ io.prometheus - simpleclient_servlet + simpleclient_servlet_jakarta ${version.io.prometheus} @@ -324,11 +145,25 @@ simpleclient_logback ${version.io.prometheus} - - io.swagger - swagger-jersey2-jaxrs - ${version.swagger-jersey2-jaxrs} + com.google.re2j + re2j + 1.7 + + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.0 + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + + + jakarta.validation + jakarta.validation-api + 3.0.2 @@ -336,55 +171,78 @@ swagger-annotations ${version.swagger.core.v3} - - javax.servlet - javax.servlet-api - ${version.javax.servlet-api} + io.swagger.core.v3 + swagger-jaxrs2-jakarta + ${version.swagger.core.v3} - javax.ws.rs - javax.ws.rs-api - ${version.javax.ws.rs-api} + io.swagger.core.v3 + swagger-jaxrs2-servlet-initializer-v2-jakarta + ${version.swagger.core.v3} - - javax.xml.bind - jaxb-api - ${version.javax.bind-jaxb-api} + io.swagger.parser.v3 + swagger-parser + 2.1.16 - org.glassfish.jaxb - jaxb-runtime - ${version.glassfish.jaxb-runtime} + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 + + + + + + org.mariadb.jdbc + mariadb-java-client + 3.1.4 + + + + org.postgresql + postgresql + 42.6.0 + + + + org.apache.kafka + kafka-clients + 3.5.1 - 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} + 20230618 com.worldturner.medeia medeia-validator-gson - ${version.medeia} + ${version.medeia.validator} + + + com.worldturner.medeia + medeia-validator-core + ${version.medeia.validator} org.projectlombok lombok - ${version.lombok} + 1.18.28 @@ -480,17 +338,11 @@ saClientLibrary ${version.nsa-sa-client} - - - org.java-websocket - Java-WebSocket - ${version.websocket} - org.yaml snakeyaml - ${version.snakeyaml} + 2.0 org.springdoc - springdoc-openapi-ui - ${version.springdoc} + springdoc-openapi-starter-webmvc-ui + 2.1.0 @@ -596,31 +448,33 @@ sdc-tosca ${version.sdc} - - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.0_spec - ${version.jboss-jaxrs-api} - + com.h2database h2 - ${version.h2} + 2.2.220 test junit junit - ${version.junit} + 4.13.2 + test + + + org.junit.jupiter + junit-jupiter-engine + ${version.jupiter} test org.junit.vintage junit-vintage-engine - ${version.junit-vintage} + ${version.jupiter} test @@ -640,33 +494,33 @@ org.assertj assertj-core - ${version.assertj} + 3.24.2 test com.openpojo openpojo - ${version.openpojo} + 0.9.1 test org.mockito - mockito-all - ${version.mockito-all} + mockito-core + ${version.mockito} test org.mockito - mockito-core - ${version.mockito-core} + mockito-junit-jupiter + ${version.mockito} test org.awaitility awaitility - ${version.awaitility} + 4.2.0 test @@ -694,42 +548,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 +608,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 +633,7 @@ org.springframework - spring-expression + spring-jcl ${version.spring} @@ -767,36 +643,35 @@ 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 +680,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,55 +705,36 @@ 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} + test - - - 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} + 10.1.13 - org.apache.tomcat - tomcat-annotations-api - ${version.tomcat} - - - 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 +768,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,) + ${version.maven-remote-resources-plugin},) bundle process - + org.jacoco jacoco-maven-plugin - [0.7.1.201405082137,) + ${version.jacoco} prepare-agent - + de.jpdigital - hibernate52-ddl-maven-plugin - [2.2.0,) + hibernate56-ddl-maven-plugin + [2.5.0,) gen-ddl - + org.codehaus.groovy.maven gmaven-plugin - [1.0,) + [1.5,) execute - + @@ -985,46 +840,46 @@ - + 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 - + io.swagger.codegen.v3 swagger-codegen-maven-plugin - [3.0.0,) + [${version.swagger.codegen.v3},) generate - + @@ -1041,7 +896,7 @@ org.apache.maven.archetype archetype-packaging - 3.2.0 + 3.2.1 @@ -1054,17 +909,17 @@ com.github.eirslett frontend-maven-plugin - 1.12.1 + ${version.frontend.maven} io.fabric8 docker-maven-plugin - 0.41.0 + 0.43.4 io.github.git-commit-id git-commit-id-maven-plugin - 5.0.0 + 6.0.0 @@ -1087,7 +942,7 @@ io.swagger.codegen.v3 swagger-codegen-maven-plugin - 3.0.36 + ${version.swagger.codegen.v3} org.apache.maven.plugins @@ -1097,17 +952,17 @@ org.apache.maven.plugins maven-assembly-plugin - 3.4.2 + 3.6.0 org.apache.maven.plugins maven-clean-plugin - 3.2.0 + 3.3.1 org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.11.0 ${project.build.sourceEncoding} ${java.version} @@ -1116,7 +971,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.5.0 + 3.6.0 org.apache.maven.plugins @@ -1126,7 +981,7 @@ org.apache.maven.plugins maven-install-plugin - 3.1.0 + 3.1.1 org.apache.maven.plugins @@ -1136,42 +991,42 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.6.0 org.apache.maven.plugins maven-pmd-plugin - 3.20.0 + 3.21.0 org.apache.maven.plugins maven-release-plugin - 3.0.0-M7 + 3.0.1 org.apache.maven.plugins maven-remote-resources-plugin - 3.0.0 + ${version.maven-remote-resources-plugin} org.apache.maven.plugins maven-resources-plugin - 3.3.0 + 3.3.1 org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 org.apache.maven.plugins maven-shade-plugin - 3.4.1 + 3.5.0 org.apache.maven.plugins maven-war-plugin - 3.3.2 + 3.4.0 org.codehaus.gmaven @@ -1181,7 +1036,7 @@ org.codehaus.mojo versions-maven-plugin - 2.14.2 + 2.16.0 org.codehaus.mojo @@ -1199,6 +1054,11 @@ spring-boot-maven-plugin ${version.springboot} + + org.apache.maven.plugins + maven-surefire-plugin + 3.1.2 + @@ -1211,9 +1071,20 @@ ${java.version} + + org.apache.maven.plugins + maven-surefire-plugin + + ${surefireArgLine} + + **/IT*.java + + + org.jacoco jacoco-maven-plugin + ${version.jacoco} pre-unit-test @@ -1265,6 +1136,7 @@ + org.apache.maven.plugins maven-checkstyle-plugin @@ -1303,7 +1175,6 @@ true true true - true true warning diff --git a/integration/src/main/resources/release/pf_release_data.csv b/integration/src/main/resources/release/pf_release_data.csv index c2564e27..d6ca81be 100644 --- a/integration/src/main/resources/release/pf_release_data.csv +++ b/integration/src/main/resources/release/pf_release_data.csv @@ -1,14 +1,14 @@ Repo, Last Tag Version,Snapshot Version,Changed Files,Docker Images -policy/parent,3.7.2,4.0.0-SNAPSHOT,41, -policy/docker,2.6.2,3.0.0-SNAPSHOT,50,'policy-jre-alpine':'policy-jdk-alpine':'policy-db-migrator' -policy/common,1.12.2,2.0.0-SNAPSHOT,1, -policy/models,2.8.2,3.0.0-SNAPSHOT,3,'policy-models-simulator' -policy/api,2.8.2,3.0.0-SNAPSHOT,2,'policy-api' -policy/pap,2.8.2,3.0.0-SNAPSHOT,2,'policy-pap' -policy/apex-pdp,2.9.2,3.0.0-SNAPSHOT,2,'policy-apex-pdp' -policy/drools-pdp,1.12.2,2.0.0-SNAPSHOT,2,'policy-drools' -policy/xacml-pdp,2.8.2,3.0.0-SNAPSHOT,2,'policy-xacml-pdp' -policy/distribution,2.9.2,3.0.0-SNAPSHOT,2,'policy-distribution' -policy/clamp,6.4.3,7.0.0-SNAPSHOT,7,'policy-clamp-ac-pf-ppnt':'policy-clamp-ac-k8s-ppnt':'policy-clamp-ac-http-ppnt':'policy-clamp-ac-a1pms-ppnt':'policy-clamp-runtime-acm':'policy-clamp-acm-element-impl':'policy-clamp-ac-kserve-ppnt':'policy-clamp-ac-sim-ppnt' -policy/gui,2.4.2,3.0.0-SNAPSHOT,2,'policy-gui' -policy/drools-applications,1.12.2,2.0.0-SNAPSHOT,1,'policy-pdpd-cl' +policy/parent,4.0.0,4.0.1-SNAPSHOT,41, +policy/docker,3.0.0,3.0.1-SNAPSHOT,50,'policy-jre-alpine':'policy-jdk-alpine':'policy-db-migrator' +policy/common,2.0.0,2.0.1-SNAPSHOT,1, +policy/models,3.0.0,3.0.1-SNAPSHOT,3,'policy-models-simulator' +policy/api,3.0.0,3.0.1-SNAPSHOT,2,'policy-api' +policy/pap,3.0.0,3.0.1-SNAPSHOT,2,'policy-pap' +policy/apex-pdp,3.0.0,3.0.1-SNAPSHOT,2,'policy-apex-pdp' +policy/drools-pdp,2.0.0,2.0.1-SNAPSHOT,2,'policy-drools' +policy/xacml-pdp,3.0.0,3.0.1-SNAPSHOT,2,'policy-xacml-pdp' +policy/distribution,3.0.0,3.0.1-SNAPSHOT,2,'policy-distribution' +policy/clamp,7.0.0,7.0.1-SNAPSHOT,7,'policy-clamp-ac-pf-ppnt':'policy-clamp-ac-k8s-ppnt':'policy-clamp-ac-http-ppnt':'policy-clamp-ac-a1pms-ppnt':'policy-clamp-runtime-acm':'policy-clamp-acm-element-impl':'policy-clamp-ac-kserve-ppnt':'policy-clamp-ac-sim-ppnt' +policy/gui,3.0.0,3.0.1-SNAPSHOT,2,'policy-gui' +policy/drools-applications,2.0.0,2.0.1-SNAPSHOT,1,'policy-pdpd-cl' diff --git a/pom.xml b/pom.xml index f5a55462..832690b9 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ org.onap.policy.parent policy-parent - 4.0.0-SNAPSHOT + 4.0.1-SNAPSHOT pom diff --git a/resources/pom.xml b/resources/pom.xml index 6b82c769..3d9dbfc7 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.parent policy-parent - 4.0.0-SNAPSHOT + 4.0.1-SNAPSHOT policy-parent-resources diff --git a/version.properties b/version.properties index 5ae2ec99..56271391 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ minor=4 minor=0 -patch=0 +patch=1 base_version=${major}.${minor}.${patch}