Merge pull request mosip#1002 from Neha2365/MOSIP-32460-neha-migrate-…

…from-java-11-to-java-21 [MOSIP- 32460] migrate from java 11 to java 21
Neha2365 · Jun 28, 2024 · 462d1e8 · 462d1e8
2 parents 71bab55 + 7ab9cd0
commit 462d1e8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/id-repository/id-repository-identity-service/Dockerfile b/id-repository/id-repository-identity-service/Dockerfile
@@ -66,6 +66,15 @@ ENV biosdk_local_dir_name=${biosdk_local_dir}
 #ENV bio_sdk_folder_env=${bio_sdk_folder}
 ENV biosdk_zip_file_path=${biosdk_zip_path}
 
+# install packages and create user
+RUN apk -q update \
+&& apk add -q unzip sudo \
+&& addgroup -g ${container_user_gid} ${container_user_group} \
+&& adduser -s /bin/sh -u ${container_user_uid} -G ${container_user_group} -h /home/${container_user} --disabled-password ${container_user} \
+&& addgroup sudo \
+&& adduser ${container_user} sudo \
+&& echo "%sudo ALL=(ALL) NOPASSWD:/home/${container_user}/${biosdk_local_dir}/install.sh" >> /etc/sudoers
+
 # set working directory for the user
 WORKDIR /home/${container_user}
 

diff --git a/id-repository/id-repository-identity-service/pom.xml b/id-repository/id-repository-identity-service/pom.xml
@@ -15,16 +15,15 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
-		<spring.boot.version>2.0.2.RELEASE</spring.boot.version>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
 		<kernel.core.version>1.2.1-java21-SNAPSHOT</kernel.core.version>
 		<kernel.idvalidator.uin.version>1.2.1-java21-SNAPSHOT</kernel.idvalidator.uin.version>
 		<kernel.cbeffutil.api.version>1.2.1-java21-SNAPSHOT</kernel.cbeffutil.api.version>
 		<kernel.idobjectvalidator.version>1.2.1-java21-SNAPSHOT</kernel.idobjectvalidator.version>
 		<kernel-idvalidator-vid.version>1.2.1-java21-SNAPSHOT</kernel-idvalidator-vid.version>
 		<kernel.khazana.version>1.2.1-java21-SNAPSHOT</kernel.khazana.version>
-		<springdoc.version>1.5.10</springdoc.version>
+
 	</properties>
 
 	<dependencies>

diff --git a/...-repository-identity-service/src/main/java/io/mosip/idrepository/identity/entity/Uin.java b/...-repository-identity-service/src/main/java/io/mosip/idrepository/identity/entity/Uin.java
@@ -70,7 +70,6 @@ public Uin(String uinRefId, String uin, String uinHash, byte[] uinData, String u
 
 	/** The uin data. */
 	@Lob
-	@JdbcTypeCode(java.sql.Types.BINARY)
 	@Basic(fetch = FetchType.LAZY)
 	@Getter(AccessLevel.NONE)
 	@Setter(AccessLevel.NONE)