Skip to content

Commit

Permalink
ugsync|tagsync: fix some NoClassDefFoundError
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander.vazquez committed Jan 28, 2025
1 parent e184206 commit 1cde390
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 71 deletions.
37 changes: 17 additions & 20 deletions agents-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
25 changes: 10 additions & 15 deletions agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -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);
}

Expand All @@ -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);
Expand Down
18 changes: 7 additions & 11 deletions distro/src/main/assembly/tagsync.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion distro/src/main/assembly/usersync.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions plugin-schema-registry/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
37 changes: 13 additions & 24 deletions tagsync/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
<version>${jersey-media.version}</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet.version}</version>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${jakarta.activation.version}</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
Expand Down Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions ugsync/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,11 @@
<artifactId>ranger-common-ha</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${jakarta.activation.version}</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
Expand Down

0 comments on commit 1cde390

Please sign in to comment.