diff --git a/agents-common/pom.xml b/agents-common/pom.xml index 9b3e801ad7..19456ebc32 100644 --- a/agents-common/pom.xml +++ b/agents-common/pom.xml @@ -74,14 +74,18 @@ com.sun.jersey - jersey-bundle + jersey-client ${jersey-bundle.version} - - - javax.ws.rs - jsr311-api - - + + + com.sun.jersey + jersey-core + ${jersey-bundle.version} + + + javax.ws.rs + jsr311-api + ${jsr311-api.version} net.java.dev.jna diff --git a/distro/src/main/assembly/admin-web.xml b/distro/src/main/assembly/admin-web.xml index 6b3d2365b8..9aa2fd6f42 100644 --- a/distro/src/main/assembly/admin-web.xml +++ b/distro/src/main/assembly/admin-web.xml @@ -241,6 +241,7 @@ org.slf4j:slf4j-api:jar:${slf4j.version} org.apache.hadoop:hadoop-common commons-logging:commons-logging + com.sun.jersey:jersey-bundle:jar:${jersey-bundle.version} com.sun.jersey.contribs:jersey-multipart commons-collections:commons-collections commons-io:commons-io diff --git a/distro/src/main/assembly/kms.xml b/distro/src/main/assembly/kms.xml index d4ae22edc8..49ddd4f792 100755 --- a/distro/src/main/assembly/kms.xml +++ b/distro/src/main/assembly/kms.xml @@ -42,7 +42,7 @@ org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version} org.apache.hadoop:hadoop-auth:jar:${hadoop.version} com.google.code.gson:gson - com.sun.jersey:jersey-bundle + com.sun.jersey:jersey-bundle:jar:${jersey-bundle.version} org.eclipse.persistence:eclipselink org.eclipse.persistence:javax.persistence com.googlecode.log4jdbc:log4jdbc diff --git a/distro/src/main/assembly/plugin-atlas.xml b/distro/src/main/assembly/plugin-atlas.xml index 6c547c0f8e..25fe1c09f1 100644 --- a/distro/src/main/assembly/plugin-atlas.xml +++ b/distro/src/main/assembly/plugin-atlas.xml @@ -60,7 +60,9 @@ 644 commons-collections:commons-collections - com.sun.jersey:jersey-bundle + com.sun.jersey:jersey-client:jar:${jersey-bundle.version} + com.sun.jersey:jersey-core:jar:${jersey-bundle.version} + javax.ws.rs:jsr311-api:jar:${jsr311-api.version} com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version} com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version} com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version} diff --git a/distro/src/main/assembly/plugin-elasticsearch.xml b/distro/src/main/assembly/plugin-elasticsearch.xml index 30ea6243d0..af85baf0cb 100644 --- a/distro/src/main/assembly/plugin-elasticsearch.xml +++ b/distro/src/main/assembly/plugin-elasticsearch.xml @@ -71,7 +71,9 @@ org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version} com.google.code.gson:gson org.eclipse.jetty:jetty-client:jar:${jetty-client.version} - com.sun.jersey:jersey-bundle + com.sun.jersey:jersey-client:jar:${jersey-bundle.version} + com.sun.jersey:jersey-core:jar:${jersey-bundle.version} + javax.ws.rs:jsr311-api:jar:${jsr311-api.version} commons-logging:commons-logging:jar:${commons.logging.version} commons-io:commons-io org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version} diff --git a/distro/src/main/assembly/plugin-kafka.xml b/distro/src/main/assembly/plugin-kafka.xml index f263394106..4f7ee1a739 100644 --- a/distro/src/main/assembly/plugin-kafka.xml +++ b/distro/src/main/assembly/plugin-kafka.xml @@ -64,7 +64,8 @@ com.google.code.gson:gson org.eclipse.jetty:jetty-client:jar:${jetty-client.version} commons-collections:commons-collections - com.sun.jersey:jersey-bundle + com.sun.jersey:jersey-client:jar:${jersey-bundle.version} + com.sun.jersey:jersey-core:jar:${jersey-bundle.version} commons-logging:commons-logging commons-io:commons-io org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version} diff --git a/distro/src/main/assembly/plugin-ozone.xml b/distro/src/main/assembly/plugin-ozone.xml index d198345d88..e7395fd1f7 100644 --- a/distro/src/main/assembly/plugin-ozone.xml +++ b/distro/src/main/assembly/plugin-ozone.xml @@ -51,9 +51,9 @@ com.fasterxml.woodstox:woodstox-core:jar:${fasterxml.woodstox.version} com.kstruct:gethostname4j - com.sun.jersey:jersey-bundle - com.sun.jersey:jersey-core - com.sun.jersey:jersey-client + com.sun.jersey:jersey-client:jar:${jersey-bundle.version} + com.sun.jersey:jersey-core:jar:${jersey-bundle.version} + javax.ws.rs:jsr311-api:jar:${jsr311-api.version} commons-cli:commons-cli commons-collections:commons-collections commons-configuration:commons-configuration:jar:${commons.configuration1.version} @@ -108,9 +108,9 @@ org.apache.solr:solr-solrj:jar:${solr.version} com.fasterxml.woodstox:woodstox-core:jar:${fasterxml.woodstox.version} org.codehaus.woodstox:stax2-api:jar:${codehaus.woodstox.stax2api.version} - com.sun.jersey:jersey-core - com.sun.jersey:jersey-client - com.sun.jersey:jersey-bundle + com.sun.jersey:jersey-client:jar:${jersey-bundle.version} + com.sun.jersey:jersey-core:jar:${jersey-bundle.version} + javax.ws.rs:jsr311-api:jar:${jsr311-api.version} com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version} com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version} com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version} diff --git a/distro/src/main/assembly/plugin-presto.xml b/distro/src/main/assembly/plugin-presto.xml index 174ed0c6f5..afc0712fb7 100644 --- a/distro/src/main/assembly/plugin-presto.xml +++ b/distro/src/main/assembly/plugin-presto.xml @@ -77,8 +77,6 @@ org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version} org.noggit:noggit:jar:${noggit.version} org.apache.solr:solr-solrj:jar:${solr.version} - com.sun.jersey:jersey-core - com.sun.jersey:jersey-server commons-cli:commons-cli commons-collections:commons-collections org.apache.commons:commons-configuration2:jar:${commons.configuration.version} @@ -95,8 +93,10 @@ org.apache.ranger:credentialbuilder org.codehaus.woodstox:stax2-api com.fasterxml.woodstox:woodstox-core - com.sun.jersey:jersey-bundle - com.sun.jersey:jersey-json + com.sun.jersey:jersey-client:jar:${jersey-bundle.version} + com.sun.jersey:jersey-core:jar:${jersey-bundle.version} + com.sun.jersey:jersey-json:jar:${jersey-bundle.version} + javax.ws.rs:jsr311-api:jar:${jsr311-api.version} com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version} com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version} com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version} diff --git a/distro/src/main/assembly/plugin-solr.xml b/distro/src/main/assembly/plugin-solr.xml index 9741975147..80221068f1 100644 --- a/distro/src/main/assembly/plugin-solr.xml +++ b/distro/src/main/assembly/plugin-solr.xml @@ -55,7 +55,9 @@ commons-collections:commons-collections com.google.code.gson:gson - com.sun.jersey:jersey-bundle + com.sun.jersey:jersey-client:jar:${jersey-bundle.version} + com.sun.jersey:jersey-core:jar:${jersey-bundle.version} + javax.ws.rs:jsr311-api:jar:${jsr311-api.version} org.apache.hadoop:hadoop-client-api:jar:${hadoop.version} org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version} com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version} diff --git a/distro/src/main/assembly/plugin-trino.xml b/distro/src/main/assembly/plugin-trino.xml index 42e0e39951..1b220fa101 100644 --- a/distro/src/main/assembly/plugin-trino.xml +++ b/distro/src/main/assembly/plugin-trino.xml @@ -64,8 +64,6 @@ org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version} org.noggit:noggit:jar:${noggit.version} org.apache.solr:solr-solrj:jar:${solr.version} - com.sun.jersey:jersey-core - com.sun.jersey:jersey-server commons-cli:commons-cli commons-collections:commons-collections org.apache.commons:commons-configuration2:jar:${commons.configuration.version} @@ -87,8 +85,10 @@ org.apache.ranger:credentialbuilder org.codehaus.woodstox:stax2-api com.fasterxml.woodstox:woodstox-core - com.sun.jersey:jersey-bundle - com.sun.jersey:jersey-json + com.sun.jersey:jersey-client:jar:${jersey-bundle.version} + com.sun.jersey:jersey-core:jar:${jersey-bundle.version} + com.sun.jersey:jersey-json:jar:${jersey-bundle.version} + javax.ws.rs:jsr311-api:jar:${jsr311-api.version} com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version} com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version} com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.version} diff --git a/distro/src/main/assembly/ranger-tools.xml b/distro/src/main/assembly/ranger-tools.xml index b5d5d08ac9..84a8d81304 100644 --- a/distro/src/main/assembly/ranger-tools.xml +++ b/distro/src/main/assembly/ranger-tools.xml @@ -50,7 +50,7 @@ org.eclipse.persistence:eclipselink org.eclipse.persistence:javax.persistence commons-collections:commons-collections - com.sun.jersey:jersey-bundle + com.sun.jersey:jersey-bundle:jar:${jersey-bundle.version} commons-io:commons-io org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version} org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version} diff --git a/distro/src/main/assembly/sample-client.xml b/distro/src/main/assembly/sample-client.xml index 3de5897221..218aba900c 100644 --- a/distro/src/main/assembly/sample-client.xml +++ b/distro/src/main/assembly/sample-client.xml @@ -56,7 +56,7 @@ org.eclipse.persistence:eclipselink org.eclipse.persistence:javax.persistence commons-collections:commons-collections - com.sun.jersey:jersey-bundle + com.sun.jersey:jersey-bundle:jar:${jersey-bundle.version} commons-io:commons-io org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version} org.noggit:noggit:jar:${noggit.version} diff --git a/distro/src/main/assembly/storm-agent.xml b/distro/src/main/assembly/storm-agent.xml index a5e5aacd50..6dfa03b57f 100644 --- a/distro/src/main/assembly/storm-agent.xml +++ b/distro/src/main/assembly/storm-agent.xml @@ -142,7 +142,9 @@ 755 644 - com.sun.jersey:jersey-bundle:jar:${jersey-bundle.version} + com.sun.jersey:jersey-client:jar:${jersey-bundle.version} + com.sun.jersey:jersey-core:jar:${jersey-bundle.version} + javax.ws.rs:jsr311-api:jar:${jsr311-api.version} diff --git a/distro/src/main/assembly/usersync.xml b/distro/src/main/assembly/usersync.xml index f6133f1344..59ce098076 100644 --- a/distro/src/main/assembly/usersync.xml +++ b/distro/src/main/assembly/usersync.xml @@ -41,7 +41,7 @@ false com.google.code.gson:gson - com.sun.jersey:jersey-bundle + com.sun.jersey:jersey-bundle:jar:${jersey-bundle.version} commons-cli:commons-cli commons-collections:commons-collections commons-logging:commons-logging diff --git a/hbase-agent/pom.xml b/hbase-agent/pom.xml index 8af2b4d094..4de157bb86 100644 --- a/hbase-agent/pom.xml +++ b/hbase-agent/pom.xml @@ -57,12 +57,6 @@ jersey-client ${jersey-bundle.version} jar - - - javax.ws.rs - jsr311-api - - com.sun.jersey @@ -204,6 +198,12 @@ org.apache.ranger ranger-plugins-common ${project.version} + + + javax.ws.rs + jsr311-api + + org.glassfish diff --git a/hdfs-agent/pom.xml b/hdfs-agent/pom.xml index 1affa6c4c2..bdfd2a944d 100644 --- a/hdfs-agent/pom.xml +++ b/hdfs-agent/pom.xml @@ -133,6 +133,12 @@ org.apache.ranger ranger-plugins-common ${project.version} + + + javax.ws.rs + jsr311-api + + org.apache.hadoop diff --git a/hive-agent/pom.xml b/hive-agent/pom.xml index 8a800e1e08..0285fc19f3 100644 --- a/hive-agent/pom.xml +++ b/hive-agent/pom.xml @@ -201,6 +201,12 @@ org.apache.ranger ranger-plugins-common ${project.version} + + + javax.ws.rs + jsr311-api + + org.apache.thrift diff --git a/knox-agent/pom.xml b/knox-agent/pom.xml index 90f6392996..21cc25d2d8 100644 --- a/knox-agent/pom.xml +++ b/knox-agent/pom.xml @@ -127,6 +127,12 @@ org.apache.ranger ranger-plugins-common ${project.version} + + + javax.ws.rs + jsr311-api + + diff --git a/plugin-kafka/pom.xml b/plugin-kafka/pom.xml index 785b341c6f..17059b5fcf 100644 --- a/plugin-kafka/pom.xml +++ b/plugin-kafka/pom.xml @@ -90,6 +90,12 @@ org.apache.ranger ranger-plugins-common ${project.version} + + + javax.ws.rs + jsr311-api + + org.apache.curator diff --git a/plugin-kms/pom.xml b/plugin-kms/pom.xml index 1116a2e9b6..53610a237e 100644 --- a/plugin-kms/pom.xml +++ b/plugin-kms/pom.xml @@ -55,6 +55,12 @@ org.apache.ranger ranger-plugins-common ${project.version} + + + javax.ws.rs + jsr311-api + + org.apache.derby diff --git a/pom.xml b/pom.xml index 73e48318b7..2c7ad5dc61 100755 --- a/pom.xml +++ b/pom.xml @@ -154,6 +154,7 @@ 2.4.10 1.0 1.3.9 + 1.1.1 5.10.0 3.9.1 2.0.3 diff --git a/security-admin/pom.xml b/security-admin/pom.xml index 2136d5b33e..3a30a36c4f 100644 --- a/security-admin/pom.xml +++ b/security-admin/pom.xml @@ -539,6 +539,12 @@ org.apache.ranger ranger-plugins-common ${project.version} + + + javax.ws.rs + jsr311-api + + org.apache.ranger diff --git a/tagsync/pom.xml b/tagsync/pom.xml index 8dbe52e8d4..dee2c3d724 100644 --- a/tagsync/pom.xml +++ b/tagsync/pom.xml @@ -257,6 +257,12 @@ org.apache.ranger ranger-plugins-common ${project.version} + + + javax.ws.rs + jsr311-api + + org.apache.ranger diff --git a/ugsync/pom.xml b/ugsync/pom.xml index b20f9d2852..7a86b09764 100644 --- a/ugsync/pom.xml +++ b/ugsync/pom.xml @@ -68,6 +68,17 @@ com.google.code.gson gson + + com.sun.jersey + jersey-bundle + ${jersey-bundle.version} + + + javax.ws.rs + jsr311-api + + + commons-cli commons-cli @@ -165,6 +176,12 @@ org.apache.ranger ranger-plugins-common ${project.version} + + + javax.ws.rs + jsr311-api + + org.apache.ranger diff --git a/unixauthclient/pom.xml b/unixauthclient/pom.xml index e5c9659f06..0ed9f134f1 100644 --- a/unixauthclient/pom.xml +++ b/unixauthclient/pom.xml @@ -32,17 +32,6 @@ com.google.code.gson gson - - com.sun.jersey - jersey-bundle - ${jersey-bundle.version} - - - javax.ws.rs - jsr311-api - - - commons-cli commons-cli