From 05735d2875ded87aecd6046abaf7ef06035d8ea5 Mon Sep 17 00:00:00 2001
From: Alfredo Oliviero <alfredo.oliviero@isti.cnr.it>
Date: Mon, 17 Nov 2025 14:32:38 +0100
Subject: [PATCH] maven-parent-javax 1.4.0-SNAPSHOT, java 21 for javax version

---
 CHANGELOG.md  |  2 ++
 pom.javax.xml | 83 ++++++++++++++++++++++++++-------------------------
 2 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a18fd6..8ec163e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 - Moved to jdk17
 - Moved to smartgear 4
+- maven-parent-javax 1.4.0-SNAPSHOT
+- java 21 for javax version
 
 ## [v2.2.0]
 - Added support to add scopes in requests in client and constants for d4s-context dynamic scope. [#28084]
diff --git a/pom.javax.xml b/pom.javax.xml
index f4916c9..27d6adf 100644
--- a/pom.javax.xml
+++ b/pom.javax.xml
@@ -4,16 +4,30 @@
 
 	<modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<artifactId>maven-parent</artifactId>
-		<groupId>org.gcube.tools</groupId>
-		<version>1.3.0-SNAPSHOT</version>
-	</parent>
-
 	<groupId>org.gcube.common</groupId>
 	<artifactId>keycloak-client-javax</artifactId>
 	<version>3.0.0-SNAPSHOT</version>
 
+	<parent>
+		<artifactId>maven-parent-javax</artifactId>
+		<groupId>org.gcube.tools</groupId>
+		<version>1.4.0-SNAPSHOT</version>
+	</parent>
+
+	<properties>
+		<java.version>21</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+		<jjwt.version>0.12.6</jjwt.version>
+        <repo.name>keycloak-client</repo.name>
+	</properties>
+
+	<scm>
+        <connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${repo.name}.git</connection>
+        <developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${repo.name}.git</developerConnection>
+        <url>https://code-repo.d4science.org/gCubeSystem/${repo.name}</url>
+    </scm>
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
@@ -26,22 +40,6 @@
 		</dependencies>
 	</dependencyManagement>
 
-    
-    <scm>
-        <connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${repo.name}.git</connection>
-        <developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${repo.name}.git</developerConnection>
-        <url>https://code-repo.d4science.org/gCubeSystem/${repo.name}</url>
-    </scm>
-
-
-	<properties>
-		<java.version>17</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-		<jjwt.version>0.12.6</jjwt.version>
-        <repo.name>keycloak-client</repo.name>
-	</properties>
-
 	<dependencies>
 
 		<dependency>
@@ -52,19 +50,16 @@
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>gcube-jackson-databind</artifactId>
-			<version>2.8.11</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>gcube-jackson-annotations</artifactId>
-			<version>2.8.11</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>gcube-jackson-core</artifactId>
-			<version>2.8.11</version>
 		</dependency>
 
 		<dependency>
@@ -105,21 +100,8 @@
 			<scope>test</scope>
 		</dependency>
 
-		<!-- <dependency>
-			<groupId>org.glassfish.jersey.core</groupId>
-			<artifactId>jersey-common</artifactId>
-			<version>2.35</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.glassfish.jersey.core</groupId>
-			<artifactId>jersey-client</artifactId>
-			<version>2.35</version>
-			<scope>test</scope>
-		</dependency> -->
-
 	</dependencies>
+	
     <build>
         <plugins>
             <plugin>
@@ -162,10 +144,31 @@
                         <include>generated-sources/javax/**/*.java</include>
                     </includes>
                     <replacements>
+                        <replacement>
+                            <token>jakarta.xml.bind</token>
+                            <value>javax.xml.bind</value>
+                        </replacement>
+                        <replacement>
+                            <token>jakarta.xml.ws</token>
+                            <value>javax.xml.ws</value>
+                        </replacement>
+                        <replacement>
+                            <token>jakarta.xml.soap</token>
+                            <value>javax.xml.soap</value>
+                        </replacement>
                         <replacement>
                             <token>jakarta.ws.rs</token>
                             <value>javax.ws.rs</value>
                         </replacement>
+                        <replacement>
+                            <token>jakarta.jws</token>
+                            <value>javax.jws</value>
+                        </replacement>
+                        <replacement>
+                            <token>jakarta.validation</token>
+                            <value>javax.validation</value>
+                        </replacement>
+
                     </replacements>
                 </configuration>
             </plugin>
@@ -187,4 +190,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>