From 0f6df3e323a86b6670831f00bc7fcd5ffdc9de85 Mon Sep 17 00:00:00 2001 From: ckm007 Date: Wed, 6 Mar 2024 16:05:48 +0000 Subject: [PATCH 1/3] [DSD-4772] PLA 1.2.0.1 release changes code to master --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d0cbef5ea..6e496f1ef 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -[![Maven Package upon a push](https://github.com/mosip/id-repository/actions/workflows/push_trigger.yml/badge.svg?branch=release-1.2.0.1)](https://github.com/mosip/id-repository/actions/workflows/push_trigger.yml) -[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?branch=release-1.2.0.1&project=mosip_id-repository&metric=alert_status)](https://sonarcloud.io/dashboard?branch=release-1.2.0.1&id=mosip_id-repository) +[![Maven Package upon a push](https://github.com/mosip/id-repository/actions/workflows/push-trigger.yml/badge.svg?branch=master)](https://github.com/mosip/id-repository/actions/workflows/push-trigger.yml) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?branch=master&project=mosip_id-repository&metric=alert_status)](https://sonarcloud.io/dashboard?branch=master&id=mosip_id-repository) # ID Repository From cdff29e8df8c7b26f12354d3a18e2927522d4053 Mon Sep 17 00:00:00 2001 From: kushagraag Date: Sat, 6 Apr 2024 05:50:40 +0530 Subject: [PATCH 2/3] upgraded to java 17 --- .../credential-request-generator/pom.xml | 14 +- id-repository/credential-service/pom.xml | 12 +- id-repository/id-repository-core/pom.xml | 10 +- .../id-repository-credentials-feeder/pom.xml | 22 +- .../id-repository-identity-service/pom.xml | 6 +- .../id-repository-salt-generator/pom.xml | 18 +- .../id-repository-vid-service/pom.xml | 6 +- id-repository/pom.xml | 369 ++++++++++-------- 8 files changed, 245 insertions(+), 212 deletions(-) diff --git a/id-repository/credential-request-generator/pom.xml b/id-repository/credential-request-generator/pom.xml index 666b60104..ac483da27 100644 --- a/id-repository/credential-request-generator/pom.xml +++ b/id-repository/credential-request-generator/pom.xml @@ -16,12 +16,12 @@ UTF-8 - 11 - 11 - 2.0.2.RELEASE - 2.0.7.RELEASE + 17 + 17 + 2.7.18 + 2.7.18 5.0.5.RELEASE - 2.0.0.RELEASE + 3.1.3 1.4.197 2.9.8 2.9.2 @@ -107,7 +107,7 @@ junit junit - 3.8.1 + 4.13.2 test @@ -294,4 +294,4 @@ - + \ No newline at end of file diff --git a/id-repository/credential-service/pom.xml b/id-repository/credential-service/pom.xml index 321e82db8..7c027e6fc 100644 --- a/id-repository/credential-service/pom.xml +++ b/id-repository/credential-service/pom.xml @@ -16,12 +16,12 @@ http://maven.apache.org UTF-8 - 1.8 - 1.8 - 2.0.2.RELEASE - 2.0.7.RELEASE + 17 + 17 + 2.7.18 + 2.7.18 5.0.5.RELEASE - 2.0.0.RELEASE + 3.1.3 1.4.197 2.9.8 2.9.2 @@ -58,7 +58,7 @@ junit junit - 3.8.1 + 4.13.2 test diff --git a/id-repository/id-repository-core/pom.xml b/id-repository/id-repository-core/pom.xml index c6dd389d0..5d6552dd4 100644 --- a/id-repository/id-repository-core/pom.xml +++ b/id-repository/id-repository-core/pom.xml @@ -17,12 +17,12 @@ 1.2.0.1 1.2.0.1 UTF-8 - 11 - 11 - 2.0.2.RELEASE - 2.0.0.RELEASE + 17 + 17 + 2.7.18 + 3.1.3 2.9.2 - 1.18.2 + 1.18.30 42.2.2 2.0.0 diff --git a/id-repository/id-repository-credentials-feeder/pom.xml b/id-repository/id-repository-credentials-feeder/pom.xml index a93e5ac72..b092b4649 100644 --- a/id-repository/id-repository-credentials-feeder/pom.xml +++ b/id-repository/id-repository-credentials-feeder/pom.xml @@ -20,23 +20,23 @@ ${parent.version} - 11 - 11 - 3.8.0 - 2.22.0 + 17 + 17 + 3.8.1 + 3.2.5 - 3.0.2 + 3.3.0 3.1.0 - 0.8.1 + 0.8.8 3.7.0.1746 - 3.2.0 + 3.6.3 2.3 - 2.0.2.RELEASE - 2.0.7.RELEASE + 2.7.18 + 2.7.18 5.0.5.RELEASE - 2.0.4.RELEASE + 3.1.3 2.0.7 @@ -65,7 +65,7 @@ 6.0.12.Final - 4.12 + 4.13.2 2.23.4 1.7.4 2.0.7 diff --git a/id-repository/id-repository-identity-service/pom.xml b/id-repository/id-repository-identity-service/pom.xml index a8b168530..ce47ab982 100644 --- a/id-repository/id-repository-identity-service/pom.xml +++ b/id-repository/id-repository-identity-service/pom.xml @@ -15,9 +15,9 @@ UTF-8 - 11 - 11 - 2.0.2.RELEASE + 17 + 17 + 2.7.18 1.2.0.1 1.2.0.1 1.2.0.1 diff --git a/id-repository/id-repository-salt-generator/pom.xml b/id-repository/id-repository-salt-generator/pom.xml index ef11b91dd..2203479b0 100644 --- a/id-repository/id-repository-salt-generator/pom.xml +++ b/id-repository/id-repository-salt-generator/pom.xml @@ -18,23 +18,23 @@ UTF-8 - 11 - 11 - 3.8.0 + 17 + 17 + 3.8.1 - 3.0.2 + 3.3.0 3.1.0 - 3.2.0 + 3.6.3 2.3 - 2.0.2.RELEASE - 2.0.7.RELEASE + 2.7.18 + 2.7.18 5.0.5.RELEASE - 2.0.4.RELEASE + 3.1.3 2.0.7 @@ -63,7 +63,7 @@ 6.0.12.Final - 4.12 + 4.13.2 2.23.4 1.7.4 2.0.7 diff --git a/id-repository/id-repository-vid-service/pom.xml b/id-repository/id-repository-vid-service/pom.xml index 9d7aaec20..41d0ad9cc 100644 --- a/id-repository/id-repository-vid-service/pom.xml +++ b/id-repository/id-repository-vid-service/pom.xml @@ -14,9 +14,9 @@ UTF-8 - 11 - 11 - 2.0.2.RELEASE + 17 + 17 + 2.7.18 1.2.0.1 1.2.0.1 1.2.0.1 diff --git a/id-repository/pom.xml b/id-repository/pom.xml index d4f872d6c..15b63b407 100644 --- a/id-repository/pom.xml +++ b/id-repository/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 io.mosip.idrepository id-repository-parent @@ -9,7 +11,7 @@ ID-Repository MOSIP ID-Repository https://github.com/mosip/id-repository - + MPL 2.0 @@ -33,27 +35,27 @@ - - - ossrh - CentralRepository - https://oss.sonatype.org/content/repositories/snapshots - default - - true - - - - central - MavenCentral - default - https://repo1.maven.org/maven2 - - false - - - - + + + ossrh + CentralRepository + https://oss.sonatype.org/content/repositories/snapshots + default + + true + + + + central + MavenCentral + default + https://repo1.maven.org/maven2 + + false + + + + ossrh @@ -64,69 +66,70 @@ https://oss.sonatype.org/service/local/staging/deploy/maven2/ - + id-repository-core id-repository-vid-service id-repository-identity-service - credential-request-generator - credential-service - id-repository-salt-generator - id-repository-credentials-feeder + credential-request-generator + credential-service + id-repository-salt-generator + id-repository-credentials-feeder - + ${parent.version} - 3.0.2 + 17 + 17 + 3.8.1 + 3.3.0 3.1.0 - 2.22.0 - 0.8.5 - 3.7.0.1746 - 3.2.0 - **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/** + 3.2.5 + 0.8.8 + 7.31.0.34839 + 3.6.3 + + **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/** **/dto/**,**/entity/**,**/config/**,**/api/** - 11 - 11 - 3.8.0 - + - 2.0.2.RELEASE - 2.0.7.RELEASE + 2.7.18 + 2.7.18 5.0.5.RELEASE - 2.0.0.RELEASE - + 3.1.3 + 4.5.6 - 1.18.8 + 1.18.30 0.6.0 2.9.2 1.4.197 - + - 4.12 + 4.13.2 2.22.0 1.2.0.1 - - + + junit junit ${junit.version} test - - + + javax.xml.bind jaxb-api 2.3.1 - javax.activation - activation - 1.1 + javax.activation + activation + 1.1 org.glassfish.jaxb @@ -134,15 +137,15 @@ 2.3.1 - org.mockito - mockito-core - ${mockito.version} - test + org.mockito + mockito-core + ${mockito.version} + test - org.javassist - javassist - 3.27.0-GA + org.javassist + javassist + 3.27.0-GA @@ -152,9 +155,38 @@ ${kernel.logger.logback.version} - + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.version} + + ${maven.compiler.source} + ${maven.compiler.target} + true + + -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED + + + + org.projectlombok + lombok + ${lombok.version} + + + + org.apache.maven.plugins maven-surefire-plugin @@ -163,7 +195,8 @@ ${skipTests} false - ${argLine} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --illegal-access=permit + ${argLine} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED + --illegal-access=permit @@ -241,114 +274,114 @@ - maven-deploy-plugin - 2.8.1 - - - default-deploy - deploy - - deploy - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - - default-deploy - deploy - - deploy - - - - - ossrh - https://oss.sonatype.org/ - false - - + maven-deploy-plugin + 2.8.1 + + + default-deploy + deploy + + deploy + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + + default-deploy + deploy + + deploy + + + + + ossrh + https://oss.sonatype.org/ + false + + - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + - - org.apache.maven.plugins - maven-javadoc-plugin - 3.2.0 - - - attach-javadocs - - jar - - - - - none - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - - - - pl.project13.maven - git-commit-id-plugin - 3.0.1 - - - get-the-git-infos - - revision - - validate - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.build.(time|version)$ - ^git.commit.id.(abbrev|full)$ - - full - ${project.basedir}/.git - - - + + org.apache.maven.plugins + maven-javadoc-plugin + 3.2.0 + + + attach-javadocs + + jar + + + + + none + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + pl.project13.maven + git-commit-id-plugin + 3.0.1 + + + get-the-git-infos + + revision + + validate + + + + true + ${project.build.outputDirectory}/git.properties + + ^git.build.(time|version)$ + ^git.commit.id.(abbrev|full)$ + + full + ${project.basedir}/.git + + + From 3c81b647444a441678985bccc9936d31e4337688 Mon Sep 17 00:00:00 2001 From: kushagraag Date: Mon, 8 Apr 2024 16:57:51 +0530 Subject: [PATCH 3/3] added doc for version update --- Version update.md | 102 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 Version update.md diff --git a/Version update.md b/Version update.md new file mode 100644 index 000000000..50b789c1f --- /dev/null +++ b/Version update.md @@ -0,0 +1,102 @@ + +### 1. Maven +Older version: + +```xml +11 +11 +3.8.0 +3.0.2 +2.22.0 +0.8.5 +``` + +Updated version: + +```xml +17 +17 +3.8.1 +3.3.0 +3.2.5 +0.8.8 +``` + +### 2. Spring boot and its related components + +older version: + +```xml +2.0.2.RELEASE +2.0.9.RELEASE +2.0.0.RELEASE +``` + +updated version: + +```xml +2.7.18 +2.7.18 +3.1.3 +``` + +## 3. junit + +Older: + +```xml +4.12 +``` + +Updated: + +```xml +4.13.2 +``` + +## 4. lombok + +Older: + +```xml +1.18.8 +``` + +### +```xml +1.18.30 +``` + +### 5. Added plugin to support lombok (needed for java 17): + +```xml + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.version} + + ${maven.compiler.source} + ${maven.compiler.target} + true + + -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED + + + + org.projectlombok + lombok + ${lombok.version} + + + + +```