CNJR-0000: Merge pull request #22 from Conjur-Enterprise/jakarta-migration-java8

Community PR: Jakarta migration java8

Author: gl-johnson

CHANGELOG.md

@@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Added Telemetry Headers
 
+### Fixed
+- Restored compatiblity with Jakarta EE libraries
+
 ## [3.0.7] - 2025-03-25
 
 ## [3.0.6] - 2024-02-20

pom.xml

@@ -138,23 +138,38 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <jaxrs.version>2.1.1</jaxrs.version>
+      <jakarta.version>3.0.0</jakarta.version>
+      <jersey.version>3.0.17</jersey.version>
     </properties>
     <dependencies>
+    
+      <!-- 
+        JAX-RX Interface, compatible with Java 8.
+      -->
+      <dependency>
+        <groupId>jakarta.ws.rs</groupId>
+        <artifactId>jakarta.ws.rs-api</artifactId>
+        <version>${jakarta.version}</version>
+      </dependency>
+
       <!--
-        JAXRS Implementation
-        You can change any of this, for example if you use Jersey 2.0 or a different implementation
-        (codehaus has one, I think).
+        JAX-RS Implementation Jersey, exclude and override to use another implementation.
       -->
       <dependency>
-        <groupId>javax.ws.rs</groupId>
-        <artifactId>javax.ws.rs-api</artifactId>
-        <version>${jaxrs.version}</version>
+        <groupId>org.glassfish.jersey.core</groupId>
+        <artifactId>jersey-client</artifactId>
+        <version>${jersey.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>org.glassfish.jersey.inject</groupId>
+          <artifactId>jersey-hk2</artifactId>
+          <version>${jersey.version}</version>
       </dependency>
+
       <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-rs-client</artifactId>
-        <version>3.5.10</version>
+        <groupId>jakarta.activation</groupId>
+        <artifactId>jakarta.activation-api</artifactId>
+        <version>2.0.1</version>
       </dependency>
 
       <!-- JSON support -->

src/main/java/com/cyberark/conjur/api/clients/AuthnClient.java

@@ -3,12 +3,12 @@
 import static com.cyberark.conjur.util.EncodeUriComponent.encodeUriComponent;
 
 import javax.net.ssl.SSLContext;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.Response;
 
 import com.cyberark.conjur.api.AuthnProvider;
 import com.cyberark.conjur.api.Configuration;

src/main/java/com/cyberark/conjur/api/clients/ResourceClient.java

@@ -1,12 +1,12 @@
 package com.cyberark.conjur.api.clients;
 
 import javax.net.ssl.SSLContext;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.Response;
 
 import com.cyberark.conjur.api.Configuration;
 import com.cyberark.conjur.api.Credentials;

src/main/java/com/cyberark/conjur/api/clients/TelemetryHeaderFilter.java

@@ -3,9 +3,9 @@
 import java.io.IOException;
 import java.util.logging.Logger;
 
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientRequestFilter;
+import jakarta.ws.rs.core.MultivaluedMap;
 
 import com.cyberark.conjur.api.Configuration;
 

src/main/java/com/cyberark/conjur/util/rs/HttpBasicAuthFilter.java

@@ -2,9 +2,9 @@
 
 import org.apache.commons.codec.binary.Base64;
 
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientRequestFilter;
+import jakarta.ws.rs.core.MultivaluedMap;
 import java.io.IOException;
 import java.nio.charset.Charset;
 

src/main/java/com/cyberark/conjur/util/rs/JsonBodyReader.java

@@ -2,11 +2,11 @@
 package com.cyberark.conjur.util.rs;
 
 import com.google.gson.Gson;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.ext.MessageBodyReader;
+import jakarta.ws.rs.ext.Provider;
 import java.io.*;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;

src/main/java/com/cyberark/conjur/util/rs/TokenAuthFilter.java

@@ -4,8 +4,8 @@
 import com.cyberark.conjur.api.Token;
 import com.cyberark.conjur.util.Args;
 
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientRequestFilter;
 import java.io.IOException;
 
 /**

src/test/java/com/cyberark/conjur/api/ConjurTest.java

@@ -5,8 +5,8 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.WebApplicationException;
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.WebApplicationException;
 import java.util.UUID;
 
 /**

src/test/java/com/cyberark/conjur/api/clients/TelemetryHeaderTest.java

@@ -2,8 +2,8 @@
 
 import java.io.IOException;
 
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.core.MultivaluedMap;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.junit.jupiter.api.Test;
@@ -17,7 +17,7 @@ public class TelemetryHeaderTest {
     @Test
 public void testTelemetryHeaderAdded() throws IOException {
     ClientRequestContext requestContext = mock(ClientRequestContext.class);
-    MultivaluedMap<String, Object> headers = new javax.ws.rs.core.MultivaluedHashMap<>();
+    MultivaluedMap<String, Object> headers = new jakarta.ws.rs.core.MultivaluedHashMap<>();
 
     when(requestContext.getHeaders()).thenReturn(headers);