Skip to content

Commit

Permalink
Merge pull request #4664 from eclipse-ee4j/2.33-BRANCH
Browse files Browse the repository at this point in the history 
Technical merge of released branch 2.33-BRANCH
  • Loading branch information
@jansupol
jansupol authored Dec 18, 2020
2 parents 872daff + c24a59c commit 8fd99cf
Show file tree
Hide file tree
Showing 360 changed files with 361 additions and 361 deletions.
2 changes: 1 addition & 1 deletion archetypes/jersey-example-java8-webapp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.archetypes</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>jersey-example-java8-webapp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/jersey-heroku-webapp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.archetypes</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>
<packaging>maven-archetype</packaging>

Expand Down
2 changes: 1 addition & 1 deletion archetypes/jersey-quickstart-grizzly2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.glassfish.jersey.archetypes</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>
<artifactId>jersey-quickstart-grizzly2</artifactId>
<packaging>maven-archetype</packaging>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/jersey-quickstart-webapp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.glassfish.jersey.archetypes</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>maven-archetype</packaging>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.archetypes</groupId>
Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<groupId>org.glassfish.jersey</groupId>
<artifactId>jersey-bom</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
<packaging>pom</packaging>
<name>jersey-bom</name>

Expand Down
2 changes: 1 addition & 1 deletion bundles/apidocs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.bundles</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>apidocs</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.jersey.bundles</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>jersey-examples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/jaxrs-ri/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.bundles</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>jaxrs-ri</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.bundles</groupId>
Expand Down
2 changes: 1 addition & 1 deletion connectors/apache-connector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>jersey-apache-connector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion connectors/grizzly-connector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>jersey-grizzly-connector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion connectors/helidon-connector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.glassfish.jersey.connectors</groupId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion connectors/jdk-connector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>jersey-jdk-connector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion connectors/jetty-connector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>jersey-jetty-connector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion connectors/netty-connector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>jersey-netty-connector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion connectors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.connectors</groupId>
Expand Down
2 changes: 1 addition & 1 deletion containers/glassfish/jersey-gf-ejb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers.glassfish</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>jersey-gf-ejb</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/glassfish/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.containers.glassfish</groupId>
Expand Down
2 changes: 1 addition & 1 deletion containers/grizzly2-http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-grizzly2-http</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/grizzly2-servlet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-grizzly2-servlet</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/jdk-http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-jdk-http</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/jersey-servlet-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-servlet-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/jersey-servlet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-servlet</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/jetty-http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.glassfish.jersey.containers</groupId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-jetty-http</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/jetty-servlet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-jetty-servlet</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/netty-http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-netty-http</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.containers</groupId>
Expand Down
2 changes: 1 addition & 1 deletion containers/simple-http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-simple-http</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion docs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>
<artifactId>jersey-documentation</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion examples/assemblies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>assemblies</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/bookmark-em/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>bookmark-em</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/bookmark/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>bookmark</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/bookstore-webapp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>bookstore-webapp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/cdi-webapp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>cdi-webapp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/clipboard-programmatic/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>clipboard-programmatic</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/clipboard/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>clipboard</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/declarative-linking/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>declarative-linking</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/entity-filtering-security/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>entity-filtering-security</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/entity-filtering-selectable/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>entity-filtering-selectable</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/entity-filtering/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
<version>2.33-SNAPSHOT</version>
<version>2.34-SNAPSHOT</version>
</parent>

<artifactId>entity-filtering</artifactId>
Expand Down
Loading

0 comments on commit 8fd99cf

Please sign in to comment.