MOSIP-35702 : Remove dependency with artifactory-ref-impl (#1066)

* MOSIP-35702 : Remove dependency with artifactory-ref-impl Signed-off-by: sudeep <[email protected]> * MOSIP-35702 : Remove dependency with artifactory-ref-impl Signed-off-by: sudeep <[email protected]> * MOSIP-35702 : Remove dependency with artifactory-ref-impl Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]>
mosip · Jan 6, 2025 · 34636a2 · 34636a2
1 parent f1edbb2
commit 34636a2
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 11 deletions.
diff --git a/partner/partner-management-service/Dockerfile b/partner/partner-management-service/Dockerfile
@@ -35,9 +35,6 @@ ENV spring_config_label_env=${spring_config_label}
 
 ENV spring_config_url_env=${spring_config_url}
 
-# environment variable to pass iam_adapter url, at docker runtime
-ENV iam_adapter_url_env=${iam_adapter_url}
-
 # can be passed during Docker build as build time environment for github branch to pickup configuration from.
 ARG container_user=mosip
 
@@ -68,5 +65,8 @@ RUN chown -R ${container_user}:${container_user} /home/${container_user}
 USER ${container_user_uid}:${container_user_gid}
 
 EXPOSE 9109
-CMD wget -q --show-progress "${iam_adapter_url_env}" -O kernel-auth-adapter.jar; \
-	java -jar -Dloader.path=./kernel-auth-adapter.jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" partner-management-service.jar ; \
+CMD java -jar \
+    -Dspring.cloud.config.label="${spring_config_label_env}" \
+    -Dspring.profiles.active="${active_profile_env}" \
+    -Dspring.cloud.config.uri="${spring_config_url_env}" \
+    partner-management-service.jar
diff --git a/partner/partner-management-service/pom.xml b/partner/partner-management-service/pom.xml
@@ -23,7 +23,12 @@
 			<groupId>io.mosip.kernel</groupId>
 			<artifactId>kernel-core</artifactId>
 			<version>${kernel.version}</version>
-		</dependency>		
+		</dependency>
+		<dependency>
+			<groupId>io.mosip.kernel</groupId>
+			<artifactId>kernel-auth-adapter</artifactId>
+			<version>${kernel.authadapter.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>io.mosip.kernel</groupId>
 			<artifactId>kernel-crypto-jce</artifactId>

diff --git a/partner/policy-management-service/Dockerfile b/partner/policy-management-service/Dockerfile
@@ -32,9 +32,6 @@ ENV spring_config_label_env=${spring_config_label}
 # environment variable to pass spring configuration url, at docker runtime
 ENV spring_config_url_env=${spring_config_url}
 
-# environment variable to pass iam_adapter url, at docker runtime
-ENV iam_adapter_url_env=${iam_adapter_url}
-
 # can be passed during Docker build as build time environment for github branch to pickup configuration from.
 ARG container_user=mosip
 
@@ -66,5 +63,8 @@ USER ${container_user_uid}:${container_user_gid}
 
 EXPOSE 9107
 
-CMD wget -q --show-progress "${iam_adapter_url_env}" -O kernel-auth-adapter.jar; \
-	java -jar -Dloader.path=./kernel-auth-adapter.jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" policy-management-service.jar ; \
+CMD java -jar \
+    -Dspring.cloud.config.label="${spring_config_label_env}" \
+    -Dspring.profiles.active="${active_profile_env}" \
+    -Dspring.cloud.config.uri="${spring_config_url_env}" \
+    policy-management-service.jar
diff --git a/partner/policy-management-service/pom.xml b/partner/policy-management-service/pom.xml
@@ -18,6 +18,11 @@
 			<version>1.2.0.1</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>io.mosip.kernel</groupId>
+			<artifactId>kernel-auth-adapter</artifactId>
+			<version>${kernel.authadapter.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>io.mosip.pms</groupId>
 			<artifactId>policy-validator</artifactId>

diff --git a/partner/pom.xml b/partner/pom.xml
@@ -71,6 +71,7 @@
 		<kernel-dataaccess-hibernate.version>1.2.0.1</kernel-dataaccess-hibernate.version>
 		<kernel-websubclient-api.version>1.2.0.1</kernel-websubclient-api.version>
 		<kernel.templatemanager.velocity.version>1.2.0.1</kernel.templatemanager.velocity.version>
+		<kernel.authadapter.version>1.2.0.1</kernel.authadapter.version>
 		<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
 		<maven.war.plugin.version>3.1.0</maven.war.plugin.version>
 		<maven.compiler.source>11</maven.compiler.source>
@@ -183,6 +184,9 @@
 					<argLine>
 						${argLine} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --illegal-access=permit
 					</argLine>
+					<classpathDependencyExcludes>
+						<classpathDependencyExclude>io.mosip.kernel:kernel-auth-adapter</classpathDependencyExclude>
+					</classpathDependencyExcludes>
 				</configuration>
 			</plugin>
 			<plugin>