Skip to content

Migration done from java 11 to java 17 #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shubhamjwl wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Migration done from java 11 to java 17 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/push_trigger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release_trigger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
61 changes: 41 additions & 20 deletions commons-packet/commons-packet-manager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,44 +9,48 @@
<name>commons-packet-manager</name>
<description>Mosip commons project </description>
<url>https://github.com/mosip/commons</url>
<version>1.2.1-SNAPSHOT</version>
<version>1-2-1-j17-SNAPSHOT</version>
<properties>

<!-- java-->
<java.version>17</java.version>

<!-- maven -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.version>3.8.0</maven.compiler.version>
<!-- <maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version> -->
<maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version>
<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
<maven.war.plugin.version>3.1.0</maven.war.plugin.version>
<!-- <maven.jacoco.plugin.version>0.8.1</maven.jacoco.plugin.version> -->
<!-- <maven.sonar.plugin.version>3.7.0.1746</maven.sonar.plugin.version> -->
<maven.javadoc.version>3.2.0</maven.javadoc.version>
<maven.javadoc.version>3.4.0</maven.javadoc.version>
<maven-shade-plugin.version>2.3</maven-shade-plugin.version>

<!-- spring -->
<spring.boot.version>2.0.2.RELEASE</spring.boot.version>
<spring.data.jpa.version>2.0.7.RELEASE</spring.data.jpa.version>
<spring-cloud-config.version>2.0.0.RELEASE</spring-cloud-config.version>
<spring.boot.version>2.7.0</spring.boot.version>
<spring.data.jpa.version>2.7.0</spring.data.jpa.version>
<spring-cloud-config.version>3.1.3</spring-cloud-config.version>
<h2.version>1.4.197</h2.version>
<jackson.datatype.version>2.9.8</jackson.datatype.version>
<kernel.keygenerator.bouncycastle.version>1.2.1-SNAPSHOT</kernel.keygenerator.bouncycastle.version>
<swagger.version>2.9.2</swagger.version>
<powermock.beta.version>2.0.7</powermock.beta.version>
<junit.version>4.13.1</junit.version>
<junit.version>4.13.2</junit.version>
<hazelcast.kubernetes.version>1.3.1</hazelcast.kubernetes.version>

<kernel-keymanager-service.version>1.2.1-SNAPSHOT</kernel-keymanager-service.version>
<kernel-idobjectvalidator.version>1.2.1-SNAPSHOT</kernel-idobjectvalidator.version>
<kernel.core.version>1.2.1-SNAPSHOT</kernel.core.version>
<kernel.biometrics.api.version>1.2.1-SNAPSHOT</kernel.biometrics.api.version>
<kernel.cbeffutil.api.version>1.2.1-SNAPSHOT</kernel.cbeffutil.api.version>
<kernel.crypto-jce.version>1.2.1-SNAPSHOT</kernel.crypto-jce.version>
<kernel.auth.adaptor.version>1.2.1-SNAPSHOT</kernel.auth.adaptor.version>
<kernel-dataaccess-hibernate.version>1.2.1-SNAPSHOT</kernel-dataaccess-hibernate.version>
<kernel.logger.logback.version>1.2.1-SNAPSHOT</kernel.logger.logback.version>
<kernel-keymanager-service.version>1-2-1-j17-SNAPSHOT</kernel-keymanager-service.version>
<kernel-idobjectvalidator.version>1-2-1-j17-SNAPSHOT</kernel-idobjectvalidator.version>
<kernel.core.version>1-2-1-j17-SNAPSHOT</kernel.core.version>
<kernel.biometrics.api.version>1-2-1-j17-SNAPSHOT</kernel.biometrics.api.version>
<kernel.cbeffutil.api.version>1-2-1-j17-SNAPSHOT</kernel.cbeffutil.api.version>
<kernel.crypto-jce.version>1.2.0-SNAPSHOT</kernel.crypto-jce.version>
<kernel.auth.adaptor.version>1-2-1-j17-SNAPSHOT</kernel.auth.adaptor.version>
<kernel-dataaccess-hibernate.version>1-2-1-j17-SNAPSHOT</kernel-dataaccess-hibernate.version>
<kernel.logger.logback.version>1-2-1-j17-SNAPSHOT</kernel.logger.logback.version>
<spring.boot.co>2.0.2.RELEASE</spring.boot.co>
<khazana.version>1.2.1-SNAPSHOT</khazana.version>
<khazana.version>1-2-1-j17-SNAPSHOT</khazana.version>
<sonar.coverage.exclusions>**/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/**"</sonar.coverage.exclusions>
<sonar.cpd.exclusions>**/dto/**,**/entity/**,**/config/**</sonar.cpd.exclusions>
</properties>
Expand Down Expand Up @@ -174,7 +178,23 @@
<target>${maven.compiler.target}</target>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.plugin.version}</version>
<configuration>
<skipTests>${skipTests}</skipTests>
<skip>false</skip>
<argLine>
--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
</argLine>

</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.1</version>
Expand Down Expand Up @@ -286,6 +306,7 @@
</configuration>
</plugin>
</plugins>
<finalName>commons-packet-service-1.2.1</finalName>
</build>
<scm>
<connection>scm:git:git://github.com/mosip/packet-manager.git</connection>
Expand Down
2 changes: 1 addition & 1 deletion commons-packet/commons-packet-service/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:11
FROM openjdk:17-jdk-slim-buster

ARG SOURCE
ARG COMMIT_HASH
Expand Down
58 changes: 41 additions & 17 deletions commons-packet/commons-packet-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,45 +6,50 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.mosip.commons</groupId>
<artifactId>commons-packet-service</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1-2-1-j17-SNAPSHOT</version>
<name>commons-packet-service</name>
<description>Mosip commons project </description>
<url>https://github.com/mosip/commons</url>
<properties>

<!-- java-->
<java.version>17</java.version>

<!-- maven -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.version>3.8.0</maven.compiler.version>
<!-- <maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version> -->
<maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version>
<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
<maven.war.plugin.version>3.1.0</maven.war.plugin.version>
<!-- <maven.jacoco.plugin.version>0.8.1</maven.jacoco.plugin.version> -->
<!-- <maven.sonar.plugin.version>3.7.0.1746</maven.sonar.plugin.version> -->
<maven.javadoc.version>3.2.0</maven.javadoc.version>
<maven.javadoc.version>3.4.0</maven.javadoc.version>
<maven-shade-plugin.version>2.3</maven-shade-plugin.version>

<!-- spring -->
<spring.boot.version>2.0.2.RELEASE</spring.boot.version>
<spring.data.jpa.version>2.0.7.RELEASE</spring.data.jpa.version>
<spring-cloud-config.version>2.0.0.RELEASE</spring-cloud-config.version>
<spring.boot.version>2.7.0</spring.boot.version>
<spring.data.jpa.version>2.7.0</spring.data.jpa.version>
<spring-cloud-config.version>3.1.3</spring-cloud-config.version>
<h2.version>1.4.197</h2.version>
<jackson.datatype.version>2.9.8</jackson.datatype.version>
<kernel.keygenerator.bouncycastle.version>1.2.1-SNAPSHOT</kernel.keygenerator.bouncycastle.version>
<swagger.version>2.9.2</swagger.version>
<powermock.beta.version>2.0.7</powermock.beta.version>

<kernel.core.version>1.2.1-SNAPSHOT</kernel.core.version>
<kernel.biometrics.api.version>1.2.1-SNAPSHOT</kernel.biometrics.api.version>
<kernel.crypto-jce.version>1.2.1-SNAPSHOT</kernel.crypto-jce.version>
<kernel.auth.adaptor.version>1.2.1-SNAPSHOT</kernel.auth.adaptor.version>
<kernel-dataaccess-hibernate.version>1.2.1-SNAPSHOT</kernel-dataaccess-hibernate.version>
<kernel.logger.logback.version>1.2.1-SNAPSHOT</kernel.logger.logback.version>

<kernel.core.version>1-2-1-j17-SNAPSHOT</kernel.core.version>
<kernel.biometrics.api.version>1-2-1-j17-SNAPSHOT</kernel.biometrics.api.version>
<kernel.crypto-jce.version>1.2.0-SNAPSHOT</kernel.crypto-jce.version>
<kernel.auth.adaptor.version>1-2-1-j17-SNAPSHOT</kernel.auth.adaptor.version>
<kernel-dataaccess-hibernate.version>1-2-1-j17-SNAPSHOT</kernel-dataaccess-hibernate.version>
<kernel.logger.logback.version>1-2-1-j17-SNAPSHOT</kernel.logger.logback.version>
<spring.boot.co>2.0.2.RELEASE</spring.boot.co>
<khazana.version>1.2.1-SNAPSHOT</khazana.version>
<khazana.version>1-2-1-j17-SNAPSHOT</khazana.version>
<sonar.coverage.exclusions>**/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/**"</sonar.coverage.exclusions>
<sonar.cpd.exclusions>**/dto/**,**/entity/**,**/config/**</sonar.cpd.exclusions>
<packet.manager.version>1.2.1-SNAPSHOT</packet.manager.version>
<packet.manager.version>1-2-1-j17-SNAPSHOT</packet.manager.version>
<springdoc.version>1.5.10</springdoc.version>
</properties>

Expand Down Expand Up @@ -91,6 +96,7 @@
<artifactId>kernel-logger-logback</artifactId>
<version>${kernel.logger.logback.version}</version>
</dependency>

<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
Expand All @@ -102,6 +108,7 @@
</exclusion>
</exclusions>
</dependency>

</dependencies>


Expand Down Expand Up @@ -134,6 +141,23 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.plugin.version}</version>
<configuration>
<skipTests>${skipTests}</skipTests>
<skip>false</skip>
<argLine>
--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
</argLine>

</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
Expand Down Expand Up @@ -295,7 +319,6 @@
<artifactId>spring-boot-starter-webflux</artifactId>
<version>2.5.4</version>
</dependency>

</dependencies>
<build>
<plugins>
Expand Down Expand Up @@ -360,6 +383,7 @@
</configuration>
</plugin>
</plugins>
<finalName>commons-packet-service</finalName>
</build>
</profile>
</profiles>
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/resources/bootstrap.properties → ...src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
41 changes: 25 additions & 16 deletions commons-packet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,45 +7,49 @@

<groupId>io.mosip.commons</groupId>
<artifactId>commons-packet</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1-2-1-j17-SNAPSHOT</version>
<name>common-packet</name>
<description>Common packet manager for MOSIP</description>
<url>https://github.com/mosip/packet-manager</url>

<packaging>pom</packaging>

<properties>

<!-- java-->
<java.version>17</java.version>

<!-- maven -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.version>3.8.0</maven.compiler.version>
<maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version>
<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
<maven.war.plugin.version>3.1.0</maven.war.plugin.version>
<maven.jacoco.version>0.8.5</maven.jacoco.version>
<maven.jacoco.version>0.8.8</maven.jacoco.version>
<maven.sonar.plugin.version>3.7.0.1746</maven.sonar.plugin.version>
<maven.javadoc.version>3.2.0</maven.javadoc.version>
<maven.javadoc.version>3.4.0</maven.javadoc.version>
<maven-shade-plugin.version>2.3</maven-shade-plugin.version>

<!-- spring -->
<spring.boot.version>2.0.2.RELEASE</spring.boot.version>
<spring.data.jpa.version>2.0.7.RELEASE</spring.data.jpa.version>
<spring-cloud-config.version>2.0.0.RELEASE</spring-cloud-config.version>
<spring.boot.version>2.7.0</spring.boot.version>
<spring.data.jpa.version>2.7.0</spring.data.jpa.version>
<spring-cloud-config.version>3.1.3</spring-cloud-config.version>
<h2.version>1.4.197</h2.version>
<jackson.datatype.version>2.9.8</jackson.datatype.version>
<kernel.keygenerator.bouncycastle.version>1.2.1-SNAPSHOT</kernel.keygenerator.bouncycastle.version>
<swagger.version>2.9.2</swagger.version>
<powermock.beta.version>2.0.7</powermock.beta.version>

<kernel.core.version>1.2.1-SNAPSHOT</kernel.core.version>
<kernel.biometrics.api.version>1.2.1-SNAPSHOT</kernel.biometrics.api.version>
<kernel.crypto-jce.version>1.2.1-SNAPSHOT</kernel.crypto-jce.version>
<kernel.auth.adaptor.version>1.2.1-SNAPSHOT</kernel.auth.adaptor.version>
<kernel-dataaccess-hibernate.version>1.2.1-SNAPSHOT</kernel-dataaccess-hibernate.version>
<kernel.logger.logback.version>1.2.1-SNAPSHOT</kernel.logger.logback.version>
<kernel.core.version>1-2-1-j17-SNAPSHOT</kernel.core.version>
<kernel.biometrics.api.version>1-2-1-j17-SNAPSHOT</kernel.biometrics.api.version>
<kernel.crypto-jce.version>1.2.0-SNAPSHOT</kernel.crypto-jce.version>
<kernel.auth.adaptor.version>1-2-1-j17-SNAPSHOT</kernel.auth.adaptor.version>
<kernel-dataaccess-hibernate.version>1-2-1-j17-SNAPSHOT</kernel-dataaccess-hibernate.version>
<kernel.logger.logback.version>1-2-1-j17-SNAPSHOT</kernel.logger.logback.version>
<spring.boot.co>2.0.2.RELEASE</spring.boot.co>
<khazana.version>1.2.1-SNAPSHOT</khazana.version>
<khazana.version>1-2-1-j17-SNAPSHOT</khazana.version>
<sonar.coverage.exclusions>**/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/**"</sonar.coverage.exclusions>
<sonar.cpd.exclusions>**/dto/**,**/entity/**,**/config/**</sonar.cpd.exclusions>
</properties>
Expand Down Expand Up @@ -76,7 +80,12 @@
<skipTests>${skipTests}</skipTests>
<skip>false</skip>
<argLine>
${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
</argLine>
</configuration>
</plugin>
Expand Down