RANGER-4038: Upgrading to spring 6

agents-audit/src/main/resources/META-INF/persistence.xml

@@ -15,7 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+<persistence version="3.0"
+			 xmlns="https://jakarta.ee/xml/ns/persistence"
+			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			 xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence
+			 					 https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
+
 	<persistence-unit name="xa_server">
 		<class>org.apache.ranger.audit.entity.AuthzAuditEventDbObj</class>
 

agents-common/pom.xml

@@ -44,15 +44,25 @@
     </parent>
     <dependencies>
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-bundle</artifactId>
-            <version>${jersey-bundle.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.ws.rs</groupId>
-                    <artifactId>jsr311-api</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-json-binding</artifactId>
+            <version>${jersey-media.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-client</artifactId>
+            <version>${jersey-core.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-json-jackson</artifactId>
+            <version>${jersey-media.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta.servlet.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
@@ -185,7 +195,6 @@
             <artifactId>jackson-core</artifactId>
             <version>${fasterxml.jackson.version}</version>
         </dependency>
-        <!-- To be added for JDK15 and above
         <dependency>
             <groupId>org.graalvm.js</groupId>
             <artifactId>js</artifactId>
@@ -196,7 +205,6 @@
             <artifactId>js-scriptengine</artifactId>
             <version>${graalvm.version}</version>
         </dependency>
-        -->
         <!-- Test -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>

agents-common/src/main/java/org/apache/ranger/admin/client/datatype/RESTResponse.java

@@ -21,6 +21,7 @@
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import jakarta.ws.rs.core.Response;
 import org.apache.ranger.authorization.utils.StringUtil;
 import org.apache.ranger.plugin.util.JsonUtilsV2;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
@@ -29,8 +30,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.jersey.api.client.ClientResponse;
-
 
 @JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -91,10 +90,10 @@ public String getMessage() {
 		return StringUtil.isEmpty(msgDesc) ? ("HTTP " + httpStatusCode) : msgDesc;
 	}
 
-	public static RESTResponse fromClientResponse(ClientResponse response) {
+	public static RESTResponse fromClientResponse(Response response) {
 		RESTResponse ret = null;
 
-		String jsonString = response == null ? null : response.getEntity(String.class);
+		String jsonString = response == null ? null : response.readEntity(String.class);
 		int    httpStatus = response == null ? 0 : response.getStatus();
 
 		if(! StringUtil.isEmpty(jsonString)) {

agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerUserStoreRefresher.java

@@ -18,7 +18,7 @@
  */
 package org.apache.ranger.plugin.contextenricher;
 
-import com.sun.jersey.api.client.ClientResponse;
+import jakarta.ws.rs.core.Response;
 import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.ranger.admin.client.datatype.RESTResponse;
@@ -34,7 +34,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.Reader;
 import java.io.Writer;
@@ -58,7 +58,7 @@ public class RangerUserStoreRefresher extends Thread {
 
     private final String cacheFile;
     private boolean          hasProvidedUserStoreToReceiver;
-    private RangerRESTClient rangerRESTClient;
+    private final RangerRESTClient rangerRESTClient;
 
     public RangerUserStoreRefresher(RangerUserStoreRetriever userStoreRetriever, RangerUserStoreEnricher userStoreEnricher,
                              RangerRESTClient restClient, long lastKnownVersion,
@@ -368,7 +368,7 @@ private RangerUserStore getUserStoreIfUpdated(long lastKnownUserStoreVersion, lo
         final RangerUserStore ret;
         final UserGroupInformation user = MiscUtil.getUGILoginUser();
         final boolean isSecureMode = user != null && UserGroupInformation.isSecurityEnabled();
-        final ClientResponse response;
+        final Response response;
 
         Map<String, String> queryParams = new HashMap<String, String>();
         queryParams.put(RangerRESTUtils.REST_PARAM_LAST_KNOWN_USERSTORE_VERSION, Long.toString(lastKnownUserStoreVersion));
@@ -378,7 +378,7 @@ private RangerUserStore getUserStoreIfUpdated(long lastKnownUserStoreVersion, lo
             if (LOG.isDebugEnabled()) {
                 LOG.debug("Checking UserStore updated as user : " + user);
             }
-            response = MiscUtil.executePrivilegedAction((PrivilegedExceptionAction<ClientResponse>) () -> {
+            response = MiscUtil.executePrivilegedAction((PrivilegedExceptionAction<Response>) () -> {
                 try {
                     String relativeURL = RangerRESTUtils.REST_URL_SERVICE_SERCURE_GET_USERSTORE;
 
@@ -418,7 +418,7 @@ private RangerUserStore getUserStoreIfUpdated(long lastKnownUserStoreVersion, lo
                     + ", response=" + response.getStatus()
                     + ", " + "lastKnownUserStoreVersion=" + lastKnownUserStoreVersion
                     + ", " + "lastActivationTimeInMillis=" + lastActivationTimeInMillis);
-            String exceptionMsg = response.hasEntity() ? response.getEntity(String.class) : null;
+            String exceptionMsg = response.hasEntity() ? response.readEntity(String.class) : null;
             LOG.warn("Received 404 error code with body:[" + exceptionMsg + "], Ignoring");
         } else {
             RESTResponse resp = RESTResponse.fromClientResponse(response);

agents-common/src/main/java/org/apache/ranger/plugin/util/JsonUtilsV2.java

@@ -21,7 +21,7 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.jersey.api.client.ClientResponse;
+import jakarta.ws.rs.core.Response;
 
 import java.io.Reader;
 import java.io.Serializable;
@@ -88,14 +88,14 @@ static public String nonSerializableObjToJson(Object obj) throws Exception {
         return getMapper().writeValueAsString(obj);
     }
 
-    static public <T> T readResponse(ClientResponse response, Class<T> cls) throws Exception {
-        String jsonStr = response.getEntity(String.class);
+    static public <T> T readResponse(Response response, Class<T> cls) throws Exception {
+        String jsonStr = response.readEntity(String.class);
 
         return jsonToObj(jsonStr, cls);
     }
 
-    static public <T> T readResponse(ClientResponse response, TypeReference<T> cls) throws Exception {
-        String jsonStr = response.getEntity(String.class);
+    static public <T> T readResponse(Response response, TypeReference<T> cls) throws Exception {
+        String jsonStr = response.readEntity(String.class);
 
         return jsonToObj(jsonStr, cls);
     }

agents-common/src/main/java/org/apache/ranger/plugin/util/PasswordUtils.java

@@ -34,7 +34,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.jersey.core.util.Base64;
+import java.util.Base64;
 public class PasswordUtils {
 
     private static final Logger LOG = LoggerFactory.getLogger(PasswordUtils.class);
@@ -78,7 +78,7 @@ private String encrypt() throws IOException {
             SecretKey key = skf.generateSecret(keySpec);
             engine.init(Cipher.ENCRYPT_MODE, key, new PBEParameterSpec(salt, iterationCount, new IvParameterSpec(iv)));
             byte[] encryptedStr = engine.doFinal(strToEncrypt.getBytes());
-            ret = new String(Base64.encode(encryptedStr));
+            ret = new String(Base64.getEncoder().encodeToString(encryptedStr));
         }
         catch(Throwable t) {
             LOG.error("Unable to encrypt password due to error", t);
@@ -101,7 +101,7 @@ private String encrypt() throws IOException {
 			SALT = crypt_algo_array[index++].getBytes(); // 2
 			iterationCount = Integer.parseInt(crypt_algo_array[index++]);// 3
 			if (needsIv(cryptAlgo)) {
-				iv = Base64.decode(crypt_algo_array[index++]);
+				iv = Base64.getDecoder().decode(crypt_algo_array[index++]);
 			} else {
 				iv = DEFAULT_INITIAL_VECTOR;
 			}
@@ -141,7 +141,7 @@ public static String decryptPassword(String aPassword) throws IOException {
     private String decrypt() throws IOException {
         String ret = null;
         try {
-            byte[] decodedPassword = Base64.decode(password);
+            byte[] decodedPassword = Base64.getDecoder().decode(password);
             Cipher engine = Cipher.getInstance(cryptAlgo);
             PBEKeySpec keySpec = new PBEKeySpec(encryptKey);
             SecretKeyFactory skf = SecretKeyFactory.getInstance(cryptAlgo);
@@ -185,7 +185,7 @@ public static String generateIvIfNeeded(String cryptAlgo) throws NoSuchAlgorithm
 	private static String generateBase64EncodedIV() throws NoSuchAlgorithmException {
 		byte[] iv = new byte[16];
 		SecureRandom.getInstance("NativePRNGNonBlocking").nextBytes(iv);
-		return new String(Base64.encode(iv));
+		return new String(Base64.getEncoder().encodeToString(iv));
 	}
 
 	public String getCryptAlgo() {
@@ -213,7 +213,7 @@ public byte[] getIv() {
 	}
 
 	public String getIvAsString() {
-		return new String(Base64.encode(getIv()));
+		return new String(Base64.getEncoder().encodeToString(getIv()));
 	}
 	public static String getDecryptPassword(String password) {
 		String decryptedPwd = null;