Skip to content

Commit 31797bb

Browse files
senivamsenivam
committed
Merge remote-tracking branch 'upstream/4.0' into 'upstream/4.0.JPMS'
Signed-off-by: Maxim Nesen <[email protected]>
2 parents 9a5db23 + 9761e25 commit 31797bb

File tree

536 files changed

+17176
-1110
lines changed

Some content is hidden

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

536 files changed

+17176
-1110
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@ nb-configuration.xml
3131
# Maven plugins noise
3232
dependency-reduced-pom.xml
3333
pom.xml.versionsBackup
34+
.flattened-pom.xml

‎NOTICE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Javassist Version 3.30.2-GA
7070
* Project: http://www.javassist.org/
7171
* Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.
7272

73-
Jackson JAX-RS Providers Version 2.18.0
73+
Jackson JAX-RS Providers Version 2.19.1
7474
* License: Apache License, 2.0
7575
* Project: https://github.com/FasterXML/jackson-jaxrs-providers
7676
* Copyright: (c) 2009-2024 FasterXML, LLC. All rights reserved unless otherwise indicated.
@@ -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.8
98+
org.objectweb.asm Version 9.9
9999
* License: Modified BSD (https://asm.ow2.io/license.html)
100100
* Copyright (c) 2000-2011 INRIA, France Telecom. All rights reserved.
101101

‎archetypes/jersey-example-java8-webapp/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.glassfish.jersey.archetypes</groupId>
2424
<artifactId>project</artifactId>
25-
<version>4.0.99-SNAPSHOT</version>
25+
<version>${revision}</version>
2626
</parent>
2727

2828
<artifactId>jersey-example-java8-webapp</artifactId>

‎archetypes/jersey-heroku-webapp/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.glassfish.jersey.archetypes</groupId>
2424
<artifactId>project</artifactId>
25-
<version>4.0.99-SNAPSHOT</version>
25+
<version>${revision}</version>
2626
</parent>
2727
<packaging>maven-archetype</packaging>
2828

‎archetypes/jersey-quickstart-grizzly2/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.glassfish.jersey.archetypes</groupId>
2323
<artifactId>project</artifactId>
24-
<version>4.0.99-SNAPSHOT</version>
24+
<version>${revision}</version>
2525
</parent>
2626
<artifactId>jersey-quickstart-grizzly2</artifactId>
2727
<packaging>maven-archetype</packaging>

‎archetypes/jersey-quickstart-webapp/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.glassfish.jersey.archetypes</groupId>
2323
<artifactId>project</artifactId>
24-
<version>4.0.99-SNAPSHOT</version>
24+
<version>${revision}</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727
<packaging>maven-archetype</packaging>

‎archetypes/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.glassfish.jersey</groupId>
2424
<artifactId>project</artifactId>
25-
<version>4.0.99-SNAPSHOT</version>
25+
<version>${revision}</version>
2626
</parent>
2727

2828
<groupId>org.glassfish.jersey.archetypes</groupId>

‎bom/pom.xml‎

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@
3030

3131
<groupId>org.glassfish.jersey</groupId>
3232
<artifactId>jersey-bom</artifactId>
33-
<version>4.0.99-SNAPSHOT</version>
33+
<version>${revision}</version>
3434
<packaging>pom</packaging>
3535
<name>jersey-bom</name>
36+
<properties>
37+
<revision>4.0.99-SNAPSHOT</revision>
38+
</properties>
3639

3740
<description>Jersey Bill of Materials (BOM)</description>
3841

@@ -103,6 +106,11 @@
103106
<artifactId>jersey-container-jetty-http2</artifactId>
104107
<version>${project.version}</version>
105108
</dependency>
109+
<dependency>
110+
<groupId>org.glassfish.jersey.containers</groupId>
111+
<artifactId>jersey-container-helidon-http</artifactId>
112+
<version>${project.version}</version>
113+
</dependency>
106114
<dependency>
107115
<groupId>org.glassfish.jersey.containers</groupId>
108116
<artifactId>jersey-container-grizzly2-http</artifactId>
@@ -143,6 +151,11 @@
143151
<artifactId>jersey-bean-validation</artifactId>
144152
<version>${project.version}</version>
145153
</dependency>
154+
<dependency>
155+
<groupId>org.glassfish.jersey.ext</groupId>
156+
<artifactId>jersey-constants</artifactId>
157+
<version>${project.version}</version>
158+
</dependency>
146159
<dependency>
147160
<groupId>org.glassfish.jersey.ext</groupId>
148161
<artifactId>jersey-entity-filtering</artifactId>
@@ -354,6 +367,11 @@
354367
<artifactId>jersey-test-framework-provider-external</artifactId>
355368
<version>${project.version}</version>
356369
</dependency>
370+
<dependency>
371+
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
372+
<artifactId>jersey-test-framework-provider-helidon</artifactId>
373+
<version>${project.version}</version>
374+
</dependency>
357375
<dependency>
358376
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
359377
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
@@ -400,6 +418,31 @@
400418
<version>2.4</version>
401419
<inherited>true</inherited>
402420
</plugin>
421+
<plugin>
422+
<groupId>org.codehaus.mojo</groupId>
423+
<artifactId>flatten-maven-plugin</artifactId>
424+
<version>1.7.2</version>
425+
<configuration>
426+
<updatePomFile>true</updatePomFile>
427+
<flattenMode>resolveCiFriendliesOnly</flattenMode>
428+
</configuration>
429+
<executions>
430+
<execution>
431+
<id>flatten</id>
432+
<phase>process-resources</phase>
433+
<goals>
434+
<goal>flatten</goal>
435+
</goals>
436+
</execution>
437+
<execution>
438+
<id>flatten.clean</id>
439+
<phase>clean</phase>
440+
<goals>
441+
<goal>clean</goal>
442+
</goals>
443+
</execution>
444+
</executions>
445+
</plugin>
403446
</plugins>
404447
</build>
405448

‎bundles/apidocs/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.glassfish.jersey.bundles</groupId>
2424
<artifactId>project</artifactId>
25-
<version>4.0.99-SNAPSHOT</version>
25+
<version>${revision}</version>
2626
</parent>
2727

2828
<artifactId>apidocs</artifactId>

‎bundles/examples/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.glassfish.jersey.bundles</groupId>
2626
<artifactId>project</artifactId>
27-
<version>4.0.99-SNAPSHOT</version>
27+
<version>${revision}</version>
2828
</parent>
2929

3030
<artifactId>jersey-examples</artifactId>

0 commit comments

Comments
 (0)