From f2e52deb999b971a1048f303b8ef89111869f97c Mon Sep 17 00:00:00 2001 From: "avinash.akkera" Date: Thu, 19 Sep 2024 19:55:48 +0530 Subject: Upgrade for Java 17 with Kotlin 1.7 - Generated a new module for CDS with Java 17, Kotlin 1.7 & Spring Boot 2.7.18. Issue-ID: CCSDK-4054 Change-Id: Ifd4f9c35953d0c7fd297f56043eec37e8bcba18d Signed-off-by: avinash.akkera --- springboot/pom.xml | 1 + springboot/spring-boot-setup/pom.xml | 35 + .../main/properties/springboot27-jdk17.properties | 11 + .../src/main/resources/pom-template-jdk17.xml | 16 +- springboot/springboot27-jdk17/pom.xml | 1016 ++++++++++++++++++++ 5 files changed, 1071 insertions(+), 8 deletions(-) create mode 100644 springboot/spring-boot-setup/src/main/properties/springboot27-jdk17.properties create mode 100644 springboot/springboot27-jdk17/pom.xml diff --git a/springboot/pom.xml b/springboot/pom.xml index f55b27cc..d34f9773 100755 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -21,6 +21,7 @@ springboot25 springboot26 springboot27 + springboot27-jdk17 springboot30 springboot31 springboot32 diff --git a/springboot/spring-boot-setup/pom.xml b/springboot/spring-boot-setup/pom.xml index d3e95f73..f61cf5d8 100644 --- a/springboot/spring-boot-setup/pom.xml +++ b/springboot/spring-boot-setup/pom.xml @@ -119,6 +119,30 @@ UTF-8 + + create-springboot27-jdk17-parent-pom + + copy-resources + + validate + + ../springboot27-jdk17 + + + src/main/resources + + pom-template-jdk17.xml + + true + + + \ + + ${basedir}/src/main/properties/springboot27-jdk17.properties + + UTF-8 + + create-springboot30-parent-pom @@ -266,6 +290,17 @@ ../springboot27/pom.xml + + rename-springboot27-jdk17-parent-pom + validate + + rename + + + ../springboot27-jdk17/pom-template-jdk17.xml + ../springboot27-jdk17/pom.xml + + rename-springboot30-parent-pom validate diff --git a/springboot/spring-boot-setup/src/main/properties/springboot27-jdk17.properties b/springboot/spring-boot-setup/src/main/properties/springboot27-jdk17.properties new file mode 100644 index 00000000..ab2ad432 --- /dev/null +++ b/springboot/spring-boot-setup/src/main/properties/springboot27-jdk17.properties @@ -0,0 +1,11 @@ +springbootparent.artifactId=spring-boot-starter-parent +springbootparent.groupId=org.springframework.boot +springbootparent.version=2.7.18 +springboot.project.artifactId=spring-boot-27-jdk-17-starter-parent +spring.version=6.1.10 +springboot.httpcomponents.core.version=4.5.16 +springboot.httpcomponents.client.version=4.5.14 +springboot.jackson.version=2.15.0 +springboot.logback.version=1.4.14 +springboot.slf4j.version=2.19.0 +springboot.antlr.version=4.12.0 diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template-jdk17.xml b/springboot/spring-boot-setup/src/main/resources/pom-template-jdk17.xml index db3e8837..394ab82d 100644 --- a/springboot/spring-boot-setup/src/main/resources/pom-template-jdk17.xml +++ b/springboot/spring-boot-setup/src/main/resources/pom-template-jdk17.xml @@ -103,15 +103,15 @@ ${spring.version} - 1.11 - 1.5.32 - 1.5.32 - 1.5.2 - 1.5.0 - 0.5.0 - 2.6.6 + 17 + 1.7.0 + 1.7.0 + 1.7.0 + 1.11.0 + 0.6.1 + 2.15.0 2.2.3 - 1.9.3 + 1.13.12 ${springboot.antlr.version} diff --git a/springboot/springboot27-jdk17/pom.xml b/springboot/springboot27-jdk17/pom.xml new file mode 100644 index 00000000..94b77225 --- /dev/null +++ b/springboot/springboot27-jdk17/pom.xml @@ -0,0 +1,1016 @@ + + + 4.0.0 + + + + org.springframework.boot + spring-boot-starter-parent + 2.7.18 + + + + org.onap.ccsdk.parent + spring-boot-27-jdk-17-starter-parent + 2.8.0-SNAPSHOT + pom + + ONAP :: ${project.groupId} :: ${project.artifactId} + Root POM to be used in place of spring-boot parent for CCSDK based projects + http://wiki.onap.org + + ONAP + + + + JIRA + https://jira.onap.org/ + + + + + ecomp-releases + ${onap.nexus.release-url} + + + ecomp-snapshots + ${onap.nexus.snapshot-url} + + + + + + 3.7.0.1746 + 3.2 + jacoco + + ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml,${project.reporting.outputDirectory}/jacoco-it/jacoco.xml + + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** + + + 0.8.8 + + + UTF-8 + UTF-8 + + /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + + + ${basedir}/src/main/resources/swagger.properties + + ${basedir}/src/main/resources/swagger.json + + + + https://nexus.onap.org + nexus.onap.org + 443 + https + https://nexus.onap.org/content/groups/public + https://nexus.onap.org/content/groups/staging + https://nexus.onap.org/content/repositories/releases + https://nexus.onap.org/content/repositories/snapshots + ecomp-staging + 176c31dfe190a + + 17 + 3.10.0 + 1.8 + features.xml + src/main/yang-gen-config + src/main/yang-gen-sal + true + + + 1.6.9 + + + (1.6.99999,1.7.99999-SNAPSHOT] + (1.7.99999, 1.8.99999-SNAPSHOT] + (1.6.99999, 1.7.99999-SNAPSHOT] + (1.8.99999, 1.9.99999-SNAPSHOT] + ${ccsdk.sli.version} + ${ccsdk.sli.version} + ${ccsdk.sli.version} + ${ccsdk.sli.version} + + + 2.7.18 + 6.1.10 + + + 17 + 1.7.0 + 1.7.0 + 1.7.0 + 1.11.0 + 0.6.1 + 2.15.0 + 2.2.3 + 1.13.12 + + + 4.12.0 + 4.12.0 + + + direct-dependencies.txt + + + + + + + org.onap.ccsdk.parent + dependencies-bom + 2.8.0-SNAPSHOT + pom + import + + + com.fasterxml.jackson + jackson-bom + 2.15.0 + pom + import + + + org.onap.ccsdk.sli.core + sli-common + ${ccsdk.sli.core.version} + + + org.onap.ccsdk.sli.core + sli-provider + ${ccsdk.sli.core.version} + + + org.onap.ccsdk.sli.core + ccsdk-sli + ${ccsdk.sli.core.version} + xml + features + + + org.onap.ccsdk.sli.core + dblib-provider + ${ccsdk.sli.core.version} + + + org.onap.ccsdk.sli.adaptors + aai-service-provider + ${ccsdk.sli.adaptors.version} + + + org.onap.logging-analytics + logging-slf4j + ${logging-analytics.version} + + + org.onap.logging-analytics + logging-filter-base + ${logging-analytics.version} + + + org.liquibase + liquibase-core + 4.4.2-nordix + + + + + + + onap-public + ${onap.nexus.public-url} + + true + never + + + true + always + + + + onap-staging + ${onap.nexus.staging-url} + + true + never + + + true + always + + + + ecomp-release + onap-repository-releases + ${onap.nexus.release-url} + + true + never + + + false + + + + ecomp-snapshot + onap-repository-snapshots + ${onap.nexus.snapshot-url} + + false + + + true + + + + + + + onap-public + ${onap.nexus.public-url} + + true + + + true + + + + onap-staging + ${onap.nexus.staging-url} + + true + + + true + + + + onap-snapshot + ${onap.nexus.snapshot-url} + + false + + + true + + + + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + 2.8 + + + true + + + + org.apache.maven.plugins + maven-site-plugin + 3.6 + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.10 + + + org.apache.maven.doxia + doxia-core + 1.7 + + + org.apache.maven.doxia + doxia-sink-api + 1.7 + + + org.apache.maven.doxia + doxia-logging-api + 1.7 + + + + + attach-descriptor + + attach-descriptor + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.17 + + + org.onap.oparent + checkstyle + 1.1.1 + + + + + check-license + + check + + process-sources + + onap-checkstyle/check-license.xml + onap-checkstyle/apache-license-2.regexp.txt + false + true + false + ${project.build.sourceDirectory} + + + false + true + + + + check-style + + check + + process-sources + + + onap-checkstyle/onap-java-style.xml + + ${project.build.sourceDirectory}/src/main/java + true + true + true + + + false + true + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${surefireArgLine} + + + **/IT*.java + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + integration-tests + + integration-test + verify + + + + ${failsafeArgLine} + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compile.plugin.version} + + ${java.version} + + + + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.7.0.1746 + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + false + + + + aggregate + + aggregate + + site + + + + + com.github.ferstl + depgraph-maven-plugin + 3.3.0 + + text + ${dependency-list.file} + ${project.basedir} + * + true + true + + + + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + pre-unit-test + + prepare-agent + + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + + surefireArgLine + + + + + post-unit-test + test + + report + + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + + ${project.reporting.outputDirectory}/jacoco-ut + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + + ${project.build.directory}/code-coverage/jacoco-it.exec + + failsafeArgLine + + + + + post-integration-test + post-integration-test + + report + + + + ${project.build.directory}/code-coverage/jacoco-it.exec + + ${project.reporting.outputDirectory}/jacoco-it + + + + default-prepare-agent + + prepare-agent + + + + default-report + prepare-package + + report + + + + default-check + + check + + + + + PACKAGE + + + COMPLEXITY + COVEREDRATIO + 0.0 + + + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + org.codehaus.mojo + build-helper-maven-plugin + 1.12 + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + + set-system-properties + + + + + maven.wagon.http.ssl.allowall + ${ssl.allowall} + + + maven.wagon.http.ssl.insecure + ${ssl.insecure} + + + + + + + + org.codehaus.mojo + versions-maven-plugin + 2.5 + + true + + + + maven-scm-plugin + 1.8.1 + + ${project.artifactId}-${project.version} + + + + pl.project13.maven + git-commit-id-plugin + 4.0.0 + + full + + ^git.build.(time|version)$ + ^git.commit.id.(abbrev|full)$ + + + + + + + + + + maven-javadoc-plugin + 2.10.4 + + false + org.umlgraph.doclet.UmlGraphDoc + + org.umlgraph + umlgraph + 5.6 + + -views + true + org.opendaylight.* + + + + + javadoc-no-fork + test-javadoc-no-fork + + + + aggregate + + aggregate + test-aggregate + + + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.3 + + + aggregate + + aggregate + test-aggregate + + + + + + maven-surefire-plugin + 2.17 + + + org.apache.maven.plugins + maven-changelog-plugin + 2.3 + + + dual-report + + range + 30 + + + changelog + file-activity + + + + + + org.codehaus.mojo + taglist-maven-plugin + 2.4 + + + + + + + + generate-json + + + ${swagger-properties} + + + swagger-sdk.generate-json + + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + initialize + + read-project-properties + + + + ${basedir}/src/main/resources/swagger.properties + + + + + + + com.github.kongchen + swagger-maven-plugin + 3.1.4 + + + + ${api-rest-package} + http,https + ${api-host-ip}:${api-host-port} + ${api-base-path} + + ${api-title} + ${api-version} + ${api-description} + + ${api-license} + + + ${basedir}/src/main/resources + + + + + + compile + + generate + + + + + + org.apache.maven.plugins + maven-install-plugin + 2.3.1 + + + install-file-id + install + + install-file + + + ${basedir}/src/main/resources/swagger.json + ${project.groupId} + ${project.artifactId}-swagger-schema + ${project.version} + json + + + + + + + + + generate-sdk + + + ${swagger-json} + + + swagger-sdk.generate-java-sdk + + + + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + initialize + ant-create-script + + true + + + + + + + + + + + + + + + + + + + + + + + + + + run + + + + + + ant-contrib + ant-contrib + 1.0b3 + + + ant + ant + + + + + + + io.swagger + swagger-codegen-maven-plugin + 2.2.1 + + + + generate + + + ${basedir}/src/main/resources/swagger.json + ${project.build.directory}/generated-sources + java + + joda + + jersey2 + ${project.groupId} + ${project.artifactId}-java-sdk + ${project.version} + ${project.groupId}.${project.artifactId}.client.model + ${project.groupId}.${project.artifactId}.client.api + ${project.groupId}.${project.artifactId}.client.invoker + + + + + + org.codehaus.mojo + exec-maven-plugin + 3.1.0 + + + swagger-generate-sources + generate-sources + + exec + + + ${project.build.directory}${file.separator}${swagger.sdk.script.file} + + + + + + org.apache.maven.plugins + maven-clean-plugin + 3.0.0 + + + clean-generated-files + generate-sources + + clean + + + + + ${project.build.directory}/generated-sources + + + + + + + + + + + org.onap.msb.swagger-sdk + swagger-sdk + 1.0.0 + + + + + + q + + true + true + true + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + sonar-jacoco-aggregate + + + onap.jacoco.aggregateFile + + + + + + org.jacoco + jacoco-maven-plugin + + + merge + + merge + + generate-resources + + ${onap.jacoco.aggregateFile} + + + ${project.basedir} + + **/target/code-coverage/*.exec + + + + + + + + + + + + + -- cgit 1.2.3-korg