Skip to content

Commit d8a8f6b

Browse files
pradeepagrawal8184pradeepagrawal8184
committed
RANGER-4706: Add required jersey 2 libraries in distro
1 parent 872f09d commit d8a8f6b

File tree

13 files changed

+262
-53
lines changed

13 files changed

+262
-53
lines changed

‎distro/src/main/assembly/hdfs-agent.xml‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -85,32 +85,34 @@
8585
<directoryMode>755</directoryMode>
8686
<fileMode>644</fileMode>
8787
<includes>
88-
<include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
89-
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
90-
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
91-
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
92-
<include>org.noggit:noggit:jar:${noggit.version}</include>
93-
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
94-
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
95-
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
96-
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
97-
<include>org.elasticsearch:elasticsearch</include>
98-
<include>org.elasticsearch:elasticsearch-core</include>
99-
<include>org.elasticsearch:elasticsearch-x-content</include>
100-
<include>org.elasticsearch.client:elasticsearch-rest-client</include>
101-
<include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>
102-
<include>org.elasticsearch.plugin:rank-eval-client</include>
103-
<include>org.elasticsearch.plugin:lang-mustache-client</include>
104-
<include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
105-
<include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
106-
<include>org.apache.lucene:lucene-core</include>
107-
<include>joda-time:joda-time</include>
108-
<include>com.carrotsearch:hppc</include>
109-
<include>org.apache.hive:hive-storage-api:jar:${hive.storage-api.version}</include>
110-
<include>org.apache.orc:orc-core:jar:${orc.version}</include>
111-
<include>org.apache.orc:orc-shims:jar:${orc.version}</include>
112-
<include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
113-
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
88+
<include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
89+
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
90+
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
91+
<include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
92+
<include>org.noggit:noggit:jar:${noggit.version}</include>
93+
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
94+
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
95+
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
96+
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
97+
<include>org.elasticsearch:elasticsearch</include>
98+
<include>org.elasticsearch:elasticsearch-core</include>
99+
<include>org.elasticsearch:elasticsearch-x-content</include>
100+
<include>org.elasticsearch.client:elasticsearch-rest-client</include>
101+
<include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>
102+
<include>org.elasticsearch.plugin:rank-eval-client</include>
103+
<include>org.elasticsearch.plugin:lang-mustache-client</include>
104+
<include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
105+
<include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
106+
<include>org.apache.lucene:lucene-core</include>
107+
<include>joda-time:joda-time</include>
108+
<include>com.carrotsearch:hppc</include>
109+
<include>org.apache.hive:hive-storage-api:jar:${hive.storage-api.version}</include>
110+
<include>org.apache.orc:orc-core:jar:${orc.version}</include>
111+
<include>org.apache.orc:orc-shims:jar:${orc.version}</include>
112+
<include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
113+
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
114+
<include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
115+
<include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
114116
</includes>
115117
</binaries>
116118
</moduleSet>

‎distro/src/main/assembly/kms.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,33 @@
186186
<include>com.squareup.okhttp:okhttp</include>
187187
<!-- ranger common metrics module-->
188188
<include>org.apache.ranger:ranger-metrics</include>
189+
<include>jakarta.ws.rs:jakarta.ws.rs-api</include>
190+
<include>jakarta.annotation:jakarta.annotation-api</include>
191+
<include>jakarta.activation:jakarta.activation-api</include>
192+
<include>jakarta.validation:jakarta.validation-api</include>
193+
<include>javax.inject:javax.inject</include>
194+
<include>org.glassfish.jersey.core:jersey-client</include>
195+
<include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
196+
<include>org.glassfish.jersey.core:jersey-common</include>
197+
<include>org.glassfish.jersey.media:jersey-media-multipart</include>
198+
<include>org.glassfish.jersey.containers:jersey-container-servlet</include>
199+
<include>org.glassfish.jersey.containers:jersey-container-servlet-core</include>
200+
<include>org.glassfish.jersey.inject:jersey-hk2</include>
201+
<include>org.glassfish.hk2.external:jakarta.inject</include>
202+
<include>org.glassfish.jersey.core:jersey-server</include>
203+
<include>org.glassfish.hk2:hk2</include>
204+
<include>org.glassfish.hk2:hk2-utils</include>
205+
<include>org.glassfish.hk2:hk2-api</include>
206+
<include>org.glassfish.hk2:hk2-core</include>
207+
<include>org.glassfish.hk2:hk2-locator</include>
208+
<include>org.glassfish.hk2:hk2-runlevel</include>
209+
<include>org.glassfish.hk2:class-model</include>
210+
<include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
211+
<include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations</include>
212+
<include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
213+
<include>com.fasterxml.jackson.core:jackson-core:jar:${fasterxml.jackson.version}</include>
214+
<include>com.fasterxml.jackson.core:jackson-databind:jar:${fasterxml.jackson.databind.version}</include>
215+
<include>org.javassist:javassist</include>
189216
</includes>
190217
</dependencySet>
191218
</dependencySets>

‎distro/src/main/assembly/plugin-kms.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,21 @@
7777
<include>org.apache.orc:orc-shims:jar:${orc.version}</include>
7878
<include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
7979
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
80+
<include>jakarta.ws.rs:jakarta.ws.rs-api</include>
81+
<include>org.glassfish.jersey.core:jersey-client</include>
82+
<include>org.glassfish.jersey.core:jersey-common</include>
83+
<include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
84+
<include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
85+
<include>org.glassfish.jersey.inject:jersey-hk2</include>
86+
<include>org.glassfish.hk2.external:jakarta.inject</include>
87+
<include>org.glassfish.hk2:hk2</include>
88+
<include>org.glassfish.hk2:hk2-utils</include>
89+
<include>org.glassfish.hk2:hk2-api</include>
90+
<include>org.glassfish.hk2:hk2-core</include>
91+
<include>org.glassfish.hk2:hk2-locator</include>
92+
<include>org.glassfish.hk2:hk2-runlevel</include>
93+
<include>org.glassfish.hk2:class-model</include>
94+
<include>javax.inject:javax.inject</include>
8095
</includes>
8196
</binaries>
8297
</moduleSet>

‎distro/src/main/assembly/plugin-kylin.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,21 @@
8686
<include>org.apache.orc:orc-core:jar:${orc.version}</include>
8787
<include>org.apache.orc:orc-shims:jar:${orc.version}</include>
8888
<include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
89+
<include>jakarta.ws.rs:jakarta.ws.rs-api</include>
90+
<include>org.glassfish.jersey.core:jersey-client</include>
91+
<include>org.glassfish.jersey.core:jersey-common</include>
92+
<include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
93+
<include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
94+
<include>org.glassfish.jersey.inject:jersey-hk2</include>
95+
<include>org.glassfish.hk2.external:jakarta.inject</include>
96+
<include>org.glassfish.hk2:hk2</include>
97+
<include>org.glassfish.hk2:hk2-utils</include>
98+
<include>org.glassfish.hk2:hk2-api</include>
99+
<include>org.glassfish.hk2:hk2-core</include>
100+
<include>org.glassfish.hk2:hk2-locator</include>
101+
<include>org.glassfish.hk2:hk2-runlevel</include>
102+
<include>org.glassfish.hk2:class-model</include>
103+
<include>javax.inject:javax.inject</include>
89104
</includes>
90105
</dependencySet>
91106
<dependencySet>

‎distro/src/main/assembly/plugin-ozone.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@
126126
<include>org.apache.orc:orc-core:jar:${orc.version}</include>
127127
<include>org.apache.orc:orc-shims:jar:${orc.version}</include>
128128
<include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
129+
<include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
130+
<include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
131+
<include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:${fasterxml.jackson.version}</include>
129132
</includes>
130133
</binaries>
131134
</moduleSet>

‎distro/src/main/assembly/plugin-solr.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,23 @@
7777
<include>org.apache.orc:orc-core:jar:${orc.version}</include>
7878
<include>org.apache.orc:orc-shims:jar:${orc.version}</include>
7979
<include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
80+
<include>jakarta.ws.rs:jakarta.ws.rs-api</include>
81+
<include>org.glassfish.jersey.core:jersey-client</include>
82+
<include>org.glassfish.jersey.core:jersey-common</include>
83+
<include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
84+
<include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
85+
<include>org.glassfish.jersey.inject:jersey-hk2</include>
86+
<include>org.glassfish.hk2.external:jakarta.inject</include>
87+
<include>org.glassfish.hk2:hk2</include>
88+
<include>org.glassfish.hk2:hk2-utils</include>
89+
<include>org.glassfish.hk2:hk2-api</include>
90+
<include>org.glassfish.hk2:hk2-core</include>
91+
<include>org.glassfish.hk2:hk2-locator</include>
92+
<include>org.glassfish.hk2:hk2-runlevel</include>
93+
<include>org.glassfish.hk2:class-model</include>
94+
<include>javax.inject:javax.inject</include>
95+
<include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:${fasterxml.jackson.version}</include>
96+
<include>javax.annotation:javax.annotation-api:jar:${javax.annotation-api.version}</include>
8097
</includes>
8198
</binaries>
8299
</moduleSet>

‎distro/src/main/assembly/plugin-sqoop.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,21 @@
5757
<directoryMode>755</directoryMode>
5858
<fileMode>644</fileMode>
5959
<includes>
60+
<include>jakarta.ws.rs:jakarta.ws.rs-api</include>
61+
<include>org.glassfish.jersey.core:jersey-client</include>
62+
<include>org.glassfish.jersey.core:jersey-common</include>
63+
<include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
64+
<include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
65+
<include>org.glassfish.jersey.inject:jersey-hk2</include>
66+
<include>org.glassfish.hk2.external:jakarta.inject</include>
67+
<include>org.glassfish.hk2:hk2</include>
68+
<include>org.glassfish.hk2:hk2-utils</include>
69+
<include>org.glassfish.hk2:hk2-api</include>
70+
<include>org.glassfish.hk2:hk2-core</include>
71+
<include>org.glassfish.hk2:hk2-locator</include>
72+
<include>org.glassfish.hk2:hk2-runlevel</include>
73+
<include>org.glassfish.hk2:class-model</include>
74+
<include>javax.inject:javax.inject</include>
6075
<include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
6176
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
6277
<include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>

‎distro/src/main/assembly/plugin-yarn.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@
8383
<include>org.apache.orc:orc-shims:jar:${orc.version}</include>
8484
<include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
8585
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
86+
<include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
87+
<include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
8688
</includes>
8789
</binaries>
8890
</moduleSet>

‎distro/src/main/assembly/storm-agent.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,21 @@
106106
<include>org.apache.orc:orc-shims:jar:${orc.version}</include>
107107
<include>io.airlift:aircompressor:jar:${aircompressor.version}</include>
108108
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
109+
<include>jakarta.ws.rs:jakarta.ws.rs-api</include>
110+
<include>org.glassfish.jersey.core:jersey-client</include>
111+
<include>org.glassfish.jersey.core:jersey-common</include>
112+
<include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
113+
<include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
114+
<include>org.glassfish.jersey.inject:jersey-hk2</include>
115+
<include>org.glassfish.hk2.external:jakarta.inject</include>
116+
<include>org.glassfish.hk2:hk2</include>
117+
<include>org.glassfish.hk2:hk2-utils</include>
118+
<include>org.glassfish.hk2:hk2-api</include>
119+
<include>org.glassfish.hk2:hk2-core</include>
120+
<include>org.glassfish.hk2:hk2-locator</include>
121+
<include>org.glassfish.hk2:hk2-runlevel</include>
122+
<include>org.glassfish.hk2:class-model</include>
123+
<include>javax.inject:javax.inject</include>
109124
</includes>
110125
</dependencySet>
111126
<dependencySet>

‎distro/src/main/assembly/tagsync.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,21 @@
9898
<include>org.apache.zookeeper:zookeeper-jute:jar:${zookeeper.version}</include>
9999
<include>com.google.guava:guava</include>
100100
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
101+
<include>jakarta.ws.rs:jakarta.ws.rs-api</include>
102+
<include>org.glassfish.jersey.core:jersey-client</include>
103+
<include>org.glassfish.jersey.core:jersey-common</include>
104+
<include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
105+
<include>org.glassfish.jersey.ext:jersey-entity-filtering</include>
106+
<include>org.glassfish.jersey.inject:jersey-hk2</include>
107+
<include>org.glassfish.hk2.external:jakarta.inject</include>
108+
<include>org.glassfish.hk2:hk2</include>
109+
<include>org.glassfish.hk2:hk2-utils</include>
110+
<include>org.glassfish.hk2:hk2-api</include>
111+
<include>org.glassfish.hk2:hk2-core</include>
112+
<include>org.glassfish.hk2:hk2-locator</include>
113+
<include>org.glassfish.hk2:hk2-runlevel</include>
114+
<include>org.glassfish.hk2:class-model</include>
115+
<include>javax.inject:javax.inject</include>
101116
</includes>
102117
</dependencySet>
103118
</dependencySets>

0 commit comments

Comments
 (0)