ugsync|tagsync: fix some NoClassDefFoundError

apache · Jan 28, 2025 · 86ad702 · 86ad702
1 parent e184206
commit 86ad702
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 68 deletions.
diff --git a/agents-common/pom.xml b/agents-common/pom.xml
@@ -43,27 +43,37 @@
         <relativePath>..</relativePath>
     </parent>
     <dependencies>
-        <dependency>
-            <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-binding</artifactId>
+            <version>${jersey-media.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.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
+            <version>${jakarta.activation.version}</version>
+        </dependency>
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
             <version>${jakarta.servlet.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>${jakarta.xml.version}</version>
+        </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
@@ -138,23 +148,10 @@
             <version>${fasterxml.jackson.databind.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-json-provider</artifactId>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
             <version>${fasterxml.jackson.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-base</artifactId>
-            <version>${fasterxml.jackson.version}</version>
-        </dependency>
-
-
         <dependency>
             <groupId>org.apache.ranger</groupId>
             <artifactId>ranger-plugins-cred</artifactId>

diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
@@ -40,15 +40,14 @@
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 
 import jakarta.ws.rs.ProcessingException;
 import jakarta.ws.rs.client.*;
 import jakarta.ws.rs.core.Cookie;
-
 import jakarta.ws.rs.core.Response;
+
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.Validate;
 import org.apache.hadoop.conf.Configuration;
@@ -62,7 +61,6 @@
 import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
 import org.glassfish.jersey.jackson.JacksonFeature;
 
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -220,30 +218,20 @@ private Client getCookieAuthClient() {
 	}
 
 	private Client buildClient() {
+		ClientConfig config = createClientConfig();
 		Client client = null;
 
 		if (mIsSSL) {
 			KeyManager[]   kmList     = getKeyManagers();
 			TrustManager[] tmList     = getTrustManagers();
 			SSLContext     sslContext = getSSLContext(kmList, tmList);
-			ClientConfig   config     = new ClientConfig();
 
-			config.register(JacksonFeature.class); // to handle List<> unmarshalling
-
-			HostnameVerifier hv = new HostnameVerifier() {
-				public boolean verify(String urlHostName, SSLSession session) {
-					return session.getPeerHost().equals(urlHostName);
-				}
-			};
+			HostnameVerifier hv = (urlHostName, session) -> session.getPeerHost().equals(urlHostName);
 
 			client = ClientBuilder.newBuilder().withConfig(config).sslContext(sslContext).hostnameVerifier(hv).build();
 		}
 
 		if(client == null) {
-			ClientConfig config = new ClientConfig();
-
-			config.register(JacksonFeature.class); // to handle List<> unmarshalling
-
 			client = ClientBuilder.newClient(config);
 		}
 
@@ -254,6 +242,13 @@ public boolean verify(String urlHostName, SSLSession session) {
 		return client;
 	}
 
+	private ClientConfig createClientConfig() {
+		ClientConfig config = new ClientConfig();
+		config.register(JacksonFeature.class);
+
+		return config;
+	}
+
 	private void setBasicAuthFilter(String username, String password) {
 		if (StringUtils.isNotEmpty(username) && StringUtils.isNotEmpty(password)) {
 			basicAuthFilter = HttpAuthenticationFeature.basic(username, password);

diff --git a/distro/src/main/assembly/tagsync.xml b/distro/src/main/assembly/tagsync.xml
@@ -42,8 +42,6 @@
 						<includes>
 							<include>com.101tec:zkclient</include>
 							<include>com.google.code.gson:gson:jar:${gson.version}</include>
-							<include>org.glassfish.jersey.media:jersey-media-json-binding:jar:${jersey-media.version}</include>
-							<include>org.glassfish.jersey.media:jersey-media-json-binding:jar:${jersey-media.version}</include>
 							<include>org.apache.atlas:atlas-notification:jar:${atlas.version}</include>
 							<include>org.apache.atlas:atlas-intg:jar:${atlas.version}</include>
 							<include>org.apache.atlas:atlas-client-v1:jar:${atlas.version}</include>
@@ -59,12 +57,10 @@
 							<include>org.apache.ranger:ranger-plugins-common</include>
 							<include>org.apache.ranger:ranger-util</include>
 							<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
-							<include>com.fasterxml.jackson.core:jackson-annotations:jar:${atlas.jackson.version}</include>
-							<include>com.fasterxml.jackson.core:jackson-core:jar:${atlas.jackson.version}</include>
-							<include>com.fasterxml.jackson.core:jackson-databind:jar:${atlas.jackson.databind.version}</include>
-							<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${atlas.jackson.version}</include>
-							<include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${atlas.jackson.version}</include>
-							<include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:${atlas.jackson.version}</include>
+							<include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
+							<include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
+							<include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version}</include>
+							<include>com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:jar:${fasterxml.jackson.version}</include>
 							<include>org.codehaus.jettison:jettison:jar:${jettison.version}</include>
 							<include>org.scala-lang:scala-library:jar:${scala.version}</include>
 							<include>org.slf4j:slf4j-api:jar:${slf4j.version}</include>
@@ -76,7 +72,6 @@
 							<include>commons-io:commons-io:jar:${commons.io.version}</include>
 							<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
 							<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-							<include>jakarta.inject:jakarta.inject-api:jar:${jakarta-inject.version}</include>
 							<include>joda-time:joda-time:jar:${joda-time.version}</include>
 							<include>org.codehaus.woodstox:stax2-api</include>
 							<include>com.fasterxml.woodstox:woodstox-core</include>
@@ -98,11 +93,12 @@
 							<include>org.apache.zookeeper:zookeeper:jar:${zookeeper.version}</include>
 							<include>org.apache.zookeeper:zookeeper-jute:jar:${zookeeper.version}</include>
 							<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
-							<include>org.glassfish.jersey.containers:jersey-container-servlet:jar:${jersey-core.version}</include>
-							<include>org.glassfish.jersey.core:jersey-common:jar:${jersey-core.version}</include>
 							<include>org.glassfish.jersey.core:jersey-client:jar:${jersey-core.version}</include>
+							<include>org.glassfish.jersey.core:jersey-common:jar:${jersey-core.version}</include>
+							<include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
 							<include>org.glassfish.jersey.media:jersey-media-json-binding:jar:${jersey-media.version}</include>
 							<include>org.glassfish.jersey.media:jersey-media-json-jackson:jar:${jersey-media.version}</include>
+							<include>jakarta.activation:jakarta.activation-api:jar:${jakarta.activation.version}</include>
 							<include>jakarta.annotation:jakarta.annotation-api:jar:${jakarta.annotation-api}</include>
 							<include>jakarta.inject:jakarta.inject-api:jar:${jakarta-inject.version}</include>
 							<include>jakarta.ws.rs:jakarta.ws.rs-api:jar:${jakarta.ws.version}</include>

diff --git a/distro/src/main/assembly/usersync.xml b/distro/src/main/assembly/usersync.xml
@@ -44,7 +44,6 @@
 							<include>org.glassfish.jersey.core:jersey-client</include>
 							<include>org.glassfish.jersey.core:jersey-common</include>
 							<include>org.glassfish.jersey.core:jersey-hk2</include>
-							<include>org.glassfish.jersey.core:jersey-server</include>
 							<include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
 							<include>org.glassfish.jersey.media:jersey-media-json-binding</include>
 							<include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
@@ -90,6 +89,7 @@
 							<include>org.slf4j:log4j-over-slf4j:jar:${${slf4j.version}}</include>
 							<include>ch.qos.logback:logback-core:jar:${logback.version}</include>
 							<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+							<include>jakarta.activation:jakarta.activation-api:jar:${jakarta.activation.version}</include>
 							<include>jakarta.annotation:jakarta.annotation-api:jar:${jakarta.annotation-api}</include>
 							<include>jakarta.inject:jakarta.inject-api:jar:${jakarta-inject.version}</include>
 							<include>jakarta.ws.rs:jakarta.ws.rs-api:jar:${jakarta.ws.version}</include>

diff --git a/plugin-schema-registry/pom.xml b/plugin-schema-registry/pom.xml
@@ -275,6 +275,10 @@
                     <groupId>org.apache.avro</groupId>
                     <artifactId>avro</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.ws.rs</groupId>
+                    <artifactId>javax.ws.rs-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

diff --git a/tagsync/pom.xml b/tagsync/pom.xml
@@ -265,34 +265,23 @@
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${atlas.jackson.version}</version>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${fasterxml.jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${atlas.jackson.databind.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-base</artifactId>
-            <version>${atlas.jackson.version}</version>
+            <artifactId>jackson-core</artifactId>
+            <version>${fasterxml.jackson.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>${atlas.jackson.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${fasterxml.jackson.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${atlas.jackson.version}</version>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
+            <version>${fasterxml.jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.ranger</groupId>