Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JAX-RS 2.1.3 (Jakarta Maven Coordinates and OSGi fixes) [EE4J_8] #3994

Merged
merged 6 commits into from
Nov 22, 2018
Merged

JAX-RS 2.1.3 (Jakarta Maven Coordinates and OSGi fixes) [EE4J_8] #3994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f7ead75
JAX-RS 2.1.2 (Jakarta Maven Coordinates)
mkarg Oct 8, 2018
bb361b3
JAX-RS 2.1.3 (OSGi fixes)
mkarg Nov 16, 2018
163b2e3
Parent changed to 1.0.5
mkarg Nov 19, 2018
5412af7
Travis enables staging profile
mkarg Nov 20, 2018
9325f4b
includeGroupIds: jakarta.ws.rs
mkarg Nov 21, 2018
ea4f055
JAX-RS is provided, not optional
mkarg Nov 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions bundles/jaxrs-ri/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
<dependencies>
<!-- JAX-RS API Sources-->
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>${jaxrs.api.impl.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
<scope>provided</scope>
</dependency>

<!-- JAX-RS RI Binaries -->
Expand Down Expand Up @@ -251,7 +251,7 @@
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>javax.ws.rs,org.glassfish.jersey.core,org.glassfish.jersey.containers,org.glassfish.jersey.jaxb,org.glassfish.jersey.inject</includeGroupIds>
<includeGroupIds>jakarta.ws.rs,org.glassfish.jersey.core,org.glassfish.jersey.containers,org.glassfish.jersey.jaxb,org.glassfish.jersey.inject</includeGroupIds>
<includeClassifiers>sources</includeClassifiers>
<outputDirectory>${generated.src.dir}</outputDirectory>
<excludes>**/NOTICE.md</excludes>
Expand Down
4 changes: 2 additions & 2 deletions bundles/jaxrs-ri/src/main/assembly/assembly-bin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
<directoryMode>0755</directoryMode>
<fileMode>0644</fileMode>
<includes>
<include>javax.ws.rs:*</include>
<include>jakarta.ws.rs:*</include>
</includes>
<excludes>
<exclude>javax.ws.rs:*:*:sources:*</exclude>
<exclude>jakarta.ws.rs:*:*:sources:*</exclude>
</excludes>
</dependencySet>
<!-- JAX-RS RI Binaries-->
Expand Down
2 changes: 1 addition & 1 deletion bundles/jaxrs-ri/src/main/assembly/assembly-src-licensee.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</excludes>
</unpackOptions>
<includes>
<include>javax.ws.rs:*:*:sources:*</include>
<include>jakarta.ws.rs:*:*:sources:*</include>
<include>org.glassfish.jersey.*:*:*:sources:*</include>
</includes>
</dependencySet>
Expand Down
2 changes: 1 addition & 1 deletion bundles/jaxrs-ri/src/main/assembly/assembly-src.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</excludes>
</unpackOptions>
<includes>
<include>javax.ws.rs:*:*:sources:*</include>
<include>jakarta.ws.rs:*:*:sources:*</include>
<include>org.glassfish.jersey.*:*:*:sources:*</include>
</includes>
</dependencySet>
Expand Down
2 changes: 1 addition & 1 deletion bundles/jaxrs-ri/src/main/assembly/common-dependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<directoryMode>0755</directoryMode>
<fileMode>0644</fileMode>
<excludes>
<exclude>javax.ws.rs:*</exclude>
<exclude>jakarta.ws.rs:*</exclude>
<exclude>org.glassfish.jersey.*:*</exclude>
<!-- CDI API dependencies come from yasson, cdi is optional there -->
<exclude>javax.enterprise:cdi-api:jar:*</exclude>
Expand Down
4 changes: 2 additions & 2 deletions connectors/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
</dependency>

<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions containers/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
</dependency>

<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions core-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@

<dependencies>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions core-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@

<dependencies>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
Expand Down
4 changes: 2 additions & 2 deletions core-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@
</dependency>

<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions ...erver/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ public void setUp() throws Exception {
final String[] entries = classPath.split(System.getProperty("path.separator"));

for (final String entry : entries) {
if (entry.contains("javax.ws.rs-api")) {
if (entry.contains("jakarta.ws.rs-api")) {
jaxRsApiPath = entry;
break;
}
}

if (jaxRsApiPath == null) {
fail("Could not find javax.ws.rs-api.");
fail("Could not find jakarta.ws.rs-api.");
}
}

Expand Down
4 changes: 2 additions & 2 deletions .../src/test/java/org/glassfish/jersey/server/internal/scanning/PackageNamesScannerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@ public void setUp() throws Exception {
final String[] entries = classPath.split(System.getProperty("path.separator"));

for (final String entry : entries) {
if (entry.contains("javax.ws.rs-api")) {
if (entry.contains("jakarta.ws.rs-api")) {
jaxRsApiPath = entry;
break;
}
}

if (jaxRsApiPath == null) {
fail("Could not find javax.ws.rs-api.");
fail("Could not find jakarta.ws.rs-api.");
}
}

Expand Down
4 changes: 2 additions & 2 deletions .../test/java/org/glassfish/jersey/server/internal/scanning/VFSSchemeResourceFinderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ public void setUp() throws Exception {
final String[] entries = classPath.split(System.getProperty("path.separator"));

for (final String entry : entries) {
if (entry.contains("javax.ws.rs-api")) {
if (entry.contains("jakarta.ws.rs-api")) {
jaxRsApiPath = entry;
break;
}
}

if (jaxRsApiPath == null) {
fail("Could not find javax.ws.rs-api.");
fail("Could not find jakarta.ws.rs-api.");
}
}

Expand Down
4 changes: 2 additions & 2 deletions docs/src/main/docbook/dependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@
</para>

<programlisting language="xml">&lt;dependency&gt;
&lt;groupId>javax.ws.rs&lt;/groupId&gt;
&lt;artifactId>javax.ws.rs-api&lt;/artifactId&gt;
&lt;groupId>jakarta.ws.rs&lt;/groupId&gt;
&lt;artifactId>jakarta.ws.rs-api&lt;/artifactId&gt;
&lt;version&gt;&jax-rs-api-jar.version;&lt;/version&gt;
&lt;scope&gt;provided&lt;/scope&gt;
&lt;/dependency&gt;</programlisting>
Expand Down
8 changes: 4 additions & 4 deletions examples/cdi-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -135,8 +135,8 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions examples/etc/gf-project-src-pom.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
<artifactId>jersey-mvc</artifactId>
</exclusion>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</exclusion>
</exclusions>
</xsl:copy>
Expand All @@ -87,8 +87,8 @@
<xsl:apply-templates />
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</exclusion>


Expand Down
8 changes: 4 additions & 4 deletions examples/etc/wls-project-src-pom.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
<artifactId>javax.inject</artifactId>
</exclusion>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</exclusion>
</exclusions>
</xsl:template>
Expand All @@ -101,8 +101,8 @@
<artifactId>javax.inject</artifactId>
</exclusion>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</exclusion>
</exclusions>
</xsl:if>
Expand Down
8 changes: 4 additions & 4 deletions examples/etc/wls1213-project-src-pom.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
<artifactId>javax.inject</artifactId>
</exclusion>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</exclusion>
</exclusions>
</xsl:template>
Expand All @@ -101,8 +101,8 @@
<artifactId>javax.inject</artifactId>
</exclusion>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</exclusion>
</exclusions>
</xsl:if>
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public static Option[] configuration() {
mavenBundle().groupId("biz.aQute.bnd").artifactId("bndlib").versionAsInProject(),

// JAX-RS API
mavenBundle().groupId("javax.ws.rs").artifactId("javax.ws.rs-api").versionAsInProject(),
mavenBundle().groupId("jakarta.ws.rs").artifactId("jakarta.ws.rs-api").versionAsInProject(),

// Jersey bundles
mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-common").versionAsInProject(),
Expand Down
4 changes: 2 additions & 2 deletions examples/managed-beans-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions examples/osgi-helloworld-webapp/additional-bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@

<dependencies>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions examples/osgi-helloworld-webapp/alternate-version-bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@

<dependencies>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public List<Option> genericOsgiOptions() {
mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").versionAsInProject(),

// JAX-RS API
mavenBundle().groupId("javax.ws.rs").artifactId("javax.ws.rs-api").versionAsInProject(),
mavenBundle().groupId("jakarta.ws.rs").artifactId("jakarta.ws.rs-api").versionAsInProject(),

// Those two bundles have different (unique) maven coordinates, but represent the same OSGi bundle in two
// different versions.
Expand Down
4 changes: 2 additions & 2 deletions examples/osgi-helloworld-webapp/lib-bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@

<dependencies>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions examples/osgi-helloworld-webapp/war-bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public List<Option> genericOsgiOptions() {
mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").versionAsInProject(),

// JAX-RS API
mavenBundle().groupId("javax.ws.rs").artifactId("javax.ws.rs-api").versionAsInProject()
mavenBundle().groupId("jakarta.ws.rs").artifactId("jakarta.ws.rs-api").versionAsInProject()

));

Expand Down
4 changes: 2 additions & 2 deletions examples/server-async-standalone/client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@

<dependencies>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
Expand Down
4 changes: 2 additions & 2 deletions ext/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@

<dependencies>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions ext/servlet-portability/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@

<dependencies>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions incubator/html-json/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@

<dependencies>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
<dependency>
<groupId>org.netbeans.html</groupId>
Expand Down
Loading