Skip to content

Commit 06d36f5

Browse files
slfan1989aajisakavirajjasaniayushtknpjfanning
authored
HADOOP-15984. Update jersey from 1.19 to 2.x. (#7019)
Co-authored-by: Akira Ajisaka <aajisaka@apache.org> Co-authored-by: Viraj Jasani <vjasani@apache.org> Co-authored-by: Ayush Saxena <ayushsaxena@apache.org> Co-authored-by: PJ Fanning <fanningpj@apache.org> Co-authored-by: Steve Loughran <stevel@apache.org> Co-authored-by: He Xiaoqiao <hexiaoqiao@apache.org> Reviewed-by: Steve Loughran <stevel@apache.org> Reviewed-by: He Xiaoqiao <hexiaoqiao@apache.org> Signed-off-by: Shilun Fan <slfan1989@apache.org>
1 parent f38d707 commit 06d36f5

File tree

392 files changed

+32897
-26930
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

392 files changed

+32897
-26930
lines changed

‎LICENSE-binary‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,17 @@ org.xerial.snappy:snappy-java:1.1.10.4
363363
org.yaml:snakeyaml:2.0
364364
org.wildfly.openssl:wildfly-openssl:2.1.4.Final
365365
software.amazon.awssdk:bundle:2.25.53
366-
366+
org.glassfish.jersey.core:jersey-common:2.46
367+
org.glassfish.jersey.core:jersey-server:2.46
368+
org.glassfish.jersey.inject:jersey-hk2:2.46
369+
org.glassfish.jersey.core:jersey-client:2.46
370+
org.glassfish.jersey.test-framework:jersey-test-framework-core:2.46
371+
org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:2.46
372+
org.glassfish.jersey.containers:jersey-container-servlet:2.46
373+
org.glassfish.jersey.containers:jersey-container-servlet-core:2.46
374+
org.glassfish.jersey.media:jersey-media-json-jettison:2.46
375+
org.glassfish.jersey.media:jersey-media-jaxb:2.46
376+
net.jodah:failsafe:2.4.4
367377

368378
--------------------------------------------------------------------------------
369379
This product bundles various third-party components under other open source
@@ -498,12 +508,6 @@ org.slf4j:slf4j-reload4j:1.7.36
498508
CDDL 1.1 + GPLv2 with classpath exception
499509
-----------------------------------------
500510

501-
com.github.pjfanning:jersey-json:1.22.0
502-
com.sun.jersey:jersey-client:1.19.4
503-
com.sun.jersey:jersey-core:1.19.4
504-
com.sun.jersey:jersey-guice:1.19.4
505-
com.sun.jersey:jersey-server:1.19.4
506-
com.sun.jersey:jersey-servlet:1.19.4
507511
com.sun.xml.bind:jaxb-impl:2.2.3-1
508512
javax.annotation:javax.annotation-api:1.3.2
509513
javax.cache:cache-api:1.1.1
@@ -513,13 +517,23 @@ javax.websocket:javax.websocket-api:1.0
513517
javax.ws.rs:jsr311-api:1.1.1
514518
javax.xml.bind:jaxb-api:2.2.11
515519

520+
Eclipse Distribution License (EDL) 1.0
521+
--------------------------
522+
523+
jakarta.xml.bind:jakarta.xml.bind-api:2.3.3
516524

517525
Eclipse Public License 1.0
518526
--------------------------
519527

520528
junit:junit:4.13.2
521529
org.jacoco:org.jacoco.agent:0.8.5
522530

531+
Eclipse Public License (EPL) 2.0
532+
--------------------------
533+
534+
jakarta.ws.rs-api:jakarta.ws.rs-api:2.1.6
535+
jakarta.servlet.jsp:jakarta.servlet.jsp-api:2.3.6
536+
jakarta.servlet:jakarta.servlet-api:4.0.4
523537

524538

525539
HSQL License

‎hadoop-client-modules/hadoop-client-check-invariants/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@
8888
<exclude>ch.qos.reload4j:reload4j</exclude>
8989
<!-- Leave javax annotations we need exposed -->
9090
<exclude>com.google.code.findbugs:jsr305</exclude>
91+
<exclude>jakarta.annotation:jakarta.annotation-api</exclude>
92+
<exclude>org.glassfish.jersey:*</exclude>
9193
<!-- Leave bouncycastle unshaded because it's signed with a special Oracle certificate so it can be a custom JCE security provider -->
9294
<exclude>org.bouncycastle:*</exclude>
9395
<!-- Leave snappy that includes native methods which cannot be relocated. -->

‎hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,11 @@ allowed_expr+="|^krb5_udp-template.conf$"
7171
allowed_expr+="|^jetty-dir.css$"
7272
# Snappy java is native library. We cannot relocate it to under org/apache/hadoop.
7373
allowed_expr+="|^org/xerial/"
74-
74+
# Comes from jersey, not sure if relocatable.
75+
allowed_expr+="|^jersey"
76+
# Comes from jakarta, not sure if relocatable.
77+
allowed_expr+="|^javax"
78+
allowed_expr+="|^javassist"
7579
allowed_expr+=")"
7680
declare -i bad_artifacts=0
7781
declare -a bad_contents

‎hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
<!-- Leave snappy that includes native methods which cannot be relocated. -->
102102
<exclude>org.xerial.snappy:*</exclude>
103103
<exclude>org.ehcache:*</exclude>
104+
<exclude>org.glassfish.jersey:*</exclude>
104105
</excludes>
105106
</banTransitiveDependencies>
106107
<banDuplicateClasses>

‎hadoop-client-modules/hadoop-client-integration-tests/pom.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,8 @@
8686
<scope>test</scope>
8787
</dependency>
8888
<dependency>
89-
<groupId>javax.xml.bind</groupId>
90-
<artifactId>jaxb-api</artifactId>
91-
<scope>test</scope>
92-
</dependency>
93-
<dependency>
94-
<groupId>javax.activation</groupId>
95-
<artifactId>activation</artifactId>
96-
<version>1.1.1</version>
89+
<groupId>jakarta.xml.bind</groupId>
90+
<artifactId>jakarta.xml.bind-api</artifactId>
9791
<scope>test</scope>
9892
</dependency>
9993
</dependencies>

‎hadoop-client-modules/hadoop-client-minicluster/pom.xml‎

Lines changed: 19 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,10 @@
344344
<groupId>org.ow2.asm</groupId>
345345
<artifactId>asm-commons</artifactId>
346346
</exclusion>
347+
<exclusion>
348+
<groupId>org.ow2.asm</groupId>
349+
<artifactId>asm-commons</artifactId>
350+
</exclusion>
347351
</exclusions>
348352
</dependency>
349353
<!-- Add optional runtime dependency on the in-development timeline server module
@@ -415,72 +419,20 @@
415419
<!-- Skip commons-logging:commons-logging-api because it looks like nothing actually included it -->
416420
<!-- Skip jetty-util because it's in client -->
417421
<dependency>
418-
<groupId>com.sun.jersey</groupId>
419-
<artifactId>jersey-core</artifactId>
422+
<groupId>org.glassfish.jersey.core</groupId>
423+
<artifactId>jersey-common</artifactId>
420424
<optional>true</optional>
421-
<exclusions>
422-
<exclusion>
423-
<groupId>javax.ws.rs</groupId>
424-
<artifactId>jsr311-api</artifactId>
425-
</exclusion>
426-
</exclusions>
427425
</dependency>
428426
<dependency>
429-
<groupId>com.sun.jersey</groupId>
430-
<artifactId>jersey-client</artifactId>
427+
<groupId>org.glassfish.jersey.core</groupId>
428+
<artifactId>jersey-client</artifactId>
431429
<optional>true</optional>
432430
</dependency>
433431
<dependency>
434-
<groupId>com.github.pjfanning</groupId>
435-
<artifactId>jersey-json</artifactId>
436-
<optional>true</optional>
437-
<exclusions>
438-
<exclusion>
439-
<groupId>com.fasterxml.jackson.core</groupId>
440-
<artifactId>jackson-core</artifactId>
441-
</exclusion>
442-
<exclusion>
443-
<groupId>com.fasterxml.jackson.core</groupId>
444-
<artifactId>jackson-databind</artifactId>
445-
</exclusion>
446-
<exclusion>
447-
<groupId>com.fasterxml.jackson.jaxrs</groupId>
448-
<artifactId>jackson-jaxrs-json-provider</artifactId>
449-
</exclusion>
450-
<exclusion>
451-
<groupId>javax.xml.bind</groupId>
452-
<artifactId>jaxb-api</artifactId>
453-
</exclusion>
454-
<exclusion>
455-
<groupId>org.codehaus.jettison</groupId>
456-
<artifactId>jettison</artifactId>
457-
</exclusion>
458-
</exclusions>
459-
</dependency>
460-
<dependency>
461-
<groupId>com.sun.jersey</groupId>
432+
<groupId>org.glassfish.jersey.core</groupId>
462433
<artifactId>jersey-server</artifactId>
463434
<optional>true</optional>
464435
</dependency>
465-
<dependency>
466-
<groupId>com.sun.jersey</groupId>
467-
<artifactId>jersey-servlet</artifactId>
468-
<optional>true</optional>
469-
<exclusions>
470-
<exclusion>
471-
<groupId>javax.servlet</groupId>
472-
<artifactId>servlet-api</artifactId>
473-
</exclusion>
474-
<exclusion>
475-
<groupId>javax.enterprise</groupId>
476-
<artifactId>cdi-api</artifactId>
477-
</exclusion>
478-
<exclusion>
479-
<groupId>ch.qos.cal10n</groupId>
480-
<artifactId>cal10n-api</artifactId>
481-
</exclusion>
482-
</exclusions>
483-
</dependency>
484436
<!-- skip org.apache.avro:avro-ipc because it doesn't look like hadoop-common actually uses it -->
485437
<dependency>
486438
<groupId>net.sf.kosmosfs</groupId>
@@ -624,23 +576,16 @@
624576
</exclusions>
625577
</dependency>
626578
<dependency>
627-
<groupId>com.sun.jersey.jersey-test-framework</groupId>
628-
<artifactId>jersey-test-framework-grizzly2</artifactId>
579+
<groupId>org.glassfish.jersey.test-framework</groupId>
580+
<artifactId>jersey-test-framework-core</artifactId>
629581
<optional>true</optional>
630-
<exclusions>
631-
<!-- excluding because client already has the tomcat version -->
632-
<exclusion>
633-
<groupId>org.glassfish</groupId>
634-
<artifactId>javax.servlet</artifactId>
635-
</exclusion>
636-
</exclusions>
637582
</dependency>
638-
<!-- skipping jersey-server because it's above -->
639583
<dependency>
640-
<groupId>com.sun.jersey.contribs</groupId>
641-
<artifactId>jersey-guice</artifactId>
584+
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
585+
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
642586
<optional>true</optional>
643587
</dependency>
588+
<!-- skipping jersey-server because it's above -->
644589
<!-- skipping guice-servlet because it's above -->
645590
<!-- skipping avro because it is in client via hadoop-common -->
646591
<!-- skipping jersey-core because it's above -->
@@ -709,6 +654,10 @@
709654
<exclude>org.bouncycastle:*</exclude>
710655
<!-- Leave snappy that includes native methods which cannot be relocated. -->
711656
<exclude>org.xerial.snappy:*</exclude>
657+
<exclude>org.glassfish.jersey:*</exclude>
658+
<exclude>org.hamcrest:*</exclude>
659+
<exclude>aopalliance:*</exclude>
660+
<exclude>javassist:*</exclude>
712661
</excludes>
713662
</artifactSet>
714663
<filters>
@@ -729,24 +678,6 @@
729678
<!-- Since runtime has classes for these jars, we exclude them.
730679
We still want the java services api files, since those were excluded in runtime
731680
-->
732-
<filter>
733-
<artifact>com.sun.jersey:jersey-client</artifact>
734-
<excludes>
735-
<exclude>**/*.class</exclude>
736-
</excludes>
737-
</filter>
738-
<filter>
739-
<artifact>com.sun.jersey:jersey-core</artifact>
740-
<excludes>
741-
<exclude>**/*.class</exclude>
742-
</excludes>
743-
</filter>
744-
<filter>
745-
<artifact>com.sun.jersey:jersey-servlet</artifact>
746-
<excludes>
747-
<exclude>**/*.class</exclude>
748-
</excludes>
749-
</filter>
750681
<filter>
751682
<artifact>org.apache.hadoop:hadoop-mapreduce-client-jobclient:*</artifact>
752683
<excludes>
@@ -760,6 +691,7 @@
760691
<excludes>
761692
<exclude>META-INF/versions/9/module-info.class</exclude>
762693
<exclude>META-INF/versions/11/module-info.class</exclude>
694+
<exclude>META-INF/versions/9/javax/xml/bind/ModuleUtil.class</exclude>
763695
</excludes>
764696
</filter>
765697

‎hadoop-client-modules/hadoop-client-runtime/pom.xml‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,24 @@
159159
<exclude>org.xerial.snappy:*</exclude>
160160
<!-- leave out kotlin classes -->
161161
<exclude>org.jetbrains.kotlin:*</exclude>
162+
<exclude>org.glassfish.jersey.test-framework:*</exclude>
163+
<exclude>org.glassfish.jersey.media:*</exclude>
164+
<exclude>org.glassfish.jersey.containers:*</exclude>
165+
<exclude>org.glassfish.jersey.test-framework.providers:*</exclude>
166+
<exclude>org.glassfish.hk2:*</exclude>
167+
<exclude>org.glassfish.jersey.inject:*</exclude>
168+
<exclude>org.glassfish.grizzly:*</exclude>
169+
<exclude>org.glassfish.jersey.core:*</exclude>
170+
<exclude>org.glassfish.hk2.external:*</exclude>
171+
<exclude>org.glassfish.jaxb:*</exclude>
172+
<exclude>jakarta.ws.rs:*</exclude>
173+
<exclude>jakarta.annotation:*</exclude>
174+
<exclude>jakarta.validation:*</exclude>
175+
<exclude>jakarta.servlet:*</exclude>
176+
<exclude>javax.annotation:*</exclude>
177+
<exclude>org.hamcrest:*</exclude>
178+
<exclude>aopalliance:*</exclude>
179+
<exclude>javassist:*</exclude>
162180
</excludes>
163181
</artifactSet>
164182
<filters>
@@ -184,13 +202,6 @@
184202
<exclude>org/apache/jasper/compiler/Localizer.class</exclude>
185203
</excludes>
186204
</filter>
187-
<!-- We rely on jersey for our web interfaces. We want to use its java services stuff only internal to jersey -->
188-
<filter>
189-
<artifact>com.sun.jersey:*</artifact>
190-
<excludes>
191-
<exclude>META-INF/services/javax.*</exclude>
192-
</excludes>
193-
</filter>
194205
<filter>
195206
<!-- skip french localization -->
196207
<artifact>org.apache.commons:commons-math3</artifact>
@@ -247,6 +258,7 @@
247258
<exclude>META-INF/versions/9/module-info.class</exclude>
248259
<exclude>META-INF/versions/11/module-info.class</exclude>
249260
<exclude>META-INF/versions/18/module-info.class</exclude>
261+
<exclude>META-INF/versions/9/javax/xml/bind/ModuleUtil.class</exclude>
250262
</excludes>
251263
</filter>
252264

0 commit comments

Comments
 (0)