Skip to content

Commit

Permalink
Merge pull request #15 from pdudits/jersey-2.29.payara-maintenance
Browse files Browse the repository at this point in the history
Release version 2.29-p1
  • Loading branch information
pdudits authored May 6, 2019
2 parents 859136e + 212e8af commit 0cc16c9
Show file tree
Hide file tree
Showing 333 changed files with 376 additions and 372 deletions.
2 changes: 1 addition & 1 deletion archetypes/jersey-example-java8-webapp/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>jersey-example-java8-webapp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/jersey-heroku-webapp/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>
<packaging>maven-archetype</packaging>

Expand Down
2 changes: 1 addition & 1 deletion archetypes/jersey-quickstart-grizzly2/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-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
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>maven-archetype</packaging>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.archetypes</groupId>
Expand Down
8 changes: 6 additions & 2 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.5</version>
<relativePath/>
<relativePath />
</parent>

<groupId>org.glassfish.jersey</groupId>
<artifactId>jersey-bom</artifactId>
<version>2.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p1</version>
<packaging>pom</packaging>
<name>jersey-bom</name>

Expand Down Expand Up @@ -404,4 +404,8 @@
</distributionManagement>
</profile>
</profiles>

<scm>
<tag>project-2.29.payara-p1</tag>
</scm>
</project>
2 changes: 1 addition & 1 deletion bundles/apidocs/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>apidocs</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/examples/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>jersey-examples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/jaxrs-ri/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>jaxrs-ri</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.bundles</groupId>
Expand Down
2 changes: 1 addition & 1 deletion connectors/apache-connector/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>jersey-apache-connector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion connectors/grizzly-connector/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>jersey-grizzly-connector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion connectors/jdk-connector/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>jersey-jdk-connector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion connectors/jetty-connector/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>jersey-jetty-connector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion connectors/netty-connector/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>jersey-netty-connector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion connectors/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.connectors</groupId>
Expand Down
2 changes: 1 addition & 1 deletion containers/glassfish/jersey-gf-ejb/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>jersey-gf-ejb</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/glassfish/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.containers.glassfish</groupId>
Expand Down
2 changes: 1 addition & 1 deletion containers/grizzly2-http/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-grizzly2-http</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/grizzly2-servlet/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-grizzly2-servlet</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/jdk-http/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-jdk-http</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/jersey-servlet-core/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-servlet-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/jersey-servlet/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-servlet</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/jetty-http/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-jetty-http</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/jetty-servlet/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-jetty-servlet</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/netty-http/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-netty-http</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion containers/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.containers</groupId>
Expand Down
2 changes: 1 addition & 1 deletion containers/simple-http/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>jersey-container-simple-http</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core-client/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.core</groupId>
Expand Down
14 changes: 5 additions & 9 deletions core-common/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.core</groupId>
Expand Down Expand Up @@ -261,8 +261,7 @@
<phase>process-resources</phase>
<configuration>
<target>
<javac srcdir="${jsr166.sourceDirectory}" destdir="${project.build.outputDirectory}"
classpath="${project.build.outputDirectory}" includeantruntime="false" />
<javac srcdir="${jsr166.sourceDirectory}" destdir="${project.build.outputDirectory}" classpath="${project.build.outputDirectory}" includeantruntime="false" />
</target>
</configuration>
<goals>
Expand All @@ -277,8 +276,7 @@
<configuration>
<target>
<mkdir dir="${java8.build.outputDirectory}" />
<javac srcdir="${java8.sourceDirectory}" destdir="${java8.build.outputDirectory}"
classpath="${project.build.outputDirectory}" includeantruntime="false" />
<javac srcdir="${java8.sourceDirectory}" destdir="${java8.build.outputDirectory}" classpath="${project.build.outputDirectory}" includeantruntime="false" />
</target>
</configuration>
<goals>
Expand Down Expand Up @@ -325,8 +323,7 @@
<phase>process-resources</phase>
<configuration>
<target>
<javac srcdir="${jsr166.sourceDirectory}" destdir="${project.build.outputDirectory}"
classpath="${project.build.outputDirectory}" includeantruntime="false" />
<javac srcdir="${jsr166.sourceDirectory}" destdir="${project.build.outputDirectory}" classpath="${project.build.outputDirectory}" includeantruntime="false" />
</target>
</configuration>
<goals>
Expand All @@ -340,8 +337,7 @@
<configuration>
<target>
<mkdir dir="${java9.build.outputDirectory}" />
<javac srcdir="${java9.sourceDirectory}" destdir="${java9.build.outputDirectory}"
classpath="${project.build.outputDirectory}" includeantruntime="false" />
<javac srcdir="${java9.sourceDirectory}" destdir="${java9.build.outputDirectory}" classpath="${project.build.outputDirectory}" includeantruntime="false" />
</target>
</configuration>
<goals>
Expand Down
2 changes: 1 addition & 1 deletion core-server/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<groupId>org.glassfish.jersey.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion docs/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>
<artifactId>jersey-documentation</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion examples/assemblies/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>assemblies</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/bookmark-em/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>bookmark-em</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/bookmark/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>bookmark</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/bookstore-webapp/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>bookstore-webapp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/cdi-webapp/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>cdi-webapp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion examples/clipboard-programmatic/pom.xml
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.29.payara-p1-SNAPSHOT</version>
<version>2.29.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>clipboard-programmatic</artifactId>
Expand Down
Loading

0 comments on commit 0cc16c9

Please sign in to comment.