Skip to content
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.

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

Develop java21 #1519

Closed
wants to merge 69 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
09916ba
migrate kernel-core to java 17
Feb 20, 2024
946cc61
Migrated kernel core, logger logback
Mar 13, 2024
5863b13
Committing changes.
Mar 15, 2024
c53bc74
Used BBOM file for dependencies
Mar 19, 2024
0bde493
Added bom file for dependencies
Mar 19, 2024
fac4897
Committing changes.
Mar 22, 2024
b064c37
Migration changes for Java 21
Mar 25, 2024
a9f4809
Reverted idgenerator changes
Mar 25, 2024
f1ddf2f
Removed unwanted code
Apr 1, 2024
a987dc0
[DSD-4947] Update push-trigger.yml
ckm007 Apr 1, 2024
83ff85e
Added kernem bom to the build
Apr 1, 2024
fdf72d7
[DSD-4947] Update push-trigger.yml
ckm007 Apr 1, 2024
cca452d
Migrated rest of modules in commons excluding saltgenerator
Apr 3, 2024
7a811a8
Corrected the docker image of java 21
Apr 4, 2024
985153b
Update to the app install command
Apr 4, 2024
0c33dd1
Update to the app install command
Apr 4, 2024
9a94801
Updated adduser and addgroup commands for alpine
Apr 4, 2024
c9a3ea4
Correction to the dockerfile addgroup
Apr 4, 2024
49d3af6
Fixed addgroup command in dockerfile
Apr 4, 2024
8a49032
Fix to adduser
Apr 4, 2024
254e3e5
Correction to adduser
Apr 4, 2024
9e5c142
adduser command fix
Apr 4, 2024
a0cfac9
Update to uid for adduser command
Apr 5, 2024
9b42a3c
Corrected adduser command
Apr 5, 2024
3817458
Corrected adduser command
Apr 5, 2024
37b42c1
Merge pull request #1499 from LoganathanSekar7627/MOSIP-31617-java-21…
ckm007 Apr 5, 2024
9d2a567
Enabled github workflow for develop-java21 branch
Apr 5, 2024
0a686f1
Merge pull request #1502 from LoganathanSekar7627/MOSIP-31617-java-21…
ckm007 Apr 5, 2024
d1c9926
Migrated saltgenerator module
Apr 11, 2024
6e7bfec
Fixes to salt generator job for Spring Batch 5 migration
Apr 12, 2024
3e48948
Merge pull request #1503 from LoganathanSekar7627/MOSIP-31617-java-21…
ckm007 Apr 15, 2024
6b3fa0d
Updated dockerfile to install wget
Apr 15, 2024
a0b8ccc
Merge pull request #1504 from LoganathanSekar7627/MOSIP-31617-java-21…
ckm007 Apr 15, 2024
c37a75e
Fix to javax persitence properties
Apr 17, 2024
b074f2b
Merge pull request #1505 from LoganathanSekar7627/MOSIP-31617-java-21…
ckm007 Apr 18, 2024
16a733b
WIP-Test case fixes
Apr 25, 2024
d96b602
Test case fixes
Apr 26, 2024
8f0d33a
Removed unwanted deprecated code in test security config
Apr 29, 2024
19cf4a8
Merge pull request #1507 from LoganathanSekar7627/MOSIP-31617-java-21…
ckm007 Apr 29, 2024
446699e
Services Startup issues
May 6, 2024
61a7f5d
Merge remote-tracking branch 'upstream/develop' into MOSIP-31617-java…
May 6, 2024
760557e
Merge pull request #1508 from LoganathanSekar7627/MOSIP-31617-java-21…
vishwa-vyom May 6, 2024
dc655f0
Updated vertx version in kernel bom, and applied related changes
May 13, 2024
d4e6a75
Removed unwanted dependency
May 13, 2024
f84afd5
Merge pull request #1509 from LoganathanSekar7627/MOSIP-31617-java-21…
ckm007 May 13, 2024
862f2fe
MOSIP-31617-updated bouncycastle version
May 16, 2024
4ba68cd
Merge pull request #1510 from LoganathanSekar7627/MOSIP-31617-java-21…
ckm007 May 16, 2024
201412d
Updated vertx version and added hazelcast to kernel-bom
May 21, 2024
ebb2a39
Merge pull request #1511 from LoganathanSekar7627/MOSIP-31617-java-21…
ckm007 May 21, 2024
9df868f
Fix for idgen service startup issue
May 24, 2024
90d5dc5
Merge pull request #1512 from LoganathanSekar7627/MOSIP-31617-java-21…
ckm007 May 24, 2024
8ff3976
Added kernel-config-server and migrated it
May 28, 2024
20d39bf
Test case fix
May 28, 2024
a55e7e6
Test case fix
May 28, 2024
fd24a40
Added args for the dockerfile
May 29, 2024
ac1a314
MOSIP-31617 Added kernel-config-server and migrated it (#1514)
loganathan-sekaran May 29, 2024
cf31e18
Merge remote-tracking branch 'upstream/develop-java21' into MOSIP-316…
May 29, 2024
8b968e7
Dockerfile correction
May 29, 2024
6e7a18d
Docker fix
May 29, 2024
e5e8e60
Mosip 31617 java 21 migration (#1515)
loganathan-sekaran May 29, 2024
8f6af1b
Merge remote-tracking branch 'upstream/develop-java21' into MOSIP-316…
May 29, 2024
6ed3b7a
Fix to dockerfile command
May 29, 2024
3700a22
MOSIP-31617 java 21 migration (#1516)
loganathan-sekaran May 29, 2024
67d06e0
Merge remote-tracking branch 'upstream/develop-java21' into MOSIP-316…
May 30, 2024
2d7e0d3
Added repository in pom
May 31, 2024
ce121ea
Merge remote-tracking branch 'upstream/develop' into MOSIP-31617-java…
May 31, 2024
f78f7fa
commit id fix
May 31, 2024
ac9cfa4
MOSIP-31617 java 21 migration - fix pom for nexus build issue (#1517)
loganathan-sekaran May 31, 2024
63afaed
Merge pull request #1518 from LoganathanSekar7627/MOSIP-31617-java-21…
ckm007 Jun 4, 2024
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
Prev Previous commit
Next Next commit
Migration changes for Java 21
Signed-off-by: Loganathan Sekar <Loganathan.Sekar@mindtree.com>
  • Loading branch information
Loganathan Sekar authored and Loganathan Sekar committed Apr 1, 2024
commit b064c377ef05821bd6bde1e4a4d39441dabfb0f3
4 changes: 2 additions & 2 deletions kernel/kernel-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<version>1.2.1-java17-SNAPSHOT</version>
<version>1.2.1-java21-SNAPSHOT</version>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-bom</artifactId>
<packaging>pom</packaging>
Expand All @@ -16,7 +16,7 @@
<jaxb-runtime-version>2.3.1</jaxb-runtime-version>
<activation-version>1.1</activation-version>
<jaxb-api-version>2.3.1</jaxb-api-version>
<lombok-version>1.18.22</lombok-version>
<lombok-version>1.18.30</lombok-version>
<javax.transaction.api.version>1.3</javax.transaction.api.version>
<javax.persistence.api.version>2.2</javax.persistence.api.version>
<javax.validation-api.version>2.0.1.Final</javax.validation-api.version>
Expand Down
6 changes: 3 additions & 3 deletions kernel/kernel-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- maven -->
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<maven.compiler.version>3.8.0</maven.compiler.version>

<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
Expand All @@ -28,7 +28,7 @@
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-bom</artifactId>
<version>1.2.1-java17-SNAPSHOT</version>
<version>1.2.1-java21-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
10 changes: 5 additions & 5 deletions kernel/kernel-dataaccess-hibernate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-dataaccess-hibernate</artifactId>
<version>1.2.1-java17-SNAPSHOT</version>
<version>1.2.1-java21-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- maven -->
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<maven.compiler.version>3.8.0</maven.compiler.version>
<!-- <maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version> -->

Expand All @@ -23,15 +23,15 @@
<maven.javadoc.version>3.2.0</maven.javadoc.version>
<maven-shade-plugin.version>2.3</maven-shade-plugin.version>

<kernel.core.version>1.2.1-java17-SNAPSHOT</kernel.core.version>
<kernel.core.version>1.2.1-java21-SNAPSHOT</kernel.core.version>
<jacoco.maven.plugin.version>0.8.5</jacoco.maven.plugin.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-bom</artifactId>
<version>1.2.1-java17-SNAPSHOT</version>
<version>1.2.1-java21-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
10 changes: 5 additions & 5 deletions kernel/kernel-logger-logback/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-logger-logback</artifactId>
<version>1.2.1-java17-SNAPSHOT</version>
<version>1.2.1-java21-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- maven -->
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<maven.compiler.version>3.8.0</maven.compiler.version>
<!-- <maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version> -->

Expand All @@ -21,7 +21,7 @@
<maven.javadoc.version>3.2.0</maven.javadoc.version>
<maven-shade-plugin.version>2.3</maven-shade-plugin.version>

<kernel.core.version>1.2.1-java17-SNAPSHOT</kernel.core.version>
<kernel.core.version>1.2.1-java21-SNAPSHOT</kernel.core.version>
<jacoco.maven.plugin.version>0.8.11</jacoco.maven.plugin.version>

</properties>
Expand All @@ -30,7 +30,7 @@
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-bom</artifactId>
<version>1.2.1-java17-SNAPSHOT</version>
<version>1.2.1-java21-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down