From 213139708b47eb93ded5ed814873ece3e11e63eb Mon Sep 17 00:00:00 2001 From: Shubham Jaiswal Date: Tue, 26 Jul 2022 14:27:28 +0530 Subject: [PATCH] Migration done from java 11 to java 17 --- .github/workflows/push_trigger.yml | 12 ++-- .github/workflows/release_trigger.yml | 8 +-- commons-packet/commons-packet-manager/pom.xml | 61 +++++++++++++------ .../commons-packet-service/Dockerfile | 2 +- commons-packet/commons-packet-service/pom.xml | 58 ++++++++++++------ ...trap.properties => application.properties} | 2 +- commons-packet/pom.xml | 41 ++++++++----- 7 files changed, 119 insertions(+), 65 deletions(-) rename commons-packet/commons-packet-service/src/main/resources/{bootstrap.properties => application.properties} (94%) diff --git a/.github/workflows/push_trigger.yml b/.github/workflows/push_trigger.yml index 2fd764d447..c2450dacba 100644 --- a/.github/workflows/push_trigger.yml +++ b/.github/workflows/push_trigger.yml @@ -16,11 +16,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: ref: ${{ github.ref }} - java-version: 11 + java-version: 17 server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file @@ -82,11 +82,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: ref: ${{ github.ref }} - java-version: 11 + java-version: 17 server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file @@ -209,11 +209,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: ref: ${{ github.ref }} - java-version: 11 + java-version: 17 server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file diff --git a/.github/workflows/release_trigger.yml b/.github/workflows/release_trigger.yml index 6476f8f7f7..62883cb19d 100644 --- a/.github/workflows/release_trigger.yml +++ b/.github/workflows/release_trigger.yml @@ -14,11 +14,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: ref: ${{ github.ref }} - java-version: 11 + java-version: 17 server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file @@ -67,11 +67,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: ref: ${{ github.ref }} - java-version: 11 + java-version: 17 server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file diff --git a/commons-packet/commons-packet-manager/pom.xml b/commons-packet/commons-packet-manager/pom.xml index b1aaf25127..34629ce77a 100644 --- a/commons-packet/commons-packet-manager/pom.xml +++ b/commons-packet/commons-packet-manager/pom.xml @@ -9,44 +9,48 @@ commons-packet-manager Mosip commons project https://github.com/mosip/commons - 1.2.1-SNAPSHOT + 1-2-1-j17-SNAPSHOT + + + 17 + UTF-8 - 11 - 11 + 17 + 17 3.8.0 - + 2.22.0 3.0.2 3.1.0 - 3.2.0 + 3.4.0 2.3 - 2.0.2.RELEASE - 2.0.7.RELEASE - 2.0.0.RELEASE + 2.7.0 + 2.7.0 + 3.1.3 1.4.197 2.9.8 1.2.1-SNAPSHOT 2.9.2 2.0.7 - 4.13.1 + 4.13.2 1.3.1 - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT + 1-2-1-j17-SNAPSHOT + 1-2-1-j17-SNAPSHOT + 1-2-1-j17-SNAPSHOT + 1-2-1-j17-SNAPSHOT + 1-2-1-j17-SNAPSHOT + 1.2.0-SNAPSHOT + 1-2-1-j17-SNAPSHOT + 1-2-1-j17-SNAPSHOT + 1-2-1-j17-SNAPSHOT 2.0.2.RELEASE - 1.2.1-SNAPSHOT + 1-2-1-j17-SNAPSHOT **/constants/**,**/config/**,**/audit/**,**/util/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** @@ -174,7 +178,23 @@ ${maven.compiler.target} - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire.plugin.version} + + ${skipTests} + false + + --add-opens java.base/java.util=ALL-UNNAMED + --add-opens java.base/java.util.zip=ALL-UNNAMED + --add-opens java.base/java.util.stream=ALL-UNNAMED + --add-opens java.base/java.io=ALL-UNNAMED + --add-opens java.base/java.lang=ALL-UNNAMED + + + + maven-deploy-plugin 2.8.1 @@ -286,6 +306,7 @@ + commons-packet-service-1.2.1 scm:git:git://github.com/mosip/packet-manager.git diff --git a/commons-packet/commons-packet-service/Dockerfile b/commons-packet/commons-packet-service/Dockerfile index 76a578c9e8..26ce7f993a 100644 --- a/commons-packet/commons-packet-service/Dockerfile +++ b/commons-packet/commons-packet-service/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11 +FROM openjdk:17-jdk-slim-buster ARG SOURCE ARG COMMIT_HASH diff --git a/commons-packet/commons-packet-service/pom.xml b/commons-packet/commons-packet-service/pom.xml index 5acd859ff4..1a5680c20c 100644 --- a/commons-packet/commons-packet-service/pom.xml +++ b/commons-packet/commons-packet-service/pom.xml @@ -6,45 +6,50 @@ 4.0.0 io.mosip.commons commons-packet-service - 1.2.1-SNAPSHOT + 1-2-1-j17-SNAPSHOT commons-packet-service Mosip commons project https://github.com/mosip/commons + + + 17 + UTF-8 - 11 - 11 + 17 + 17 3.8.0 - + 2.22.0 3.0.2 3.1.0 - 3.2.0 + 3.4.0 2.3 - 2.0.2.RELEASE - 2.0.7.RELEASE - 2.0.0.RELEASE + 2.7.0 + 2.7.0 + 3.1.3 1.4.197 2.9.8 1.2.1-SNAPSHOT 2.9.2 2.0.7 - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT + + 1-2-1-j17-SNAPSHOT + 1-2-1-j17-SNAPSHOT + 1.2.0-SNAPSHOT + 1-2-1-j17-SNAPSHOT + 1-2-1-j17-SNAPSHOT + 1-2-1-j17-SNAPSHOT 2.0.2.RELEASE - 1.2.1-SNAPSHOT + 1-2-1-j17-SNAPSHOT **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** - 1.2.1-SNAPSHOT + 1-2-1-j17-SNAPSHOT 1.5.10 @@ -91,6 +96,7 @@ kernel-logger-logback ${kernel.logger.logback.version} + org.springdoc springdoc-openapi-ui @@ -102,6 +108,7 @@ + @@ -134,6 +141,23 @@ + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire.plugin.version} + + ${skipTests} + false + + --add-opens java.base/java.util=ALL-UNNAMED + --add-opens java.base/java.util.zip=ALL-UNNAMED + --add-opens java.base/java.util.stream=ALL-UNNAMED + --add-opens java.base/java.io=ALL-UNNAMED + --add-opens java.base/java.lang=ALL-UNNAMED + + + + maven-jar-plugin @@ -295,7 +319,6 @@ spring-boot-starter-webflux 2.5.4 - @@ -360,6 +383,7 @@ + commons-packet-service diff --git a/commons-packet/commons-packet-service/src/main/resources/bootstrap.properties b/commons-packet/commons-packet-service/src/main/resources/application.properties similarity index 94% rename from commons-packet/commons-packet-service/src/main/resources/bootstrap.properties rename to commons-packet/commons-packet-service/src/main/resources/application.properties index 6d7e2f43a3..7626d9cd7b 100644 --- a/commons-packet/commons-packet-service/src/main/resources/bootstrap.properties +++ b/commons-packet/commons-packet-service/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.cloud.config.uri=http://localhost:51000/config +spring.config.import=optional:configserver:http://localhost:51000/config spring.cloud.config.label=master spring.profiles.active=mz spring.application.name=application,packet-manager diff --git a/commons-packet/pom.xml b/commons-packet/pom.xml index 3f64005ad0..4615146342 100644 --- a/commons-packet/pom.xml +++ b/commons-packet/pom.xml @@ -7,7 +7,7 @@ io.mosip.commons commons-packet - 1.2.1-SNAPSHOT + 1-2-1-j17-SNAPSHOT common-packet Common packet manager for MOSIP https://github.com/mosip/packet-manager @@ -15,37 +15,41 @@ pom + + + 17 + UTF-8 - 11 - 11 + 17 + 17 3.8.0 2.22.0 3.0.2 3.1.0 - 0.8.5 + 0.8.8 3.7.0.1746 - 3.2.0 + 3.4.0 2.3 - 2.0.2.RELEASE - 2.0.7.RELEASE - 2.0.0.RELEASE + 2.7.0 + 2.7.0 + 3.1.3 1.4.197 2.9.8 1.2.1-SNAPSHOT 2.9.2 2.0.7 - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT + 1-2-1-j17-SNAPSHOT + 1-2-1-j17-SNAPSHOT + 1.2.0-SNAPSHOT + 1-2-1-j17-SNAPSHOT + 1-2-1-j17-SNAPSHOT + 1-2-1-j17-SNAPSHOT 2.0.2.RELEASE - 1.2.1-SNAPSHOT + 1-2-1-j17-SNAPSHOT **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**" **/dto/**,**/entity/**,**/config/** @@ -76,7 +80,12 @@ ${skipTests} false - ${argLine} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --illegal-access=permit + --add-opens java.base/java.util=ALL-UNNAMED + --add-opens java.base/java.util.zip=ALL-UNNAMED + --add-opens java.base/java.util.stream=ALL-UNNAMED + --add-opens java.base/java.io=ALL-UNNAMED + --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --illegal-access=permit