Skip to content

Commit 3b93f4d

Browse files
jansupoljansupol
authored
Stop distributing jaxrs-ri bundle (#5556)
* Stop distributing jaxrs-ri bundle update apidocs bundle Signed-off-by: jansupol <jan.supol@oracle.com>
1 parent f51e056 commit 3b93f4d

File tree

6 files changed

+27
-103
lines changed

6 files changed

+27
-103
lines changed

‎bundles/apidocs/pom.xml‎

Lines changed: 16 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -59,17 +59,6 @@
5959
<artifactId>org.osgi.core</artifactId>
6060
</dependency>
6161
<!-- CONNECTORS -->
62-
<dependency>
63-
<groupId>org.glassfish.jersey.connectors</groupId>
64-
<artifactId>jersey-apache-connector</artifactId>
65-
<version>${project.version}</version>
66-
<!--<exclusions>
67-
<exclusion>
68-
<groupId>commons-codec</groupId>
69-
<artifactId>commons-codec</artifactId>
70-
</exclusion>
71-
</exclusions>-->
72-
</dependency>
7362
<dependency>
7463
<groupId>org.glassfish.jersey.connectors</groupId>
7564
<artifactId>jersey-apache5-connector</artifactId>
@@ -129,27 +118,31 @@
129118
<artifactId>jakarta.persistence-api</artifactId>
130119
</dependency>
131120
<dependency>
132-
<groupId>org.glassfish</groupId>
133-
<artifactId>javax.servlet</artifactId>
134-
<version>3.1</version>
121+
<groupId>jakarta.servlet</groupId>
122+
<artifactId>jakarta.servlet-api</artifactId>
135123
</dependency>
136124
<dependency>
137125
<groupId>jakarta.persistence</groupId>
138126
<artifactId>jakarta.persistence-api</artifactId>
139127
</dependency>
140128
<dependency>
141129
<groupId>org.glassfish.jersey.containers</groupId>
142-
<artifactId>jersey-container-simple-http</artifactId>
130+
<artifactId>jersey-container-jdk-http</artifactId>
143131
<version>${project.version}</version>
144132
</dependency>
145133
<dependency>
146134
<groupId>org.glassfish.jersey.containers</groupId>
147-
<artifactId>jersey-container-jdk-http</artifactId>
135+
<artifactId>jersey-container-jetty-http</artifactId>
148136
<version>${project.version}</version>
149137
</dependency>
150138
<dependency>
151139
<groupId>org.glassfish.jersey.containers</groupId>
152-
<artifactId>jersey-container-jetty-http</artifactId>
140+
<artifactId>jersey-container-jetty-http2</artifactId>
141+
<version>${project.version}</version>
142+
</dependency>
143+
<dependency>
144+
<groupId>org.glassfish.jersey.containers</groupId>
145+
<artifactId>jersey-container-netty-http</artifactId>
153146
<version>${project.version}</version>
154147
</dependency>
155148
<dependency>
@@ -173,6 +166,11 @@
173166
<artifactId>jersey-media-json-binding</artifactId>
174167
<version>${project.version}</version>
175168
</dependency>
169+
<dependency>
170+
<groupId>org.glassfish.jersey.media</groupId>
171+
<artifactId>jersey-media-gson</artifactId>
172+
<version>${project.version}</version>
173+
</dependency>
176174
<dependency>
177175
<groupId>org.glassfish.jersey.media</groupId>
178176
<artifactId>jersey-media-json-jackson</artifactId>
@@ -294,10 +292,6 @@
294292
<configuration>
295293
<includeDependencySources>true</includeDependencySources>
296294
<sourceFileExcludes>
297-
<fileExclude>META-INF/versions/12/org/glassfish/jersey/wadl/doclet/*.java</fileExclude>
298-
<fileExclude>META-INF/versions/17/org/glassfish/jersey/jetty/*.java</fileExclude>
299-
<fileExclude>META-INF/versions/17/org/glassfish/jersey/jetty/connector/*.java</fileExclude>
300-
<fileExclude>META-INF/versions/17/org/glassfish/jersey/helidon/connector/*.java</fileExclude>
301295
<fileExclude>org/glassfish/jersey/helidon/connector/*.java</fileExclude>
302296
<fileExclude>org/glassfish/jersey/wadl/doclet/*.java</fileExclude>
303297
</sourceFileExcludes>
@@ -330,61 +324,4 @@
330324
</plugin>
331325
</plugins>
332326
</build>
333-
<profiles>
334-
<profile>
335-
<id>jetty11</id>
336-
<activation>
337-
<activeByDefault>true</activeByDefault>
338-
</activation>
339-
<properties>
340-
<jetty.version>${jetty11.version}</jetty.version>
341-
</properties>
342-
<dependencyManagement>
343-
<dependencies>
344-
<dependency>
345-
<groupId>org.glassfish.jersey.connectors</groupId>
346-
<artifactId>jersey-jetty11-connector</artifactId>
347-
<version>${project.version}</version>
348-
</dependency>
349-
<!--<dependency>
350-
<groupId>org.glassfish.jersey.connectors</groupId>
351-
<artifactId>jersey-jetty11-http2-connector</artifactId>
352-
<version>${project.version}</version>
353-
</dependency>
354-
<dependency>
355-
<groupId>org.glassfish.jersey.containers</groupId>
356-
<artifactId>jersey-container-jetty11-http</artifactId>
357-
<version>${project.version}</version>
358-
</dependency>
359-
<dependency>
360-
<groupId>org.glassfish.jersey.containers</groupId>
361-
<artifactId>jersey-container-jetty11-http2</artifactId>
362-
<version>${project.version}</version>
363-
</dependency>--> <!-- TODO - HTTP/2 support for Jetty 12 container -->
364-
</dependencies>
365-
</dependencyManagement>
366-
<dependencies>
367-
<dependency>
368-
<groupId>org.glassfish.jersey.connectors</groupId>
369-
<artifactId>jersey-jetty11-connector</artifactId>
370-
<version>${project.version}</version>
371-
</dependency>
372-
<!--<dependency>
373-
<groupId>org.glassfish.jersey.connectors</groupId>
374-
<artifactId>jersey-jetty11-http2-connector</artifactId>
375-
<version>${project.version}</version>
376-
</dependency>
377-
<dependency>
378-
<groupId>org.glassfish.jersey.containers</groupId>
379-
<artifactId>jersey-container-jetty11-http</artifactId>
380-
<version>${project.version}</version>
381-
</dependency>
382-
<dependency>
383-
<groupId>org.glassfish.jersey.containers</groupId>
384-
<artifactId>jersey-container-jetty11-http2</artifactId>
385-
<version>${project.version}</version>
386-
</dependency>--> <!-- TODO - HTTP/2 support for Jetty 12 container -->
387-
</dependencies>
388-
</profile>
389-
</profiles>
390327
</project>

‎bundles/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -34,9 +34,9 @@
3434

3535
<description>Jersey bundles providers umbrella project module.</description>
3636

37-
<modules>
38-
<module>jaxrs-ri</module>
39-
</modules>
37+
<!-- <modules>-->
38+
<!-- <module>jaxrs-ri</module>-->
39+
<!-- </modules>-->
4040

4141
<profiles>
4242
<profile>

‎tests/integration/jersey-5087/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@
5858
<groupId>org.glassfish.jersey.core</groupId>
5959
<artifactId>jersey-server</artifactId>
6060
</dependency>
61-
<dependency>
62-
<groupId>org.glassfish.jersey.bundles</groupId>
63-
<artifactId>jaxrs-ri</artifactId>
64-
</dependency>
6561
<dependency>
6662
<groupId>org.glassfish.jersey.connectors</groupId>
6763
<artifactId>jersey-apache5-connector</artifactId>

‎tests/integration/microprofile/config/webapp/pom.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2019, 2023 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2019, 2024 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -40,10 +40,6 @@
4040
</exclusion>
4141
</exclusions>
4242
</dependency>
43-
<dependency>
44-
<groupId>org.glassfish.jersey.bundles</groupId>
45-
<artifactId>jaxrs-ri</artifactId>
46-
</dependency>
4743
</dependencies>
4844

4945
<build>

‎tests/integration/servlet-2.5-autodiscovery-2/pom.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2011, 2023 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2011, 2024 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -33,11 +33,6 @@
3333
<description>Servlet integration test - servlet-2.5-autodiscovery-2 - auto-discovery of Bean Validation (JAX-RS bundle)</description>
3434

3535
<dependencies>
36-
<dependency>
37-
<groupId>org.glassfish.jersey.bundles</groupId>
38-
<artifactId>jaxrs-ri</artifactId>
39-
<type>jar</type>
40-
</dependency>
4136
<dependency>
4237
<groupId>org.glassfish.jersey.ext</groupId>
4338
<artifactId>jersey-bean-validation</artifactId>
@@ -48,6 +43,10 @@
4843
</exclusion>
4944
</exclusions>
5045
</dependency>
46+
<dependency>
47+
<groupId>org.glassfish.jersey.containers</groupId>
48+
<artifactId>jersey-container-servlet-core</artifactId>
49+
</dependency>
5150

5251
<dependency>
5352
<groupId>org.glassfish.jersey.test-framework.providers</groupId>

‎tests/osgi/functional/pom.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
<excludes>
7474
<exclude>**/BeanValidationTest*</exclude>
7575
<exclude>**/JsonProcessingTest*</exclude>
76+
<exclude>**/JaxRsRiBundleTest*</exclude>
7677
</excludes>
7778
</configuration>
7879
<executions>
@@ -255,11 +256,6 @@
255256
<artifactId>jersey-test-framework-core</artifactId>
256257
<scope>test</scope>
257258
</dependency>
258-
<dependency>
259-
<groupId>org.glassfish.jersey.bundles</groupId>
260-
<artifactId>jaxrs-ri</artifactId>
261-
<scope>test</scope>
262-
</dependency>
263259
<!-- <dependency>-->
264260
<!-- <groupId>org.mortbay.jetty</groupId>-->
265261
<!-- <artifactId>jetty</artifactId>-->

0 commit comments

Comments
 (0)