From c6b9324c88e8a2d83d1e9a141ac558efb8896c57 Mon Sep 17 00:00:00 2001
From: lucio <lucio@192.168.1.66>
Date: Wed, 2 Oct 2024 09:29:07 +0200
Subject: [PATCH] moved to jakarta

---
 .classpath                                    |  4 +--
 pom.xml                                       | 26 ++++++++++++-------
 .../org/gcube/common/clients/LegacyQuery.java |  8 +++---
 .../java/org/gcube/common/clients/Plugin.java |  4 +--
 .../common/clients/ProxyBuilderImpl.java      |  6 ++---
 .../java/org/gcube/common/clients/Utils.java  |  4 +--
 6 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/.classpath b/.classpath
index 635aca3..93923f7 100644
--- a/.classpath
+++ b/.classpath
@@ -6,16 +6,16 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="java/|resources/" kind="src" path="src/main"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
diff --git a/pom.xml b/pom.xml
index 7d1a48b..0ee8fbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,6 @@
-<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">
+<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>
 	<parent>
 		<groupId>org.gcube.tools</groupId>
@@ -7,10 +9,12 @@
 	</parent>
 	<groupId>org.gcube.core</groupId>
 	<artifactId>common-generic-clients</artifactId>
-	<version>2.0.0</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<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>
@@ -18,7 +22,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-bom</artifactId>
-				<version>3.0.1-SNAPSHOT</version>
+				<version>4.0.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -46,10 +50,14 @@
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.sun.xml.ws</groupId>
-			<artifactId>rt</artifactId>
-			<version>2.3.3</version>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -63,5 +71,5 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	
+
 </project>
diff --git a/src/main/java/org/gcube/common/clients/LegacyQuery.java b/src/main/java/org/gcube/common/clients/LegacyQuery.java
index 7574ad6..d1041c1 100644
--- a/src/main/java/org/gcube/common/clients/LegacyQuery.java
+++ b/src/main/java/org/gcube/common/clients/LegacyQuery.java
@@ -1,14 +1,11 @@
 package org.gcube.common.clients;
 
-import static java.lang.String.*;
+import static java.lang.String.format;
 
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.ws.EndpointReference;
-import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
-
 import org.gcube.common.clients.exceptions.DiscoveryException;
 import org.gcube.common.clients.queries.Query;
 import org.gcube.common.resources.gcore.GCoreEndpoint;
@@ -16,6 +13,9 @@ import org.gcube.resources.discovery.client.api.DiscoveryClient;
 import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
 import org.gcube.resources.discovery.icclient.ICFactory;
 
+import jakarta.xml.ws.EndpointReference;
+import jakarta.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
+
 /**
  * A query for service endpoints published as {@link GCoreEndpoint}s.
  * @author Fabio Simeoni
diff --git a/src/main/java/org/gcube/common/clients/Plugin.java b/src/main/java/org/gcube/common/clients/Plugin.java
index 2dd9a8f..eeeaac8 100644
--- a/src/main/java/org/gcube/common/clients/Plugin.java
+++ b/src/main/java/org/gcube/common/clients/Plugin.java
@@ -1,9 +1,9 @@
 package org.gcube.common.clients;
 
-import javax.xml.ws.EndpointReference;
-
 import org.gcube.common.clients.delegates.ProxyPlugin;
 
+import jakarta.xml.ws.EndpointReference;
+
 /**
  * Plugs into the framework to provide information about target endpoints.
  * 
diff --git a/src/main/java/org/gcube/common/clients/ProxyBuilderImpl.java b/src/main/java/org/gcube/common/clients/ProxyBuilderImpl.java
index e62644d..d41d585 100644
--- a/src/main/java/org/gcube/common/clients/ProxyBuilderImpl.java
+++ b/src/main/java/org/gcube/common/clients/ProxyBuilderImpl.java
@@ -1,13 +1,13 @@
 package org.gcube.common.clients;
 
-import javax.xml.ws.EndpointReference;
-import javax.xml.ws.wsaddressing.W3CEndpointReference;
-
 import org.gcube.common.clients.builders.AbstractStatelessBuilder;
 import org.gcube.common.clients.cache.EndpointCache;
 import org.gcube.common.clients.config.Property;
 import org.gcube.common.clients.queries.Query;
 
+import jakarta.xml.ws.EndpointReference;
+import jakarta.xml.ws.wsaddressing.W3CEndpointReference;
+
 /**
  * Default implementation of {@link ProxyBuilder}.
  * 
diff --git a/src/main/java/org/gcube/common/clients/Utils.java b/src/main/java/org/gcube/common/clients/Utils.java
index da8c959..8cb8865 100644
--- a/src/main/java/org/gcube/common/clients/Utils.java
+++ b/src/main/java/org/gcube/common/clients/Utils.java
@@ -1,10 +1,10 @@
 package org.gcube.common.clients;
 
-import javax.xml.ws.EndpointReference;
-
 import org.gcube.common.clients.cache.DefaultEndpointCache;
 import org.gcube.common.clients.cache.EndpointCache;
 
+import jakarta.xml.ws.EndpointReference;
+
 /**
  * Library-wide utilities
  *