From e2975e6eae181fe3ff33635de265e22f434c00c9 Mon Sep 17 00:00:00 2001
From: lucio <lucio@mb-lelii.isti.cnr.it>
Date: Wed, 8 May 2024 12:01:54 +0200
Subject: [PATCH] porting to changes in gcube-security

---
 pom.xml | 90 +++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 58 insertions(+), 32 deletions(-)

diff --git a/pom.xml b/pom.xml
index 29460af..fceed0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,16 +13,25 @@
 	<packaging>pom</packaging>
 	<name>gCube Smartgears Bom</name>
 	<description>
-		gCube Smartgears Bom is used to declare the version and set to provided the libraries already available in Smartgears container.
-		In such a way any service developer does not have to deal with dependencies conflicts and provided dependencies. 
+		gCube Smartgears Bom is used to declare the version and set to provided
+		the libraries already available in Smartgears container.
+		In such a way any service developer does not have to deal with
+		dependencies conflicts and provided dependencies.
 	</description>
 	<properties>
 		<gcube-jackson.version>2.8.11</gcube-jackson.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<jakarta.version>4.0.4</jakarta.version>
+		<jakarta-api.version>4.0.1</jakarta-api.version>
+		<jaxb-impl.version>4.0.4</jaxb-impl.version>
+		<jaxws.version>4.0.2</jaxws.version>
+
 	</properties>
 	<scm>
-		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
-		<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
+		<connection>
+			scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
+		<developerConnection>
+			scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
 		<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
 	</scm>
 	<dependencyManagement>
@@ -36,46 +45,52 @@
 				<scope>import</scope>
 			</dependency>
 			<!-- END Imports -->
-			<!-- XML Deps -->
+
 			<dependency>
-				<groupId>javax.xml.bind</groupId>
-				<artifactId>jaxb-api</artifactId>
+				<groupId>jakarta.servlet</groupId>
+				<artifactId>jakarta.servlet-api</artifactId>
+				<version>6.0.0</version>
 				<scope>provided</scope>
 			</dependency>
+
+
+			<!-- XML Deps -->
 			<dependency>
-				<groupId>javax.xml.ws</groupId>
-				<artifactId>jaxws-api</artifactId>
+				<groupId>jakarta.xml.bind</groupId>
+				<artifactId>jakarta.xml.bind-api</artifactId>
+				<version>${jakarta-api.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.glassfish.jaxb</groupId>
+				<artifactId>jaxb-runtime</artifactId>
+				<version>${jaxb-impl.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>com.sun.xml.bind</groupId>
 				<artifactId>jaxb-impl</artifactId>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>com.sun.xml.bind</groupId>
-				<artifactId>jaxb-core</artifactId>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>jakarta.xml.bind</groupId>
-				<artifactId>jakarta.xml.bind-api</artifactId>
-				<version>2.3.3</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>jakarta.xml.soap</groupId>
-				<artifactId>jakarta.xml.soap-api</artifactId>
-				<version>1.4.2</version>
+				<version>${jaxb-impl.version}</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>jakarta.xml.ws</groupId>
 				<artifactId>jakarta.xml.ws-api</artifactId>
-				<version>2.3.3</version>
+				<version>${jakarta-api.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.sun.xml.ws</groupId>
+				<artifactId>jaxws-rt</artifactId>
+				<version>${jaxws.version}</version>
 				<scope>provided</scope>
 			</dependency>
-			<!-- Setting scope to provided to dependencies already declared in gcube-bom -->
+			<dependency>
+				<groupId>jakarta.ws.rs</groupId>
+				<artifactId>jakarta.ws.rs-api</artifactId>
+				<version>3.1.0</version>
+			</dependency>
+
+			<!-- Setting scope to provided to dependencies already declared in
+			gcube-bom -->
 			<dependency>
 				<groupId>org.gcube.common</groupId>
 				<artifactId>common-security</artifactId>
@@ -91,7 +106,7 @@
 			<dependency>
 				<groupId>org.gcube.resources</groupId>
 				<artifactId>common-gcore-resources</artifactId>
-				<version>[1.3.5-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+				<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
@@ -133,7 +148,7 @@
 			<dependency>
 				<groupId>org.gcube.resources.discovery</groupId>
 				<artifactId>discovery-client</artifactId>
-				<version>[1.0.2-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+				<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
@@ -206,6 +221,11 @@
 				<scope>provided</scope>
 			</dependency>
 			<!-- END Facets Based Resource Model related dependencies -->
+			<dependency>
+				<groupId>org.gcube.common</groupId>
+				<artifactId>keycloak-client</artifactId>
+				<scope>provided</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.gcube.common</groupId>
 				<artifactId>health-api</artifactId>
@@ -241,9 +261,14 @@
 				<version>2.0.12</version>
 				<scope>provided</scope>
 			</dependency>
-			<!-- END Setting scope to provided to dependencies already declared in 
+
+			<!-- END Setting scope to provided to dependencies already declared
+			in 
 				gcube-bom -->
+
+
 			<!-- Declaring dependencies needed by a smartgears webapp -->
+
 			<dependency>
 				<groupId>org.gcube.core</groupId>
 				<artifactId>common-smartgears</artifactId>
@@ -298,8 +323,9 @@
 			<dependency>
 				<groupId>org.aspectj</groupId>
 				<artifactId>aspectjrt</artifactId>
-				<version>1.9.7</version>
+				<version>1.9.21.1</version>
 			</dependency>
+
 		</dependencies>
 	</dependencyManagement>
 </project>