From f749e561c438a8802366817d9cb7d65591c40f82 Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Fri, 31 May 2024 13:56:05 +0530 Subject: [PATCH 1/4] MOSIP-33031 : java21 migration Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- .github/workflows/push-trigger.yml | 22 ++++++------- .../pom.xml | 33 +++++++++---------- authentication/pom.xml | 33 ++++++++++--------- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index efe16446fcf..a047ab82d0f 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -62,7 +62,7 @@ jobs: GPG_SECRET: ${{ secrets.GPG_SECRET }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} build-maven-pre-registration-booking-service: - uses: mosip/kattu/.github/workflows/maven-build.yml@master + uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21 with: SERVICE_LOCATION: pre-registration-booking-service BUILD_ARTIFACT: pre-registration-booking-service @@ -82,7 +82,7 @@ jobs: BUILD_ARTIFACT: 'pre-registration-booking-service' fail-fast: false name: ${{ matrix.SERVICE_NAME }} - uses: mosip/kattu/.github/workflows/docker-build.yml@master + uses: mosip/kattu/.github/workflows/docker-build.yml@master-java21 with: SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} SERVICE_NAME: ${{ matrix.SERVICE_NAME }} @@ -96,7 +96,7 @@ jobs: publish_to_nexus_pre-registration-booking-service: if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' }}" needs: build-maven-pre-registration-booking-service - uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master + uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master-java21 with: SERVICE_LOCATION: pre-registration-booking-service secrets: @@ -109,7 +109,7 @@ jobs: sonar_analysis: needs: build-maven-pre-registration-booking-service if: "${{ github.event_name != 'pull_request' }}" - uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master + uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21 with: SERVICE_LOCATION: pre-registration-booking-service PROJECT_KEY: mosip_pre-registration-booking-service @@ -123,7 +123,7 @@ jobs: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} build-maven-registration-processor-external-stage: - uses: mosip/kattu/.github/workflows/maven-build.yml@master + uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21 with: SERVICE_LOCATION: registration-processor/registration-processor-external-stage BUILD_ARTIFACT: registration-processor-external-stage @@ -144,7 +144,7 @@ jobs: BUILD_ARTIFACT: 'registration-processor-external-stage' fail-fast: false name: ${{ matrix.SERVICE_NAME }} - uses: mosip/kattu/.github/workflows/docker-build.yml@master + uses: mosip/kattu/.github/workflows/docker-build.yml@master-java21 with: SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} SERVICE_NAME: ${{ matrix.SERVICE_NAME }} @@ -155,7 +155,7 @@ jobs: RELEASE_DOCKER_HUB: ${{ secrets.RELEASE_DOCKER_HUB }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} build-maven-registration-processor-external-integration-service: - uses: mosip/kattu/.github/workflows/maven-build.yml@master + uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21 with: SERVICE_LOCATION: registration-processor/registration-processor-external-integration-service BUILD_ARTIFACT: registration-processor-external-integration-service @@ -176,7 +176,7 @@ jobs: BUILD_ARTIFACT: 'registration-processor-external-integration-service' fail-fast: false name: ${{ matrix.SERVICE_NAME }} - uses: mosip/kattu/.github/workflows/docker-build.yml@master + uses: mosip/kattu/.github/workflows/docker-build.yml@master-java21 with: SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} SERVICE_NAME: ${{ matrix.SERVICE_NAME }} @@ -211,7 +211,7 @@ jobs: GPG_SECRET: ${{ secrets.GPG_SECRET }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} build-maven-authentication-ref-impl: - uses: mosip/kattu/.github/workflows/maven-build.yml@master + uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21 with: SERVICE_LOCATION: authentication BUILD_ARTIFACT: authentication @@ -224,7 +224,7 @@ jobs: publish_to_nexus_authentication-ref-impl: if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' }}" needs: build-maven-authentication-ref-impl - uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master + uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master-java21 with: SERVICE_LOCATION: authentication secrets: @@ -237,7 +237,7 @@ jobs: sonar_analysis_authentication-ref-impl: needs: build-maven-authentication-ref-impl if: "${{ github.event_name != 'pull_request' }}" - uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master + uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21 with: SERVICE_LOCATION: authentication PROJECT_KEY: mosip_biosdk-client diff --git a/authentication/authentication-childauthfilter-impl/pom.xml b/authentication/authentication-childauthfilter-impl/pom.xml index 145c66873ea..df5f33f2843 100644 --- a/authentication/authentication-childauthfilter-impl/pom.xml +++ b/authentication/authentication-childauthfilter-impl/pom.xml @@ -4,9 +4,9 @@ io.mosip.authentication authentication-ref-impl-parent - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT authentication-childauthfilter-impl authentication-childauthfilter-impl ID Authentication Filter reference Implementation to check allowed auth types for child @@ -17,34 +17,33 @@ UTF-8 - 11 - 11 + 21 + 21 3.8.0 - 3.0.2 3.1.0 - - 3.2.0 2.3 - - - - 4.12 - 2.23.4 - 1.7.4 - 2.0.7 - - + + + + io.mosip.kernel + kernel-bom + 1.2.1-java21-SNAPSHOT + pom + import + + + + org.projectlombok lombok - ${lombok.version} compile diff --git a/authentication/pom.xml b/authentication/pom.xml index 160bf89e1d8..6a0e75828ac 100644 --- a/authentication/pom.xml +++ b/authentication/pom.xml @@ -5,7 +5,7 @@ io.mosip.authentication authentication-ref-impl-parent - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT pom id-authentication Reference Impl Parent @@ -69,29 +69,23 @@ UTF-8 - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT ${kernel.parent.version} ${kernel.parent.version} - 11 - 11 + 21 + 21 3.8.0 3.2.0 2.9.2 - 0.8.5 + 0.8.11 3.7.0.1746 - 2.0.0 2.22.0 - 4.13.1 - 2.23.4 1.9.3 - - 1.18.8 - 2.0.2.RELEASE 4.0.1.RELEASE @@ -118,19 +112,29 @@ 3.1 + + + + io.mosip.kernel + kernel-bom + 1.2.1-java21-SNAPSHOT + pom + import + + + + junit junit - ${junit.version} test org.projectlombok lombok - ${lombok.version} compile @@ -148,17 +152,14 @@ org.springframework.boot spring-boot-starter-webflux - ${spring.boot.version} javax.xml.bind jaxb-api - 2.3.1 org.javassist javassist - 3.27.0-GA From 1fbc335ce7cad485e81d87036d4863153a7f8f0a Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Tue, 18 Jun 2024 18:33:55 +0530 Subject: [PATCH 2/4] Update push-trigger.yml Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- .github/workflows/push-trigger.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 947103e703c..60c8716bb51 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -211,7 +211,7 @@ jobs: GPG_SECRET: ${{ secrets.GPG_SECRET }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} build-maven-authentication-ref-impl: - uses: mosip/kattu/.github/workflows/maven-build.yml@master + uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21 with: SERVICE_LOCATION: authentication BUILD_ARTIFACT: authentication @@ -224,7 +224,7 @@ jobs: publish_to_nexus_authentication-ref-impl: if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' }}" needs: build-maven-authentication-ref-impl - uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master + uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master-java21 with: SERVICE_LOCATION: authentication secrets: @@ -237,7 +237,7 @@ jobs: sonar_analysis_authentication-ref-impl: needs: build-maven-authentication-ref-impl if: "${{ github.event_name != 'pull_request' }}" - uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master + uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21 with: SERVICE_LOCATION: authentication PROJECT_KEY: mosip_biosdk-client From 18f69fc9bf7874fd8246a21a9742143151e0e31d Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Fri, 21 Jun 2024 12:01:28 +0530 Subject: [PATCH 3/4] build failure fixes Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- pre-registration-booking-service/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pre-registration-booking-service/pom.xml b/pre-registration-booking-service/pom.xml index f7512bd7c99..2375fd41403 100644 --- a/pre-registration-booking-service/pom.xml +++ b/pre-registration-booking-service/pom.xml @@ -46,8 +46,8 @@ UTF-8 1.4.2 - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT + 1.2.0.1 + 1.2.0.1 2.0.2.RELEASE 2.0.9.RELEASE @@ -79,7 +79,7 @@ 4.3 - 1.18.8 + 1.18.30 2.23.4 1.1 From dd8a801d0d08797caddca074b044a7b6d5ee900f Mon Sep 17 00:00:00 2001 From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Date: Fri, 21 Jun 2024 12:13:55 +0530 Subject: [PATCH 4/4] lombok changes Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --- pre-registration-booking-service/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pre-registration-booking-service/pom.xml b/pre-registration-booking-service/pom.xml index 2375fd41403..63b5e04abb8 100644 --- a/pre-registration-booking-service/pom.xml +++ b/pre-registration-booking-service/pom.xml @@ -79,7 +79,7 @@ 4.3 - 1.18.30 + 1.18.8 2.23.4 1.1