From e441864ffecc6f279a1041d842558876e4a87fd8 Mon Sep 17 00:00:00 2001 From: khuddus shariff Date: Mon, 22 Apr 2024 13:36:00 +0530 Subject: [PATCH 1/5] Migration java 21 Signed-off-by: khuddus shariff --- cache-provider-hazelcast/pom.xml | 43 ++++++++++++++---------- pre-registration-booking-service/pom.xml | 10 +++--- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/cache-provider-hazelcast/pom.xml b/cache-provider-hazelcast/pom.xml index 5161d4ad84..a9c742946f 100644 --- a/cache-provider-hazelcast/pom.xml +++ b/cache-provider-hazelcast/pom.xml @@ -6,7 +6,7 @@ io.mosip.cacheprovider cache-provider-hazelcast - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT MPL 2.0 @@ -32,8 +32,8 @@ UTF-8 - 11 - 11 + 21 + 21 3.8.0 2.22.0 3.0.2 @@ -43,14 +43,14 @@ 3.2.0 2.3 3.3.0 + 2.2.1 + 1.5 + 3.0.1 + 3.2.0 + 2.8.1 + 1.6.7 - - 2.0.2.RELEASE - 2.0.7 - 4.13.1 3.12.12 - 1.4.2 - 1.4.2 @@ -63,18 +63,27 @@ https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + io.mosip.kernel + kernel-bom + 1.2.1-java21-SNAPSHOT + pom + import + + + org.springframework.boot spring-boot-starter - ${spring.boot.version} provided org.springframework.boot spring-boot-starter-actuator - ${spring.boot.version} provided @@ -109,7 +118,7 @@ org.apache.maven.plugins maven-source-plugin - 2.2.1 + ${maven-source-plugin.version} attach-sources @@ -122,7 +131,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 + ${maven-gpg-plugin.version} sign-artifacts @@ -142,7 +151,7 @@ pl.project13.maven git-commit-id-plugin - 3.0.1 + ${git-commit-id-plugin.version} get-the-git-infos @@ -167,7 +176,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + ${maven-javadoc-plugin.version} attach-javadocs @@ -182,7 +191,7 @@ maven-deploy-plugin - 2.8.1 + ${maven-deploy-plugin.version} default-deploy @@ -196,7 +205,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + ${nexus-staging-maven-plugin.version} true diff --git a/pre-registration-booking-service/pom.xml b/pre-registration-booking-service/pom.xml index f7512bd7c9..3d8462a313 100644 --- a/pre-registration-booking-service/pom.xml +++ b/pre-registration-booking-service/pom.xml @@ -213,11 +213,11 @@ spring-boot-devtools runtime - - io.mosip.preregistration - pre-registration-core - ${pre.registration.core.version} - + + + + + io.mosip.kernel kernel-core From db414dcbb99604f86cc6f6957242417ad31d083a Mon Sep 17 00:00:00 2001 From: khuddus shariff Date: Mon, 22 Apr 2024 13:40:07 +0530 Subject: [PATCH 2/5] Migration java 21 Signed-off-by: khuddus shariff --- pre-registration-booking-service/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pre-registration-booking-service/pom.xml b/pre-registration-booking-service/pom.xml index 3d8462a313..f7512bd7c9 100644 --- a/pre-registration-booking-service/pom.xml +++ b/pre-registration-booking-service/pom.xml @@ -213,11 +213,11 @@ spring-boot-devtools runtime - - - - - + + io.mosip.preregistration + pre-registration-core + ${pre.registration.core.version} + io.mosip.kernel kernel-core From 386a8b1dde13d9e53b40d6caa24272ec9dce4f1e Mon Sep 17 00:00:00 2001 From: khuddus shariff Date: Mon, 22 Apr 2024 13:41:43 +0530 Subject: [PATCH 3/5] Migration java 21 Signed-off-by: khuddus shariff --- cache-provider-redis/pom.xml | 46 ++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/cache-provider-redis/pom.xml b/cache-provider-redis/pom.xml index cfb7bb8802..13f5113775 100644 --- a/cache-provider-redis/pom.xml +++ b/cache-provider-redis/pom.xml @@ -6,30 +6,20 @@ io.mosip.cacheprovider cache-provider-redis - 1.0-SNAPSHOT + 1.2.1-java21-SNAPSHOT UTF-8 - 11 - 11 + 21 + 21 3.8.0 2.22.0 - 3.0.2 - 3.1.0 - 0.8.1 - 3.7.0.1746 - 3.2.0 - 2.3 3.3.0 - - - 2.0.2.RELEASE - 2.0.7 - 4.13.1 - 3.12.12 - 1.4.2 - 1.4.2 + 3.2.3 + 2.9.0 + 2.8.1 + 1.6.7 @@ -43,28 +33,38 @@ + + + + io.mosip.kernel + kernel-bom + 1.2.1-java21-SNAPSHOT + pom + import + + + + org.springframework.boot spring-boot-starter - ${spring.boot.version} provided org.springframework.boot spring-boot-starter-actuator - ${spring.boot.version} provided org.springframework.boot spring-boot-starter-data-redis - ${spring.boot.version} + ${spring-boot-starter-data-redis.version} redis.clients jedis - 2.9.0 + ${jedis.version} @@ -92,7 +92,7 @@ maven-deploy-plugin - 2.8.1 + ${maven-deploy-plugin.version} default-deploy @@ -106,7 +106,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + ${nexus-staging-maven-plugin.version} true From 223ba3ebbc2a50c22d154ba260476796530c3f7c Mon Sep 17 00:00:00 2001 From: khuddus shariff Date: Mon, 22 Apr 2024 15:26:25 +0530 Subject: [PATCH 4/5] [MOSIP-32572] migration java21 Signed-off-by: khuddus shariff --- .github/workflows/push-trigger.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index b082eada13..8cfd3d80c5 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -187,7 +187,7 @@ jobs: RELEASE_DOCKER_HUB: ${{ secrets.RELEASE_DOCKER_HUB }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} build-maven-cache-provider-hazelcast: - uses: mosip/kattu/.github/workflows/maven-build.yml@master + uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21 with: SERVICE_LOCATION: cache-provider-hazelcast BUILD_ARTIFACT: cache-provider-hazelcast @@ -200,7 +200,7 @@ jobs: publish_to_nexus_cache-provider-hazelcast: if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' }}" needs: build-maven-cache-provider-hazelcast - 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: cache-provider-hazelcast secrets: From e4cd9c37b8bc3c612504c1eb1e59ea52e538f1fd Mon Sep 17 00:00:00 2001 From: khuddus shariff Date: Tue, 23 Apr 2024 10:52:38 +0530 Subject: [PATCH 5/5] [MOSIP-32572] Migration java21 Signed-off-by: khuddus shariff --- .github/workflows/push-trigger.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index ec5d663eff..efe16446fc 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -187,7 +187,7 @@ jobs: RELEASE_DOCKER_HUB: ${{ secrets.RELEASE_DOCKER_HUB }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} build-maven-cache-provider-hazelcast: - uses: mosip/kattu/.github/workflows/maven-build.yml@master + uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21 with: SERVICE_LOCATION: cache-provider-hazelcast BUILD_ARTIFACT: cache-provider-hazelcast @@ -200,7 +200,7 @@ jobs: publish_to_nexus_cache-provider-hazelcast: if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' }}" needs: build-maven-cache-provider-hazelcast - 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: cache-provider-hazelcast secrets: