From bc3320131ee12a59210559209120f76d6d48dc46 Mon Sep 17 00:00:00 2001
From: lucio <lucio@192.168.1.58>
Date: Thu, 29 Feb 2024 10:12:09 +0100
Subject: [PATCH] moving to jakarta

---
 pom.xml                                       | 32 ++++++++++---------
 .../discovery/icclient/ICClient.java          |  4 +--
 .../icclient/stubs/CollectorStub.java         | 14 ++++----
 .../stubs/MalformedQueryException.java        |  2 +-
 4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index ecd79e5..2684280 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,47 +7,39 @@
 		<artifactId>maven-parent</artifactId>
 		<version>1.1.0</version>
 	</parent>
-
 	<groupId>org.gcube.resources.discovery</groupId>
 	<artifactId>ic-client</artifactId>
 	<version>2.0.0-SNAPSHOT</version>
 	<name>Information Collector Client</name>
 	<description>Client API for the Information Collector service</description>
-
 	<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>
 		<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
 	</scm>
-
 	<properties>
 		<distroDirectory>distro</distroDirectory>
 	</properties>
-
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-bom</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
+				<version>3.0.1-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
-
 	<dependencies>
-
 		<dependency>
 			<groupId>org.gcube.resources.discovery</groupId>
 			<artifactId>discovery-client</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.gcube.resources</groupId>
 			<artifactId>common-gcore-resources</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-gcore-stubs</artifactId>
@@ -60,32 +52,42 @@
 			<groupId>org.gcube.common</groupId>
 			<artifactId>common-security</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
-
+		<dependency>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-impl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.xml.ws</groupId>
+			<artifactId>jakarta.xml.ws-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.ws</groupId>
+			<artifactId>jaxws-rt</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope-maps</artifactId>
 			<scope>compile</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
 			<version>1.6.4</version>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
-
 	</dependencies>
-
 </project>
\ No newline at end of file
diff --git a/src/main/java/org/gcube/resources/discovery/icclient/ICClient.java b/src/main/java/org/gcube/resources/discovery/icclient/ICClient.java
index b30851b..6bfd5bd 100644
--- a/src/main/java/org/gcube/resources/discovery/icclient/ICClient.java
+++ b/src/main/java/org/gcube/resources/discovery/icclient/ICClient.java
@@ -11,8 +11,6 @@ import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.xml.ws.soap.SOAPFaultException;
-
 import org.gcube.common.clients.stubs.jaxws.JAXWSUtils;
 import org.gcube.common.scope.api.ServiceMap;
 import org.gcube.common.security.providers.SecretManagerProvider;
@@ -24,6 +22,8 @@ import org.gcube.resources.discovery.icclient.stubs.MalformedQueryException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.xml.ws.soap.SOAPFaultException;
+
 /**
  * An {@link DiscoveryClient} that submits queries to the Information Collector, without parsing the results.
  * 
diff --git a/src/main/java/org/gcube/resources/discovery/icclient/stubs/CollectorStub.java b/src/main/java/org/gcube/resources/discovery/icclient/stubs/CollectorStub.java
index 2046adf..12e807d 100644
--- a/src/main/java/org/gcube/resources/discovery/icclient/stubs/CollectorStub.java
+++ b/src/main/java/org/gcube/resources/discovery/icclient/stubs/CollectorStub.java
@@ -1,12 +1,14 @@
 package org.gcube.resources.discovery.icclient.stubs;
 
-import static org.gcube.resources.discovery.icclient.stubs.CollectorConstants.*;
+import static org.gcube.resources.discovery.icclient.stubs.CollectorConstants.portType;
+import static org.gcube.resources.discovery.icclient.stubs.CollectorConstants.target_namespace;
+
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.xml.ws.soap.SOAPFaultException;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.ws.soap.SOAPFaultException;
 
 /**
  * A local interface to the resource discovery service.
diff --git a/src/main/java/org/gcube/resources/discovery/icclient/stubs/MalformedQueryException.java b/src/main/java/org/gcube/resources/discovery/icclient/stubs/MalformedQueryException.java
index 3b3bf64..1fe5cc2 100644
--- a/src/main/java/org/gcube/resources/discovery/icclient/stubs/MalformedQueryException.java
+++ b/src/main/java/org/gcube/resources/discovery/icclient/stubs/MalformedQueryException.java
@@ -1,6 +1,6 @@
 package org.gcube.resources.discovery.icclient.stubs;
 
-import javax.xml.ws.WebFault;
+import jakarta.xml.ws.WebFault;
 
 /**
  * Thrown by {@link CollectorStub#execute(String)} when the query cannot be submitted to the Information Collector