Skip to content

Commit 5911924

Browse files
senivamsenivam
authored
merge of the current 4.0 into the 4.0.JPMS
2 parents ef7f0ac + ec82c7a commit 5911924

File tree

294 files changed

+7943
-1719
lines changed

Some content is hidden

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

294 files changed

+7943
-1719
lines changed

‎.github/workflows/validate.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,20 +68,14 @@ jobs:
6868
runs-on: ubuntu-latest
6969
steps:
7070
- uses: actions/checkout@v4
71-
- name: Set up JDK 17
72-
uses: actions/[email protected]
73-
with:
74-
distribution: ${{ env.JAVA_DISTRO }}
75-
java-version: 17
76-
cache: maven
77-
- name: Build JDK17+ required modules
78-
run: mvn -B -U -V clean install -DskipTests -pl :jersey-helidon-connector -am
7971
- name: Set up JDK ${{ env.JAVA_VERSION }}
8072
uses: actions/[email protected]
8173
with:
8274
distribution: ${{ env.JAVA_DISTRO }}
8375
java-version: ${{ env.JAVA_VERSION }}
8476
cache: maven
77+
- name: Build JDK21+ required modules
78+
run: mvn -B -U -V clean install -DskipTests -pl :jersey-helidon-connector -am
8579
- name: Build ApiDocs
8680
run: etc/scripts/apidocs.sh
8781
archetypes:

‎NOTICE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Bean Validation API 3.1.0
4747
* Copyright: 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
4848
* by the @authors tag.
4949

50-
Hibernate Validator CDI, 8.0.1.Final
50+
Hibernate Validator CDI, 8.0.2.Final
5151
* License: Apache License, 2.0
5252
* Project: https://beanvalidation.org/
5353
* Repackaged in org.glassfish.jersey.server.validation.internal.hibernate
@@ -95,7 +95,7 @@ KineticJS, v4.7.1
9595
* Project: http://www.kineticjs.com, https://github.com/ericdrowell/KineticJS
9696
* Copyright: Eric Rowell
9797

98-
org.objectweb.asm Version 9.7.1
98+
org.objectweb.asm Version 9.8
9999
* License: Modified BSD (https://asm.ow2.io/license.html)
100100
* Copyright (c) 2000-2011 INRIA, France Telecom. All rights reserved.
101101

‎archetypes/jersey-quickstart-webapp/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@
4141
<dependencies>
4242
<dependency>
4343
<groupId>org.glassfish.jersey.containers</groupId>
44-
<artifactId>jersey-container-servlet-core</artifactId>
45-
<!-- use the following artifactId if you don't need servlet 2.x compatibility -->
46-
<!-- artifactId>jersey-container-servlet</artifactId -->
44+
<artifactId>jersey-container-servlet</artifactId>
4745
</dependency>
4846
<dependency>
4947
<groupId>org.glassfish.jersey.inject</groupId>

‎archetypes/jersey-quickstart-webapp/src/main/resources/archetype-resources/src/main/java/module-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module ${package}.module {
22
requires jakarta.ws.rs;
33

4-
requires org.glassfish.jersey.container.servlet.core;
4+
requires org.glassfish.jersey.container.servlet;
55
requires org.glassfish.jersey.inject.hk2;
66

77
exports ${package};

‎bom/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,6 @@
133133
<artifactId>jersey-container-servlet</artifactId>
134134
<version>${project.version}</version>
135135
</dependency>
136-
<dependency>
137-
<groupId>org.glassfish.jersey.containers</groupId>
138-
<artifactId>jersey-container-servlet-core</artifactId>
139-
<version>${project.version}</version>
140-
</dependency>
141136
<dependency>
142137
<groupId>org.glassfish.jersey.containers.glassfish</groupId>
143138
<artifactId>jersey-gf-ejb</artifactId>

‎bundles/apidocs/pom.xml‎

Lines changed: 131 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,134 @@
2929
<name>jersey-bundles-apidocs</name>
3030
<packaging>jar</packaging>
3131

32+
<description>
33+
Eclipse Jersey API Documentation Bundle.
34+
</description>
35+
<url>https://projects.eclipse.org/projects/ee4j.jersey</url>
36+
<licenses>
37+
<license>
38+
<name>EPL 2.0</name>
39+
<url>http://www.eclipse.org/legal/epl-2.0</url>
40+
<distribution>repo</distribution>
41+
<comments>Except for 3rd content and examples.
42+
See also https://github.com/eclipse-ee4j/jersey/blob/master/NOTICE.md</comments>
43+
</license>
44+
<license>
45+
<name>GPL2 w/ CPE</name>
46+
<url>https://www.gnu.org/software/classpath/license.html</url>
47+
<distribution>repo</distribution>
48+
<comments>Except for 3rd content and examples.
49+
See also https://github.com/eclipse-ee4j/jersey/blob/master/NOTICE.md</comments>
50+
</license>
51+
<license>
52+
<name>EDL 1.0</name>
53+
<url>http://www.eclipse.org/org/documents/edl-v10.php</url>
54+
<distribution>repo</distribution>
55+
<comments>The examples except bookstore-webapp example</comments>
56+
</license>
57+
<license>
58+
<name>BSD 2-Clause</name>
59+
<url>https://opensource.org/licenses/BSD-2-Clause</url>
60+
<distribution>repo</distribution>
61+
<comments>The bookstore-webapp example</comments>
62+
</license>
63+
<license>
64+
<name>Apache License, 2.0</name>
65+
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
66+
<distribution>repo</distribution>
67+
<comments>Google Guava @ org.glassfish.jersey.internal.guava,
68+
Dropwizard Monitoring inspired classes @ org.glassfish.jersey.server.internal.monitoring.core,
69+
Hibernate Validation classes @ org.glassfish.jersey.server.validation.internal.hibernate, and
70+
Jackson JAX-RS Providers @ org.glassfish.jersey.jackson.internal.jackson.jaxrs</comments>
71+
</license>
72+
<license>
73+
<name>Public Domain</name>
74+
<url>https://creativecommons.org/publicdomain/zero/1.0/</url>
75+
<distribution>repo</distribution>
76+
<comments>JSR-166 Extension to JEP 266 @ org.glassfish.jersey.internal.jsr166</comments>
77+
</license>
78+
<license>
79+
<name>Modified BSD</name>
80+
<url>https://asm.ow2.io/license.html</url>
81+
<distribution>repo</distribution>
82+
<comments>ASM @ jersey.repackaged.org.objectweb.asm</comments>
83+
</license>
84+
<license>
85+
<name>jQuery license</name>
86+
<url>jquery.org/license</url>
87+
<distribution>repo</distribution>
88+
<comments>jQuery v1.12.4</comments>
89+
</license>
90+
<license>
91+
<name>MIT license</name>
92+
<url>http://www.opensource.org/licenses/mit-license.php</url>
93+
<distribution>repo</distribution>
94+
<comments>AngularJS, Bootstrap v3.3.7,
95+
jQuery Barcode plugin 0.3, KineticJS v4.7.1</comments>
96+
</license>
97+
<license>
98+
<name>W3C license</name>
99+
<url>https://www.w3.org/Consortium/Legal/copyright-documents-19990405</url>
100+
<distribution>repo</distribution>
101+
<comments>Content of core-server/etc</comments>
102+
</license>
103+
</licenses>
104+
<scm>
105+
<connection>scm:git:[email protected]:jersey/jersey.git</connection>
106+
<developerConnection>scm:git:[email protected]:eclipse-ee4j/jersey.git</developerConnection>
107+
<url>https://github.com/eclipse-ee4j/jersey</url>
108+
<tag>HEAD</tag>
109+
</scm>
110+
<developers>
111+
<developer>
112+
<name>Jorge Bescos Gascon</name>
113+
<organization>Oracle Corporation</organization>
114+
<organizationUrl>http://www.oracle.com/</organizationUrl>
115+
</developer>
116+
<developer>
117+
<name>Lukas Jungmann</name>
118+
<organization>Oracle Corporation</organization>
119+
<organizationUrl>http://www.oracle.com/</organizationUrl>
120+
</developer>
121+
<developer>
122+
<name>Dmitry Kornilov</name>
123+
<organization>Oracle Corporation</organization>
124+
<organizationUrl>http://www.oracle.com/</organizationUrl>
125+
<url>https://dmitrykornilov.net</url>
126+
</developer>
127+
<developer>
128+
<name>David Kral</name>
129+
<organization>Oracle Corporation</organization>
130+
<organizationUrl>http://www.oracle.com/</organizationUrl>
131+
</developer>
132+
<developer>
133+
<name>Tomas Kraus</name>
134+
<organization>Oracle Corporation</organization>
135+
<organizationUrl>http://www.oracle.com/</organizationUrl>
136+
</developer>
137+
<developer>
138+
<name>Tomas Langer</name>
139+
<organization>Oracle Corporation</organization>
140+
<organizationUrl>http://www.oracle.com/</organizationUrl>
141+
</developer>
142+
<developer>
143+
<name>Maxim Nesen</name>
144+
<organization>Oracle Corporation</organization>
145+
<organizationUrl>http://www.oracle.com/</organizationUrl>
146+
</developer>
147+
<developer>
148+
<name>Santiago Pericas-Geertsen</name>
149+
<organization>Oracle Corporation</organization>
150+
<organizationUrl>http://www.oracle.com/</organizationUrl>
151+
</developer>
152+
<developer>
153+
<name>Jan Supol</name>
154+
<organization>Oracle Corporation</organization>
155+
<organizationUrl>http://www.oracle.com/</organizationUrl>
156+
<url>http://blog.supol.info</url>
157+
</developer>
158+
</developers>
159+
32160
<dependencies>
33161
<!-- CORE -->
34162
<dependency>
@@ -57,6 +185,7 @@
57185
<dependency>
58186
<groupId>org.osgi</groupId>
59187
<artifactId>org.osgi.core</artifactId>
188+
<version>${osgi.version}</version>
60189
</dependency>
61190
<!-- CONNECTORS -->
62191
<dependency>
@@ -106,16 +235,12 @@
106235
<artifactId>jersey-container-servlet</artifactId>
107236
<version>${project.version}</version>
108237
</dependency>
109-
<dependency>
110-
<groupId>org.glassfish.jersey.containers</groupId>
111-
<artifactId>jersey-container-servlet-core</artifactId>
112-
<version>${project.version}</version>
113-
</dependency>
114238
<!-- need to explicitly include the servlet dependency here
115239
as it is scoped as provided in the jersey-servet modules -->
116240
<dependency>
117241
<groupId>jakarta.persistence</groupId>
118242
<artifactId>jakarta.persistence-api</artifactId>
243+
<version>${jakarta.persistence.version}</version>
119244
</dependency>
120245
<dependency>
121246
<groupId>jakarta.servlet</groupId>
@@ -175,6 +300,7 @@
175300
<dependency>
176301
<groupId>com.fasterxml.jackson.module</groupId>
177302
<artifactId>jackson-module-jaxb-annotations</artifactId>
303+
<version>${jackson.version}</version>
178304
<exclusions>
179305
<exclusion>
180306
<groupId>jakarta.xml.bind</groupId>

‎bundles/examples/pom.xml‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,134 @@
3131
<name>jersey-bundles-examples</name>
3232
<packaging>pom</packaging>
3333

34+
<description>
35+
Eclipse Jersey Examples Bundle.
36+
</description>
37+
<url>https://projects.eclipse.org/projects/ee4j.jersey</url>
38+
<licenses>
39+
<license>
40+
<name>EPL 2.0</name>
41+
<url>http://www.eclipse.org/legal/epl-2.0</url>
42+
<distribution>repo</distribution>
43+
<comments>Except for 3rd content and examples.
44+
See also https://github.com/eclipse-ee4j/jersey/blob/master/NOTICE.md</comments>
45+
</license>
46+
<license>
47+
<name>GPL2 w/ CPE</name>
48+
<url>https://www.gnu.org/software/classpath/license.html</url>
49+
<distribution>repo</distribution>
50+
<comments>Except for 3rd content and examples.
51+
See also https://github.com/eclipse-ee4j/jersey/blob/master/NOTICE.md</comments>
52+
</license>
53+
<license>
54+
<name>EDL 1.0</name>
55+
<url>http://www.eclipse.org/org/documents/edl-v10.php</url>
56+
<distribution>repo</distribution>
57+
<comments>The examples except bookstore-webapp example</comments>
58+
</license>
59+
<license>
60+
<name>BSD 2-Clause</name>
61+
<url>https://opensource.org/licenses/BSD-2-Clause</url>
62+
<distribution>repo</distribution>
63+
<comments>The bookstore-webapp example</comments>
64+
</license>
65+
<license>
66+
<name>Apache License, 2.0</name>
67+
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
68+
<distribution>repo</distribution>
69+
<comments>Google Guava @ org.glassfish.jersey.internal.guava,
70+
Dropwizard Monitoring inspired classes @ org.glassfish.jersey.server.internal.monitoring.core,
71+
Hibernate Validation classes @ org.glassfish.jersey.server.validation.internal.hibernate, and
72+
Jackson JAX-RS Providers @ org.glassfish.jersey.jackson.internal.jackson.jaxrs</comments>
73+
</license>
74+
<license>
75+
<name>Public Domain</name>
76+
<url>https://creativecommons.org/publicdomain/zero/1.0/</url>
77+
<distribution>repo</distribution>
78+
<comments>JSR-166 Extension to JEP 266 @ org.glassfish.jersey.internal.jsr166</comments>
79+
</license>
80+
<license>
81+
<name>Modified BSD</name>
82+
<url>https://asm.ow2.io/license.html</url>
83+
<distribution>repo</distribution>
84+
<comments>ASM @ jersey.repackaged.org.objectweb.asm</comments>
85+
</license>
86+
<license>
87+
<name>jQuery license</name>
88+
<url>jquery.org/license</url>
89+
<distribution>repo</distribution>
90+
<comments>jQuery v1.12.4</comments>
91+
</license>
92+
<license>
93+
<name>MIT license</name>
94+
<url>http://www.opensource.org/licenses/mit-license.php</url>
95+
<distribution>repo</distribution>
96+
<comments>AngularJS, Bootstrap v3.3.7,
97+
jQuery Barcode plugin 0.3, KineticJS v4.7.1</comments>
98+
</license>
99+
<license>
100+
<name>W3C license</name>
101+
<url>https://www.w3.org/Consortium/Legal/copyright-documents-19990405</url>
102+
<distribution>repo</distribution>
103+
<comments>Content of core-server/etc</comments>
104+
</license>
105+
</licenses>
106+
<scm>
107+
<connection>scm:git:[email protected]:jersey/jersey.git</connection>
108+
<developerConnection>scm:git:[email protected]:eclipse-ee4j/jersey.git</developerConnection>
109+
<url>https://github.com/eclipse-ee4j/jersey</url>
110+
<tag>HEAD</tag>
111+
</scm>
112+
<developers>
113+
<developer>
114+
<name>Jorge Bescos Gascon</name>
115+
<organization>Oracle Corporation</organization>
116+
<organizationUrl>http://www.oracle.com/</organizationUrl>
117+
</developer>
118+
<developer>
119+
<name>Lukas Jungmann</name>
120+
<organization>Oracle Corporation</organization>
121+
<organizationUrl>http://www.oracle.com/</organizationUrl>
122+
</developer>
123+
<developer>
124+
<name>Dmitry Kornilov</name>
125+
<organization>Oracle Corporation</organization>
126+
<organizationUrl>http://www.oracle.com/</organizationUrl>
127+
<url>https://dmitrykornilov.net</url>
128+
</developer>
129+
<developer>
130+
<name>David Kral</name>
131+
<organization>Oracle Corporation</organization>
132+
<organizationUrl>http://www.oracle.com/</organizationUrl>
133+
</developer>
134+
<developer>
135+
<name>Tomas Kraus</name>
136+
<organization>Oracle Corporation</organization>
137+
<organizationUrl>http://www.oracle.com/</organizationUrl>
138+
</developer>
139+
<developer>
140+
<name>Tomas Langer</name>
141+
<organization>Oracle Corporation</organization>
142+
<organizationUrl>http://www.oracle.com/</organizationUrl>
143+
</developer>
144+
<developer>
145+
<name>Maxim Nesen</name>
146+
<organization>Oracle Corporation</organization>
147+
<organizationUrl>http://www.oracle.com/</organizationUrl>
148+
</developer>
149+
<developer>
150+
<name>Santiago Pericas-Geertsen</name>
151+
<organization>Oracle Corporation</organization>
152+
<organizationUrl>http://www.oracle.com/</organizationUrl>
153+
</developer>
154+
<developer>
155+
<name>Jan Supol</name>
156+
<organization>Oracle Corporation</organization>
157+
<organizationUrl>http://www.oracle.com/</organizationUrl>
158+
<url>http://blog.supol.info</url>
159+
</developer>
160+
</developers>
161+
34162
<dependencies>
35163
<!--
36164
<dependency>

0 commit comments

Comments
 (0)