Merge with master
Signed-off-by: Jan Supol <jan.supol@oracle.com>
diff --git a/.travis.yml b/.travis.yml
index 7e51c61..964c748 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@
jdk:
- oraclejdk8
+ - openjdk8
cache:
directories:
@@ -15,8 +16,9 @@
matrix:
- TEST_SET="-Ptravis_e2e_skip"
- TEST_SET="-Ptravis_e2e"
+ - TEST_SET="glassfish-copyright:copyright"
install: true
script:
- - bash travis.sh $TEST_SET
\ No newline at end of file
+ - bash etc/travis/travis.sh $TEST_SET
\ No newline at end of file
diff --git a/NOTICE.md b/NOTICE.md
index d8d6b38..ca18740 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -70,10 +70,6 @@
* Project: http://www.javassist.org/
* Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.
-Java(TM) EE Interceptors 1.1 API Version 1.0.0.Beta1
-* License: LGPL 2.1
-* Copyright 2005, JBoss Inc., and individual contributors as indicated by the @authors tag.
-
Jackson JAX-RS Providers Version 2.8.10
* License: Apache License, 2.0
* Project: https://github.com/FasterXML/jackson-jaxrs-providers
@@ -111,3 +107,7 @@
* License: Apache License, 2.0
* Copyright (c) 2015-2018 Oracle and/or its affiliates. All rights reserved.
* Copyright 2010-2013 Coda Hale and Yammer, Inc.
+
+W3.org documents
+* License: W3C License
+* Copyright: Copyright (c) 1994-2001 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
diff --git a/archetypes/jersey-example-java8-webapp/pom.xml b/archetypes/jersey-example-java8-webapp/pom.xml
index eb42c23..08699f8 100644
--- a/archetypes/jersey-example-java8-webapp/pom.xml
+++ b/archetypes/jersey-example-java8-webapp/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.archetypes</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-example-java8-webapp</artifactId>
@@ -37,6 +37,9 @@
<directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>${project.build.directory}/legal</directory>
+ </resource>
</resources>
</build>
</project>
diff --git a/archetypes/jersey-example-java8-webapp/src/main/resources/archetype-resources/pom.xml b/archetypes/jersey-example-java8-webapp/src/main/resources/archetype-resources/pom.xml
index b3e9f15..8b30af9 100644
--- a/archetypes/jersey-example-java8-webapp/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/jersey-example-java8-webapp/src/main/resources/archetype-resources/pom.xml
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -88,7 +105,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/archetypes/jersey-heroku-webapp/pom.xml b/archetypes/jersey-heroku-webapp/pom.xml
index 0a336a7..ea156ec 100644
--- a/archetypes/jersey-heroku-webapp/pom.xml
+++ b/archetypes/jersey-heroku-webapp/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.archetypes</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<packaging>maven-archetype</packaging>
@@ -48,6 +48,9 @@
<directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>${project.build.directory}/legal</directory>
+ </resource>
</resources>
</build>
</project>
diff --git a/archetypes/jersey-quickstart-grizzly2/pom.xml b/archetypes/jersey-quickstart-grizzly2/pom.xml
index a005cd9..ad86d93 100644
--- a/archetypes/jersey-quickstart-grizzly2/pom.xml
+++ b/archetypes/jersey-quickstart-grizzly2/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -21,7 +21,7 @@
<parent>
<groupId>org.glassfish.jersey.archetypes</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-quickstart-grizzly2</artifactId>
<packaging>maven-archetype</packaging>
@@ -37,6 +37,9 @@
<directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>${project.build.directory}/legal</directory>
+ </resource>
</resources>
<plugins>
<plugin>
diff --git a/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml b/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml
index bacd3bc..053b38c 100644
--- a/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.9</version>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/archetypes/jersey-quickstart-webapp/pom.xml b/archetypes/jersey-quickstart-webapp/pom.xml
index 47e666b..d2dfa76 100644
--- a/archetypes/jersey-quickstart-webapp/pom.xml
+++ b/archetypes/jersey-quickstart-webapp/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -21,7 +21,7 @@
<parent>
<groupId>org.glassfish.jersey.archetypes</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>maven-archetype</packaging>
@@ -47,6 +47,9 @@
<directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>${project.build.directory}/legal</directory>
+ </resource>
</resources>
</build>
</project>
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 8963ace..2ba2da7 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.archetypes</groupId>
@@ -57,28 +57,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>${gpg.mvn.plugin.version}</version>
- <executions>
- <execution>
- <id>sign-artifact</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/bom/pom.xml b/bom/pom.xml
index 50ee2a4..e2b5ccb 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,15 +22,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.java</groupId>
- <artifactId>jvnet-parent</artifactId>
- <version>4</version>
- <relativePath />
+ <groupId>org.eclipse.ee4j</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0.5</version>
+ <relativePath/>
</parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>jersey-bom</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
<packaging>pom</packaging>
<name>jersey-bom</name>
@@ -373,31 +373,13 @@
</dependencyManagement>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.glassfish.copyright</groupId>
- <artifactId>glassfish-copyright-maven-plugin</artifactId>
- <version>1.28</version>
- <configuration>
- <excludeFile>etc/config/copyright-exclude</excludeFile>
- <!--svn|mercurial|git - defaults to svn-->
- <scm>git</scm>
- <!-- turn on/off debugging -->
- <debug>false</debug>
- <!-- skip files not under SCM-->
- <scmOnly>true</scmOnly>
- <!-- turn off warnings -->
- <warn>true</warn>
- <!-- for use with repair -->
- <update>false</update>
- <!-- check that year is correct -->
- <ignoreYear>false</ignoreYear>
- <templateFile>etc/config/copyright.txt</templateFile>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.glassfish.copyright</groupId>
+ <artifactId>glassfish-copyright-maven-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ </plugins>
</build>
<profiles>
@@ -415,40 +397,5 @@
</site>
</distributionManagement>
</profile>
- <profile>
- <id>release</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.7</version>
- <executions>
- <execution>
- <id>default-deploy</id>
- <phase>deploy</phase>
- <goals>
- <goal>deploy</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <serverId>jvnet-nexus-staging</serverId>
- <nexusUrl>https://maven.java.net/</nexusUrl>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
diff --git a/bundles/apidocs/pom.xml b/bundles/apidocs/pom.xml
index f02bb60..cc069cd 100644
--- a/bundles/apidocs/pom.xml
+++ b/bundles/apidocs/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.bundles</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>apidocs</artifactId>
diff --git a/bundles/examples/pom.xml b/bundles/examples/pom.xml
index 78e25b0..b739345 100644
--- a/bundles/examples/pom.xml
+++ b/bundles/examples/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.jersey.bundles</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-examples</artifactId>
@@ -32,6 +32,7 @@
<packaging>pom</packaging>
<dependencies>
+<!--
<dependency>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>bean-validation-webapp</artifactId>
@@ -46,6 +47,7 @@
<classifier>gf-project-src</classifier>
<type>zip</type>
</dependency>
+-->
<dependency>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>bookmark</artifactId>
@@ -434,6 +436,7 @@
<classifier>gf-project-src</classifier>
<type>zip</type>
</dependency>
+<!--
<dependency>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>monitoring-webapp</artifactId>
@@ -441,6 +444,7 @@
<classifier>project-src</classifier>
<type>zip</type>
</dependency>
+-->
<dependency>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>multipart-webapp</artifactId>
@@ -462,6 +466,7 @@
<classifier>project-src</classifier>
<type>zip</type>
</dependency>
+<!--
<dependency>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>oauth2-client-google-webapp</artifactId>
@@ -469,6 +474,7 @@
<classifier>project-src</classifier>
<type>zip</type>
</dependency>
+-->
<dependency>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>osgi-helloworld-webapp</artifactId>
@@ -553,6 +559,7 @@
<classifier>gf-project-src</classifier>
<type>zip</type>
</dependency>
+<!--
<dependency>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>shortener-webapp</artifactId>
@@ -567,6 +574,7 @@
<classifier>gf-project-src</classifier>
<type>zip</type>
</dependency>
+-->
<dependency>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>simple-console</artifactId>
@@ -574,6 +582,7 @@
<classifier>project-src</classifier>
<type>zip</type>
</dependency>
+<!--
<dependency>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>sparklines</artifactId>
@@ -581,6 +590,7 @@
<classifier>project-src</classifier>
<type>zip</type>
</dependency>
+-->
<dependency>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>sse-item-store-jersey-webapp</artifactId>
@@ -623,6 +633,7 @@
<classifier>project-src</classifier>
<type>zip</type>
</dependency>
+<!--
<dependency>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>tone-generator</artifactId>
@@ -630,6 +641,7 @@
<classifier>project-src</classifier>
<type>zip</type>
</dependency>
+-->
<dependency>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>xml-moxy</artifactId>
diff --git a/bundles/jaxrs-ri/pom.xml b/bundles/jaxrs-ri/pom.xml
index c78f2a7..ec7361b 100644
--- a/bundles/jaxrs-ri/pom.xml
+++ b/bundles/jaxrs-ri/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.bundles</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jaxrs-ri</artifactId>
@@ -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 -->
@@ -166,13 +166,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <scope>provided</scope>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -181,14 +180,14 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet3.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -252,10 +251,10 @@
<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>
+ <excludes>**/NOTICE.md,**/NOTICE.markdown</excludes>
</configuration>
</execution>
</executions>
@@ -282,6 +281,7 @@
javax.servlet.annotation.*;resolution:=optional;version="[2.4,5.0)",
javax.servlet.descriptor.*;resolution:=optional;version="[2.4,5.0)",
javax.servlet.*;version="[2.4,5.0)",
+ javax.annotation;version="!",
javax.persistence.*;resolution:=optional,
javax.validation.*;resolution:=optional;version="${range;[==,3);${javax.validation.api.version}}",
sun.misc.*;resolution:=optional,
@@ -311,6 +311,7 @@
<artifact>*:*</artifact> <!-- jersey artifacts -->
<excludes>
<exclude>META-INF/NOTICE.md</exclude>
+ <exclude>META-INF/NOTICE.markdown</exclude>
</excludes>
</filter>
<filter>
diff --git a/bundles/jaxrs-ri/src/main/assembly/assembly-bin.xml b/bundles/jaxrs-ri/src/main/assembly/assembly-bin.xml
index 6eced85..6f2c1e9 100644
--- a/bundles/jaxrs-ri/src/main/assembly/assembly-bin.xml
+++ b/bundles/jaxrs-ri/src/main/assembly/assembly-bin.xml
@@ -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-->
diff --git a/bundles/jaxrs-ri/src/main/assembly/assembly-src-licensee.xml b/bundles/jaxrs-ri/src/main/assembly/assembly-src-licensee.xml
index 635b53c..a7ec56e 100644
--- a/bundles/jaxrs-ri/src/main/assembly/assembly-src-licensee.xml
+++ b/bundles/jaxrs-ri/src/main/assembly/assembly-src-licensee.xml
@@ -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>
diff --git a/bundles/jaxrs-ri/src/main/assembly/assembly-src.xml b/bundles/jaxrs-ri/src/main/assembly/assembly-src.xml
index 1cd0035..a951e5b 100644
--- a/bundles/jaxrs-ri/src/main/assembly/assembly-src.xml
+++ b/bundles/jaxrs-ri/src/main/assembly/assembly-src.xml
@@ -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>
diff --git a/bundles/jaxrs-ri/src/main/assembly/common-dependencies.xml b/bundles/jaxrs-ri/src/main/assembly/common-dependencies.xml
index 9dd7855..2c92564 100644
--- a/bundles/jaxrs-ri/src/main/assembly/common-dependencies.xml
+++ b/bundles/jaxrs-ri/src/main/assembly/common-dependencies.xml
@@ -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>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 3f4f0d4..f9c3e12 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.bundles</groupId>
@@ -40,7 +40,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
diff --git a/connectors/apache-connector/pom.xml b/connectors/apache-connector/pom.xml
index 7ac1ecd..9d5e8c1 100644
--- a/connectors/apache-connector/pom.xml
+++ b/connectors/apache-connector/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-apache-connector</artifactId>
@@ -66,7 +66,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnector.java b/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnector.java
index f5874dc..693a8d3 100644
--- a/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnector.java
+++ b/connectors/apache-connector/src/main/java/org/glassfish/jersey/apache/connector/ApacheConnector.java
@@ -462,7 +462,7 @@
}
try {
- responseContext.setEntityStream(new HttpClientResponseInputStream(getInputStream(response)));
+ responseContext.setEntityStream(getInputStream(response));
} catch (final IOException e) {
LOGGER.log(Level.SEVERE, null, e);
}
@@ -601,18 +601,6 @@
return stringHeaders;
}
- private static final class HttpClientResponseInputStream extends FilterInputStream {
-
- HttpClientResponseInputStream(final InputStream inputStream) throws IOException {
- super(inputStream);
- }
-
- @Override
- public void close() throws IOException {
- super.close();
- }
- }
-
private static InputStream getInputStream(final CloseableHttpResponse response) throws IOException {
final InputStream inputStream;
@@ -631,8 +619,13 @@
return new FilterInputStream(inputStream) {
@Override
public void close() throws IOException {
- response.close();
- super.close();
+ try {
+ super.close();
+ } catch (IOException ex) {
+ // Ignore
+ } finally {
+ response.close();
+ }
}
};
}
diff --git a/connectors/apache-connector/src/test/java/org/glassfish/jersey/apache/connector/AuthTest.java b/connectors/apache-connector/src/test/java/org/glassfish/jersey/apache/connector/AuthTest.java
index 6a98130..07586e9 100644
--- a/connectors/apache-connector/src/test/java/org/glassfish/jersey/apache/connector/AuthTest.java
+++ b/connectors/apache-connector/src/test/java/org/glassfish/jersey/apache/connector/AuthTest.java
@@ -29,22 +29,26 @@
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
import javax.inject.Singleton;
import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
+import org.glassfish.jersey.client.authentication.ResponseAuthenticationException;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.CredentialsProvider;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* @author Paul Sandoz
@@ -116,6 +120,8 @@
public static class AuthResource {
int requestCount = 0;
+ int queryParamsBasicRequestCount = 0;
+ int queryParamsDigestRequestCount = 0;
@GET
public String get(@Context HttpHeaders h) {
@@ -144,6 +150,44 @@
return "GET";
}
+ @GET
+ @Path("basicAndDigest")
+ public String getBasicAndDigest(@Context HttpHeaders h) {
+ String value = h.getRequestHeaders().getFirst("Authorization");
+ if (value == null) {
+ throw new WebApplicationException(
+ Response.status(401).header("WWW-Authenticate", "Basic realm=\"WallyWorld\"")
+ .header("WWW-Authenticate", "Digest realm=\"WallyWorld\"")
+ .entity("Forbidden").build());
+ } else if (value.startsWith("Basic")) {
+ throw new WebApplicationException(
+ Response.status(401).header("WWW-Authenticate", "Basic realm=\"WallyWorld\"")
+ .header("WWW-Authenticate", "Digest realm=\"WallyWorld\"")
+ .entity("Digest authentication expected").build());
+ }
+
+ return "GET";
+ }
+
+ @GET
+ @Path("noauth")
+ public String get() {
+ return "GET";
+ }
+
+ @GET
+ @Path("digest")
+ public String getDigest(@Context HttpHeaders h) {
+ String value = h.getRequestHeaders().getFirst("Authorization");
+ if (value == null) {
+ throw new WebApplicationException(
+ Response.status(401).header("WWW-Authenticate", "Digest realm=\"WallyWorld\"")
+ .entity("Forbidden").build());
+ }
+
+ return "GET";
+ }
+
@POST
public String post(@Context HttpHeaders h, String e) {
requestCount++;
@@ -205,6 +249,64 @@
return e;
}
+
+ @GET
+ @Path("content")
+ public String getWithContent(@Context HttpHeaders h) {
+ requestCount++;
+ String value = h.getRequestHeaders().getFirst("Authorization");
+ if (value == null) {
+ assertEquals(1, requestCount);
+ throw new WebApplicationException(
+ Response.status(401).header("WWW-Authenticate", "Basic realm=\"WallyWorld\"")
+ .entity("Forbidden").build());
+ } else {
+ assertTrue(requestCount > 1);
+ }
+
+ return "GET";
+ }
+
+ @GET
+ @Path("contentDigestAuth")
+ public String getWithContentDigestAuth(@Context HttpHeaders h) {
+ requestCount++;
+ String value = h.getRequestHeaders().getFirst("Authorization");
+ if (value == null) {
+ assertEquals(1, requestCount);
+ throw new WebApplicationException(
+ Response.status(401).header("WWW-Authenticate", "Digest nonce=\"1234\"")
+ .entity("Forbidden").build());
+ } else {
+ assertTrue(requestCount > 1);
+ }
+
+ return "GET";
+ }
+
+ @GET
+ @Path("queryParamsBasic")
+ public String getQueryParamsBasic(@Context HttpHeaders h, @Context UriInfo uriDetails) {
+ queryParamsBasicRequestCount++;
+ String value = h.getRequestHeaders().getFirst("Authorization");
+ if (value == null) {
+ throw new WebApplicationException(
+ Response.status(401).header("WWW-Authenticate", "Basic realm=\"WallyWorld\"").build());
+ }
+ return "GET " + queryParamsBasicRequestCount;
+ }
+
+ @GET
+ @Path("queryParamsDigest")
+ public String getQueryParamsDigest(@Context HttpHeaders h, @Context UriInfo uriDetails) {
+ queryParamsDigestRequestCount++;
+ String value = h.getRequestHeaders().getFirst("Authorization");
+ if (value == null) {
+ throw new WebApplicationException(
+ Response.status(401).header("WWW-Authenticate", "Digest realm=\"WallyWorld\"").build());
+ }
+ return "GET " + queryParamsDigestRequestCount;
+ }
}
@Test
@@ -255,6 +357,46 @@
}
@Test
+ public void testAuthGetWithBasicAndDigestFilter() {
+ ClientConfig cc = new ClientConfig();
+ cc.connectorProvider(new ApacheConnectorProvider());
+ Client client = ClientBuilder.newClient(cc);
+ client.register(HttpAuthenticationFeature.universal("name", "password"));
+ WebTarget r = client.target(getBaseUri()).path("test/basicAndDigest");
+
+ assertEquals("GET", r.request().get(String.class));
+ }
+
+ @Test
+ public void testAuthGetBasicNoChallenge() {
+ ClientConfig cc = new ClientConfig();
+ cc.connectorProvider(new ApacheConnectorProvider());
+ Client client = ClientBuilder.newClient(cc);
+ client.register(HttpAuthenticationFeature.basicBuilder().build());
+ WebTarget r = client.target(getBaseUri()).path("test/noauth");
+
+ assertEquals("GET", r.request().get(String.class));
+ }
+
+ @Test
+ public void testAuthGetWithDigestFilter() {
+ ClientConfig cc = new ClientConfig();
+ PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager();
+ cc.connectorProvider(new ApacheConnectorProvider());
+ cc.property(ApacheClientProperties.CONNECTION_MANAGER, cm);
+ Client client = ClientBuilder.newClient(cc);
+ client.register(HttpAuthenticationFeature.universal("name", "password"));
+ WebTarget r = client.target(getBaseUri()).path("test/digest");
+
+ assertEquals("GET", r.request().get(String.class));
+
+ // Verify the connection that was used for the request is available for reuse
+ // and no connections are leased
+ assertEquals(cm.getTotalStats().getAvailable(), 1);
+ assertEquals(cm.getTotalStats().getLeased(), 0);
+ }
+
+ @Test
@Ignore("JERSEY-1750: Cannot retry request with a non-repeatable request entity. How to buffer the entity?"
+ " Allow repeatable write in jersey?")
public void testAuthPost() {
@@ -348,4 +490,86 @@
assertEquals("POST", r.request().post(Entity.text("POST"), String.class));
}
+
+ @Test
+ public void testAuthGetWithBasicFilterAndContent() {
+ ClientConfig cc = new ClientConfig();
+ PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager();
+ cc.connectorProvider(new ApacheConnectorProvider());
+ cc.property(ApacheClientProperties.CONNECTION_MANAGER, cm);
+ Client client = ClientBuilder.newClient(cc);
+ client.register(HttpAuthenticationFeature.universalBuilder().build());
+ WebTarget r = client.target(getBaseUri()).path("test/content");
+
+ try {
+ assertEquals("GET", r.request().get(String.class));
+ fail();
+ } catch (ResponseAuthenticationException ex) {
+ // expected
+ }
+
+ // Verify the connection that was used for the request is available for reuse
+ // and no connections are leased
+ assertEquals(cm.getTotalStats().getAvailable(), 1);
+ assertEquals(cm.getTotalStats().getLeased(), 0);
+ }
+
+ @Test
+ public void testAuthGetWithDigestFilterAndContent() {
+ ClientConfig cc = new ClientConfig();
+ PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager();
+ cc.connectorProvider(new ApacheConnectorProvider());
+ cc.property(ApacheClientProperties.CONNECTION_MANAGER, cm);
+ Client client = ClientBuilder.newClient(cc);
+ client.register(HttpAuthenticationFeature.universalBuilder().build());
+ WebTarget r = client.target(getBaseUri()).path("test/contentDigestAuth");
+
+ try {
+ assertEquals("GET", r.request().get(String.class));
+ fail();
+ } catch (ResponseAuthenticationException ex) {
+ // expected
+ }
+
+ // Verify the connection that was used for the request is available for reuse
+ // and no connections are leased
+ assertEquals(cm.getTotalStats().getAvailable(), 1);
+ assertEquals(cm.getTotalStats().getLeased(), 0);
+ }
+
+ @Test
+ public void testAuthGetQueryParamsBasic() {
+ ClientConfig cc = new ClientConfig();
+ cc.connectorProvider(new ApacheConnectorProvider());
+ Client client = ClientBuilder.newClient(cc);
+ client.register(HttpAuthenticationFeature.universal("name", "password"));
+
+ WebTarget r = client.target(getBaseUri()).path("test/queryParamsBasic");
+ assertEquals("GET 2", r.request().get(String.class));
+
+ r = client.target(getBaseUri())
+ .path("test/queryParamsBasic")
+ .queryParam("param1", "value1")
+ .queryParam("param2", "value2");
+ assertEquals("GET 3", r.request().get(String.class));
+
+ }
+
+ @Test
+ public void testAuthGetQueryParamsDigest() {
+ ClientConfig cc = new ClientConfig();
+ cc.connectorProvider(new ApacheConnectorProvider());
+ Client client = ClientBuilder.newClient(cc);
+ client.register(HttpAuthenticationFeature.universal("name", "password"));
+
+ WebTarget r = client.target(getBaseUri()).path("test/queryParamsDigest");
+ assertEquals("GET 2", r.request().get(String.class));
+
+ r = client.target(getBaseUri())
+ .path("test/queryParamsDigest")
+ .queryParam("param1", "value1")
+ .queryParam("param2", "value2");
+ assertEquals("GET 3", r.request().get(String.class));
+
+ }
}
diff --git a/connectors/apache-connector/src/test/java/org/glassfish/jersey/apache/connector/StreamingTest.java b/connectors/apache-connector/src/test/java/org/glassfish/jersey/apache/connector/StreamingTest.java
index 546c2c3..6bfac5a 100644
--- a/connectors/apache-connector/src/test/java/org/glassfish/jersey/apache/connector/StreamingTest.java
+++ b/connectors/apache-connector/src/test/java/org/glassfish/jersey/apache/connector/StreamingTest.java
@@ -25,10 +25,13 @@
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.MediaType;
-
+import javax.ws.rs.core.Response;
import javax.inject.Singleton;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+
import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.ClientProperties;
import org.glassfish.jersey.server.ChunkedOutput;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
@@ -40,6 +43,7 @@
* @author Petr Janouch (petr.janouch at oracle.com)
*/
public class StreamingTest extends JerseyTest {
+ private PoolingHttpClientConnectionManager connectionManager;
/**
* Test that a data stream can be terminated from the client side.
@@ -47,7 +51,8 @@
@Test
public void clientCloseTest() throws IOException {
// start streaming
- InputStream inputStream = target().path("/streamingEndpoint").request().get(InputStream.class);
+ InputStream inputStream = target().path("/streamingEndpoint").request()
+ .property(ClientProperties.READ_TIMEOUT, 1_000).get(InputStream.class);
WebTarget sendTarget = target().path("/streamingEndpoint/send");
// trigger sending 'A' to the stream; OK is sent if everything on the server was OK
@@ -61,8 +66,35 @@
assertEquals("NOK", sendTarget.request().get().readEntity(String.class));
}
+ /**
+ * Tests that closing a response after completely reading the entity reuses the connection
+ */
+ @Test
+ public void reuseConnectionTest() throws IOException {
+ Response response = target().path("/streamingEndpoint/get").request().get();
+ InputStream is = response.readEntity(InputStream.class);
+ byte[] buf = new byte[8192];
+ is.read(buf);
+ is.close();
+ response.close();
+
+ assertEquals(1, connectionManager.getTotalStats().getAvailable());
+ assertEquals(0, connectionManager.getTotalStats().getLeased());
+ }
+
+ /**
+ * Tests that closing a request without reading the entity does not throw an exception.
+ */
+ @Test
+ public void clientCloseThrowsNoExceptionTest() throws IOException {
+ Response response = target().path("/streamingEndpoint/get").request().get();
+ response.close();
+ }
+
@Override
protected void configureClient(ClientConfig config) {
+ connectionManager = new PoolingHttpClientConnectionManager();
+ config.property(ApacheClientProperties.CONNECTION_MANAGER, connectionManager);
config.connectorProvider(new ApacheConnectorProvider());
}
@@ -94,5 +126,12 @@
public ChunkedOutput<String> get() {
return output;
}
+
+ @GET
+ @Path("get")
+ @Produces(MediaType.TEXT_PLAIN)
+ public String getString() {
+ return "OK";
+ }
}
}
diff --git a/connectors/grizzly-connector/pom.xml b/connectors/grizzly-connector/pom.xml
index eb4dea9..9680eb4 100644
--- a/connectors/grizzly-connector/pom.xml
+++ b/connectors/grizzly-connector/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-grizzly-connector</artifactId>
@@ -63,7 +63,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/connectors/jdk-connector/pom.xml b/connectors/jdk-connector/pom.xml
index ac16069..fe88dcc 100644
--- a/connectors/jdk-connector/pom.xml
+++ b/connectors/jdk-connector/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-jdk-connector</artifactId>
@@ -56,7 +56,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/connectors/jdk-connector/src/main/java/org/glassfish/jersey/jdk/connector/internal/ProxyBasicAuthenticator.java b/connectors/jdk-connector/src/main/java/org/glassfish/jersey/jdk/connector/internal/ProxyBasicAuthenticator.java
index f7d7777..bab2807 100644
--- a/connectors/jdk-connector/src/main/java/org/glassfish/jersey/jdk/connector/internal/ProxyBasicAuthenticator.java
+++ b/connectors/jdk-connector/src/main/java/org/glassfish/jersey/jdk/connector/internal/ProxyBasicAuthenticator.java
@@ -17,8 +17,8 @@
package org.glassfish.jersey.jdk.connector.internal;
import java.nio.charset.Charset;
+import java.util.Base64;
-import org.glassfish.jersey.internal.util.Base64;
/**
* @author Ondrej Kosatka (ondrej.kosatka at oracle.com)
@@ -46,6 +46,6 @@
System.arraycopy(prefix, 0, usernamePassword, 0, prefix.length);
System.arraycopy(passwordBytes, 0, usernamePassword, prefix.length, passwordBytes.length);
- return "Basic " + Base64.encodeAsString(usernamePassword);
+ return "Basic " + Base64.getEncoder().encodeToString(usernamePassword);
}
}
diff --git a/connectors/jdk-connector/src/test/java/org/glassfish/jersey/jdk/connector/internal/ProxyTest.java b/connectors/jdk-connector/src/test/java/org/glassfish/jersey/jdk/connector/internal/ProxyTest.java
index d1a0a72..15a2cdf 100644
--- a/connectors/jdk-connector/src/test/java/org/glassfish/jersey/jdk/connector/internal/ProxyTest.java
+++ b/connectors/jdk-connector/src/test/java/org/glassfish/jersey/jdk/connector/internal/ProxyTest.java
@@ -19,6 +19,7 @@
import java.io.IOException;
import java.io.OutputStream;
import java.nio.charset.Charset;
+import java.util.Base64;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -31,7 +32,6 @@
import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.client.ClientProperties;
-import org.glassfish.jersey.internal.util.Base64;
import org.glassfish.jersey.jdk.connector.JdkConnectorProperties;
import org.glassfish.jersey.jdk.connector.JdkConnectorProvider;
import org.glassfish.jersey.server.ResourceConfig;
@@ -227,7 +227,7 @@
response.setStatus(400);
return false;
}
- String decoded = new String(Base64.decode(authorizationHeader.substring(6).getBytes()),
+ String decoded = new String(Base64.getDecoder().decode(authorizationHeader.substring(6).getBytes()),
CHARACTER_SET);
final String[] split = decoded.split(":");
final String username = split[0];
diff --git a/connectors/jetty-connector/pom.xml b/connectors/jetty-connector/pom.xml
index 22e28ba..7c7b2d8 100644
--- a/connectors/jetty-connector/pom.xml
+++ b/connectors/jetty-connector/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-jetty-connector</artifactId>
@@ -71,7 +71,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/AsyncTest.java b/connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/AsyncTest.java
index 7d62881..0f732f9 100644
--- a/connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/AsyncTest.java
+++ b/connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/AsyncTest.java
@@ -110,6 +110,8 @@
}
});
asyncResponse.setTimeout(1, TimeUnit.SECONDS);
+ asyncResponse.resume(Response.status(Response.Status.SERVICE_UNAVAILABLE)
+ .entity("Operation time out.").build());
new Thread(new Runnable() {
diff --git a/connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/HelloWorldTest.java b/connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/HelloWorldTest.java
index 9c70675..641648d 100644
--- a/connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/HelloWorldTest.java
+++ b/connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/HelloWorldTest.java
@@ -71,7 +71,6 @@
@Override
protected void configureClient(ClientConfig config) {
- config.property(ClientProperties.ASYNC_THREADPOOL_SIZE, 20);
config.connectorProvider(new JettyConnectorProvider());
}
diff --git a/connectors/netty-connector/pom.xml b/connectors/netty-connector/pom.xml
index dd6fc6a..1927576 100644
--- a/connectors/netty-connector/pom.xml
+++ b/connectors/netty-connector/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-netty-connector</artifactId>
@@ -60,7 +60,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/connectors/pom.xml b/connectors/pom.xml
index f48fcb7..a778aaf 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.connectors</groupId>
@@ -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>
diff --git a/containers/glassfish/jersey-gf-ejb/pom.xml b/containers/glassfish/jersey-gf-ejb/pom.xml
index 4038ce7..0c97a46 100644
--- a/containers/glassfish/jersey-gf-ejb/pom.xml
+++ b/containers/glassfish/jersey-gf-ejb/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers.glassfish</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-gf-ejb</artifactId>
@@ -40,20 +40,20 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<version>${ejb.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.interceptor</groupId>
- <artifactId>javax.interceptor-api</artifactId>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
<version>${javax.interceptor.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -72,6 +72,11 @@
<artifactId>container-common</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.main.hk2</groupId>
+ <artifactId>hk2-config</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
@@ -93,7 +98,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -104,29 +109,20 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
<extensions>true</extensions>
<configuration>
<instructions>
<!-- Explicitly set versions for packages from GlassFish to allow future uptake of GlassFish 5.x-->
<Import-Package>
com.sun.*;version="[4.0,6)",
+ javax.annotation.*;version="!",
org.glassfish.ejb.*;version="[4.0,6)",
org.glassfish.internal.*;version="[4.0,6)",
*
</Import-Package>
- <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
- <_nodefaultversion>false</_nodefaultversion>
</instructions>
</configuration>
- <executions>
- <execution>
- <id>osgi-bundle</id>
- <phase>package</phase>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
diff --git a/containers/glassfish/pom.xml b/containers/glassfish/pom.xml
index c10d92e..fa6826c 100644
--- a/containers/glassfish/pom.xml
+++ b/containers/glassfish/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.containers.glassfish</groupId>
diff --git a/containers/grizzly2-http/pom.xml b/containers/grizzly2-http/pom.xml
index 49e75e5..46c9b66 100644
--- a/containers/grizzly2-http/pom.xml
+++ b/containers/grizzly2-http/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-container-grizzly2-http</artifactId>
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
@@ -47,7 +47,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/containers/grizzly2-servlet/pom.xml b/containers/grizzly2-servlet/pom.xml
index caee668..cf4f75c 100644
--- a/containers/grizzly2-servlet/pom.xml
+++ b/containers/grizzly2-servlet/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-container-grizzly2-servlet</artifactId>
@@ -34,8 +34,8 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<version>${servlet4.version}</version>
</dependency>
@@ -68,6 +68,9 @@
<directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>${project.build.directory}/legal</directory>
+ </resource>
</resources>
<plugins>
<plugin>
diff --git a/containers/jdk-http/pom.xml b/containers/jdk-http/pom.xml
index 41c87bd..3497cac 100644
--- a/containers/jdk-http/pom.xml
+++ b/containers/jdk-http/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-container-jdk-http</artifactId>
@@ -44,7 +44,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
diff --git a/containers/jersey-servlet-core/pom.xml b/containers/jersey-servlet-core/pom.xml
index 4bc5700..8e90bde 100644
--- a/containers/jersey-servlet-core/pom.xml
+++ b/containers/jersey-servlet-core/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-container-servlet-core</artifactId>
@@ -34,18 +34,18 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet2.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
</dependencies>
@@ -53,7 +53,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/containers/jersey-servlet/pom.xml b/containers/jersey-servlet/pom.xml
index a9a6634..9f901d0 100644
--- a/containers/jersey-servlet/pom.xml
+++ b/containers/jersey-servlet/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-container-servlet</artifactId>
@@ -34,9 +34,9 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet3.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
@@ -49,6 +49,10 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
@@ -57,7 +61,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/containers/jersey-servlet/src/main/java/org/glassfish/jersey/servlet/init/JerseyServletContainerInitializer.java b/containers/jersey-servlet/src/main/java/org/glassfish/jersey/servlet/init/JerseyServletContainerInitializer.java
index 5d58730..17493a3 100644
--- a/containers/jersey-servlet/src/main/java/org/glassfish/jersey/servlet/init/JerseyServletContainerInitializer.java
+++ b/containers/jersey-servlet/src/main/java/org/glassfish/jersey/servlet/init/JerseyServletContainerInitializer.java
@@ -68,10 +68,10 @@
- If an application subclass is present that is not being handled by an
existing servlet then the servlet added by the ContainerInitializer MUST be
named with the fully qualified name of the Application subclass. If the
- Application subclass is annotated with @PathPrefix and no servlet-mapping
+ Application subclass is annotated with @ApplicationPath and no servlet-mapping
exists for the added servlet then a new servlet mapping is added with the
- value of the @PathPrefix annotation with "/*" appended otherwise the existing
- mapping is used. If the Application subclass is not annotated with @PathPrefix
+ value of the @ApplicationPath annotation with "/*" appended otherwise the existing
+ mapping is used. If the Application subclass is not annotated with @ApplicationPath
then the application MUST be packaged with a web.xml that specifies a servlet
mapping for the added servlet. It is an error for more than one Application
to be deployed at the same effective servlet mapping.
diff --git a/containers/jetty-http/pom.xml b/containers/jetty-http/pom.xml
index eb3d0b8..d4c158e 100644
--- a/containers/jetty-http/pom.xml
+++ b/containers/jetty-http/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.glassfish.jersey.containers</groupId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-container-jetty-http</artifactId>
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
@@ -56,7 +56,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/containers/jetty-servlet/pom.xml b/containers/jetty-servlet/pom.xml
index 8ddf7b4..2b056df 100644
--- a/containers/jetty-servlet/pom.xml
+++ b/containers/jetty-servlet/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-container-jetty-servlet</artifactId>
@@ -63,6 +63,9 @@
<directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>${project.build.directory}/legal</directory>
+ </resource>
</resources>
<plugins>
<plugin>
diff --git a/containers/netty-http/pom.xml b/containers/netty-http/pom.xml
index beb0545..a604811 100644
--- a/containers/netty-http/pom.xml
+++ b/containers/netty-http/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-container-netty-http</artifactId>
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
@@ -48,7 +48,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/containers/pom.xml b/containers/pom.xml
index 2246a14..3be359d 100644
--- a/containers/pom.xml
+++ b/containers/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.containers</groupId>
@@ -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>
diff --git a/containers/simple-http/pom.xml b/containers/simple-http/pom.xml
index e3bfb38..7ef0351 100644
--- a/containers/simple-http/pom.xml
+++ b/containers/simple-http/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-container-simple-http</artifactId>
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
<groupId>org.simpleframework</groupId>
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/core-client/pom.xml b/core-client/pom.xml
index 8db5eab..d10e482 100644
--- a/core-client/pom.xml
+++ b/core-client/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.core</groupId>
@@ -37,7 +37,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -88,14 +88,23 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<inherited>true</inherited>
+ <configuration>
+ <instructions>
+ <Import-Package>
+ javax.annotation.*;version="!",
+ *
+ </Import-Package>
+ <unpackBundle>true</unpackBundle>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
<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>
@@ -106,7 +115,7 @@
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
diff --git a/core-client/src/main/java/org/glassfish/jersey/client/JerseyClient.java b/core-client/src/main/java/org/glassfish/jersey/client/JerseyClient.java
index d94824d..8dadb35 100644
--- a/core-client/src/main/java/org/glassfish/jersey/client/JerseyClient.java
+++ b/core-client/src/main/java/org/glassfish/jersey/client/JerseyClient.java
@@ -71,8 +71,6 @@
private final LinkedBlockingDeque<WeakReference<JerseyClient.ShutdownHook>> shutdownHooks =
new LinkedBlockingDeque<WeakReference<JerseyClient.ShutdownHook>>();
private final ReferenceQueue<JerseyClient.ShutdownHook> shReferenceQueue = new ReferenceQueue<JerseyClient.ShutdownHook>();
- private final ExecutorService executorService;
- private final ScheduledExecutorService scheduledExecutorService;
/**
* Client instance shutdown hook.
@@ -138,39 +136,6 @@
* Create a new Jersey client instance.
*
* @param config jersey client configuration.
- * @param sslContext jersey client SSL context.
- * @param verifier jersey client host name verifier.
- * @param defaultSslContextProvider default SSL context provider.
- */
- protected JerseyClient(final Configuration config,
- final SSLContext sslContext,
- final HostnameVerifier verifier,
- final DefaultSslContextProvider defaultSslContextProvider,
- ExecutorService executorService,
- ScheduledExecutorService scheduledExecutorService) {
- this(config, sslContext == null ? null : Values.unsafe(sslContext), verifier,
- defaultSslContextProvider, executorService, scheduledExecutorService);
- }
-
- /**
- * Create a new Jersey client instance.
- *
- * @param config jersey client configuration.
- * @param sslContextProvider jersey client SSL context provider.
- * @param verifier jersey client host name verifier.
- */
- protected JerseyClient(final Configuration config,
- final UnsafeValue<SSLContext, IllegalStateException> sslContextProvider,
- final HostnameVerifier verifier,
- ExecutorService executorService,
- ScheduledExecutorService scheduledExecutorService) {
- this(config, sslContextProvider, verifier, null, executorService, scheduledExecutorService);
- }
-
- /**
- * Create a new Jersey client instance.
- *
- * @param config jersey client configuration.
* @param sslContextProvider jersey client SSL context provider. Non {@code null} provider is expected to
* return non-default value.
* @param verifier jersey client host name verifier.
@@ -180,15 +145,6 @@
final UnsafeValue<SSLContext, IllegalStateException> sslContextProvider,
final HostnameVerifier verifier,
final DefaultSslContextProvider defaultSslContextProvider) {
- this(config, sslContextProvider, verifier, defaultSslContextProvider, null, null);
- }
-
- protected JerseyClient(final Configuration config,
- final UnsafeValue<SSLContext, IllegalStateException> sslContextProvider,
- final HostnameVerifier verifier,
- final DefaultSslContextProvider defaultSslContextProvider,
- ExecutorService executorService,
- ScheduledExecutorService scheduledExecutorService) {
this.config = config == null ? new ClientConfig(this) : new ClientConfig(this, config);
if (sslContextProvider == null) {
@@ -216,8 +172,6 @@
}
this.hostnameVerifier = verifier;
- this.executorService = executorService;
- this.scheduledExecutorService = scheduledExecutorService;
}
@Override
@@ -430,11 +384,11 @@
}
public ExecutorService getExecutorService() {
- return executorService;
+ return config.getExecutorService();
}
public ScheduledExecutorService getScheduledExecutorService() {
- return scheduledExecutorService;
+ return config.getScheduledExecutorService();
}
@Override
diff --git a/core-client/src/main/java/org/glassfish/jersey/client/JerseyClientBuilder.java b/core-client/src/main/java/org/glassfish/jersey/client/JerseyClientBuilder.java
index b01e8a0..309ef77 100644
--- a/core-client/src/main/java/org/glassfish/jersey/client/JerseyClientBuilder.java
+++ b/core-client/src/main/java/org/glassfish/jersey/client/JerseyClientBuilder.java
@@ -44,8 +44,6 @@
private HostnameVerifier hostnameVerifier;
private SslConfigurator sslConfigurator;
private SSLContext sslContext;
- private ExecutorService executorService;
- private ScheduledExecutorService scheduledExecutorService;
/**
* Create a new custom-configured {@link JerseyClient} instance.
@@ -124,13 +122,13 @@
@Override
public ClientBuilder executorService(ExecutorService executorService) {
- this.executorService = executorService;
+ config.executorService(executorService);
return this;
}
@Override
public ClientBuilder scheduledExecutorService(ScheduledExecutorService scheduledExecutorService) {
- this.scheduledExecutorService = scheduledExecutorService;
+ config.scheduledExecutorService(scheduledExecutorService);
return this;
}
@@ -157,8 +155,7 @@
@Override
public JerseyClient build() {
if (sslContext != null) {
- return new JerseyClient(config, sslContext, hostnameVerifier, null, executorService,
- scheduledExecutorService);
+ return new JerseyClient(config, sslContext, hostnameVerifier, null);
} else if (sslConfigurator != null) {
final SslConfigurator sslConfiguratorCopy = sslConfigurator.copy();
return new JerseyClient(
@@ -169,10 +166,9 @@
return sslConfiguratorCopy.createSSLContext();
}
}),
- hostnameVerifier, executorService, scheduledExecutorService);
+ hostnameVerifier);
} else {
- return new JerseyClient(config, (UnsafeValue<SSLContext, IllegalStateException>) null, hostnameVerifier,
- executorService, scheduledExecutorService);
+ return new JerseyClient(config, (UnsafeValue<SSLContext, IllegalStateException>) null, hostnameVerifier);
}
}
diff --git a/core-client/src/main/java/org/glassfish/jersey/client/authentication/AuthenticationUtil.java b/core-client/src/main/java/org/glassfish/jersey/client/authentication/AuthenticationUtil.java
new file mode 100644
index 0000000..2f8266b
--- /dev/null
+++ b/core-client/src/main/java/org/glassfish/jersey/client/authentication/AuthenticationUtil.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.jersey.client.authentication;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import javax.ws.rs.client.ClientRequestContext;
+
+/**
+ * Common authentication utilities
+ */
+class AuthenticationUtil {
+ static void discardInputAndClose(InputStream is) {
+ byte[] buf = new byte[4096];
+ try {
+ while (true) {
+ if (is.read(buf) <= 0) {
+ break;
+ }
+ }
+ } catch (IOException ex) {
+ // ignore
+ } finally {
+ try {
+ is.close();
+ } catch (IOException ex) {
+ // ignore
+ }
+ }
+ }
+
+ static URI getCacheKey(ClientRequestContext request) {
+ URI requestUri = request.getUri();
+ if (requestUri.getRawQuery() != null) {
+ // Return a URI without the query part of the request URI
+ try {
+ return new URI(
+ requestUri.getScheme(),
+ requestUri.getAuthority(),
+ requestUri.getPath(),
+ null,
+ requestUri.getFragment());
+ } catch (URISyntaxException e) {
+ // Ignore and fall through
+ }
+ }
+ return requestUri;
+ }
+}
diff --git a/core-client/src/main/java/org/glassfish/jersey/client/authentication/BasicAuthenticator.java b/core-client/src/main/java/org/glassfish/jersey/client/authentication/BasicAuthenticator.java
index f526307..be0cfe3 100644
--- a/core-client/src/main/java/org/glassfish/jersey/client/authentication/BasicAuthenticator.java
+++ b/core-client/src/main/java/org/glassfish/jersey/client/authentication/BasicAuthenticator.java
@@ -16,12 +16,15 @@
package org.glassfish.jersey.client.authentication;
+import java.util.Base64;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.ClientResponseContext;
import javax.ws.rs.core.HttpHeaders;
import org.glassfish.jersey.client.internal.LocalizationMessages;
-import org.glassfish.jersey.internal.util.Base64;
/**
* Implementation of Basic Http Authentication method (RFC 2617).
@@ -32,6 +35,8 @@
*/
final class BasicAuthenticator {
+ private static final Logger LOGGER = Logger.getLogger(BasicAuthenticator.class.getName());
+
private final HttpAuthenticationFilter.Credentials defaultCredentials;
/**
@@ -61,22 +66,22 @@
System.arraycopy(prefix, 0, usernamePassword, 0, prefix.length);
System.arraycopy(password, 0, usernamePassword, prefix.length, password.length);
- return "Basic " + Base64.encodeAsString(usernamePassword);
+ return "Basic " + Base64.getEncoder().encodeToString(usernamePassword);
}
/**
* Adds authentication information to the request.
*
* @param request Request context.
- * @throws RequestAuthenticationException in case that basic credentials missing or are in invalid format
*/
- public void filterRequest(ClientRequestContext request) throws RequestAuthenticationException {
+ public void filterRequest(ClientRequestContext request) {
HttpAuthenticationFilter.Credentials credentials = HttpAuthenticationFilter.getCredentials(request,
defaultCredentials, HttpAuthenticationFilter.Type.BASIC);
if (credentials == null) {
- throw new RequestAuthenticationException(LocalizationMessages.AUTHENTICATION_CREDENTIALS_MISSING_BASIC());
+ LOGGER.fine(LocalizationMessages.AUTHENTICATION_CREDENTIALS_NOT_PROVIDED_BASIC());
+ } else {
+ request.getHeaders().add(HttpHeaders.AUTHORIZATION, calculateAuthentication(credentials));
}
- request.getHeaders().add(HttpHeaders.AUTHORIZATION, calculateAuthentication(credentials));
}
/**
@@ -96,6 +101,9 @@
.getCredentials(request, defaultCredentials, HttpAuthenticationFilter.Type.BASIC);
if (credentials == null) {
+ if (response.hasEntity()) {
+ AuthenticationUtil.discardInputAndClose(response.getEntityStream());
+ }
throw new ResponseAuthenticationException(null, LocalizationMessages.AUTHENTICATION_CREDENTIALS_MISSING_BASIC());
}
diff --git a/core-client/src/main/java/org/glassfish/jersey/client/authentication/DigestAuthenticator.java b/core-client/src/main/java/org/glassfish/jersey/client/authentication/DigestAuthenticator.java
index 59f75bd..fd04a1d 100644
--- a/core-client/src/main/java/org/glassfish/jersey/client/authentication/DigestAuthenticator.java
+++ b/core-client/src/main/java/org/glassfish/jersey/client/authentication/DigestAuthenticator.java
@@ -90,7 +90,7 @@
* @throws IOException When error with encryption occurs.
*/
boolean filterRequest(final ClientRequestContext request) throws IOException {
- final DigestScheme digestScheme = digestCache.get(request.getUri());
+ final DigestScheme digestScheme = digestCache.get(AuthenticationUtil.getCacheKey(request));
if (digestScheme != null) {
final HttpAuthenticationFilter.Credentials cred = HttpAuthenticationFilter.getCredentials(request,
this.credentials, HttpAuthenticationFilter.Type.DIGEST);
@@ -125,16 +125,19 @@
final HttpAuthenticationFilter.Credentials cred = HttpAuthenticationFilter.getCredentials(request,
this.credentials, HttpAuthenticationFilter.Type.DIGEST);
if (cred == null) {
-
+ if (response.hasEntity()) {
+ AuthenticationUtil.discardInputAndClose(response.getEntityStream());
+ }
throw new ResponseAuthenticationException(null, LocalizationMessages.AUTHENTICATION_CREDENTIALS_MISSING_DIGEST());
}
final boolean success = HttpAuthenticationFilter.repeatRequest(request, response, createNextAuthToken(digestScheme,
request, cred));
+ URI cacheKey = AuthenticationUtil.getCacheKey(request);
if (success) {
- digestCache.put(request.getUri(), digestScheme);
+ digestCache.put(cacheKey, digestScheme);
} else {
- digestCache.remove(request.getUri());
+ digestCache.remove(cacheKey);
}
return success;
}
diff --git a/core-client/src/main/java/org/glassfish/jersey/client/authentication/HttpAuthenticationFilter.java b/core-client/src/main/java/org/glassfish/jersey/client/authentication/HttpAuthenticationFilter.java
index 97675c3..09185c4 100644
--- a/core-client/src/main/java/org/glassfish/jersey/client/authentication/HttpAuthenticationFilter.java
+++ b/core-client/src/main/java/org/glassfish/jersey/client/authentication/HttpAuthenticationFilter.java
@@ -25,9 +25,9 @@
import java.util.List;
import java.util.Map;
+import javax.annotation.Priority;
import javax.ws.rs.Priorities;
import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.ClientRequestFilter;
import javax.ws.rs.client.ClientResponseContext;
@@ -42,8 +42,6 @@
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
-import javax.annotation.Priority;
-
import org.glassfish.jersey.client.ClientProperties;
import org.glassfish.jersey.client.internal.LocalizationMessages;
@@ -198,15 +196,21 @@
Type result = null; // which authentication is requested: BASIC or DIGEST
boolean authenticate;
+ // If the server requests both BASIC and DIGEST, prefer DIGEST since it's stronger
+ // (see https://tools.ietf.org/html/rfc2617#section-4.6)
if (response.getStatus() == Response.Status.UNAUTHORIZED.getStatusCode()) {
- String authString = response.getHeaders().getFirst(HttpHeaders.WWW_AUTHENTICATE);
- if (authString != null) {
- final String upperCaseAuth = authString.trim().toUpperCase();
- if (upperCaseAuth.startsWith("BASIC")) {
- result = Type.BASIC;
- } else if (upperCaseAuth.startsWith("DIGEST")) {
- result = Type.DIGEST;
- } else {
+ List<String> authStrings = response.getHeaders().get(HttpHeaders.WWW_AUTHENTICATE);
+ if (authStrings != null) {
+ for (String authString : authStrings) {
+ final String upperCaseAuth = authString.trim().toUpperCase();
+ if (result == null && upperCaseAuth.startsWith("BASIC")) {
+ result = Type.BASIC;
+ } else if (upperCaseAuth.startsWith("DIGEST")) {
+ result = Type.DIGEST;
+ }
+ }
+
+ if (result == null) {
// unknown authentication -> this filter cannot authenticate with this method
return;
}
@@ -247,7 +251,7 @@
}
private String getCacheKey(ClientRequestContext request) {
- return request.getUri().toString() + ":" + request.getMethod();
+ return AuthenticationUtil.getCacheKey(request).toString() + ":" + request.getMethod();
}
private void updateCache(ClientRequestContext request, boolean success, Type operation) {
@@ -270,8 +274,16 @@
* {@code false} otherwise).
*/
static boolean repeatRequest(ClientRequestContext request, ClientResponseContext response, String newAuthorizationHeader) {
- Client client = request.getClient();
+ // If the failed response has an entity stream, close it. We must do this to avoid leaking a connection
+ // when we replace the entity stream of the failed response with that of the repeated response (see below).
+ // Notice that by closing the entity stream before sending the repeated request we allow the connection allocated
+ // to the failed request to be reused, if possible, for the repeated request.
+ if (response.hasEntity()) {
+ AuthenticationUtil.discardInputAndClose(response.getEntityStream());
+ response.setEntityStream(null);
+ }
+ Client client = request.getClient();
String method = request.getMethod();
MediaType mediaType = request.getMediaType();
URI lUri = request.getUri();
@@ -294,6 +306,12 @@
builder.property(REQUEST_PROPERTY_FILTER_REUSED, "true");
+ // Copy other properties, if any, from the original request
+ for (String propertyName : request.getPropertyNames()) {
+ Object propertyValue = request.getProperty(propertyName);
+ builder.property(propertyName, propertyValue);
+ }
+
Invocation invocation;
if (request.getEntity() == null) {
invocation = builder.build(method);
diff --git a/core-client/src/main/resources/org/glassfish/jersey/client/internal/localization.properties b/core-client/src/main/resources/org/glassfish/jersey/client/internal/localization.properties
index 12134f7..7e45210 100644
--- a/core-client/src/main/resources/org/glassfish/jersey/client/internal/localization.properties
+++ b/core-client/src/main/resources/org/glassfish/jersey/client/internal/localization.properties
@@ -16,6 +16,7 @@
#brief.message.identifier=Message text, possibly with some attributes "{0}" etc.
authentication.credentials.missing.basic=Credentials must be defined for basic authentication. Define username and password either when creating HttpAuthenticationFeature or use specific credentials for each request using the request property (see HttpAuthenticationFeature).
+authentication.credentials.not.provided.basic=No credentials are provided for basic authentication. Request will be sent without an Authorization header.
authentication.credentials.missing.digest=Credentials must be defined for digest authentication. Define username and password either when creating HttpAuthenticationFeature or use specific credentials for each request using the request property (see HttpAuthenticationFeature).
authentication.credentials.request.password.unsupported=Unsupported password type class. Password passed in the request property must be String or byte[].
chunked.input.closed=Chunked input has been closed already.
diff --git a/core-client/src/test/java/org/glassfish/jersey/client/ClientConfigTest.java b/core-client/src/test/java/org/glassfish/jersey/client/ClientConfigTest.java
index 558cf69..05234b1 100644
--- a/core-client/src/test/java/org/glassfish/jersey/client/ClientConfigTest.java
+++ b/core-client/src/test/java/org/glassfish/jersey/client/ClientConfigTest.java
@@ -158,7 +158,7 @@
}
/**
- * Copied from DefaultConfigTest.
+ * Copied from CommonConfigTest.
*/
@Test
public void testGetFeatures() {
diff --git a/core-client/src/test/java/org/glassfish/jersey/client/filter/HttpBasicAuthFilterTest.java b/core-client/src/test/java/org/glassfish/jersey/client/filter/HttpBasicAuthFilterTest.java
index 43f2511..e967db0 100644
--- a/core-client/src/test/java/org/glassfish/jersey/client/filter/HttpBasicAuthFilterTest.java
+++ b/core-client/src/test/java/org/glassfish/jersey/client/filter/HttpBasicAuthFilterTest.java
@@ -17,6 +17,7 @@
package org.glassfish.jersey.client.filter;
+import java.util.Base64;
import java.util.concurrent.Future;
import javax.ws.rs.client.Client;
@@ -34,7 +35,7 @@
import org.glassfish.jersey.client.spi.AsyncConnectorCallback;
import org.glassfish.jersey.client.spi.Connector;
import org.glassfish.jersey.client.spi.ConnectorProvider;
-import org.glassfish.jersey.internal.util.Base64;
+
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -53,7 +54,8 @@
Invocation.Builder invBuilder = client.target(UriBuilder.fromUri("/").build()).request();
Response r = invBuilder.get();
- assertEquals("Basic " + Base64.encodeAsString("Uzivatelske jmeno:Heslo"), r.getHeaderString(HttpHeaders.AUTHORIZATION));
+ assertEquals("Basic " + Base64.getEncoder().encodeToString("Uzivatelske jmeno:Heslo".getBytes()),
+ r.getHeaderString(HttpHeaders.AUTHORIZATION));
}
@Test
@@ -63,7 +65,7 @@
Invocation.Builder invBuilder = client.target(UriBuilder.fromUri("/").build()).request();
Response r = invBuilder.get();
- assertEquals("Basic " + Base64.encodeAsString(":"), r.getHeaderString(HttpHeaders.AUTHORIZATION));
+ assertEquals("Basic " + Base64.getEncoder().encodeToString(":".getBytes()), r.getHeaderString(HttpHeaders.AUTHORIZATION));
}
private static class TestConnector implements Connector, ConnectorProvider {
diff --git a/core-common/pom.xml b/core-common/pom.xml
index 37de72a..f4ad864 100644
--- a/core-common/pom.xml
+++ b/core-common/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.core</groupId>
@@ -95,7 +95,7 @@
</plugin>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -126,6 +126,8 @@
<!-- Note: When you're changing these properties change them also in bundles/jaxrs-ri/pom.xml. -->
<Import-Package>
sun.misc.*;resolution:=optional,
+ javax.activation.*;version="!",
+ javax.annotation.*;version="!",
*
</Import-Package>
<Export-Package>org.glassfish.jersey.*;version=${project.version}</Export-Package>
@@ -167,12 +169,12 @@
<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>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -181,7 +183,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
diff --git a/core-common/src/main/java/org/glassfish/jersey/SslConfigurator.java b/core-common/src/main/java/org/glassfish/jersey/SslConfigurator.java
index 0cca232..1f03bfc 100644
--- a/core-common/src/main/java/org/glassfish/jersey/SslConfigurator.java
+++ b/core-common/src/main/java/org/glassfish/jersey/SslConfigurator.java
@@ -282,10 +282,7 @@
}
/**
- * Get a new & initialized SSL configurator instance.
- *
- * The instance {@link #retrieve(java.util.Properties) retrieves} the initial configuration from
- * {@link System#getProperties() system properties}.
+ * Get a new & initialized SSL configurator instance. The the instantiated configurator will be empty.
*
* @return new & initialized SSL configurator instance.
*/
@@ -296,9 +293,9 @@
/**
* Get a new SSL configurator instance.
*
- * @param readSystemProperties if {@code true}, {@link #retrieve(java.util.Properties) Retrieves}
- * the initial configuration from {@link System#getProperties()},
- * otherwise the instantiated configurator will be empty.
+ * @param readSystemProperties if {@code true}, {@link #retrieve() Retrieves} the initial configuration from
+ * {@link System#getProperty(String)}}, otherwise the instantiated configurator will
+ * be empty.
* @return new SSL configurator instance.
*/
public static SslConfigurator newInstance(boolean readSystemProperties) {
@@ -307,7 +304,7 @@
private SslConfigurator(boolean readSystemProperties) {
if (readSystemProperties) {
- retrieve(AccessController.doPrivileged(PropertiesHelper.getSystemProperties()));
+ retrieve();
}
}
@@ -821,6 +818,55 @@
return this;
}
+ /**
+ * Retrieve the SSL context configuration from the system properties.
+ *
+ * @return updated SSL configurator instance.
+ */
+ public SslConfigurator retrieve() {
+ trustStoreProvider = AccessController.doPrivileged(
+ PropertiesHelper.getSystemProperty(TRUST_STORE_PROVIDER));
+ keyStoreProvider = AccessController.doPrivileged(
+ PropertiesHelper.getSystemProperty(KEY_STORE_PROVIDER));
+
+ trustManagerFactoryProvider = AccessController.doPrivileged(
+ PropertiesHelper.getSystemProperty(TRUST_MANAGER_FACTORY_PROVIDER));
+ keyManagerFactoryProvider = AccessController.doPrivileged(
+ PropertiesHelper.getSystemProperty(KEY_MANAGER_FACTORY_PROVIDER));
+
+ trustStoreType = AccessController.doPrivileged(PropertiesHelper.getSystemProperty(TRUST_STORE_TYPE));
+ keyStoreType = AccessController.doPrivileged(PropertiesHelper.getSystemProperty(KEY_STORE_TYPE));
+
+ final String trustStorePassword = AccessController.doPrivileged(
+ PropertiesHelper.getSystemProperty(TRUST_STORE_PASSWORD));
+ if (trustStorePassword != null) {
+ trustStorePass = trustStorePassword.toCharArray();
+ } else {
+ trustStorePass = null;
+ }
+
+ final String keyStorePassword = AccessController.doPrivileged(
+ PropertiesHelper.getSystemProperty(KEY_STORE_PASSWORD));
+ if (keyStorePassword != null) {
+ keyStorePass = keyStorePassword.toCharArray();
+ } else {
+ keyStorePass = null;
+ }
+
+ trustStoreFile = AccessController.doPrivileged(PropertiesHelper.getSystemProperty(TRUST_STORE_FILE));
+ keyStoreFile = AccessController.doPrivileged(PropertiesHelper.getSystemProperty(KEY_STORE_FILE));
+
+ trustStoreBytes = null;
+ keyStoreBytes = null;
+
+ trustStore = null;
+ keyStore = null;
+
+ securityProtocol = "TLS";
+
+ return this;
+ }
+
@Override
public boolean equals(Object o) {
if (this == o) {
diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/OsgiRegistry.java b/core-common/src/main/java/org/glassfish/jersey/internal/OsgiRegistry.java
index e96fee4..846e133 100644
--- a/core-common/src/main/java/org/glassfish/jersey/internal/OsgiRegistry.java
+++ b/core-common/src/main/java/org/glassfish/jersey/internal/OsgiRegistry.java
@@ -210,6 +210,9 @@
if (providerClassName.trim().length() == 0) {
continue;
}
+ if (providerClassName.startsWith("#")) {
+ continue;
+ }
if (LOGGER.isLoggable(Level.FINEST)) {
LOGGER.log(Level.FINEST, "SPI provider: {0}", providerClassName);
}
diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/l10n/Localizable.java b/core-common/src/main/java/org/glassfish/jersey/internal/l10n/Localizable.java
index a518896..d9a0274 100644
--- a/core-common/src/main/java/org/glassfish/jersey/internal/l10n/Localizable.java
+++ b/core-common/src/main/java/org/glassfish/jersey/internal/l10n/Localizable.java
@@ -16,6 +16,9 @@
package org.glassfish.jersey.internal.l10n;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
/**
* Localizable message.
*
@@ -54,4 +57,11 @@
* @return the localization messages resource bundle name.
*/
public String getResourceBundleName();
+
+ /**
+ * Get the resource bundle of the given localization.
+ * @param locale the given {@code Locale}
+ * @return the localization messages resource bundle for given locale.
+ */
+ public ResourceBundle getResourceBundle(Locale locale);
}
diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/l10n/LocalizableMessage.java b/core-common/src/main/java/org/glassfish/jersey/internal/l10n/LocalizableMessage.java
index e5e402d..b941485 100644
--- a/core-common/src/main/java/org/glassfish/jersey/internal/l10n/LocalizableMessage.java
+++ b/core-common/src/main/java/org/glassfish/jersey/internal/l10n/LocalizableMessage.java
@@ -16,17 +16,30 @@
package org.glassfish.jersey.internal.l10n;
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
/**
* @author WS Development Team
*/
public final class LocalizableMessage implements Localizable {
private final String _bundlename;
+ private final LocalizableMessageFactory.ResourceBundleSupplier _rbSupplier;
+
private final String _key;
private final Object[] _args;
+ @Deprecated
public LocalizableMessage(String bundlename, String key, Object... args) {
+ this(bundlename, null, key, args);
+ }
+
+ public LocalizableMessage(String bundlename, LocalizableMessageFactory.ResourceBundleSupplier rbSupplier,
+ String key, Object... args) {
_bundlename = bundlename;
+ _rbSupplier = rbSupplier;
_key = key;
if (args == null) {
args = new Object[0];
@@ -41,11 +54,20 @@
@Override
public Object[] getArguments() {
- return _args.clone();
+ return Arrays.copyOf(_args, _args.length);
}
@Override
public String getResourceBundleName() {
return _bundlename;
}
-}
+
+ @Override
+ public ResourceBundle getResourceBundle(Locale locale) {
+ if (_rbSupplier == null) {
+ return null;
+ }
+
+ return _rbSupplier.getResourceBundle(locale);
+ }
+}
\ No newline at end of file
diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/l10n/LocalizableMessageFactory.java b/core-common/src/main/java/org/glassfish/jersey/internal/l10n/LocalizableMessageFactory.java
index 5886fe0..d5d62e2 100644
--- a/core-common/src/main/java/org/glassfish/jersey/internal/l10n/LocalizableMessageFactory.java
+++ b/core-common/src/main/java/org/glassfish/jersey/internal/l10n/LocalizableMessageFactory.java
@@ -16,19 +16,39 @@
package org.glassfish.jersey.internal.l10n;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
/**
* @author WS Development Team
*/
public class LocalizableMessageFactory {
private final String _bundlename;
+ private final ResourceBundleSupplier _rbSupplier;
+ @Deprecated
public LocalizableMessageFactory(String bundlename) {
_bundlename = bundlename;
+ _rbSupplier = null;
+ }
+
+ public LocalizableMessageFactory(String bundlename, ResourceBundleSupplier rbSupplier) {
+ _bundlename = bundlename;
+ _rbSupplier = rbSupplier;
}
public Localizable getMessage(String key, Object... args) {
- return new LocalizableMessage(_bundlename, key, args);
+ return new LocalizableMessage(_bundlename, _rbSupplier, key, args);
+ }
+
+ public interface ResourceBundleSupplier {
+ /**
+ * Gets the ResourceBundle.
+ * @param locale the requested bundle's locale
+ * @return ResourceBundle
+ */
+ ResourceBundle getResourceBundle(Locale locale);
}
}
diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/l10n/Localizer.java b/core-common/src/main/java/org/glassfish/jersey/internal/l10n/Localizer.java
index b812d64..058617f 100644
--- a/core-common/src/main/java/org/glassfish/jersey/internal/l10n/Localizer.java
+++ b/core-common/src/main/java/org/glassfish/jersey/internal/l10n/Localizer.java
@@ -86,7 +86,12 @@
alternateBundleName,
_locale);
} catch (MissingResourceException e2) {
- // try OSGi
+ //try context classloader
+ try {
+ bundle = ResourceBundle.getBundle(bundlename, _locale,
+ Thread.currentThread().getContextClassLoader());
+ } catch (MissingResourceException e3) {
+ // try OSGi
OsgiRegistry osgiRegistry = ReflectionHelper.getOsgiRegistryInstance();
if (osgiRegistry != null) {
bundle = osgiRegistry.getResourceBundle(bundlename);
@@ -101,6 +106,7 @@
}
}
}
+ }
}
}
}
diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/util/Base64.java b/core-common/src/main/java/org/glassfish/jersey/internal/util/Base64.java
deleted file mode 100644
index f3c6f57..0000000
--- a/core-common/src/main/java/org/glassfish/jersey/internal/util/Base64.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.jersey.internal.util;
-
-import java.io.UnsupportedEncodingException;
-
-/**
- * Utility class that implements base64 encoding and decoding.
- *
- * @author Martin Matula
- */
-public class Base64 {
-
- private static final byte[] CHAR_SET;
-
- static {
- final String s = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
- byte[] cs;
-
- try {
- cs = s.getBytes("ASCII");
- } catch (final UnsupportedEncodingException ex) {
- // should never happen
- cs = s.getBytes();
- }
- CHAR_SET = cs;
- }
-
- private static final byte[] BASE64INDEXES = {
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 62, 64, 64, 64, 63,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 64, 64, 64, 64, 64, 64,
- 64, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 64, 64, 64, 64, 64,
- 64, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64
- };
-
- /**
- * Encodes array of bytes using base64 encoding.
- *
- * @param buffer Array of bytes to be encoded.
- * @return Encoded result as an array of bytes.
- */
- public static byte[] encode(final byte[] buffer) {
- final int ccount = buffer.length / 3;
- final int rest = buffer.length % 3;
- final byte[] result = new byte[(ccount + (rest > 0 ? 1 : 0)) * 4];
-
- for (int i = 0; i < ccount; i++) {
- result[i * 4] = CHAR_SET[(buffer[i * 3] >> 2) & 0xff];
- result[i * 4 + 1] = CHAR_SET[(((buffer[i * 3] & 0x03) << 4) | (buffer[i * 3 + 1] >> 4)) & 0xff];
- result[i * 4 + 2] = CHAR_SET[(((buffer[i * 3 + 1] & 0x0f) << 2) | (buffer[i * 3 + 2] >> 6)) & 0xff];
- result[i * 4 + 3] = CHAR_SET[buffer[i * 3 + 2] & 0x3f];
- }
-
- int temp = 0;
-
- if (rest > 0) {
- if (rest == 2) {
- result[ccount * 4 + 2] = CHAR_SET[((buffer[ccount * 3 + 1] & 0x0f) << 2) & 0xff];
- temp = buffer[ccount * 3 + 1] >> 4;
- } else {
- result[ccount * 4 + 2] = CHAR_SET[CHAR_SET.length - 1];
- }
- result[ccount * 4 + 3] = CHAR_SET[CHAR_SET.length - 1];
- result[ccount * 4 + 1] = CHAR_SET[(((buffer[ccount * 3] & 0x03) << 4) | temp) & 0xff];
- result[ccount * 4] = CHAR_SET[(buffer[ccount * 3] >> 2) & 0xff];
- }
-
- return result;
- }
-
- /**
- * Decodes Base64 data into octects.
- *
- * @param buffer Byte array containing Base64 data
- * @return Array containing decoded data.
- */
- @SuppressWarnings("fallthrough")
- public static byte[] decode(final byte[] buffer) {
- if (buffer.length < 4 && (buffer.length % 4) != 0) {
- return new byte[0];
- }
-
- final int ccount = buffer.length / 4;
- final int paddingCount = (buffer[buffer.length - 1] == '=' ? 1 : 0) + (buffer[buffer.length - 2] == '=' ? 1 : 0);
- final byte[] result = new byte[3 * (ccount - 1) + (3 - paddingCount)];
-
- for (int i = 0; i < (ccount - 1); i++) {
- result[i * 3] = (byte) ((BASE64INDEXES[buffer[i * 4]] << 2) | (BASE64INDEXES[buffer[i * 4 + 1]] >> 4));
- result[i * 3 + 1] = (byte) ((BASE64INDEXES[buffer[i * 4 + 1]] << 4) | (BASE64INDEXES[buffer[i * 4 + 2]] >> 2));
- result[i * 3 + 2] = (byte) ((BASE64INDEXES[buffer[i * 4 + 2]] << 6) | BASE64INDEXES[buffer[i * 4 + 3]]);
- }
-
- final int i = ccount - 1;
- switch (paddingCount) {
- case 0:
- result[i * 3 + 2] = (byte) ((BASE64INDEXES[buffer[i * 4 + 2]] << 6) | BASE64INDEXES[buffer[i * 4 + 3]]);
- result[i * 3 + 1] = (byte) ((BASE64INDEXES[buffer[i * 4 + 1]] << 4) | (BASE64INDEXES[buffer[i * 4 + 2]] >> 2));
- result[i * 3] = (byte) ((BASE64INDEXES[buffer[i * 4]] << 2) | (BASE64INDEXES[buffer[i * 4 + 1]] >> 4));
- break;
- case 1:
- result[i * 3 + 1] = (byte) ((BASE64INDEXES[buffer[i * 4 + 1]] << 4) | (BASE64INDEXES[buffer[i * 4 + 2]] >> 2));
- result[i * 3] = (byte) ((BASE64INDEXES[buffer[i * 4]] << 2) | (BASE64INDEXES[buffer[i * 4 + 1]] >> 4));
- break;
- case 2:
- result[i * 3] = (byte) ((BASE64INDEXES[buffer[i * 4]] << 2) | (BASE64INDEXES[buffer[i * 4 + 1]] >> 4));
- break;
- }
-
- return result;
- }
-
- /**
- * Encodes array of bytes using base64 encoding and returns the result as a string.
- *
- * @param buffer Array of bytes to be encoded.
- * @return Resulting encoded string.
- */
- public static String encodeAsString(final byte[] buffer) {
- final byte[] result = encode(buffer);
- try {
- return new String(result, "ASCII");
- } catch (final UnsupportedEncodingException ex) {
- // should never happen
- return new String(result);
- }
- }
-
- /**
- * Encodes a string using base64 and returns the result as another string.
- *
- * @param text String to be encoded.
- * @return Resulting encoded string.
- */
- public static String encodeAsString(final String text) {
- return encodeAsString(text.getBytes());
- }
-
- /**
- * Decodes array of bytes using base64 decoding and returns the result as a string.
- *
- * @param buffer Array of bytes to be decoded.
- * @return Resulting decoded string.
- */
- public static String decodeAsString(final byte[] buffer) {
- final byte[] result = decode(buffer);
- try {
- return new String(result, "ASCII");
- } catch (final UnsupportedEncodingException ex) {
- // should never happen
- return new String(result);
- }
- }
-
- /**
- * Decodes a string using base64 and returns the result as another string.
- *
- * @param text String to be decoded.
- * @return Resulting decoded string.
- */
- public static String decodeAsString(final String text) {
- return decodeAsString(text.getBytes());
- }
-}
diff --git a/core-common/src/main/java/org/glassfish/jersey/logging/LoggingInterceptor.java b/core-common/src/main/java/org/glassfish/jersey/logging/LoggingInterceptor.java
index e37c2c8..85e0e08 100644
--- a/core-common/src/main/java/org/glassfish/jersey/logging/LoggingInterceptor.java
+++ b/core-common/src/main/java/org/glassfish/jersey/logging/LoggingInterceptor.java
@@ -70,8 +70,16 @@
private static final String NOTIFICATION_PREFIX = "* ";
private static final MediaType TEXT_MEDIA_TYPE = new MediaType("text", "*");
+ /**
+ * application/vnd.api+json (documented here: http://jsonapi.org/)
+ * is a modified form of JSON, which is not present in the JAX-RS
+ * MediaType class as a static constant. Requested in Issue #3849
+ */
+ private static final MediaType APPLICATION_VND_API_JSON = new MediaType("application", "vnd.api+json");
+
private static final Set<MediaType> READABLE_APP_MEDIA_TYPES = new HashSet<MediaType>() {{
add(TEXT_MEDIA_TYPE);
+ add(APPLICATION_VND_API_JSON);
add(MediaType.APPLICATION_ATOM_XML_TYPE);
add(MediaType.APPLICATION_FORM_URLENCODED_TYPE);
add(MediaType.APPLICATION_JSON_TYPE);
diff --git a/core-common/src/main/java/org/glassfish/jersey/message/internal/MessageBodyFactory.java b/core-common/src/main/java/org/glassfish/jersey/message/internal/MessageBodyFactory.java
index ae361ee..5b78763 100644
--- a/core-common/src/main/java/org/glassfish/jersey/message/internal/MessageBodyFactory.java
+++ b/core-common/src/main/java/org/glassfish/jersey/message/internal/MessageBodyFactory.java
@@ -138,7 +138,7 @@
* and then by the declared supported media types, if the provided classes
* are the same.
*/
- private static final Comparator<AbstractEntityProviderModel<?>> WORKER_BY_TYPE_COMPARATOR =
+ static final Comparator<AbstractEntityProviderModel<?>> WORKER_BY_TYPE_COMPARATOR =
new Comparator<AbstractEntityProviderModel<?>>() {
@Override
@@ -154,7 +154,8 @@
} else if (o2ProviderClassParam.isAssignableFrom(o1ProviderClassParam)) {
return -1;
}
- return 0;
+ // Fallback to comparing provided class name.
+ return CLASS_BY_NAME_COMPARATOR.compare(o1ProviderClassParam, o2ProviderClassParam);
}
private int compare(List<MediaType> mediaTypeList1, List<MediaType> mediaTypeList2) {
@@ -165,6 +166,8 @@
}
};
+ private static final Comparator<Class<?>> CLASS_BY_NAME_COMPARATOR = Comparator.comparing(Class::getName);
+
private InjectionManager injectionManager;
private final Boolean legacyProviderOrdering;
diff --git a/core-common/src/main/resources/META-INF/NOTICE.md b/core-common/src/main/resources/META-INF/NOTICE.markdown
similarity index 100%
rename from core-common/src/main/resources/META-INF/NOTICE.md
rename to core-common/src/main/resources/META-INF/NOTICE.markdown
diff --git a/core-common/src/test/java/org/glassfish/jersey/internal/util/Base64Test.java b/core-common/src/test/java/org/glassfish/jersey/internal/util/Base64Test.java
index 89dfa98..b083ad9 100644
--- a/core-common/src/test/java/org/glassfish/jersey/internal/util/Base64Test.java
+++ b/core-common/src/test/java/org/glassfish/jersey/internal/util/Base64Test.java
@@ -17,6 +17,7 @@
package org.glassfish.jersey.internal.util;
import java.util.Arrays;
+import java.util.Base64;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -48,35 +49,35 @@
@Test
public void testEncodeString() throws Exception {
for (int i = 0; i < decoded.length; i++) {
- assertEquals(encoded[i], new String(Base64.encode(decoded[i].getBytes("ASCII")), "ASCII"));
+ assertEquals(encoded[i], new String(Base64.getEncoder().encode(decoded[i].getBytes("ASCII")), "ASCII"));
}
}
@Test
public void testDecodeString() throws Exception {
for (int i = 0; i < encoded.length; i++) {
- assertEquals(decoded[i], new String(Base64.decode(encoded[i].getBytes("ASCII")), "ASCII"));
+ assertEquals(decoded[i], new String(Base64.getDecoder().decode(encoded[i].getBytes("ASCII")), "ASCII"));
}
}
@Test
public void testRoundtripLengthMod3Equals0() {
byte[] data = {0, 1, 2, 3, 4, 5, 6, 7, 8};
- byte[] result = Base64.decode(Base64.encode(data));
+ byte[] result = Base64.getDecoder().decode(Base64.getEncoder().encode(data));
assertTrue("failed to roundtrip value to base64", Arrays.equals(data, result));
}
@Test
public void testRoundtripLengthMod3Equals1() {
byte[] data = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
- byte[] result = Base64.decode(Base64.encode(data));
+ byte[] result = Base64.getDecoder().decode(Base64.getEncoder().encode(data));
assertTrue("failed to roundtrip value to base64", Arrays.equals(data, result));
}
@Test
public void testRoundtripLengthMod3Equals2() {
byte[] data = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
- byte[] result = Base64.decode(Base64.encode(data));
+ byte[] result = Base64.getDecoder().decode(Base64.getEncoder().encode(data));
assertTrue("failed to roundtrip value to base64", Arrays.equals(data, result));
}
@@ -84,10 +85,10 @@
public void testRoundtripOneByteGreaterThan127() {
byte[] data = {(byte) 128};
try {
- byte[] result = Base64.decode(Base64.encode(data));
- fail();
- } catch (Exception e) {
+ byte[] result = Base64.getDecoder().decode(Base64.getEncoder().encode(data));
// ok
+ } catch (Exception e) {
+ fail();
}
}
@@ -95,10 +96,10 @@
public void testRoundtripAssortedValues() {
byte[] data = {0, 1, 63, 64, 65, (byte) 127, (byte) 128, (byte) 1299, (byte) 254, (byte) 255};
try {
- Base64.decode(Base64.encode(data));
- fail();
- } catch (Exception e) {
+ Base64.getDecoder().decode(Base64.getEncoder().encode(data));
// ok
+ } catch (Exception e) {
+ fail();
}
}
@@ -109,10 +110,10 @@
data[i] = (byte) (255 - i);
}
try {
- new String(Base64.encode(data));
- fail();
- } catch (Exception e) {
+ new String(Base64.getEncoder().encode(data));
// ok
+ } catch (Exception e) {
+ fail();
}
}
@@ -122,7 +123,7 @@
+ "+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn"
+ "+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6"
+ "/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w==";
- byte[] result = Base64.decode(data.getBytes());
+ byte[] result = Base64.getDecoder().decode(data.getBytes());
assertEquals("incorrect length", result.length, 256);
for (int i = 0; i < 256; ++i) {
diff --git a/core-common/src/test/java/org/glassfish/jersey/logging/LoggingInterceptorTest.java b/core-common/src/test/java/org/glassfish/jersey/logging/LoggingInterceptorTest.java
index 4bdeb63..59f2755 100644
--- a/core-common/src/test/java/org/glassfish/jersey/logging/LoggingInterceptorTest.java
+++ b/core-common/src/test/java/org/glassfish/jersey/logging/LoggingInterceptorTest.java
@@ -53,6 +53,11 @@
}
@Test
+ public void testReadableTypeApplicationSubVndApiJson() {
+ assertTrue(LoggingInterceptor.isReadable(new MediaType("application", "vnd.api+json")));
+ }
+
+ @Test
public void testReadableTypeAppSubBinary() {
assertFalse(LoggingInterceptor.isReadable(new MediaType("application", "octet-stream")));
}
diff --git a/core-common/src/test/java/org/glassfish/jersey/message/internal/MessageBodyFactoryTest.java b/core-common/src/test/java/org/glassfish/jersey/message/internal/MessageBodyFactoryTest.java
new file mode 100644
index 0000000..c6ff32c
--- /dev/null
+++ b/core-common/src/test/java/org/glassfish/jersey/message/internal/MessageBodyFactoryTest.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.jersey.message.internal;
+
+import java.lang.reflect.Type;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyWriter;
+
+import org.glassfish.jersey.message.WriterModel;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import static org.glassfish.jersey.message.internal.MessageBodyFactory.WORKER_BY_TYPE_COMPARATOR;
+
+public class MessageBodyFactoryTest {
+
+ @Test
+ public void testWorkerByTypeComparatorContract() {
+ ArrayList<WriterModel> list = new ArrayList<>();
+ list.add(new WriterModel(new BarMessageBodyWriter(), new ArrayList<>(), true));
+ list.add(new WriterModel(new ObjectMessageBodyWriter(), new ArrayList<>(), true));
+ list.add(new WriterModel(new BazMessageBodyWriter(), new ArrayList<>(), true));
+
+ for (WriterModel a : list) {
+ for (WriterModel b : list) {
+ assertEquals(
+ "Comparator breaks contract: compare(a, b) != -compare(b, a)",
+ -Integer.signum(WORKER_BY_TYPE_COMPARATOR.compare(a, b)),
+ Integer.signum(WORKER_BY_TYPE_COMPARATOR.compare(b, a)));
+
+ for (WriterModel c : list) {
+ if (WORKER_BY_TYPE_COMPARATOR.compare(a, b) > 0
+ && WORKER_BY_TYPE_COMPARATOR.compare(b, c) > 0
+ && WORKER_BY_TYPE_COMPARATOR.compare(a, c) <= 0) {
+ fail("Comparator breaks contract: a > b and b > c but a <= c");
+ }
+
+ if (WORKER_BY_TYPE_COMPARATOR.compare(a, b) == 0) {
+ assertEquals(
+ "Comparator breaks contract: a == b but a < c and b > c or vice versa",
+ Integer.signum(WORKER_BY_TYPE_COMPARATOR.compare(a, c)),
+ Integer.signum(WORKER_BY_TYPE_COMPARATOR.compare(b, c)));
+ }
+ }
+ }
+ }
+ }
+
+ static class Bar {
+
+ }
+
+ static class Baz extends Bar {
+
+ }
+
+ /** Implements writer for arbitrary class. */
+ static class BarMessageBodyWriter implements MessageBodyWriter<Bar> {
+
+ @Override
+ public long getSize(Bar bar, Class<?> type, Type genericType, Annotation[] annotation, MediaType mediaType) {
+ return -1;
+ }
+
+ @Override
+ public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotation, MediaType mediaType) {
+ return true;
+ }
+
+ @Override
+ public void writeTo(
+ Bar bar,
+ Class<?> type,
+ Type genericType,
+ Annotation[] annotation,
+ MediaType mediaType,
+ MultivaluedMap<String, Object> headers, OutputStream entityStream) {}
+ }
+
+ /** Implements writer for class that extends from something already provided. */
+ static class BazMessageBodyWriter implements MessageBodyWriter<Baz> {
+
+ @Override
+ public long getSize(Baz baz, Class<?> type, Type genericType, Annotation[] annotation, MediaType mediaType) {
+ return -1;
+ }
+
+ @Override
+ public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotation, MediaType mediaType) {
+ return true;
+ }
+
+ @Override
+ public void writeTo(
+ Baz baz,
+ Class<?> type,
+ Type genericType,
+ Annotation[] annotation,
+ MediaType mediaType,
+ MultivaluedMap<String, Object> headers, OutputStream entityStream) {}
+ }
+
+ /** Implements writer for arbitrary class that cannot be assigned to from other providers. */
+ static class ObjectMessageBodyWriter implements MessageBodyWriter<Integer> {
+
+ @Override
+ public long getSize(Integer i, Class<?> type, Type genericType, Annotation[] annotation, MediaType mediaType) {
+ return -1;
+ }
+
+ @Override
+ public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotation, MediaType mediaType) {
+ return true;
+ }
+
+ @Override
+ public void writeTo(
+ Integer i,
+ Class<?> type,
+ Type genericType,
+ Annotation[] annotation,
+ MediaType mediaType,
+ MultivaluedMap<String, Object> headers, OutputStream entityStream) {}
+ }
+}
diff --git a/core-server/etc/XMLSchema.dtd b/core-server/etc/XMLSchema.dtd
index 69dd7f1..e8e8f76 100644
--- a/core-server/etc/XMLSchema.dtd
+++ b/core-server/etc/XMLSchema.dtd
@@ -1,21 +1,3 @@
-<!--
-
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
<!-- DTD for XML Schemas: Part 1: Structures
Public Identifier: "-//W3C//DTD XMLSCHEMA 200102//EN"
Official Location: http://www.w3.org/2001/XMLSchema.dtd -->
diff --git a/core-server/etc/catalog.xml b/core-server/etc/catalog.xml
index 8990b8d..ef1ee04 100644
--- a/core-server/etc/catalog.xml
+++ b/core-server/etc/catalog.xml
@@ -1,21 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
<system systemId="http://www.w3.org/2001/xml.xsd"
diff --git a/core-server/etc/datatypes.dtd b/core-server/etc/datatypes.dtd
index 93b5363..8e48553 100644
--- a/core-server/etc/datatypes.dtd
+++ b/core-server/etc/datatypes.dtd
@@ -1,22 +1,4 @@
<!--
-
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!--
DTD for XML Schemas: Part 2: Datatypes
$Id: datatypes.dtd,v 1.23 2001/03/16 17:36:30 ht Exp $
Note this DTD is NOT normative, or even definitive. - - the
diff --git a/core-server/etc/wadl.xsd b/core-server/etc/wadl.xsd
index 422d0f2..e3fa243 100644
--- a/core-server/etc/wadl.xsd
+++ b/core-server/etc/wadl.xsd
@@ -1,21 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://wadl.dev.java.net/2009/02"
diff --git a/core-server/etc/xml.xsd b/core-server/etc/xml.xsd
index 816a5e9..af8e822 100644
--- a/core-server/etc/xml.xsd
+++ b/core-server/etc/xml.xsd
@@ -1,21 +1,4 @@
<?xml version='1.0'?>
-<!--
-
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >
<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
diff --git a/core-server/pom.xml b/core-server/pom.xml
index 56294c5..3069a25 100644
--- a/core-server/pom.xml
+++ b/core-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.core</groupId>
@@ -73,7 +73,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -94,6 +94,7 @@
com.sun.research.ws.wadl.*;version=${project.version}
</Export-Package>
<Import-Package>
+ javax.annotation.*;version="!",
javax.validation.*;resolution:=optional;version="${range;[==,3);${javax.validation.api.version}}",
*
</Import-Package>
@@ -111,8 +112,8 @@
<artifactId>maven-jaxb-plugin</artifactId>
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
<version>${jaxb.api.version}</version>
</dependency>
<dependency>
@@ -167,8 +168,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>
@@ -178,13 +179,13 @@
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
diff --git a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ClassReader.java b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ClassReader.java
index 0366274..6246bcf 100644
--- a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ClassReader.java
+++ b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/ClassReader.java
@@ -167,7 +167,7 @@
this.b = b;
// checks the class version
// added "support" for java 11 compiled classes
- if (readShort(off + 6) > Opcodes.V11) {
+ if (readShort(off + 6) > Opcodes.V12) {
throw new IllegalArgumentException();
}
// parses the constant pool
diff --git a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/Opcodes.java b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/Opcodes.java
index 42e403f..3532da6 100644
--- a/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/Opcodes.java
+++ b/core-server/src/main/java/jersey/repackaged/org/objectweb/asm/Opcodes.java
@@ -58,10 +58,11 @@
int V1_6 = 0 << 16 | 50;
int V1_7 = 0 << 16 | 51;
int V1_8 = 0 << 16 | 52;
- // added "support" for java 9, 10, 11 compiled classes
+ // added "support" for java 9, 10, 11, 12 compiled classes
int V9 = 0 << 16 | 53;
int V10 = 0 << 16 | 54;
int V11 = 0 << 16 | 55;
+ int V12 = 0 << 16 | 56;
// access flags
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/internal/inject/ParamConverterFactory.java b/core-server/src/main/java/org/glassfish/jersey/server/internal/inject/ParamConverterFactory.java
index ca54231..2d8afd0 100644
--- a/core-server/src/main/java/org/glassfish/jersey/server/internal/inject/ParamConverterFactory.java
+++ b/core-server/src/main/java/org/glassfish/jersey/server/internal/inject/ParamConverterFactory.java
@@ -19,7 +19,7 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -49,7 +49,7 @@
ParamConverterFactory(Set<ParamConverterProvider> providers, Set<ParamConverterProvider> customProviders) {
- Set<ParamConverterProvider> copyProviders = new HashSet<>(providers);
+ Set<ParamConverterProvider> copyProviders = new LinkedHashSet<>(providers);
converterProviders = new ArrayList<>();
converterProviders.addAll(customProviders);
copyProviders.removeAll(customProviders);
diff --git a/core-server/src/main/resources/META-INF/NOTICE.md b/core-server/src/main/resources/META-INF/NOTICE.markdown
similarity index 84%
rename from core-server/src/main/resources/META-INF/NOTICE.md
rename to core-server/src/main/resources/META-INF/NOTICE.markdown
index 7e9bc00..adf1cef 100644
--- a/core-server/src/main/resources/META-INF/NOTICE.md
+++ b/core-server/src/main/resources/META-INF/NOTICE.markdown
@@ -39,3 +39,7 @@
org.objectweb.asm Version 5.0.4
* License: Modified BSD (http://asm.objectweb.org/license.html)
* Copyright: (c) 2000-2011 INRIA, France Telecom. All rights reserved.
+
+W3.org documents
+* License: W3C License
+* Copyright: Copyright (c) 1994-2001 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
diff --git a/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java b/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java
index 8bf25f8..c81f860 100644
--- a/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java
+++ b/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java
@@ -54,20 +54,20 @@
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.");
}
}
@Test
public void testRecursiveResourceEnumerationOfAllPackages() throws IOException {
- final int actualEntries = countJarEntriesByPattern(Pattern.compile(".*\\.(class|properties|xml)"));
+ final int actualEntries = countJarEntriesByPattern(Pattern.compile(".*\\.(class|properties|xml|md)"));
final int scannedEntries = countJarEntriesUsingScanner("", true);
assertThat("Failed to enumerate all contents of javax.ws.rs-api", scannedEntries, equalTo(actualEntries));
}
diff --git a/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/PackageNamesScannerTest.java b/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/PackageNamesScannerTest.java
index 63aae05..29b18c0 100644
--- a/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/PackageNamesScannerTest.java
+++ b/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/PackageNamesScannerTest.java
@@ -16,7 +16,18 @@
package org.glassfish.jersey.server.internal.scanning;
+import mockit.Expectations;
+import mockit.Injectable;
+import mockit.Tested;
+import mockit.Verifications;
+import mockit.integration.junit4.JMockit;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLStreamHandler;
@@ -26,21 +37,16 @@
import java.util.Vector;
import java.util.jar.JarInputStream;
-import org.junit.Before;
-import org.junit.Test;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import mockit.Expectations;
-import mockit.Mocked;
-import mockit.Verifications;
-
/**
* Unit tests for {@link PackageNamesScanner}.
*
* @author Eric Navarro
* @author Michal Gajdos
*/
+@RunWith(JMockit.class)
public class PackageNamesScannerTest {
private static final String[] packages = {"javax.ws.rs"};
@@ -53,14 +59,14 @@
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.");
}
}
@@ -89,14 +95,23 @@
new PackageNamesScanner(createTestClassLoader("bad", createTestURLStreamHandler("bad"), jaxRsApiPath), packages, false);
}
+
+ @Tested
+ PackageNamesScanner scanner1 = new PackageNamesScanner(new String[]{"javax.ws.rs"}, false);
+ @Tested
+ PackageNamesScanner scanner2 = new PackageNamesScanner(new String[]{"javax.ws.rs.core"}, false);
+ @Tested
+ PackageNamesScanner scanner3 = new PackageNamesScanner(new String[]{"javax.ws.rs.client"}, false);
+
/**
* Reproducer for OWLS-19790: When scanner is reset the underlying JAR input streams should be closed.
*/
@Test
- public void testInputStreamClosedAfterReset(@Mocked final JarInputStream stream) throws Exception {
- final PackageNamesScanner scanner1 = new PackageNamesScanner(new String[] {"javax.ws.rs"}, false);
- final PackageNamesScanner scanner2 = new PackageNamesScanner(new String[] {"javax.ws.rs.core"}, false);
- final PackageNamesScanner scanner3 = new PackageNamesScanner(new String[] {"javax.ws.rs.client"}, false);
+ public void testInputStreamClosedAfterReset() throws Exception {
+ JarInputStream stream = new JarInputStream(
+ new ByteArrayInputStream("test".getBytes(), 0, 4));
+
+ new Expectations(InputStream.class){};
scanner1.reset();
@@ -115,10 +130,12 @@
* Reproducer for OWLS-19790: When scanner is closed the underlying JAR input streams should be closed as well.
*/
@Test
- public void testInputStreamClosedAfterClose(@Mocked final JarInputStream stream) throws Exception {
- final PackageNamesScanner scanner1 = new PackageNamesScanner(new String[] {"javax.ws.rs"}, false);
- final PackageNamesScanner scanner2 = new PackageNamesScanner(new String[] {"javax.ws.rs.core"}, false);
- final PackageNamesScanner scanner3 = new PackageNamesScanner(new String[] {"javax.ws.rs.client"}, false);
+ public void testInputStreamClosedAfterClose() throws Exception {
+
+ JarInputStream stream = new JarInputStream(
+ new ByteArrayInputStream("test".getBytes(), 0, 4));
+
+ new Expectations(JarInputStream.class){};
scanner1.close();
@@ -136,16 +153,19 @@
/**
* Reproducer for OWLS-19790: When we iterate through the all entries provided by a scanner JAR input stream should be closed.
*/
+ @Tested
+ PackageNamesScanner scanner = new PackageNamesScanner(new String[]{"javax.ws.rs"}, false);
@Test
- public void testInputStreamClosedAfterIteration(@Mocked final JarInputStream stream) throws Exception {
- new Expectations() {{
+ public void testInputStreamClosedAfterIteration(@Injectable("false") boolean recursive) throws Exception {
+ JarInputStream stream = new JarInputStream(
+ new ByteArrayInputStream("test".getBytes(), 0, 4));
+
+ new Expectations(JarInputStream.class) {{
stream.getNextJarEntry();
result = null;
stream.close();
}};
- final PackageNamesScanner scanner = new PackageNamesScanner(new String[] {"javax.ws.rs"}, false);
-
while (scanner.hasNext()) {
scanner.next();
}
diff --git a/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/VFSSchemeResourceFinderTest.java b/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/VFSSchemeResourceFinderTest.java
index 681aa17..2c50cd7 100644
--- a/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/VFSSchemeResourceFinderTest.java
+++ b/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/VFSSchemeResourceFinderTest.java
@@ -50,14 +50,14 @@
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.");
}
}
@@ -75,7 +75,7 @@
while (entries.hasMoreElements()) {
final JarEntry entry = entries.nextElement();
- if (entry.getName().endsWith(".class")) {
+ if (entry.getName().endsWith(".class") && !entry.getName().endsWith("module-info.class")) {
actualEntries++;
}
}
diff --git a/docs/pom.xml b/docs/pom.xml
index 8b68994..8b08277 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,14 +22,14 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-documentation</artifactId>
<packaging>pom</packaging>
<name>jersey-documentation</name>
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<properties>
<javanet.repository.id>releases</javanet.repository.id>
<jersey.docs.version>${jersey.version}</jersey.docs.version>
diff --git a/docs/src/main/docbook/dependencies.xml b/docs/src/main/docbook/dependencies.xml
index 5d60d3f..83ef88b 100644
--- a/docs/src/main/docbook/dependencies.xml
+++ b/docs/src/main/docbook/dependencies.xml
@@ -93,8 +93,8 @@
</para>
<programlisting language="xml"><dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<version>&jax-rs-api-jar.version;</version>
<scope>provided</scope>
</dependency></programlisting>
diff --git a/etc/config/copyright-exclude b/etc/config/copyright-exclude
index d5c25ed..e821711 100644
--- a/etc/config/copyright-exclude
+++ b/etc/config/copyright-exclude
@@ -24,6 +24,8 @@
.zip
.dat
.lua
+travis.sh
+.travis.yml
/docs/src/main/docbook/inc/modules_table_footer.src
/docs/src/main/docbook/inc/modules_table_header.src
/docs/src/main/docbook/inc/modules_table_row.src
@@ -35,6 +37,9 @@
/etc/jersey-1-migrated-tests
/etc/config/copyright-exclude
/etc/config/copyright.txt
+/etc/config/edl-copyright.txt
+/etc/jenkins/
+/etc/travis/
/LICENSE.md
/third-party-license-readme.txt
nb-configuration.xml
@@ -51,7 +56,9 @@
truststore-example_com-client
truststore-localhost-client
truststore-server
+/examples/bookstore-webapp
/examples/reload/resources
+/examples/bean-validation-webapp/src/main/webapp/fonts
/core-server/etc
bootstrap
build.readme
@@ -74,6 +81,7 @@
/core-server/src/main/java/org/glassfish/jersey/server/internal/monitoring/core/UniformTimeValuesSnapshot.java
/core-server/src/main/java/jersey/repackaged
/media/json-jackson/src/main/java/org/glassfish/jersey/jackson/internal/jackson
-/examples/bean-validation-webapp/src/main/webapp/fonts
/META-INF/NOTICE.md
NOTICE.md
+/ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/ProcessAllAnnotatedTypes.java
+/ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/ProcessJAXRSAnnotatedTypes.java
diff --git a/etc/config/edl-copyright.txt b/etc/config/edl-copyright.txt
new file mode 100644
index 0000000..4f27da8
--- /dev/null
+++ b/etc/config/edl-copyright.txt
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) YYYY Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Distribution License v. 1.0, which is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
\ No newline at end of file
diff --git a/etc/hudson/README b/etc/hudson/README
deleted file mode 100644
index 321312b..0000000
--- a/etc/hudson/README
+++ /dev/null
@@ -1 +0,0 @@
-Folder containing all Hudson scripts.
\ No newline at end of file
diff --git a/etc/jenkins/Jenkinsfile_EE4J_build b/etc/jenkins/Jenkinsfile_EE4J_build
new file mode 100644
index 0000000..65a8b56
--- /dev/null
+++ b/etc/jenkins/Jenkinsfile_EE4J_build
@@ -0,0 +1,54 @@
+#!/usr/bin/env groovy
+
+pipeline {
+ agent any
+ triggers {
+ pollSCM('H H * * *')
+ }
+ tools {
+ jdk 'oracle-jdk8-latest'
+ maven 'apache-maven-latest'
+ }
+ environment {
+ MVN = 'mvn -B -q -Ddoclint=none -Dmaven.test.failure.ignore=true -Dadditionalparam="-Xdoclint:none" -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+ REPO='git@github.com:eclipse-ee4j/jersey.git'
+ SECRET_FILE_ID='6474d9ed-eadc-47a0-8f60-43277c1cad52'
+ SECURITY_FILE_ID='8e6103e6-a03e-44fe-bd9a-a4ed070d9b56'
+ CONFIG_FILE_ID='c88e58d9-97bd-4f06-af82-fd469abcedea'
+ CREDENTIALS_ID='f5848e71-9994-45e3-8214-137ce91ddbcf'
+ BUILD_BRANCH='EE4J_8'
+ }
+ stages {
+ stage('Fetch from git') {
+ steps {
+ git(branch: BUILD_BRANCH, credentialsId: CREDENTIALS_ID, url: REPO)
+ }
+ }
+ stage('Nightly Build') {
+ steps {
+ withCredentials([file(credentialsId: SECRET_FILE_ID, variable: 'KEYRING')]) {
+ configFileProvider([configFile(fileId: SECURITY_FILE_ID, targetLocation: '/home/jenkins/.m2/')]) {
+
+ //# Workaround: GPG initialization
+ sh("gpg --batch --import ${KEYRING}")
+ sh '''
+ for fpr in $(gpg --list-keys --with-colons | awk -F: '/fpr:/ {print $10}' | sort -u);
+ do
+ echo -e "5\ny\n" | gpg --batch --command-fd 0 --expert --edit-key $fpr trust;
+ done
+ '''
+ configFileProvider([configFile(fileId: CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_XML')]) {
+ sh "$MVN -s $MAVEN_SETTINGS_XML clean install"
+ }
+ }
+ }
+ }
+ post {
+ always {
+ archiveArtifacts allowEmptyArchive: true, artifacts: '**/target/**.jar', fingerprint: true, onlyIfSuccessful: true
+ junit allowEmptyResults: true, testResults:'**/target/surefire-reports/*.xml'
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/etc/jenkins/Jenkinsfile_master_build b/etc/jenkins/Jenkinsfile_master_build
new file mode 100644
index 0000000..a4c5483
--- /dev/null
+++ b/etc/jenkins/Jenkinsfile_master_build
@@ -0,0 +1,54 @@
+#!/usr/bin/env groovy
+
+pipeline {
+ agent any
+ triggers {
+ pollSCM('H H * * *')
+ }
+ tools {
+ jdk 'oracle-jdk8-latest'
+ maven 'apache-maven-latest'
+ }
+ environment {
+ MVN = 'mvn -B -q -Dmaven.test.failure.ignore=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+ REPO='git@github.com:eclipse-ee4j/jersey.git'
+ SECRET_FILE_ID='6474d9ed-eadc-47a0-8f60-43277c1cad52'
+ SECURITY_FILE_ID='8e6103e6-a03e-44fe-bd9a-a4ed070d9b56'
+ CONFIG_FILE_ID='c88e58d9-97bd-4f06-af82-fd469abcedea'
+ CREDENTIALS_ID='f5848e71-9994-45e3-8214-137ce91ddbcf'
+ BUILD_BRANCH='master'
+ }
+ stages {
+ stage('Fetch from git') {
+ steps {
+ git(branch: BUILD_BRANCH, credentialsId: CREDENTIALS_ID, url: REPO)
+ }
+ }
+ stage('Nightly Build') {
+ steps {
+ withCredentials([file(credentialsId: SECRET_FILE_ID, variable: 'KEYRING')]) {
+ configFileProvider([configFile(fileId: SECURITY_FILE_ID, targetLocation: '/home/jenkins/.m2/')]) {
+
+ //# Workaround: GPG initialization
+ sh("gpg --batch --import ${KEYRING}")
+ sh '''
+ for fpr in $(gpg --list-keys --with-colons | awk -F: '/fpr:/ {print $10}' | sort -u);
+ do
+ echo -e "5\ny\n" | gpg --batch --command-fd 0 --expert --edit-key $fpr trust;
+ done
+ '''
+ configFileProvider([configFile(fileId: CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_XML')]) {
+ sh "$MVN -s $MAVEN_SETTINGS_XML clean install"
+ }
+ }
+ }
+ }
+ post {
+ always {
+ archiveArtifacts allowEmptyArchive: true, artifacts: '**/target/**.jar', fingerprint: true, onlyIfSuccessful: true
+ junit allowEmptyResults: true, testResults:'**/target/surefire-reports/*.xml'
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/etc/jenkins/Jenkinsfile_release b/etc/jenkins/Jenkinsfile_release
new file mode 100644
index 0000000..6fce5ed
--- /dev/null
+++ b/etc/jenkins/Jenkinsfile_release
@@ -0,0 +1,183 @@
+#!/usr/bin/env groovy
+
+node {
+
+ def MVN_HOME='/opt/tools/apache-maven/latest'
+ def HELP_PLUGIN='org.apache.maven.plugins:maven-help-plugin:2.1.1'
+ def TARGET = 'deploy'
+ def RELEASE_VERSION=RELEASE_VERSION
+ def NEXT_VERSION=NEXT_VERSION
+ def RELEASE_TAG=''
+ def OVERWRITE=OVERWRITE
+ def PROJECT_NAME='Jersey'
+ def LOGIN='jersey-bot'
+ def EMAIL = 'jersey-bot@eclipse.org'
+ def REPO='git@github.com:eclipse-ee4j/jersey.git'
+ def SECRET_FILE_ID='6474d9ed-eadc-47a0-8f60-43277c1cad52'
+ def SECURITY_FILE_ID='8e6103e6-a03e-44fe-bd9a-a4ed070d9b56'
+ def CONFIG_FILE_ID='c88e58d9-97bd-4f06-af82-fd469abcedea'
+ def CREDENTIALS_ID='f5848e71-9994-45e3-8214-137ce91ddbcf'
+ def GIT_ORIGIN='origin'
+ def RELEASE_FOLDER='.'
+ def RELEASE_BRANCH=BRANCH
+
+ env.JAVA_HOME="/opt/tools/java/oracle/jdk-8/1.8.0_181"
+ env.PATH="${env.JAVA_HOME}/bin:${env.PATH}"
+ sh '/opt/tools/java/oracle/jdk-8/1.8.0_181/bin/java -version'
+ sh 'java -version'
+
+ stage('Fetch from git') {
+ git(branch: RELEASE_BRANCH, credentialsId: CREDENTIALS_ID, url: REPO)
+ }
+ stage('Prepare environment') {
+
+ dir (RELEASE_FOLDER) {
+ //# Check whether top level pom.xml contains SNAPSHOT version
+ if (!sh(returnStdout: true, script: "grep '<version>' pom.xml | grep 'SNAPSHOT'")?.trim()) {
+ error('-[ Missing SNAPSHOT version in POM! ]-------------------------------------------')
+ }
+
+ //# Compute release versions
+ def SNAPSHOT_VERSION = sh(returnStdout: true, script: "${MVN_HOME}/bin/mvn -B ${HELP_PLUGIN}:evaluate -Dexpression=project.version 2> /dev/null | grep -E '^[0-9]+(.[0-9]+)+-SNAPSHOT\$'").trim()
+
+ if (!RELEASE_VERSION?.trim()) {
+ if (!SNAPSHOT_VERSION?.trim()) {
+ error('-[ Missing required snapshot version number! ]----------------------------------')
+ } else {
+ def versionTokens = SNAPSHOT_VERSION.split('-')
+ RELEASE_VERSION = versionTokens[0]
+ }
+ }
+
+ if (!NEXT_VERSION?.trim()) {
+ def (MAJOR_VERSION, MINOR_VERSION) = RELEASE_VERSION.tokenize('.')
+ def NEXT_MINOR_VERSION = (MINOR_VERSION as Integer) + 1
+ NEXT_VERSION = MAJOR_VERSION + '.' + NEXT_MINOR_VERSION + '-SNAPSHOT'
+ }
+
+ RELEASE_TAG = RELEASE_VERSION + '-RELEASE'
+
+ echo "Current version: ${SNAPSHOT_VERSION}"
+ echo "Release version: ${RELEASE_VERSION}"
+ echo "Next version: ${NEXT_VERSION}"
+ echo "Release tag: ${RELEASE_TAG}"
+
+ if (!SNAPSHOT_VERSION?.trim() || !RELEASE_VERSION?.trim() || !NEXT_VERSION?.trim()) {
+ error '-[ Missing required version numbers! ]------------------------------------------'
+ }
+
+ if (DRY_RUN == 'true') {
+ echo '-[ Dry run turned on ]----------------------------------------------------------'
+ TARGET = 'install'
+ }
+ echo '-[ Configure git user ]--------------------------------------------------------'
+ sh "git config --local user.email \"${EMAIL}\""
+ sh "git config --local user.name \"$LOGIN\""
+
+ }
+
+ }
+ stage ('Prepare GPG') {
+ withCredentials([file(credentialsId: SECRET_FILE_ID, variable: 'KEYRING')]) {
+ //# Workaround: GPG initialization
+ sh("gpg --batch --import ${KEYRING}")
+ sh '''
+ for fpr in $(gpg --list-keys --with-colons | awk -F: '/fpr:/ {print $10}' | sort -u);
+ do
+ echo -e "5\ny\n" | gpg --batch --command-fd 0 --expert --edit-key $fpr trust;
+ done
+ '''
+ }
+ }
+ stage ('Prepare branch') {
+ echo '-[ Prepare branch ]-------------------------------------------------------------'
+
+ def BRANCH_CHECK = sh(returnStdout: true, script: "git branch -r").trim().contains(GIT_ORIGIN+'/'+RELEASE_VERSION)
+
+ if (BRANCH_CHECK) {
+ if ( OVERWRITE == 'true' ) {
+ echo "${GIT_ORIGIN}/${RELEASE_VERSION} branch already exists, deleting"
+ sshagent([CREDENTIALS_ID]) {
+ sh "git push ${GIT_ORIGIN} :${RELEASE_VERSION} && true"
+ }
+ } else {
+ error "${GIT_ORIGIN}/${RELEASE_VERSION} branch already exists"
+ }
+ }
+ echo '-[ Swiching to release branch ]-------------------------------------------------'
+ sh """
+ git checkout ${GIT_ORIGIN}/${RELEASE_BRANCH} && true
+ git reset --hard ${GIT_ORIGIN}/${RELEASE_BRANCH} && true
+ # Always delete local branch if exists
+ git branch --delete ${RELEASE_VERSION} && true
+ git checkout -b ${RELEASE_VERSION}
+ """
+ echo '-[ Release tag cleanup ]--------------------------------------------------------'
+ def TAG_CHECK = sh(returnStdout: true, script: "git tag").trim().contains(RELEASE_TAG)
+ if (TAG_CHECK) {
+ if (OVERWRITE == 'true' ) {
+ echo "${RELEASE_TAG} tag already exists, deleting"
+ sshagent([CREDENTIALS_ID]) {
+ sh "git push --delete origin ${RELEASE_TAG} && true"
+ }
+ } else {
+ error "${RELEASE_TAG} tag already exists"
+ }
+ //# Always delete local tag if exists
+ sh """
+ git tag --delete ${RELEASE_TAG} && true
+ """
+ }
+
+ }
+ stage("Build ${PROJECT_NAME}") {
+ echo env.JAVA_HOME
+ echo '-[ Run maven release ]---------------------------------------------------------'
+ echo '-[ Set Release version ]-------------------------------------------------------'
+ sh """
+ cd ${RELEASE_FOLDER}
+ ${MVN_HOME}/bin/mvn -q versions:set -DnewVersion=${RELEASE_VERSION}
+ ${MVN_HOME}/bin/mvn -q versions:commit
+ """
+ echo '-[ Run release build ]---------------------------------------------------------'
+ dir (RELEASE_FOLDER) {
+ configFileProvider([configFile(fileId: SECURITY_FILE_ID, targetLocation: '/home/jenkins/.m2/')]) {
+
+ configFileProvider([configFile(fileId: CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_XML')]) {
+ sh "${MVN_HOME}/bin/mvn -q -B -s ${MAVEN_SETTINGS_XML} -DskipTests -Ddoclint=none -Dadditionalparam='-Xdoclint:none' " +
+ " -U -C clean package source:jar javadoc:jar ${TARGET}"
+ }
+ }
+ }
+ }
+ stage ('Prepare release') {
+ echo '-[ Perform release commit to git ]---------------------------------------------'
+ sh "git commit -a -m ${RELEASE_VERSION}"
+ sh "git tag -m ${RELEASE_TAG} -a ${RELEASE_TAG}"
+ echo '-[ Set next snapshot version ]-------------------------------------------------'
+ dir (RELEASE_FOLDER) {
+ sh "${MVN_HOME}/bin/mvn -q versions:set -DnewVersion=${NEXT_VERSION}"
+ sh "${MVN_HOME}/bin/mvn -q versions:commit"
+ }
+ echo '-[ Perform commit to git ]-----------------------------------------------------'
+ sh "git commit -a -m ${NEXT_VERSION}"
+ }
+ stage('Publish release') {
+ if (DRY_RUN == 'true') {
+ echo '-[ Prepared branch ]----------------------------------------------------------'
+ sh "git branch --list ${RELEASE_VERSION}"
+ echo '-[ Prepared tag ]-------------------------------------------------------------'
+ sh "git tag --list ${RELEASE_TAG}"
+ echo '-[ Prepared commits ]---------------------------------------------------------'
+ sh 'git log -n 5'
+ sshagent([CREDENTIALS_ID]) {
+ sh "git push ${GIT_ORIGIN} ${RELEASE_VERSION} --dry-run"
+ }
+ return
+ } else {
+ sshagent([CREDENTIALS_ID]) {
+ sh "git push ${GIT_ORIGIN} ${RELEASE_VERSION} --follow-tags"
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/etc/jenkins/Jenkinsfile_release_config b/etc/jenkins/Jenkinsfile_release_config
new file mode 100644
index 0000000..c1d2370
--- /dev/null
+++ b/etc/jenkins/Jenkinsfile_release_config
@@ -0,0 +1,25 @@
+#!/usr/bin/env groovy
+
+pipeline {
+
+ agent any
+ parameters {
+ string(name: 'RELEASE_VERSION', description: 'Optional version to release. Default value is taken from POM snapshot.')
+
+ string(name: 'NEXT_VERSION', description: 'Optional next snapshot version to set (e.g. 1.2.3-SNAPSHOT). Default value is taken from POM snapshot with last component incremented by 1.')
+
+ choice(name: 'BRANCH', choices: ['master', 'EE4J_8'], description: 'Mandatory release branch (master, EE4J_8)')
+
+ booleanParam(name: 'DRY_RUN', defaultValue: true, description: 'Do not publish artifacts to OSSRH and code changes to GitHub.')
+
+ booleanParam(name: 'OVERWRITE', defaultValue: false, description: 'Allows to overwrite existing version in git and OSSRH staging repositories.')
+
+ }
+ stages {
+ stage('config') {
+ steps {
+ echo 'config'
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/etc/jenkins/README b/etc/jenkins/README
new file mode 100644
index 0000000..743555d
--- /dev/null
+++ b/etc/jenkins/README
@@ -0,0 +1 @@
+Folder containing all Jenkins scripts.
\ No newline at end of file
diff --git a/etc/travis/README b/etc/travis/README
new file mode 100644
index 0000000..3b11b8f
--- /dev/null
+++ b/etc/travis/README
@@ -0,0 +1 @@
+Folder containing all Travis scripts.
diff --git a/travis.sh b/etc/travis/travis.sh
similarity index 81%
rename from travis.sh
rename to etc/travis/travis.sh
index a6a4a79..21985dc 100644
--- a/travis.sh
+++ b/etc/travis/travis.sh
@@ -25,7 +25,11 @@
bash -c "while true; do tail -5 $BUILD_OUTPUT; sleep $PING_SLEEP; done" &
PING_LOOP_PID=$!
-mvn -e -U -B -Peclipse_repo clean install $1 >> $BUILD_OUTPUT 2>&1
+if [ "$1" = "glassfish-copyright:copyright" ]; then
+ mvn glassfish-copyright:copyright
+else
+ mvn -e -U -B -Peclipse_repo clean install $1 >> $BUILD_OUTPUT 2>&1
+fi
# The build finished without returning an error so dump a tail of the output
dump_output
diff --git a/examples/NOTICE.md b/examples/NOTICE.md
new file mode 100644
index 0000000..0f2a7ab
--- /dev/null
+++ b/examples/NOTICE.md
@@ -0,0 +1,109 @@
+# Notice for Jersey
+This content is produced and maintained by the Eclipse Jersey project.
+
+* Project home: https://projects.eclipse.org/projects/ee4j.jersey
+
+## Trademarks
+Eclipse Jersey is a trademark of the Eclipse Foundation.
+
+## Copyright
+
+All content is the property of the respective authors or their employers. For
+more information regarding authorship of content, please consult the listed
+source code repository logs.
+
+## Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Eclipse Distribution License v. 1.0 which is available at
+https://www.eclipse.org/org/documents/edl-v10.php.
+
+SPDX-License-Identifier: BSD-3-Clause
+
+## Source Code
+The project maintains the following source code repositories:
+
+* https://github.com/eclipse-ee4j/jersey/examples
+
+## Third-party Content
+
+Angular JS, v1.6.6
+* License MIT (http://www.opensource.org/licenses/mit-license.php)
+* Project: http://angularjs.org
+* Coyright: (c) 2010-2017 Google, Inc.
+
+aopalliance Version 1
+* License: all the source code provided by AOP Alliance is Public Domain.
+* Project: http://aopalliance.sourceforge.net
+* Copyright: Material in the public domain is not protected by copyright
+
+Bean Validation API 1.1.0.Final
+* License: Apache License, 2.0
+* Project: http://beanvalidation.org/1.1/
+* Copyright: 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
+* by the @authors tag.
+
+Bootstrap v3.3.7
+* License: MIT license (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+* Project: http://getbootstrap.com
+* Copyright: 2011-2016 Twitter, Inc
+
+CDI API Version 1.1
+* License: Apache License, 2.0
+* Project: http://www.seamframework.org/Weld
+* Copyright 2010, Red Hat, Inc., and individual contributors by the @authors tag.
+
+Google Guava Version 18.0
+* License: Apache License, 2.0
+* Copyright (C) 2009 The Guava Authors
+
+javax.inject Version: 1
+* License: Apache License, 2.0
+* Copyright (C) 2009 The JSR-330 Expert Group
+
+Javassist Version 3.22.0-CR2
+* License: Apache License, 2.0
+* Project: http://www.javassist.org/
+* Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.
+
+Jackson JAX-RS Providers Version 2.8.10
+* License: Apache License, 2.0
+* Project: https://github.com/FasterXML/jackson-jaxrs-providers
+* Copyright: (c) 2009-2011 FasterXML, LLC. All rights reserved unless otherwise indicated.
+
+jQuery v1.12.4
+* License: jquery.org/license
+* Project: jquery.org
+* Copyright: (c) jQuery Foundation
+
+jQuery Barcode plugin 0.3
+* License: MIT & GPL (http://www.opensource.org/licenses/mit-license.php & http://www.gnu.org/licenses/gpl.html)
+* Project: http://www.pasella.it/projects/jQuery/barcode
+* Copyright: (c) 2009 Antonello Pasella antonello.pasella@gmail.com
+
+JSR-166 Extension - JEP 266
+* License: CC0
+* No copyright
+* Written by Doug Lea with assistance from members of JCP JSR-166 Expert Group and released to the public domain, as explained at http://creativecommons.org/publicdomain/zero/1.0/
+
+KineticJS, v4.7.1
+* License: MIT license (http://www.opensource.org/licenses/mit-license.php)
+* Project: http://www.kineticjs.com, https://github.com/ericdrowell/KineticJS
+* Copyright: Eric Rowell
+
+org.objectweb.asm Version 5.0.4
+* License: Modified BSD (http://asm.objectweb.org/license.html)
+* Copyright (c) 2000-2011 INRIA, France Telecom. All rights reserved.
+
+org.osgi.core version 4.2.0
+* License: Apache License, 2.0
+* Copyright (c) OSGi Alliance (2005, 2008). All Rights Reserved.
+
+org.glassfish.jersey.server.internal.monitoring.core
+* License: Apache License, 2.0
+* Copyright (c) 2015-2018 Oracle and/or its affiliates. All rights reserved.
+* Copyright 2010-2013 Coda Hale and Yammer, Inc.
+
+W3.org documents
+* License: W3C License
+* Copyright: Copyright (c) 1994-2001 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
diff --git a/examples/assemblies/pom.xml b/examples/assemblies/pom.xml
index 527177c..b1c7512 100644
--- a/examples/assemblies/pom.xml
+++ b/examples/assemblies/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>assemblies</artifactId>
diff --git a/examples/assemblies/src/main/resources/assemblies/glassfish-src-zip.xml b/examples/assemblies/src/main/resources/assemblies/glassfish-src-zip.xml
index 44bf0bf..a49d72f 100644
--- a/examples/assemblies/src/main/resources/assemblies/glassfish-src-zip.xml
+++ b/examples/assemblies/src/main/resources/assemblies/glassfish-src-zip.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -39,5 +39,9 @@
<directory>${project.basedir}/target/gf-pom-file</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>${project.basedir}/target/legal</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
</fileSets>
</assembly>
diff --git a/examples/assemblies/src/main/resources/assemblies/src-zip.xml b/examples/assemblies/src/main/resources/assemblies/src-zip.xml
index 6f99a65..684b2dc 100644
--- a/examples/assemblies/src/main/resources/assemblies/src-zip.xml
+++ b/examples/assemblies/src/main/resources/assemblies/src-zip.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -37,6 +37,10 @@
<exclude>**/sun-web.xml</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>${project.basedir}/target/legal</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
</fileSets>
</assembly>
diff --git a/examples/bookmark-em/pom.xml b/examples/bookmark-em/pom.xml
index 12927d3..8720578 100644
--- a/examples/bookmark-em/pom.xml
+++ b/examples/bookmark-em/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>bookmark-em</artifactId>
@@ -34,8 +34,8 @@
<artifactId>jersey-media-json-jettison</artifactId>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
@@ -43,20 +43,20 @@
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<version>${ejb.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ <version>${jta.api.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -96,7 +96,7 @@
</properties>
</profile>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/bookmark/pom.xml b/examples/bookmark/pom.xml
index 4db7fc9..6a66f19 100644
--- a/examples/bookmark/pom.xml
+++ b/examples/bookmark/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>bookmark</artifactId>
@@ -34,17 +34,17 @@
<artifactId>jersey-media-json-jettison</artifactId>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ <version>${jta.api.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -84,7 +84,7 @@
</properties>
</profile>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/bookstore-webapp/README.MD b/examples/bookstore-webapp/README.MD
index 3921d7f..870e986 100644
--- a/examples/bookstore-webapp/README.MD
+++ b/examples/bookstore-webapp/README.MD
@@ -1,10 +1,26 @@
[//]: # " Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved. "
[//]: # " "
-[//]: # " This program and the accompanying materials are made available under the "
-[//]: # " terms of the Eclipse Distribution License v. 1.0, which is available at "
-[//]: # " http://www.eclipse.org/org/documents/edl-v10.php. "
+[//]: # " Redistribution and use in source and binary forms, with or without "
+[//]: # " modification, are permitted provided that the following conditions are met: "
[//]: # " "
-[//]: # " SPDX-License-Identifier: BSD-3-Clause "
+[//]: # " 1. Redistributions of source code must retain the above copyright notice, this "
+[//]: # " list of conditions and the following disclaimer. "
+[//]: # " 2. Redistributions in binary form must reproduce the above copyright notice, "
+[//]: # " this list of conditions and the following disclaimer in the documentation "
+[//]: # " and/or other materials provided with the distribution. "
+[//]: # " "
+[//]: # " THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND "
+[//]: # " ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED "
+[//]: # " WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE "
+[//]: # " DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR "
+[//]: # " ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES "
+[//]: # " (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; "
+[//]: # " LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND "
+[//]: # " ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT "
+[//]: # " (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS "
+[//]: # " SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. "
+[//]: # " "
+[//]: # " SPDX-License-Identifier: BSD-2-Clause "
Bookstore
=========
diff --git a/examples/bookstore-webapp/pom.xml b/examples/bookstore-webapp/pom.xml
index 8b910bb..d8ac509 100644
--- a/examples/bookstore-webapp/pom.xml
+++ b/examples/bookstore-webapp/pom.xml
@@ -1,13 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
- This program and the accompanying materials are made available under the
- terms of the Eclipse Distribution License v. 1.0, which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
- SPDX-License-Identifier: BSD-3-Clause
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ SPDX-License-Identifier: BSD-2-Clause
-->
@@ -19,7 +35,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>bookstore-webapp</artifactId>
@@ -38,13 +54,13 @@
<artifactId>jersey-hk2</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet2.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
+ <groupId>jakarta.servlet.jsp.jstl</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>${jstl.version}</version>
</dependency>
</dependencies>
@@ -96,7 +112,7 @@
</properties>
</profile>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/MyApplication.java b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/MyApplication.java
index fc591f6..4d363a3 100644
--- a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/MyApplication.java
+++ b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/MyApplication.java
@@ -1,11 +1,27 @@
/*
* Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
*
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Distribution License v. 1.0, which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
*
- * SPDX-License-Identifier: BSD-3-Clause
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
*/
package org.glassfish.jersey.examples.bookstore.webapp;
diff --git a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Book.java b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Book.java
index 4d0ff1b..0718577 100644
--- a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Book.java
+++ b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Book.java
@@ -1,11 +1,27 @@
/*
* Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
*
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Distribution License v. 1.0, which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
*
- * SPDX-License-Identifier: BSD-3-Clause
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
*/
package org.glassfish.jersey.examples.bookstore.webapp.resource;
diff --git a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Bookstore.java b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Bookstore.java
index 367eccb..7aa54d9 100644
--- a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Bookstore.java
+++ b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Bookstore.java
@@ -1,11 +1,27 @@
/*
* Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
*
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Distribution License v. 1.0, which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
*
- * SPDX-License-Identifier: BSD-3-Clause
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
*/
package org.glassfish.jersey.examples.bookstore.webapp.resource;
diff --git a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/CD.java b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/CD.java
index 1e357e7..de78bc2 100644
--- a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/CD.java
+++ b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/CD.java
@@ -1,11 +1,27 @@
/*
* Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
*
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Distribution License v. 1.0, which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
*
- * SPDX-License-Identifier: BSD-3-Clause
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
*/
package org.glassfish.jersey.examples.bookstore.webapp.resource;
diff --git a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Happy.java b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Happy.java
index f9314d6..7619d97 100644
--- a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Happy.java
+++ b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Happy.java
@@ -1,11 +1,27 @@
/*
* Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
*
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Distribution License v. 1.0, which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
*
- * SPDX-License-Identifier: BSD-3-Clause
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
*/
package org.glassfish.jersey.examples.bookstore.webapp.resource;
diff --git a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Item.java b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Item.java
index 77bfbd9..08e0b7e 100644
--- a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Item.java
+++ b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Item.java
@@ -1,11 +1,27 @@
/*
* Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
*
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Distribution License v. 1.0, which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
*
- * SPDX-License-Identifier: BSD-3-Clause
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
*/
package org.glassfish.jersey.examples.bookstore.webapp.resource;
diff --git a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Track.java b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Track.java
index 86888f1..9868da3 100644
--- a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Track.java
+++ b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Track.java
@@ -1,11 +1,27 @@
/*
* Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
*
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Distribution License v. 1.0, which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
*
- * SPDX-License-Identifier: BSD-3-Clause
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
*/
package org.glassfish.jersey.examples.bookstore.webapp.resource;
diff --git a/examples/bookstore-webapp/src/main/webapp/WEB-INF/web.xml b/examples/bookstore-webapp/src/main/webapp/WEB-INF/web.xml
index 1bba9e7..58e6493 100644
--- a/examples/bookstore-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/examples/bookstore-webapp/src/main/webapp/WEB-INF/web.xml
@@ -3,11 +3,27 @@
Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
- This program and the accompanying materials are made available under the
- terms of the Eclipse Distribution License v. 1.0, which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
- SPDX-License-Identifier: BSD-3-Clause
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ SPDX-License-Identifier: BSD-2-Clause
-->
diff --git a/examples/bookstore-webapp/src/main/webapp/css/style.css b/examples/bookstore-webapp/src/main/webapp/css/style.css
index 412a223..153d6de 100644
--- a/examples/bookstore-webapp/src/main/webapp/css/style.css
+++ b/examples/bookstore-webapp/src/main/webapp/css/style.css
@@ -1,11 +1,27 @@
/*
* Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
*
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Distribution License v. 1.0, which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
*
- * SPDX-License-Identifier: BSD-3-Clause
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
*/
body {
diff --git a/examples/bookstore-webapp/src/main/webapp/jsp/help.jsp b/examples/bookstore-webapp/src/main/webapp/jsp/help.jsp
index 8ac9f84..b3f0a82 100644
--- a/examples/bookstore-webapp/src/main/webapp/jsp/help.jsp
+++ b/examples/bookstore-webapp/src/main/webapp/jsp/help.jsp
@@ -2,11 +2,27 @@
Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
- This program and the accompanying materials are made available under the
- terms of the Eclipse Distribution License v. 1.0, which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
- SPDX-License-Identifier: BSD-3-Clause
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ SPDX-License-Identifier: BSD-2-Clause
--%>
diff --git a/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Book/index.jsp b/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Book/index.jsp
index 5ec592e..b57e2f0 100644
--- a/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Book/index.jsp
+++ b/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Book/index.jsp
@@ -2,11 +2,27 @@
Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
- This program and the accompanying materials are made available under the
- terms of the Eclipse Distribution License v. 1.0, which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
- SPDX-License-Identifier: BSD-3-Clause
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ SPDX-License-Identifier: BSD-2-Clause
--%>
diff --git a/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Bookstore/count.jsp b/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Bookstore/count.jsp
index b6ff454..6dd6a43 100644
--- a/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Bookstore/count.jsp
+++ b/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Bookstore/count.jsp
@@ -2,11 +2,27 @@
Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
- This program and the accompanying materials are made available under the
- terms of the Eclipse Distribution License v. 1.0, which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
- SPDX-License-Identifier: BSD-3-Clause
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.10.php.
+
+ SPDX-License-Identifier: BSD-2-Clause
--%>
diff --git a/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Bookstore/index.jsp b/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Bookstore/index.jsp
index 21afccf..00825dc 100644
--- a/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Bookstore/index.jsp
+++ b/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Bookstore/index.jsp
@@ -2,11 +2,27 @@
Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
- This program and the accompanying materials are made available under the
- terms of the Eclipse Distribution License v. 1.0, which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
- SPDX-License-Identifier: BSD-3-Clause
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ SPDX-License-Identifier: BSD-2-Clause
--%>
diff --git a/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Bookstore/time.jsp b/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Bookstore/time.jsp
index 88ccced..f47d154 100644
--- a/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Bookstore/time.jsp
+++ b/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Bookstore/time.jsp
@@ -2,11 +2,27 @@
Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
- This program and the accompanying materials are made available under the
- terms of the Eclipse Distribution License v. 1.0, which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
- SPDX-License-Identifier: BSD-3-Clause
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ SPDX-License-Identifier: BSD-2-Clause
--%>
diff --git a/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/CD/index.jsp b/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/CD/index.jsp
index 6e6a896..c0f9995 100644
--- a/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/CD/index.jsp
+++ b/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/CD/index.jsp
@@ -2,11 +2,27 @@
Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
- This program and the accompanying materials are made available under the
- terms of the Eclipse Distribution License v. 1.0, which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
- SPDX-License-Identifier: BSD-3-Clause
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ SPDX-License-Identifier: BSD-2-Clause
--%>
diff --git a/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Happy/index.jsp b/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Happy/index.jsp
index feef3bf..b44e94f 100644
--- a/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Happy/index.jsp
+++ b/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Happy/index.jsp
@@ -2,11 +2,27 @@
Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
- This program and the accompanying materials are made available under the
- terms of the Eclipse Distribution License v. 1.0, which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
- SPDX-License-Identifier: BSD-3-Clause
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ SPDX-License-Identifier: BSD-2-Clause
--%>
diff --git a/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Item/footer.jsp b/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Item/footer.jsp
index 1cab567..490821e 100644
--- a/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Item/footer.jsp
+++ b/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Item/footer.jsp
@@ -2,11 +2,27 @@
Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
- This program and the accompanying materials are made available under the
- terms of the Eclipse Distribution License v. 1.0, which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
- SPDX-License-Identifier: BSD-3-Clause
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ SPDX-License-Identifier: BSD-2-Clause
--%>
diff --git a/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Track/index.jsp b/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Track/index.jsp
index e941f29..5b8a33e 100644
--- a/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Track/index.jsp
+++ b/examples/bookstore-webapp/src/main/webapp/org/glassfish/jersey/examples/bookstore/webapp/resource/Track/index.jsp
@@ -2,11 +2,27 @@
Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
- This program and the accompanying materials are made available under the
- terms of the Eclipse Distribution License v. 1.0, which is available at
- http://www.eclipse.org/org/documents/edl-v10.php.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
- SPDX-License-Identifier: BSD-3-Clause
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ SPDX-License-Identifier: BSD-2-Clause
--%>
diff --git a/examples/bookstore-webapp/src/test/java/org/glassfish/jersey/examples/bookstore/webapp/resource/BookstoreTest.java b/examples/bookstore-webapp/src/test/java/org/glassfish/jersey/examples/bookstore/webapp/resource/BookstoreTest.java
index 3e2d2cf..abecf27 100644
--- a/examples/bookstore-webapp/src/test/java/org/glassfish/jersey/examples/bookstore/webapp/resource/BookstoreTest.java
+++ b/examples/bookstore-webapp/src/test/java/org/glassfish/jersey/examples/bookstore/webapp/resource/BookstoreTest.java
@@ -1,11 +1,27 @@
/*
* Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
*
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Distribution License v. 1.0, which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
*
- * SPDX-License-Identifier: BSD-3-Clause
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
*/
package org.glassfish.jersey.examples.bookstore.webapp.resource;
diff --git a/examples/bookstore-webapp/src/test/java/org/glassfish/jersey/examples/bookstore/webapp/resource/ItemTest.java b/examples/bookstore-webapp/src/test/java/org/glassfish/jersey/examples/bookstore/webapp/resource/ItemTest.java
index 0e14ab4..8a3e6dc 100644
--- a/examples/bookstore-webapp/src/test/java/org/glassfish/jersey/examples/bookstore/webapp/resource/ItemTest.java
+++ b/examples/bookstore-webapp/src/test/java/org/glassfish/jersey/examples/bookstore/webapp/resource/ItemTest.java
@@ -1,11 +1,27 @@
/*
* Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
*
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Distribution License v. 1.0, which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
*
- * SPDX-License-Identifier: BSD-3-Clause
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
*/
package org.glassfish.jersey.examples.bookstore.webapp.resource;
diff --git a/examples/bookstore-webapp/src/test/java/org/glassfish/jersey/examples/bookstore/webapp/resource/TestSupport.java b/examples/bookstore-webapp/src/test/java/org/glassfish/jersey/examples/bookstore/webapp/resource/TestSupport.java
index f454e85..6a4c221 100644
--- a/examples/bookstore-webapp/src/test/java/org/glassfish/jersey/examples/bookstore/webapp/resource/TestSupport.java
+++ b/examples/bookstore-webapp/src/test/java/org/glassfish/jersey/examples/bookstore/webapp/resource/TestSupport.java
@@ -1,11 +1,27 @@
/*
* Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
*
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Distribution License v. 1.0, which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
*
- * SPDX-License-Identifier: BSD-3-Clause
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
*/
package org.glassfish.jersey.examples.bookstore.webapp.resource;
diff --git a/examples/cdi-webapp/pom.xml b/examples/cdi-webapp/pom.xml
index 078e6b0..b418871 100644
--- a/examples/cdi-webapp/pom.xml
+++ b/examples/cdi-webapp/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>cdi-webapp</artifactId>
@@ -35,13 +35,13 @@
<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>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -103,7 +103,7 @@
</properties>
</profile>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
@@ -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>
@@ -146,7 +146,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -166,7 +166,7 @@
</dependency>
<dependency>
<groupId>org.jboss.weld.servlet</groupId>
- <artifactId>weld-servlet</artifactId>
+ <artifactId>weld-servlet-core</artifactId>
</dependency>
</dependencies>
</profile>
diff --git a/examples/clipboard-programmatic/pom.xml b/examples/clipboard-programmatic/pom.xml
index f1321db..eab8bf4 100644
--- a/examples/clipboard-programmatic/pom.xml
+++ b/examples/clipboard-programmatic/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>clipboard-programmatic</artifactId>
@@ -57,7 +57,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/clipboard/pom.xml b/examples/clipboard/pom.xml
index 1655949..14449b8 100644
--- a/examples/clipboard/pom.xml
+++ b/examples/clipboard/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>clipboard</artifactId>
@@ -57,7 +57,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/declarative-linking/pom.xml b/examples/declarative-linking/pom.xml
index 023669d..eb1315d 100644
--- a/examples/declarative-linking/pom.xml
+++ b/examples/declarative-linking/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>declarative-linking</artifactId>
@@ -45,13 +45,13 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>javax.el</artifactId>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.el</artifactId>
</dependency>
<dependency>
@@ -87,7 +87,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/entity-filtering-security/pom.xml b/examples/entity-filtering-security/pom.xml
index 4eca15c..d755fd0 100644
--- a/examples/entity-filtering-security/pom.xml
+++ b/examples/entity-filtering-security/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>entity-filtering-security</artifactId>
@@ -75,7 +75,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/entity-filtering-selectable/pom.xml b/examples/entity-filtering-selectable/pom.xml
index fa1acc5..da88745 100644
--- a/examples/entity-filtering-selectable/pom.xml
+++ b/examples/entity-filtering-selectable/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>entity-filtering-selectable</artifactId>
@@ -75,7 +75,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/entity-filtering-selectable/src/test/java/org/glassfish/jersey/examples/entityfiltering/selectable/PersonResourceTest.java b/examples/entity-filtering-selectable/src/test/java/org/glassfish/jersey/examples/entityfiltering/selectable/PersonResourceTest.java
index dc0a275..3dc9ace 100644
--- a/examples/entity-filtering-selectable/src/test/java/org/glassfish/jersey/examples/entityfiltering/selectable/PersonResourceTest.java
+++ b/examples/entity-filtering-selectable/src/test/java/org/glassfish/jersey/examples/entityfiltering/selectable/PersonResourceTest.java
@@ -137,6 +137,28 @@
}
/**
+ * Test empty (but valid) filters.
+ * Valid empty filters are:
+ * . ,. , .. .,
+ *
+ *
+ * result is empty object (nothing is returned) but Jersey will not throw any exception
+ */
+ @Test
+ public void testEmptyFilters() throws Exception {
+ final Person entity = target("people").path("1234")
+ .queryParam("select", ".").request()
+ .get(Person.class);
+
+ // Null values (all elements).
+ assertThat(entity.getFamilyName(), nullValue());
+ assertThat(entity.getGivenName(), nullValue());
+ assertThat(entity.getAddresses(), nullValue());
+ assertThat(entity.getPhoneNumbers(), nullValue());
+ assertThat(entity.getRegion(), nullValue());
+ }
+
+ /**
* Test 2nd and 3rd level filters.
*/
@Test
diff --git a/examples/entity-filtering/pom.xml b/examples/entity-filtering/pom.xml
index 0d4f615..d4eda8d 100644
--- a/examples/entity-filtering/pom.xml
+++ b/examples/entity-filtering/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>entity-filtering</artifactId>
@@ -76,7 +76,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/domain/EntityStore.java b/examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/domain/EntityStore.java
index 0d99eda..c2cd8d1 100644
--- a/examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/domain/EntityStore.java
+++ b/examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/domain/EntityStore.java
@@ -29,8 +29,9 @@
static {
// Projects.
- final Project project = createProject("Jersey", "Jersey is the open source (under dual EPL+GPL license) JAX-RS 2.1 "
- + "(JSR 370) production quality Reference Implementation for building RESTful Web services.");
+ final Project project = createProject("Jersey", "Jersey is the open source (see NOTICE.md for license "
+ + "information) JAX-RS 2.1 (JSR 370) production quality Reference Implementation for building RESTful Web "
+ + "services.");
// Users.
final User robot = createUser("Jersey Robot", "very@secret.com");
diff --git a/examples/etc/gf-project-src-pom.xsl b/examples/etc/gf-project-src-pom.xsl
index 50df08f..bcd0b5c 100644
--- a/examples/etc/gf-project-src-pom.xsl
+++ b/examples/etc/gf-project-src-pom.xsl
@@ -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>
@@ -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>
diff --git a/examples/etc/wls-project-src-pom.xsl b/examples/etc/wls-project-src-pom.xsl
index 6116b5b..350753b 100644
--- a/examples/etc/wls-project-src-pom.xsl
+++ b/examples/etc/wls-project-src-pom.xsl
@@ -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>
@@ -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>
diff --git a/examples/etc/wls1213-project-src-pom.xsl b/examples/etc/wls1213-project-src-pom.xsl
index 40b63b5..b06099b 100644
--- a/examples/etc/wls1213-project-src-pom.xsl
+++ b/examples/etc/wls1213-project-src-pom.xsl
@@ -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>
@@ -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>
diff --git a/examples/exception-mapping/pom.xml b/examples/exception-mapping/pom.xml
index 68f418d..119d2cd 100644
--- a/examples/exception-mapping/pom.xml
+++ b/examples/exception-mapping/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>exception-mapping</artifactId>
@@ -57,7 +57,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/extended-wadl-webapp/pom.xml b/examples/extended-wadl-webapp/pom.xml
index 4c14f2e..33941b6 100644
--- a/examples/extended-wadl-webapp/pom.xml
+++ b/examples/extended-wadl-webapp/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>extended-wadl-webapp</artifactId>
@@ -122,6 +122,17 @@
<artifactId>javassist</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -225,7 +236,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java b/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java
index e72a5dc..3cd37e1 100644
--- a/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java
+++ b/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java
@@ -95,11 +95,13 @@
public static Option[] configuration() {
List<Option> options = Arrays.asList(options(
// systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("FINEST"),
- systemProperty("org.osgi.framework.system.packages.extra").value("javax.annotation"),
+ systemProperty("org.osgi.framework.system.packages.extra").value("jakarta.annotation"),
systemProperty(JAXRS_RUNTIME_DELEGATE_PROPERTY).value("org.glassfish.jersey.internal.RuntimeDelegateImpl"),
// javax.annotation must go first!
- mavenBundle().groupId("javax.annotation").artifactId("javax.annotation-api").versionAsInProject(),
+ mavenBundle().groupId("jakarta.annotation").artifactId("jakarta.annotation-api").versionAsInProject(),
+ //JAXB-API
+ mavenBundle().groupId("jakarta.xml.bind").artifactId("jakarta.xml.bind-api").versionAsInProject(),
junitBundles(),
@@ -110,23 +112,10 @@
mavenBundle().groupId("org.glassfish.hk2").artifactId("osgi-resource-locator").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2").artifactId("hk2-locator").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2").artifactId("hk2-utils").versionAsInProject(),
- mavenBundle().groupId("org.glassfish.hk2.external").artifactId("javax.inject").versionAsInProject(),
+ mavenBundle().groupId("org.glassfish.hk2.external").artifactId("jakarta.inject").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2.external").artifactId("aopalliance-repackaged").versionAsInProject(),
mavenBundle().groupId("org.javassist").artifactId("javassist").versionAsInProject(),
- // JAX-RS API
- mavenBundle().groupId("javax.ws.rs").artifactId("javax.ws.rs-api").versionAsInProject(),
-
- // Jersey bundles
- mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-common").versionAsInProject(),
- mavenBundle().groupId("org.glassfish.jersey.media").artifactId("jersey-media-jaxb").versionAsInProject(),
- mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-server").versionAsInProject(),
- mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-client").versionAsInProject(),
- mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").versionAsInProject(),
-
- // jettison
- mavenBundle().groupId("org.codehaus.jettison").artifactId("jettison").versionAsInProject(),
-
// validation
mavenBundle().groupId("javax.validation").artifactId("validation-api").versionAsInProject(),
@@ -140,10 +129,30 @@
mavenBundle().groupId("org.glassfish.jersey.containers").artifactId("jersey-container-grizzly2-http")
.versionAsInProject(),
+ //SUN JAXB IMPL OSGI
+ mavenBundle().groupId("com.sun.xml.bind").artifactId("jaxb-osgi").versionAsInProject().versionAsInProject(),
+ systemPackage("com.sun.source.tree"),
+ systemPackage("com.sun.source.util"),
+
+
// tinybundles + required dependencies
mavenBundle().groupId("org.ops4j.pax.tinybundles").artifactId("tinybundles").versionAsInProject(),
mavenBundle().groupId("biz.aQute.bnd").artifactId("bndlib").versionAsInProject(),
+ // JAX-RS API
+ mavenBundle().groupId("jakarta.ws.rs").artifactId("jakarta.ws.rs-api").versionAsInProject(),
+
+ // Jersey bundles
+ mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-common").versionAsInProject(),
+ mavenBundle().groupId("org.glassfish.jersey.media").artifactId("jersey-media-jaxb").versionAsInProject(),
+ mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-server").versionAsInProject(),
+ mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-client").versionAsInProject(),
+ mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").versionAsInProject(),
+
+ // jettison
+ mavenBundle().groupId("org.codehaus.jettison").artifactId("jettison").versionAsInProject(),
+
+
// create ad-hoc bundle
provision(
bundle()
diff --git a/examples/freemarker-webapp/pom.xml b/examples/freemarker-webapp/pom.xml
index 97c6b2b..80605ba 100644
--- a/examples/freemarker-webapp/pom.xml
+++ b/examples/freemarker-webapp/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>freemarker-webapp</artifactId>
@@ -51,7 +51,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/groovy/pom.xml b/examples/groovy/pom.xml
index 2ce8088..358b499 100644
--- a/examples/groovy/pom.xml
+++ b/examples/groovy/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>groovy</artifactId>
<packaging>jar</packaging>
@@ -49,7 +49,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/helloworld-benchmark/pom.xml b/examples/helloworld-benchmark/pom.xml
index 6ce7c4c..8a350e0 100644
--- a/examples/helloworld-benchmark/pom.xml
+++ b/examples/helloworld-benchmark/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>helloworld-benchmark</artifactId>
@@ -132,7 +132,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/helloworld-cdi2-se/pom.xml b/examples/helloworld-cdi2-se/pom.xml
index ba3cfaa..27d7458 100644
--- a/examples/helloworld-cdi2-se/pom.xml
+++ b/examples/helloworld-cdi2-se/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>helloworld-cdi2-se</artifactId>
@@ -71,7 +71,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/helloworld-netty/pom.xml b/examples/helloworld-netty/pom.xml
index e3ec898..7b1b108 100644
--- a/examples/helloworld-netty/pom.xml
+++ b/examples/helloworld-netty/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2016, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>helloworld-netty</artifactId>
@@ -64,7 +64,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/helloworld-programmatic/pom.xml b/examples/helloworld-programmatic/pom.xml
index 5356b50..c9f437b 100644
--- a/examples/helloworld-programmatic/pom.xml
+++ b/examples/helloworld-programmatic/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>helloworld-programmatic</artifactId>
@@ -57,7 +57,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/helloworld-pure-jax-rs/pom.xml b/examples/helloworld-pure-jax-rs/pom.xml
index 7e34ec4..54545b6 100644
--- a/examples/helloworld-pure-jax-rs/pom.xml
+++ b/examples/helloworld-pure-jax-rs/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>helloworld-pure-jax-rs</artifactId>
@@ -60,7 +60,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/helloworld-spring-annotations/pom.xml b/examples/helloworld-spring-annotations/pom.xml
index 555e33e..e6944da 100644
--- a/examples/helloworld-spring-annotations/pom.xml
+++ b/examples/helloworld-spring-annotations/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2014, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -15,7 +15,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.glassfish.jersey.examples</groupId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>helloworld-spring-annotations</artifactId>
@@ -67,7 +67,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/helloworld-spring-webapp/pom.xml b/examples/helloworld-spring-webapp/pom.xml
index 1ef882f..f396e7a 100644
--- a/examples/helloworld-spring-webapp/pom.xml
+++ b/examples/helloworld-spring-webapp/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -25,7 +25,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>helloworld-spring-webapp</artifactId>
@@ -94,7 +94,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/helloworld-webapp/pom.xml b/examples/helloworld-webapp/pom.xml
index ad575de..3eee3b5 100644
--- a/examples/helloworld-webapp/pom.xml
+++ b/examples/helloworld-webapp/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>helloworld-webapp</artifactId>
@@ -30,8 +30,8 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<version>${servlet4.version}</version>
</dependency>
@@ -66,7 +66,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/helloworld-weld/pom.xml b/examples/helloworld-weld/pom.xml
index 44adf89..b9e04d3 100644
--- a/examples/helloworld-weld/pom.xml
+++ b/examples/helloworld-weld/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>helloworld-weld</artifactId>
@@ -73,7 +73,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/helloworld/pom.xml b/examples/helloworld/pom.xml
index e716587..1962efc 100644
--- a/examples/helloworld/pom.xml
+++ b/examples/helloworld/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>helloworld</artifactId>
@@ -66,7 +66,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/http-patch/pom.xml b/examples/http-patch/pom.xml
index 8bd5179..adcd4d8 100644
--- a/examples/http-patch/pom.xml
+++ b/examples/http-patch/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>http-patch</artifactId>
@@ -83,7 +83,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/http-trace/pom.xml b/examples/http-trace/pom.xml
index e0e77ab..3c40fca 100644
--- a/examples/http-trace/pom.xml
+++ b/examples/http-trace/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>http-trace</artifactId>
@@ -62,7 +62,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/https-clientserver-grizzly/pom.xml b/examples/https-clientserver-grizzly/pom.xml
index fb060b0..a5c6af8 100644
--- a/examples/https-clientserver-grizzly/pom.xml
+++ b/examples/https-clientserver-grizzly/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>https-clientserver-grizzly</artifactId>
@@ -29,8 +29,8 @@
<dependencies>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
@@ -70,7 +70,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/https-server-glassfish/pom.xml b/examples/https-server-glassfish/pom.xml
index 844ba0d..f0b7ef8 100644
--- a/examples/https-server-glassfish/pom.xml
+++ b/examples/https-server-glassfish/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>https-server-glassfish</artifactId>
@@ -57,7 +57,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/java8-webapp/pom.xml b/examples/java8-webapp/pom.xml
index 0b4ac28..b75062c 100644
--- a/examples/java8-webapp/pom.xml
+++ b/examples/java8-webapp/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -18,7 +18,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>java8-webapp</artifactId>
@@ -79,7 +79,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/jaxb/pom.xml b/examples/jaxb/pom.xml
index 47f856d..e17e21d 100644
--- a/examples/jaxb/pom.xml
+++ b/examples/jaxb/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -16,7 +16,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jaxb</artifactId>
@@ -62,7 +62,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/jaxrs-types-injection/pom.xml b/examples/jaxrs-types-injection/pom.xml
index e026912..eddfcda 100644
--- a/examples/jaxrs-types-injection/pom.xml
+++ b/examples/jaxrs-types-injection/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jaxrs-types-injection</artifactId>
@@ -57,7 +57,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/jersey-ejb/pom.xml b/examples/jersey-ejb/pom.xml
index 2a62817..8d01ffd 100644
--- a/examples/jersey-ejb/pom.xml
+++ b/examples/jersey-ejb/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-ejb</artifactId>
@@ -33,8 +33,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -69,7 +69,7 @@
</properties>
</profile>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/json-binding-webapp/pom.xml b/examples/json-binding-webapp/pom.xml
index 5eef5aa..9a61c17 100644
--- a/examples/json-binding-webapp/pom.xml
+++ b/examples/json-binding-webapp/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -16,7 +16,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>json-binding-webapp</artifactId>
@@ -68,7 +68,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/json-jackson/pom.xml b/examples/json-jackson/pom.xml
index 16d0f6d..93c79d5 100644
--- a/examples/json-jackson/pom.xml
+++ b/examples/json-jackson/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>json-jackson</artifactId>
@@ -68,7 +68,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/json-jackson1/pom.xml b/examples/json-jackson1/pom.xml
index b68c645..d901464 100644
--- a/examples/json-jackson1/pom.xml
+++ b/examples/json-jackson1/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>json-jackson1</artifactId>
@@ -62,7 +62,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/json-jettison/pom.xml b/examples/json-jettison/pom.xml
index 2b1226a..9fcff83 100644
--- a/examples/json-jettison/pom.xml
+++ b/examples/json-jettison/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>json-jettison</artifactId>
@@ -62,7 +62,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/json-moxy/pom.xml b/examples/json-moxy/pom.xml
index 815ae38..5d67f06 100644
--- a/examples/json-moxy/pom.xml
+++ b/examples/json-moxy/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>json-moxy</artifactId>
@@ -62,7 +62,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/json-processing-webapp/pom.xml b/examples/json-processing-webapp/pom.xml
index e84003b..f53def4 100644
--- a/examples/json-processing-webapp/pom.xml
+++ b/examples/json-processing-webapp/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>json-processing-webapp</artifactId>
@@ -50,7 +50,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/json-with-padding/pom.xml b/examples/json-with-padding/pom.xml
index dc814a3..0a37bd8 100644
--- a/examples/json-with-padding/pom.xml
+++ b/examples/json-with-padding/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>json-with-padding</artifactId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <artifactId>jaxb-osgi</artifactId>
</dependency>
<dependency>
@@ -68,7 +68,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/managed-beans-webapp/pom.xml b/examples/managed-beans-webapp/pom.xml
index 6703aa6..3cbcfbf 100644
--- a/examples/managed-beans-webapp/pom.xml
+++ b/examples/managed-beans-webapp/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>managed-beans-webapp</artifactId>
@@ -35,13 +35,13 @@
<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>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -50,8 +50,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
</dependencies>
@@ -80,7 +80,7 @@
</properties>
</profile>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/managed-client-simple-webapp/pom.xml b/examples/managed-client-simple-webapp/pom.xml
index 2644e0b..0c17c39 100644
--- a/examples/managed-client-simple-webapp/pom.xml
+++ b/examples/managed-client-simple-webapp/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>managed-client-simple-webapp</artifactId>
@@ -45,7 +45,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/managed-client-webapp/pom.xml b/examples/managed-client-webapp/pom.xml
index 9f9287f..5373401 100644
--- a/examples/managed-client-webapp/pom.xml
+++ b/examples/managed-client-webapp/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>managed-client-webapp</artifactId>
@@ -53,7 +53,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/managed-client/pom.xml b/examples/managed-client/pom.xml
index ad922d4..fc52ba6 100644
--- a/examples/managed-client/pom.xml
+++ b/examples/managed-client/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>managed-client</artifactId>
@@ -64,7 +64,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/multipart-webapp/pom.xml b/examples/multipart-webapp/pom.xml
index 64a2057..cf045db 100644
--- a/examples/multipart-webapp/pom.xml
+++ b/examples/multipart-webapp/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>multipart-webapp</artifactId>
@@ -50,7 +50,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/oauth-client-twitter/pom.xml b/examples/oauth-client-twitter/pom.xml
index 8cc99cc..27cc972 100644
--- a/examples/oauth-client-twitter/pom.xml
+++ b/examples/oauth-client-twitter/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -15,7 +15,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.glassfish.jersey.examples</groupId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -67,7 +67,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/open-tracing/pom.xml b/examples/open-tracing/pom.xml
index d3083e3..308c21b 100644
--- a/examples/open-tracing/pom.xml
+++ b/examples/open-tracing/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>open-tracing</artifactId>
@@ -90,7 +90,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/osgi-helloworld-webapp/additional-bundle/pom.xml b/examples/osgi-helloworld-webapp/additional-bundle/pom.xml
index 3e0fa05..560a9d8 100644
--- a/examples/osgi-helloworld-webapp/additional-bundle/pom.xml
+++ b/examples/osgi-helloworld-webapp/additional-bundle/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>osgi-helloworld-webapp</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.examples.osgi-helloworld-webapp</groupId>
@@ -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>
diff --git a/examples/osgi-helloworld-webapp/alternate-version-bundle/pom.xml b/examples/osgi-helloworld-webapp/alternate-version-bundle/pom.xml
index d958fdc..10071e2 100644
--- a/examples/osgi-helloworld-webapp/alternate-version-bundle/pom.xml
+++ b/examples/osgi-helloworld-webapp/alternate-version-bundle/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>osgi-helloworld-webapp</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.examples.osgi-helloworld-webapp</groupId>
@@ -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>
diff --git a/examples/osgi-helloworld-webapp/functional-test/pom.xml b/examples/osgi-helloworld-webapp/functional-test/pom.xml
index de4aeaf..4bae4a5 100644
--- a/examples/osgi-helloworld-webapp/functional-test/pom.xml
+++ b/examples/osgi-helloworld-webapp/functional-test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>osgi-helloworld-webapp</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.examples.osgi-helloworld-webapp</groupId>
@@ -66,8 +66,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -137,6 +137,16 @@
<artifactId>org.apache.felix.framework.security</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- uncomment the following dependency to get ability
to run felix console in the test -->
<!--dependency>
diff --git a/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java b/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java
index 86bd28a..dd89740 100644
--- a/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java
+++ b/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java
@@ -52,6 +52,7 @@
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.systemPackage;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
/**
@@ -112,7 +113,7 @@
systemProperty(org.osgi.framework.Constants.FRAMEWORK_SECURITY)
.value(org.osgi.framework.Constants.FRAMEWORK_SECURITY_OSGI),
systemProperty("org.osgi.service.http.port").value(String.valueOf(port)),
- systemProperty("org.osgi.framework.system.packages.extra").value("javax.annotation"),
+ systemProperty("org.osgi.framework.system.packages.extra").value("jakarta.annotation"),
systemProperty("jersey.config.test.container.port").value(String.valueOf(port)),
// systemProperty(BundleLocationProperty).value(bundleLocation),
@@ -129,7 +130,7 @@
// mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.4"),
// javax.annotation must go first!
- mavenBundle().groupId("javax.annotation").artifactId("javax.annotation-api").versionAsInProject(),
+ mavenBundle().groupId("jakarta.annotation").artifactId("jakarta.annotation-api").versionAsInProject(),
// pax exam dependencies
mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
junitBundles(), // adds junit classes to the OSGi context
@@ -139,11 +140,16 @@
mavenBundle().groupId("org.glassfish.hk2").artifactId("osgi-resource-locator").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2").artifactId("hk2-locator").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2").artifactId("hk2-utils").versionAsInProject(),
- mavenBundle().groupId("org.glassfish.hk2.external").artifactId("javax.inject").versionAsInProject(),
+ mavenBundle().groupId("org.glassfish.hk2.external").artifactId("jakarta.inject").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2.external").artifactId("aopalliance-repackaged").versionAsInProject(),
mavenBundle().groupId("org.javassist").artifactId("javassist").versionAsInProject(),
- // JAX-RS API
- mavenBundle().groupId("javax.ws.rs").artifactId("javax.ws.rs-api").versionAsInProject(),
+ //JAXB-API
+ mavenBundle().groupId("jakarta.xml.bind").artifactId("jakarta.xml.bind-api").versionAsInProject(),
+ //SUN JAXB IMPL OSGI
+ mavenBundle().groupId("com.sun.xml.bind").artifactId("jaxb-osgi").versionAsInProject().versionAsInProject(),
+ systemPackage("com.sun.source.tree"),
+ systemPackage("com.sun.source.util"),
+
// validation - required by jersey-container-servlet-core
mavenBundle().groupId("javax.validation").artifactId("validation-api").versionAsInProject(),
// Jersey bundles
@@ -153,6 +159,10 @@
mavenBundle().groupId("org.glassfish.jersey.containers").artifactId("jersey-container-servlet-core")
.versionAsInProject(),
mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").versionAsInProject(),
+
+ // JAX-RS API
+ 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.
// (see the maven bundle plugin configuration in each of the two pom.xml files
diff --git a/examples/osgi-helloworld-webapp/functional-test/src/test/resources/felix.policy b/examples/osgi-helloworld-webapp/functional-test/src/test/resources/felix.policy
index 18caacb..103cc52 100644
--- a/examples/osgi-helloworld-webapp/functional-test/src/test/resources/felix.policy
+++ b/examples/osgi-helloworld-webapp/functional-test/src/test/resources/felix.policy
@@ -12,7 +12,7 @@
allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*System*"] (org.osgi.framework.PackagePermission) } "packageToSystem";
allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*additional-bundle*"] (java.security.AllPermission) } "allToAdditional";
allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*javassist*"] (java.security.AllPermission) } "allToJavassist";
-allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*javax.ws.rs*"] (java.security.AllPermission) } "allToJavaxWsRs";
+allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*jakarta.ws.rs*"] (java.security.AllPermission) } "allToJavaxWsRs";
allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*jetty*"] (java.security.AllPermission) } "allToJetty";
allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*hk2*"] (java.security.AllPermission) } "allToHk2";
allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*osgi*"] (java.security.AllPermission) } "allToOsgi";
diff --git a/examples/osgi-helloworld-webapp/lib-bundle/pom.xml b/examples/osgi-helloworld-webapp/lib-bundle/pom.xml
index 18586bf..46d94fe 100644
--- a/examples/osgi-helloworld-webapp/lib-bundle/pom.xml
+++ b/examples/osgi-helloworld-webapp/lib-bundle/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>osgi-helloworld-webapp</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.examples.osgi-helloworld-webapp</groupId>
@@ -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>
diff --git a/examples/osgi-helloworld-webapp/pom.xml b/examples/osgi-helloworld-webapp/pom.xml
index 1461b5f..067299a 100644
--- a/examples/osgi-helloworld-webapp/pom.xml
+++ b/examples/osgi-helloworld-webapp/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>osgi-helloworld-webapp</artifactId>
@@ -35,7 +35,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/osgi-helloworld-webapp/war-bundle/pom.xml b/examples/osgi-helloworld-webapp/war-bundle/pom.xml
index 5bf8b16..bd9eb80 100644
--- a/examples/osgi-helloworld-webapp/war-bundle/pom.xml
+++ b/examples/osgi-helloworld-webapp/war-bundle/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>osgi-helloworld-webapp</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.examples.osgi-helloworld-webapp</groupId>
@@ -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>
diff --git a/examples/osgi-http-service/bundle/pom.xml b/examples/osgi-http-service/bundle/pom.xml
index 4ee914e..834cd65 100644
--- a/examples/osgi-http-service/bundle/pom.xml
+++ b/examples/osgi-http-service/bundle/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>osgi-http-service</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.examples.osgi-http-service</groupId>
diff --git a/examples/osgi-http-service/functional-test/pom.xml b/examples/osgi-http-service/functional-test/pom.xml
index 7d147fc..91a0e2d 100644
--- a/examples/osgi-http-service/functional-test/pom.xml
+++ b/examples/osgi-http-service/functional-test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>osgi-http-service</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.examples.osgi-http-service</groupId>
@@ -41,8 +41,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
</dependency>
@@ -108,10 +108,10 @@
<!-- Grizzly dependencies-->
<dependency>
- <groupId>com.sun.grizzly.osgi</groupId>
+ <groupId>org.glassfish.grizzly.osgi</groupId>
<artifactId>grizzly-httpservice-bundle</artifactId>
<scope>test</scope>
- <version>1.9.45</version>
+ <version>${grizzly2.version}</version>
</dependency>
@@ -129,6 +129,16 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java b/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java
index 67110b3..6ba9126 100644
--- a/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java
+++ b/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java
@@ -44,6 +44,7 @@
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.systemPackage;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
/**
@@ -83,7 +84,7 @@
systemProperty("org.osgi.service.http.port").value(String.valueOf(port)),
systemProperty(BundleLocationProperty).value(bundleLocation),
systemProperty("jersey.config.test.container.port").value(String.valueOf(port)),
- systemProperty("org.osgi.framework.system.packages.extra").value("javax.annotation"),
+ systemProperty("org.osgi.framework.system.packages.extra").value("jakarta.annotation"),
systemProperty(JAXRS_RUNTIME_DELEGATE_PROPERTY).value("org.glassfish.jersey.internal.RuntimeDelegateImpl"),
// do not remove the following line
@@ -94,7 +95,7 @@
// mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.4"),
// javax.annotation has to go first!
- mavenBundle().groupId("javax.annotation").artifactId("javax.annotation-api").versionAsInProject(),
+ mavenBundle().groupId("jakarta.annotation").artifactId("jakarta.annotation-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
junitBundles(),
@@ -104,12 +105,16 @@
mavenBundle().groupId("org.glassfish.hk2").artifactId("osgi-resource-locator").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2").artifactId("hk2-locator").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2").artifactId("hk2-utils").versionAsInProject(),
- mavenBundle().groupId("org.glassfish.hk2.external").artifactId("javax.inject").versionAsInProject(),
+ mavenBundle().groupId("org.glassfish.hk2.external").artifactId("jakarta.inject").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2.external").artifactId("aopalliance-repackaged").versionAsInProject(),
mavenBundle().groupId("org.javassist").artifactId("javassist").versionAsInProject(),
- // JAX-RS API
- mavenBundle().groupId("javax.ws.rs").artifactId("javax.ws.rs-api").versionAsInProject(),
+ //JAXB-API
+ mavenBundle().groupId("jakarta.xml.bind").artifactId("jakarta.xml.bind-api").versionAsInProject(),
+ //SUN JAXB IMPL OSGI
+ mavenBundle().groupId("com.sun.xml.bind").artifactId("jaxb-osgi").versionAsInProject().versionAsInProject(),
+ systemPackage("com.sun.source.tree"),
+ systemPackage("com.sun.source.util"),
// validation
mavenBundle().groupId("javax.validation").artifactId("validation-api").versionAsInProject(),
@@ -120,7 +125,11 @@
mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-client").versionAsInProject(),
mavenBundle().groupId("org.glassfish.jersey.containers").artifactId("jersey-container-servlet-core")
.versionAsInProject(),
- mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").versionAsInProject()
+ mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").versionAsInProject(),
+
+ // JAX-RS API
+ mavenBundle().groupId("jakarta.ws.rs").artifactId("jakarta.ws.rs-api").versionAsInProject()
+
));
final String localRepository = AccessController.doPrivileged(PropertiesHelper.getSystemProperty("localRepository"));
@@ -134,7 +143,7 @@
public List<Option> grizzlyOptions() {
return Arrays.asList(options(
- mavenBundle().groupId("com.sun.grizzly.osgi").artifactId("grizzly-httpservice-bundle").versionAsInProject()
+ mavenBundle().groupId("org.glassfish.grizzly.osgi").artifactId("grizzly-httpservice-bundle").versionAsInProject()
));
}
diff --git a/examples/osgi-http-service/pom.xml b/examples/osgi-http-service/pom.xml
index 26b2b0f..e1ffacb 100644
--- a/examples/osgi-http-service/pom.xml
+++ b/examples/osgi-http-service/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>osgi-http-service</artifactId>
@@ -34,7 +34,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/pom.xml b/examples/pom.xml
index 2354e7d..d876543 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<licenses>
@@ -180,8 +180,91 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <!-- Add legal information, NOTICE.md and LINCENSE.md to jars -->
+ <executions>
+ <execution>
+ <!-- copy the files to classes folder for maven-jar/war-plugin to grab it -->
+ <id>copy-legaldocs</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>process-sources</phase>
+ <configuration>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${legal.source.folder}</directory>
+ <targetPath>META-INF/</targetPath>
+ <includes>
+ <include>NOTICE.md</include>
+ <include>LICENSE.md</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <!-- copy the files to source folder for maven-source-plugin to grab it -->
+ <id>copy-legaldocs-to-sources</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>process-sources</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/generated-sources/rsrc-gen</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${legal.source.folder}</directory>
+ <targetPath>META-INF/</targetPath>
+ <includes>
+ <include>NOTICE.md</include>
+ <include>LICENSE.md</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <!-- copy the files to legal folder for felix plugin to grab it -->
+ <id>copy-legaldocs-to-wars</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>process-sources</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/${project.artifactId}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${legal.source.folder}</directory>
+ <targetPath>META-INF/</targetPath>
+ <includes>
+ <include>NOTICE.md</include>
+ <include>LICENSE.md</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}/legal</directory>
+ </resource>
+ </resources>
</build>
+ <properties>
+ <legal.source.folder>${maven.multiModuleProjectDirectory}/examples</legal.source.folder>
+ </properties>
+
</project>
diff --git a/examples/reload/pom.xml b/examples/reload/pom.xml
index ebf097d..d847d57 100644
--- a/examples/reload/pom.xml
+++ b/examples/reload/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>reload</artifactId>
@@ -96,7 +96,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/rx-client-webapp/pom.xml b/examples/rx-client-webapp/pom.xml
index 14ab43d..c1864fe 100644
--- a/examples/rx-client-webapp/pom.xml
+++ b/examples/rx-client-webapp/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2014, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -18,7 +18,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>rx-client-webapp</artifactId>
@@ -82,7 +82,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/server-async-managed/pom.xml b/examples/server-async-managed/pom.xml
index 60905bb..ea465a1 100644
--- a/examples/server-async-managed/pom.xml
+++ b/examples/server-async-managed/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>server-async-managed</artifactId>
@@ -61,7 +61,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/server-async-standalone/client/pom.xml b/examples/server-async-standalone/client/pom.xml
index 06f779b..c629324 100644
--- a/examples/server-async-standalone/client/pom.xml
+++ b/examples/server-async-standalone/client/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>server-async-standalone</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>server-async-standalone-client</artifactId>
@@ -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>
diff --git a/examples/server-async-standalone/pom.xml b/examples/server-async-standalone/pom.xml
index 04c3e8a..b5df260 100644
--- a/examples/server-async-standalone/pom.xml
+++ b/examples/server-async-standalone/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>server-async-standalone</artifactId>
@@ -33,7 +33,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/server-async-standalone/webapp/pom.xml b/examples/server-async-standalone/webapp/pom.xml
index 22bc1b8..e1a2046 100644
--- a/examples/server-async-standalone/webapp/pom.xml
+++ b/examples/server-async-standalone/webapp/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>server-async-standalone</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>server-async-standalone-webapp</artifactId>
diff --git a/examples/server-async/pom.xml b/examples/server-async/pom.xml
index 90d0c23..b5fbd71 100644
--- a/examples/server-async/pom.xml
+++ b/examples/server-async/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>server-async</artifactId>
@@ -58,7 +58,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/server-sent-events-jaxrs/pom.xml b/examples/server-sent-events-jaxrs/pom.xml
index ade2a8f..07b8031 100644
--- a/examples/server-sent-events-jaxrs/pom.xml
+++ b/examples/server-sent-events-jaxrs/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>server-sent-events-jaxrs</artifactId>
@@ -62,7 +62,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/server-sent-events-jersey/pom.xml b/examples/server-sent-events-jersey/pom.xml
index af580c1..63af5de 100644
--- a/examples/server-sent-events-jersey/pom.xml
+++ b/examples/server-sent-events-jersey/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>server-sent-events-jersey</artifactId>
@@ -62,7 +62,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/servlet3-webapp/pom.xml b/examples/servlet3-webapp/pom.xml
index 13acfb2..4d9a491 100644
--- a/examples/servlet3-webapp/pom.xml
+++ b/examples/servlet3-webapp/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet3-webapp</artifactId>
@@ -108,7 +108,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/simple-console/pom.xml b/examples/simple-console/pom.xml
index fcb5fc8..a09ea3c 100644
--- a/examples/simple-console/pom.xml
+++ b/examples/simple-console/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>simple-console</artifactId>
@@ -62,7 +62,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/sse-item-store-jaxrs-webapp/pom.xml b/examples/sse-item-store-jaxrs-webapp/pom.xml
index afba6c1..252ee8b 100644
--- a/examples/sse-item-store-jaxrs-webapp/pom.xml
+++ b/examples/sse-item-store-jaxrs-webapp/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>sse-item-store-jaxrs-webapp</artifactId>
@@ -79,7 +79,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/sse-item-store-jersey-webapp/pom.xml b/examples/sse-item-store-jersey-webapp/pom.xml
index fdadcd5..9e93d1c 100644
--- a/examples/sse-item-store-jersey-webapp/pom.xml
+++ b/examples/sse-item-store-jersey-webapp/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>sse-item-store-jersey-webapp</artifactId>
@@ -79,7 +79,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/sse-twitter-aggregator/pom.xml b/examples/sse-twitter-aggregator/pom.xml
index 8a65d36..fbcb54c 100644
--- a/examples/sse-twitter-aggregator/pom.xml
+++ b/examples/sse-twitter-aggregator/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>sse-twitter-aggregator</artifactId>
@@ -77,7 +77,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/system-properties-example/pom.xml b/examples/system-properties-example/pom.xml
index c3657a2..e1991e1 100644
--- a/examples/system-properties-example/pom.xml
+++ b/examples/system-properties-example/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -17,7 +17,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>system-properties-example</artifactId>
@@ -63,7 +63,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/examples/webapp-example-parent/pom.xml b/examples/webapp-example-parent/pom.xml
index aba706e..15391a8 100644
--- a/examples/webapp-example-parent/pom.xml
+++ b/examples/webapp-example-parent/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>webapp-example-parent</artifactId>
diff --git a/examples/xml-moxy/pom.xml b/examples/xml-moxy/pom.xml
index f6ffdef..8171caf 100644
--- a/examples/xml-moxy/pom.xml
+++ b/examples/xml-moxy/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -16,7 +16,7 @@
<parent>
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>xml-moxy</artifactId>
@@ -63,7 +63,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/ext/bean-validation/pom.xml b/ext/bean-validation/pom.xml
index aa1b1f6..979c8dd 100644
--- a/ext/bean-validation/pom.xml
+++ b/ext/bean-validation/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-bean-validation</artifactId>
@@ -37,7 +37,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -54,7 +54,11 @@
<instructions>
<!-- Note: When you're changing these properties change them also in bundles/jax-rs-ri/bundle/pom.xml. -->
<Export-Package>org.glassfish.jersey.server.validation.*;version=${project.version}</Export-Package>
- <Import-Package>javax.validation.*;resolution:=optional;version="${range;[==,3);${javax.validation.api.version}}", *</Import-Package>
+ <Import-Package>
+ javax.annotation.*;version="!",
+ javax.validation.*;resolution:=optional;version="${range;[==,3);${javax.validation.api.version}}",
+ *
+ </Import-Package>
</instructions>
<unpackBundle>true</unpackBundle>
</configuration>
@@ -65,7 +69,7 @@
<dependencies>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
@@ -83,19 +87,19 @@
<artifactId>validation-api</artifactId>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
+ <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
<!-- java-el related dependencies are in scope "provided" in hibernate-validator -->
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>javax.el</artifactId>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.el</artifactId>
</dependency>
<dependency>
diff --git a/ext/cdi/jersey-cdi1x-ban-custom-hk2-binding/pom.xml b/ext/cdi/jersey-cdi1x-ban-custom-hk2-binding/pom.xml
index 8b7598c..8cbe151 100644
--- a/ext/cdi/jersey-cdi1x-ban-custom-hk2-binding/pom.xml
+++ b/ext/cdi/jersey-cdi1x-ban-custom-hk2-binding/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2014, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.ext.cdi</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-cdi1x-ban-custom-hk2-binding</artifactId>
@@ -63,23 +63,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
<extensions>true</extensions>
<configuration>
<instructions>
<Export-Package>org.glassfish.jersey.ext.cdi1x.hk2ban</Export-Package>
- <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
- <_nodefaultversion>false</_nodefaultversion>
</instructions>
</configuration>
- <executions>
- <execution>
- <id>osgi-bundle</id>
- <phase>package</phase>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
diff --git a/ext/cdi/jersey-cdi1x-servlet/pom.xml b/ext/cdi/jersey-cdi1x-servlet/pom.xml
index e09cfe5..a2002fe 100644
--- a/ext/cdi/jersey-cdi1x-servlet/pom.xml
+++ b/ext/cdi/jersey-cdi1x-servlet/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2014, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.ext.cdi</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-cdi1x-servlet</artifactId>
@@ -34,9 +34,9 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet3.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -76,7 +76,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -87,23 +87,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
<extensions>true</extensions>
<configuration>
<instructions>
<Export-Package>org.glassfish.jersey.ext.cdi1x.servlet.internal</Export-Package>
- <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
- <_nodefaultversion>false</_nodefaultversion>
</instructions>
</configuration>
- <executions>
- <execution>
- <id>osgi-bundle</id>
- <phase>package</phase>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
diff --git a/ext/cdi/jersey-cdi1x-servlet/src/main/java/org/glassfish/jersey/ext/cdi1x/servlet/internal/CdiExternalRequestScopeExtension.java b/ext/cdi/jersey-cdi1x-servlet/src/main/java/org/glassfish/jersey/ext/cdi1x/servlet/internal/CdiExternalRequestScopeExtension.java
index 53fe1a0..e191462 100644
--- a/ext/cdi/jersey-cdi1x-servlet/src/main/java/org/glassfish/jersey/ext/cdi1x/servlet/internal/CdiExternalRequestScopeExtension.java
+++ b/ext/cdi/jersey-cdi1x-servlet/src/main/java/org/glassfish/jersey/ext/cdi1x/servlet/internal/CdiExternalRequestScopeExtension.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018 Payara Foundation and/or its affiliates.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -13,7 +14,6 @@
*
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-
package org.glassfish.jersey.ext.cdi1x.servlet.internal;
import java.lang.annotation.Annotation;
@@ -57,7 +57,7 @@
*/
private void beforeBeanDiscovery(@Observes BeforeBeanDiscovery beforeBeanDiscoveryEvent, final BeanManager beanManager) {
requestScopeType = beanManager.createAnnotatedType(CdiExternalRequestScope.class);
- beforeBeanDiscoveryEvent.addAnnotatedType(requestScopeType);
+ beforeBeanDiscoveryEvent.addAnnotatedType(requestScopeType, "Jersey " + CdiExternalRequestScope.class.getName());
}
/**
diff --git a/ext/cdi/jersey-cdi1x-transaction/pom.xml b/ext/cdi/jersey-cdi1x-transaction/pom.xml
index cea42c1..5b23ddc 100644
--- a/ext/cdi/jersey-cdi1x-transaction/pom.xml
+++ b/ext/cdi/jersey-cdi1x-transaction/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2014, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.ext.cdi</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-cdi1x-transaction</artifactId>
@@ -75,7 +75,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -86,23 +86,14 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
<extensions>true</extensions>
<configuration>
<instructions>
<Export-Package>org.glassfish.jersey.ext.cdi1x.transaction.internal</Export-Package>
- <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
- <_nodefaultversion>false</_nodefaultversion>
+ <Import-Package>javax.annotation.*;version="!",*</Import-Package>
</instructions>
</configuration>
- <executions>
- <execution>
- <id>osgi-bundle</id>
- <phase>package</phase>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
diff --git a/ext/cdi/jersey-cdi1x-transaction/src/main/java/org/glassfish/jersey/ext/cdi1x/transaction/internal/TransactionalExceptionInterceptorProvider.java b/ext/cdi/jersey-cdi1x-transaction/src/main/java/org/glassfish/jersey/ext/cdi1x/transaction/internal/TransactionalExceptionInterceptorProvider.java
index 54ac7eb..d6b5320 100644
--- a/ext/cdi/jersey-cdi1x-transaction/src/main/java/org/glassfish/jersey/ext/cdi1x/transaction/internal/TransactionalExceptionInterceptorProvider.java
+++ b/ext/cdi/jersey-cdi1x-transaction/src/main/java/org/glassfish/jersey/ext/cdi1x/transaction/internal/TransactionalExceptionInterceptorProvider.java
@@ -16,14 +16,17 @@
package org.glassfish.jersey.ext.cdi1x.transaction.internal;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import java.util.List;
import java.util.Set;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.ext.ExceptionMapper;
-
import javax.annotation.Priority;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterTypeDiscovery;
@@ -33,6 +36,8 @@
import javax.inject.Qualifier;
import javax.interceptor.Interceptor;
import javax.transaction.TransactionalException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.ext.ExceptionMapper;
import org.glassfish.jersey.ext.cdi1x.internal.CdiUtil;
import org.glassfish.jersey.ext.cdi1x.internal.GenericCdiBeanSupplier;
@@ -41,12 +46,6 @@
import org.glassfish.jersey.internal.inject.InjectionManager;
import org.glassfish.jersey.server.spi.ComponentProvider;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
/**
* Jersey CDI extension that provides means to retain {@link WebApplicationException}
* thrown from JAX-RS components implemented as CDI transactional beans.
@@ -100,10 +99,17 @@
}
@SuppressWarnings("unused")
- private void beforeBeanDiscovery(@Observes final BeforeBeanDiscovery beforeBeanDiscovery, final javax.enterprise.inject.spi
- .BeanManager beanManager) {
- beforeBeanDiscovery.addAnnotatedType(beanManager.createAnnotatedType(WebAppExceptionHolder.class));
- beforeBeanDiscovery.addAnnotatedType(beanManager.createAnnotatedType(WebAppExceptionInterceptor.class));
- beforeBeanDiscovery.addAnnotatedType(beanManager.createAnnotatedType(TransactionalExceptionMapper.class));
+ private void beforeBeanDiscovery(@Observes BeforeBeanDiscovery beforeBeanDiscovery, BeanManager beanManager) {
+ addAnnotatedTypes(beforeBeanDiscovery, beanManager,
+ WebAppExceptionHolder.class,
+ WebAppExceptionInterceptor.class,
+ TransactionalExceptionMapper.class
+ );
+ }
+
+ private static void addAnnotatedTypes(BeforeBeanDiscovery beforeBeanDiscovery, BeanManager beanManager, Class<?>... types) {
+ for (Class<?> type : types) {
+ beforeBeanDiscovery.addAnnotatedType(beanManager.createAnnotatedType(type), "Jersey " + type.getName());
+ }
}
}
diff --git a/ext/cdi/jersey-cdi1x-validation/pom.xml b/ext/cdi/jersey-cdi1x-validation/pom.xml
index 26d209a..6eefa02 100644
--- a/ext/cdi/jersey-cdi1x-validation/pom.xml
+++ b/ext/cdi/jersey-cdi1x-validation/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.ext.cdi</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-cdi1x-validation</artifactId>
@@ -41,7 +41,7 @@
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
+ <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope>
</dependency>
@@ -51,6 +51,17 @@
<artifactId>cdi-api</artifactId>
<scope>provided</scope>
<version>1.2</version>
+ <exclusions>
+ <!-- Remove ancient javax.el that causes problems with Hibernate -->
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
@@ -74,7 +85,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -85,21 +96,14 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
<extensions>true</extensions>
<configuration>
<instructions>
<Export-Package>org.glassfish.jersey.ext.cdi1x.validation.internal;version=${project.version}</Export-Package>
+ <Import-Package>javax.annotation.*;version="!",*</Import-Package>
</instructions>
</configuration>
- <executions>
- <execution>
- <id>osgi-bundle</id>
- <phase>package</phase>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
diff --git a/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapper.java b/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapper.java
index 16a098d..5b808ce 100644
--- a/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapper.java
+++ b/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapper.java
@@ -27,8 +27,8 @@
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
-import org.hibernate.validator.internal.cdi.interceptor.MethodValidated;
-import org.hibernate.validator.internal.cdi.interceptor.ValidationInterceptor;
+import org.hibernate.validator.cdi.internal.interceptor.MethodValidated;
+import org.hibernate.validator.cdi.internal.interceptor.ValidationInterceptor;
/**
* JAX-RS wrapper for Hibernate CDI bean validation interceptor.
diff --git a/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapperExtension.java b/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapperExtension.java
index b461110..73a0e3a 100644
--- a/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapperExtension.java
+++ b/ext/cdi/jersey-cdi1x-validation/src/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapperExtension.java
@@ -43,7 +43,7 @@
import org.glassfish.jersey.internal.util.collection.Cache;
import org.glassfish.jersey.server.model.Resource;
-import org.hibernate.validator.internal.cdi.interceptor.ValidationInterceptor;
+import org.hibernate.validator.cdi.internal.interceptor.ValidationInterceptor;
/**
* CDI extension to register {@link CdiInterceptorWrapper}.
@@ -67,9 +67,13 @@
* @param beanManager current bean manager.
*/
private void beforeBeanDiscovery(@Observes BeforeBeanDiscovery beforeBeanDiscoveryEvent, final BeanManager beanManager) {
- beforeBeanDiscoveryEvent.addAnnotatedType(beanManager.createAnnotatedType(CdiInterceptorWrapper.class));
+ beforeBeanDiscoveryEvent.addAnnotatedType(beanManager.createAnnotatedType(CdiInterceptorWrapper.class),
+ "Jersey " + CdiInterceptorWrapper.class.getName()
+ );
interceptorAnnotatedType = beanManager.createAnnotatedType(ValidationInterceptor.class);
- beforeBeanDiscoveryEvent.addAnnotatedType(interceptorAnnotatedType);
+ beforeBeanDiscoveryEvent.addAnnotatedType(interceptorAnnotatedType,
+ "Jersey " + ValidationInterceptor.class.getName()
+ );
}
/**
@@ -78,7 +82,7 @@
* @param afterTypeDiscovery CDI bootstrap event.
*/
private void afterTypeDiscovery(@Observes final AfterTypeDiscovery afterTypeDiscovery) {
- afterTypeDiscovery.getInterceptors().remove(ValidationInterceptor.class);
+ afterTypeDiscovery.getInterceptors().removeIf(ValidationInterceptor.class::equals);
}
/**
diff --git a/ext/cdi/jersey-cdi1x/pom.xml b/ext/cdi/jersey-cdi1x/pom.xml
index 11ef360..99463ff 100644
--- a/ext/cdi/jersey-cdi1x/pom.xml
+++ b/ext/cdi/jersey-cdi1x/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.ext.cdi</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-cdi1x</artifactId>
@@ -64,7 +64,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -75,6 +75,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -82,19 +83,9 @@
org.glassfish.jersey.ext.cdi1x.spi,org.glassfish.jersey.ext.cdi1x.internal,
org.glassfish.jersey.ext.cdi1x.internal.spi
</Export-Package>
- <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
- <_nodefaultversion>false</_nodefaultversion>
+ <Import-Package>javax.annotation.*;version="!",*</Import-Package>
</instructions>
</configuration>
- <executions>
- <execution>
- <id>osgi-bundle</id>
- <phase>package</phase>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
diff --git a/ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/CdiComponentProvider.java b/ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/CdiComponentProvider.java
index 80b2126..7dd258d 100644
--- a/ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/CdiComponentProvider.java
+++ b/ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/CdiComponentProvider.java
@@ -448,8 +448,72 @@
};
}
+ private boolean containsJaxRsParameterizedCtor(final AnnotatedType annotatedType) {
+ return containAnnotatedParameters(annotatedType.getConstructors(), JaxRsParamProducer.JAX_RS_STRING_PARAM_ANNOTATIONS);
+ }
+
+ private boolean containsJaxRsConstructorInjection(final AnnotatedType annotatedType) {
+ return containAnnotatedParameters(annotatedType.getConstructors(), JAX_RS_INJECT_ANNOTATIONS);
+ }
+
+ private boolean containsJaxRsMethodInjection(final AnnotatedType annotatedType) {
+ return containAnnotatedParameters(annotatedType.getMethods(), JAX_RS_INJECT_ANNOTATIONS);
+ }
+
+ private boolean containsJaxRsFieldInjection(final AnnotatedType annotatedType) {
+ return containAnnotation(annotatedType.getFields(), JAX_RS_INJECT_ANNOTATIONS);
+ }
+
+ private boolean containAnnotatedParameters(final Collection<AnnotatedCallable> annotatedCallables,
+ final Set<Class<? extends Annotation>> annotationSet) {
+ for (final AnnotatedCallable c : annotatedCallables) {
+ if (containAnnotation(c.getParameters(), annotationSet)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private boolean containAnnotation(final Collection<Annotated> elements,
+ final Set<Class<? extends Annotation>> annotationSet) {
+ for (final Annotated element : elements) {
+ if (hasAnnotation(element, annotationSet)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static boolean hasAnnotation(final Annotated element, final Set<Class<? extends Annotation>> annotations) {
+ for (final Class<? extends Annotation> a : annotations) {
+ if (element.isAnnotationPresent(a)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
@SuppressWarnings("unused")
- private void processAnnotatedType(@Observes
+ private void afterTypeDiscovery(@Observes final AfterTypeDiscovery afterTypeDiscovery) {
+ if (LOGGER.isLoggable(Level.CONFIG) && !jerseyVetoedTypes.isEmpty()) {
+ LOGGER.config(LocalizationMessages.CDI_TYPE_VETOED(customHk2TypesProvider,
+ listElements(new StringBuilder().append("\n"), jerseyVetoedTypes).toString()));
+ }
+ }
+
+ @SuppressWarnings("unused")
+ private void beforeBeanDiscovery(@Observes final BeforeBeanDiscovery beforeBeanDiscovery, final BeanManager beanManager) {
+ beforeBeanDiscovery.addAnnotatedType(
+ beanManager.createAnnotatedType(JaxRsParamProducer.class),
+ "Jersey " + JaxRsParamProducer.class.getName()
+ );
+ beforeBeanDiscovery.addAnnotatedType(
+ beanManager.createAnnotatedType(ProcessJAXRSAnnotatedTypes.class),
+ "Jersey " + ProcessJAXRSAnnotatedTypes.class.getName()
+ );
+ }
+
+ public void processAnnotatedType(//@Observes
// We can not apply the following constraint
// if we want to fully support {@link org.glassfish.jersey.ext.cdi1x.spi.Hk2CustomBoundTypesProvider}.
// Covered by tests/integration/cdi-with-jersey-injection-custom-cfg-webapp test application:
@@ -535,64 +599,6 @@
}
}
- private boolean containsJaxRsParameterizedCtor(final AnnotatedType annotatedType) {
- return containAnnotatedParameters(annotatedType.getConstructors(), JaxRsParamProducer.JAX_RS_STRING_PARAM_ANNOTATIONS);
- }
-
- private boolean containsJaxRsConstructorInjection(final AnnotatedType annotatedType) {
- return containAnnotatedParameters(annotatedType.getConstructors(), JAX_RS_INJECT_ANNOTATIONS);
- }
-
- private boolean containsJaxRsMethodInjection(final AnnotatedType annotatedType) {
- return containAnnotatedParameters(annotatedType.getMethods(), JAX_RS_INJECT_ANNOTATIONS);
- }
-
- private boolean containsJaxRsFieldInjection(final AnnotatedType annotatedType) {
- return containAnnotation(annotatedType.getFields(), JAX_RS_INJECT_ANNOTATIONS);
- }
-
- private boolean containAnnotatedParameters(final Collection<AnnotatedCallable> annotatedCallables,
- final Set<Class<? extends Annotation>> annotationSet) {
- for (final AnnotatedCallable c : annotatedCallables) {
- if (containAnnotation(c.getParameters(), annotationSet)) {
- return true;
- }
- }
- return false;
- }
-
- private boolean containAnnotation(final Collection<Annotated> elements,
- final Set<Class<? extends Annotation>> annotationSet) {
- for (final Annotated element : elements) {
- if (hasAnnotation(element, annotationSet)) {
- return true;
- }
- }
- return false;
- }
-
- private static boolean hasAnnotation(final Annotated element, final Set<Class<? extends Annotation>> annotations) {
- for (final Class<? extends Annotation> a : annotations) {
- if (element.isAnnotationPresent(a)) {
- return true;
- }
- }
- return false;
- }
-
- @SuppressWarnings("unused")
- private void afterTypeDiscovery(@Observes final AfterTypeDiscovery afterTypeDiscovery) {
- if (LOGGER.isLoggable(Level.CONFIG) && !jerseyVetoedTypes.isEmpty()) {
- LOGGER.config(LocalizationMessages.CDI_TYPE_VETOED(customHk2TypesProvider,
- listElements(new StringBuilder().append("\n"), jerseyVetoedTypes).toString()));
- }
- }
-
- @SuppressWarnings("unused")
- private void beforeBeanDiscovery(@Observes final BeforeBeanDiscovery beforeBeanDiscovery,
- final javax.enterprise.inject.spi.BeanManager beanManager) {
- beforeBeanDiscovery.addAnnotatedType(beanManager.createAnnotatedType(JaxRsParamProducer.class));
- }
@SuppressWarnings("unused")
private void processInjectionTarget(@Observes final ProcessInjectionTarget event) {
diff --git a/ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/ProcessAllAnnotatedTypes.java b/ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/ProcessAllAnnotatedTypes.java
new file mode 100644
index 0000000..96328de
--- /dev/null
+++ b/ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/ProcessAllAnnotatedTypes.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2018 Payara Foundation and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+package org.glassfish.jersey.ext.cdi1x.internal;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
+
+public class ProcessAllAnnotatedTypes implements Extension {
+
+ public void processAnnotatedType(@Observes ProcessAnnotatedType<?> processAnnotatedType, BeanManager beanManager) {
+ CdiComponentProvider cdiComponentProvider = beanManager.getExtension(CdiComponentProvider.class);
+ cdiComponentProvider.processAnnotatedType(processAnnotatedType);
+ }
+
+}
diff --git a/ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/ProcessJAXRSAnnotatedTypes.java b/ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/ProcessJAXRSAnnotatedTypes.java
new file mode 100644
index 0000000..8985eb1
--- /dev/null
+++ b/ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/ProcessJAXRSAnnotatedTypes.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2018 Payara Foundation and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+package org.glassfish.jersey.ext.cdi1x.internal;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import javax.enterprise.inject.spi.WithAnnotations;
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.BeanParam;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.MatrixParam;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+
+public class ProcessJAXRSAnnotatedTypes implements Extension {
+
+ public void processAnnotatedType(
+ @Observes
+ @WithAnnotations({
+ Context.class,
+ ApplicationPath.class,
+ HeaderParam.class,
+ QueryParam.class,
+ FormParam.class,
+ MatrixParam.class,
+ BeanParam.class,
+ PathParam.class})
+ ProcessAnnotatedType<?> processAnnotatedType, BeanManager beanManager) {
+
+ beanManager.getExtension(CdiComponentProvider.class)
+ .processAnnotatedType(processAnnotatedType);
+ }
+
+}
diff --git a/ext/cdi/jersey-cdi1x/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/ext/cdi/jersey-cdi1x/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
index 64adbff..398cf16 100644
--- a/ext/cdi/jersey-cdi1x/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
+++ b/ext/cdi/jersey-cdi1x/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
@@ -1 +1,2 @@
org.glassfish.jersey.ext.cdi1x.internal.CdiComponentProvider
+org.glassfish.jersey.ext.cdi1x.internal.ProcessAllAnnotatedTypes
diff --git a/ext/cdi/jersey-weld2-se/pom.xml b/ext/cdi/jersey-weld2-se/pom.xml
index f9e88c8..5e42459 100644
--- a/ext/cdi/jersey-weld2-se/pom.xml
+++ b/ext/cdi/jersey-weld2-se/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2014, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.ext.cdi</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-weld2-se</artifactId>
@@ -61,6 +61,9 @@
<directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>${project.build.directory}/legal</directory>
+ </resource>
</resources>
</build>
</project>
diff --git a/ext/cdi/pom.xml b/ext/cdi/pom.xml
index a3c8254..afafecf 100644
--- a/ext/cdi/pom.xml
+++ b/ext/cdi/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.ext.cdi</groupId>
diff --git a/ext/entity-filtering/pom.xml b/ext/entity-filtering/pom.xml
index a5619c5..2c79264 100644
--- a/ext/entity-filtering/pom.xml
+++ b/ext/entity-filtering/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-entity-filtering</artifactId>
@@ -60,7 +60,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -76,7 +76,7 @@
<configuration>
<instructions>
<Export-Package>org.glassfish.jersey.message.filtering.*;version=${project.version}</Export-Package>
- <Import-Package>*</Import-Package>
+ <Import-Package>javax.annotation.*;version="!",*</Import-Package>
</instructions>
<unpackBundle>true</unpackBundle>
</configuration>
diff --git a/ext/entity-filtering/src/main/java/org/glassfish/jersey/message/filtering/SelectableScopeResolver.java b/ext/entity-filtering/src/main/java/org/glassfish/jersey/message/filtering/SelectableScopeResolver.java
index 6e22afb..ff0437b 100644
--- a/ext/entity-filtering/src/main/java/org/glassfish/jersey/message/filtering/SelectableScopeResolver.java
+++ b/ext/entity-filtering/src/main/java/org/glassfish/jersey/message/filtering/SelectableScopeResolver.java
@@ -83,6 +83,9 @@
final String[] fields = Tokenizer.tokenize(fieldName, ",");
for (final String field : fields) {
final String[] subfields = Tokenizer.tokenize(field, ".");
+ if (subfields.length == 0) {
+ continue;
+ }
// in case of nested path, add first level as stand-alone to ensure subgraph is added
scopes.add(SelectableScopeResolver.PREFIX + subfields[0]);
if (subfields.length > 1) {
diff --git a/ext/metainf-services/pom.xml b/ext/metainf-services/pom.xml
index 8eef68a..2bb89b7 100644
--- a/ext/metainf-services/pom.xml
+++ b/ext/metainf-services/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-metainf-services</artifactId>
@@ -67,7 +67,7 @@
</plugin>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -80,6 +80,15 @@
<artifactId>maven-bundle-plugin</artifactId>
<inherited>true</inherited>
<extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Import-Package>
+ javax.annotation.*;version="!",
+ *
+ </Import-Package>
+ <unpackBundle>true</unpackBundle>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git a/ext/mvc-bean-validation/pom.xml b/ext/mvc-bean-validation/pom.xml
index 4fa6f35..333214d 100644
--- a/ext/mvc-bean-validation/pom.xml
+++ b/ext/mvc-bean-validation/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
- Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-mvc-bean-validation</artifactId>
@@ -41,6 +41,11 @@
<inherited>true</inherited>
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/legal</directory>
+ </resource>
+ </resources>
</build>
<dependencies>
@@ -58,6 +63,18 @@
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.el</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.el</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/ext/mvc-freemarker/pom.xml b/ext/mvc-freemarker/pom.xml
index 73b152d..c40e070 100644
--- a/ext/mvc-freemarker/pom.xml
+++ b/ext/mvc-freemarker/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-mvc-freemarker</artifactId>
@@ -48,6 +48,11 @@
</configuration>
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/legal</directory>
+ </resource>
+ </resources>
</build>
<dependencies>
diff --git a/ext/mvc-jsp/pom.xml b/ext/mvc-jsp/pom.xml
index e76f2f5..c122749 100644
--- a/ext/mvc-jsp/pom.xml
+++ b/ext/mvc-jsp/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-mvc-jsp</artifactId>
@@ -37,7 +37,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -53,7 +53,8 @@
<configuration>
<instructions>
<Import-Package>
- javax.servlet.jsp.*;version="${range;[==,+);${jsp.version}}",
+ javax.servlet.jsp.*;version="[2.0,3.0)",
+ javax.servlet.*;version="!",
*
</Import-Package>
<Export-Package>org.glassfish.jersey.server.mvc.jsp.*;version=${project.version}</Export-Package>
@@ -67,7 +68,7 @@
<dependencies>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
@@ -81,14 +82,14 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet2.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>jakarta.servlet.jsp</groupId>
+ <artifactId>jakarta.servlet.jsp-api</artifactId>
<version>${jsp.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/ext/mvc-mustache/pom.xml b/ext/mvc-mustache/pom.xml
index b3c747c..ee5f5cf 100644
--- a/ext/mvc-mustache/pom.xml
+++ b/ext/mvc-mustache/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
- Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-mvc-mustache</artifactId>
@@ -48,6 +48,11 @@
</configuration>
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/legal</directory>
+ </resource>
+ </resources>
</build>
<dependencies>
diff --git a/ext/mvc/pom.xml b/ext/mvc/pom.xml
index 9a0ff5e..8d84a6f 100644
--- a/ext/mvc/pom.xml
+++ b/ext/mvc/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-mvc</artifactId>
@@ -51,7 +51,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -67,6 +67,7 @@
<configuration>
<instructions>
<Export-Package>org.glassfish.jersey.server.mvc.*;version=${project.version}</Export-Package>
+ <Import-Package>javax.annotation.*;version="!",*</Import-Package>
</instructions>
<unpackBundle>true</unpackBundle>
</configuration>
diff --git a/ext/pom.xml b/ext/pom.xml
index 0e56abf..0fe2582 100644
--- a/ext/pom.xml
+++ b/ext/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.ext</groupId>
@@ -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>
diff --git a/ext/proxy-client/pom.xml b/ext/proxy-client/pom.xml
index 4477b0f..91c3c01 100644
--- a/ext/proxy-client/pom.xml
+++ b/ext/proxy-client/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
- Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-proxy-client</artifactId>
@@ -47,6 +47,11 @@
</configuration>
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/legal</directory>
+ </resource>
+ </resources>
</build>
<dependencies>
diff --git a/ext/rx/pom.xml b/ext/rx/pom.xml
index 3826cc7..5df6635 100644
--- a/ext/rx/pom.xml
+++ b/ext/rx/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2014, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.ext.rx</groupId>
@@ -54,4 +54,15 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}/legal</directory>
+ </resource>
+ </resources>
+ </build>
</project>
diff --git a/ext/rx/rx-client-guava/pom.xml b/ext/rx/rx-client-guava/pom.xml
index 8061dd1..fa89dc8 100644
--- a/ext/rx/rx-client-guava/pom.xml
+++ b/ext/rx/rx-client-guava/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.ext.rx</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-rx-client-guava</artifactId>
diff --git a/ext/rx/rx-client-rxjava/pom.xml b/ext/rx/rx-client-rxjava/pom.xml
index 0afec67..0dcb7c4 100644
--- a/ext/rx/rx-client-rxjava/pom.xml
+++ b/ext/rx/rx-client-rxjava/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.ext.rx</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-rx-client-rxjava</artifactId>
diff --git a/ext/rx/rx-client-rxjava2/pom.xml b/ext/rx/rx-client-rxjava2/pom.xml
index 36614ce..56ab7f6 100644
--- a/ext/rx/rx-client-rxjava2/pom.xml
+++ b/ext/rx/rx-client-rxjava2/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.ext.rx</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-rx-client-rxjava2</artifactId>
diff --git a/ext/servlet-portability/pom.xml b/ext/servlet-portability/pom.xml
index 6e0fada..eaaead1 100644
--- a/ext/servlet-portability/pom.xml
+++ b/ext/servlet-portability/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.glassfish.jersey.ext</groupId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-servlet-portability</artifactId>
@@ -38,7 +38,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -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>
@@ -68,9 +68,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet2.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/ext/spring4/pom.xml b/ext/spring4/pom.xml
index 450eba3..e3bf6ea 100644
--- a/ext/spring4/pom.xml
+++ b/ext/spring4/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-spring4</artifactId>
@@ -122,9 +122,9 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
@@ -151,14 +151,14 @@
</dependencies>
<properties>
- <spring4.version>4.3.4.RELEASE</spring4.version>
+ <spring4.version>4.3.8.RELEASE</spring4.version>
</properties>
<build>
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/ext/wadl-doclet/pom.xml b/ext/wadl-doclet/pom.xml
index c90da71..94c27f5 100644
--- a/ext/wadl-doclet/pom.xml
+++ b/ext/wadl-doclet/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.glassfish.jersey.ext</groupId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jersey-wadl-doclet</artifactId>
@@ -98,4 +98,11 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/legal</directory>
+ </resource>
+ </resources>
+ </build>
</project>
diff --git a/incubator/declarative-linking/pom.xml b/incubator/declarative-linking/pom.xml
index 592cb2a..cf9e9d9 100644
--- a/incubator/declarative-linking/pom.xml
+++ b/incubator/declarative-linking/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.incubator</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.ext</groupId>
@@ -49,13 +49,13 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>javax.el</artifactId>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.el</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -86,24 +86,6 @@
<profiles>
<profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <links>
- <link>https://jsr311.java.net/nonav/releases/1.1</link>
- <link>https://jersey.java.net/nonav/apidocs/latest/jersey/</link>
- </links>
- <notimestamp>true</notimestamp>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>cobertura</id>
<activation>
<property>
@@ -142,6 +124,9 @@
<include>META-INF/**/*</include>
</includes>
</resource>
+ <resource>
+ <directory>${project.build.directory}/legal</directory>
+ </resource>
</resources>
<plugins>
<plugin>
diff --git a/incubator/gae-integration/pom.xml b/incubator/gae-integration/pom.xml
index f692c90..54c76bf 100644
--- a/incubator/gae-integration/pom.xml
+++ b/incubator/gae-integration/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
- Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.incubator</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-gae-integration</artifactId>
@@ -49,4 +49,11 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/legal</directory>
+ </resource>
+ </resources>
+ </build>
</project>
diff --git a/incubator/html-json/pom.xml b/incubator/html-json/pom.xml
index 882bb46..c6ad5df 100644
--- a/incubator/html-json/pom.xml
+++ b/incubator/html-json/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.incubator</groupId>
<artifactId>project</artifactId>
- <version>2.26-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.media</groupId>
@@ -39,7 +39,7 @@
</description>
<properties>
- <net.java.html.version>1.0</net.java.html.version>
+ <net.java.html.version>1.5.1</net.java.html.version>
</properties>
<repositories>
@@ -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>
@@ -72,8 +72,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
@@ -114,4 +114,15 @@
<scope>runtime</scope>
</dependency>
</dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}/legal</directory>
+ </resource>
+ </resources>
+ </build>
</project>
diff --git a/incubator/kryo/pom.xml b/incubator/kryo/pom.xml
index a6a7757..402fcf9 100644
--- a/incubator/kryo/pom.xml
+++ b/incubator/kryo/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.incubator</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.media</groupId>
@@ -36,8 +36,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>
@@ -57,4 +57,15 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}/legal</directory>
+ </resource>
+ </resources>
+ </build>
</project>
diff --git a/incubator/open-tracing/pom.xml b/incubator/open-tracing/pom.xml
index f96771e..3cbb999 100644
--- a/incubator/open-tracing/pom.xml
+++ b/incubator/open-tracing/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.incubator</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.incubator</groupId>
@@ -77,7 +77,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/incubator/pom.xml b/incubator/pom.xml
index 484edcb..d3bde86 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.incubator</groupId>
@@ -38,7 +38,7 @@
<modules>
<module>declarative-linking</module>
<module>gae-integration</module>
- <!--<module>html-json</module>-->
+ <module>html-json</module>
<module>kryo</module>
<module>open-tracing</module>
</modules>
diff --git a/inject/cdi2-se/pom.xml b/inject/cdi2-se/pom.xml
index b3e732a..43fc892 100644
--- a/inject/cdi2-se/pom.xml
+++ b/inject/cdi2-se/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-cdi2-se</artifactId>
@@ -67,7 +67,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -86,7 +86,9 @@
org.glassfish.jersey.inject.cdi.se.*;version=${project.version}
</Export-Package>
<Import-Package>
- sun.misc.*;resolution:=optional, *
+ sun.misc.*;resolution:=optional,
+ javax.annotation.*;version="!",
+ *
</Import-Package>
</instructions>
<unpackBundle>true</unpackBundle>
diff --git a/inject/hk2/pom.xml b/inject/hk2/pom.xml
index 69ac48c..b33a71c 100644
--- a/inject/hk2/pom.xml
+++ b/inject/hk2/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-hk2</artifactId>
@@ -67,7 +67,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -87,6 +87,7 @@
</Export-Package>
<Import-Package>
sun.misc.*;resolution:=optional,
+ javax.annotation.*;version="!",
*
</Import-Package>
</instructions>
diff --git a/inject/pom.xml b/inject/pom.xml
index 0a5c14b..c83adcc 100644
--- a/inject/pom.xml
+++ b/inject/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.inject</groupId>
diff --git a/media/jaxb/pom.xml b/media/jaxb/pom.xml
index e5c309c..23f65a1 100644
--- a/media/jaxb/pom.xml
+++ b/media/jaxb/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-media-jaxb</artifactId>
@@ -74,7 +74,7 @@
</plugin>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -104,6 +104,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>javax.xml.bind.*;version="!",*</Import-Package>
<Export-Package>org.glassfish.jersey.jaxb.*;version=${project.version}</Export-Package>
</instructions>
<unpackBundle>true</unpackBundle>
@@ -121,13 +122,13 @@
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
diff --git a/media/json-binding/pom.xml b/media/json-binding/pom.xml
index b6cb798..e7d4e8c 100644
--- a/media/json-binding/pom.xml
+++ b/media/json-binding/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-media-json-binding</artifactId>
@@ -38,7 +38,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -54,6 +54,7 @@
<configuration>
<instructions>
<Export-Package>org.glassfish.jersey.jackson.*</Export-Package>
+ <Import-Package>javax.annotation.*;version="!",*</Import-Package>
</instructions>
<unpackBundle>true</unpackBundle>
</configuration>
@@ -70,18 +71,45 @@
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
+ <artifactId>jakarta.json</artifactId>
+ <version>${jsonp.ri.version}</version>
</dependency>
<!-- TODO - remove snapshot dependencies (will need yasson & API release, as there only is 2 month old M1 version -->
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>yasson</artifactId>
+ <exclusions>
+ <!-- Remove ancient javax.el that causes problems with Hibernate -->
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.json.bind</groupId>
+ <artifactId>javax.json.bind-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.json</groupId>
+ <artifactId>javax.json-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>javax.json.bind</groupId>
- <artifactId>javax.json.bind-api</artifactId>
+ <groupId>jakarta.json.bind</groupId>
+ <artifactId>jakarta.json.bind-api</artifactId>
+ <version>${jsonb.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <version>${jsonp.ri.version}</version>
</dependency>
<dependency>
diff --git a/media/json-jackson/pom.xml b/media/json-jackson/pom.xml
index fe1bff2..e205763 100644
--- a/media/json-jackson/pom.xml
+++ b/media/json-jackson/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-media-json-jackson</artifactId>
@@ -61,7 +61,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -77,6 +77,7 @@
<configuration>
<instructions>
<Export-Package>org.glassfish.jersey.jackson.*</Export-Package>
+ <Import-Package>javax.annotation.*;version="!",*</Import-Package>
</instructions>
<unpackBundle>true</unpackBundle>
</configuration>
diff --git a/media/json-jackson/src/main/java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/util/EndpointAsBeanProperty.java b/media/json-jackson/src/main/java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/util/EndpointAsBeanProperty.java
index fd870d1..89ed89a 100644
--- a/media/json-jackson/src/main/java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/util/EndpointAsBeanProperty.java
+++ b/media/json-jackson/src/main/java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/util/EndpointAsBeanProperty.java
@@ -50,7 +50,7 @@
if (_type == type) {
return this;
}
- return new Std(_name, type, _wrapperName, _contextAnnotations, _member, _metadata);
+ return new Std(_name, type, _wrapperName, _member, _metadata);
}
@Override
diff --git a/media/json-jackson/src/main/resources/META-INF/NOTICE.md b/media/json-jackson/src/main/resources/META-INF/NOTICE.markdown
similarity index 100%
rename from media/json-jackson/src/main/resources/META-INF/NOTICE.md
rename to media/json-jackson/src/main/resources/META-INF/NOTICE.markdown
diff --git a/media/json-jackson1/pom.xml b/media/json-jackson1/pom.xml
index 9cd372b..1e0de1a 100644
--- a/media/json-jackson1/pom.xml
+++ b/media/json-jackson1/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-media-json-jackson1</artifactId>
@@ -38,7 +38,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/media/json-jettison/pom.xml b/media/json-jettison/pom.xml
index b5adfc2..d3079bb 100644
--- a/media/json-jettison/pom.xml
+++ b/media/json-jettison/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-media-json-jettison</artifactId>
@@ -38,7 +38,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/media/json-processing/pom.xml b/media/json-processing/pom.xml
index 60022e9..696ad7b 100644
--- a/media/json-processing/pom.xml
+++ b/media/json-processing/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-media-json-processing</artifactId>
@@ -38,7 +38,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -56,6 +56,7 @@
<Export-Package>org.glassfish.jersey.jsonp.*;version=${project.version}</Export-Package>
<!-- TODO: change to ${range;[==,+);${jsonp.api.version}} once the version is final-->
<Import-Package>
+ javax.annotation.*;version="!",
javax.json.*;version="[0,2)",
org.glassfish.json.*;version="[0,2)",
*
@@ -77,7 +78,7 @@
<!-- JSON-P API + RI + JAX-RS Providers -->
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
+ <artifactId>jakarta.json</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
diff --git a/media/moxy/pom.xml b/media/moxy/pom.xml
index afbb8f3..2f95e65 100644
--- a/media/moxy/pom.xml
+++ b/media/moxy/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-media-moxy</artifactId>
@@ -38,7 +38,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
@@ -56,6 +56,7 @@
<configuration>
<instructions>
<Export-Package>org.glassfish.jersey.moxy.*</Export-Package>
+ <Import-Package>javax.annotation.*;version="!",*</Import-Package>
</instructions>
<unpackBundle>true</unpackBundle>
</configuration>
@@ -92,8 +93,30 @@
</dependency>
<dependency>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <version>${jsonp.ri.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.json</artifactId>
+ <version>${jsonp.ri.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.moxy</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.json</groupId>
+ <artifactId>javax.json-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/media/multipart/pom.xml b/media/multipart/pom.xml
index d9fc47f..befc434 100644
--- a/media/multipart/pom.xml
+++ b/media/multipart/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-media-multipart</artifactId>
@@ -38,7 +38,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/media/pom.xml b/media/pom.xml
index b46b403..c873b55 100644
--- a/media/pom.xml
+++ b/media/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.media</groupId>
diff --git a/media/sse/pom.xml b/media/sse/pom.xml
index be75d26..13d7b66 100644
--- a/media/sse/pom.xml
+++ b/media/sse/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-media-sse</artifactId>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
@@ -62,7 +62,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -74,6 +74,11 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<inherited>true</inherited>
+ <configuration>
+ <instructions>
+ <Import-Package>javax.annotation.*;version="!",*</Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git a/media/sse/src/main/java/org/glassfish/jersey/media/sse/internal/JerseySseBroadcaster.java b/media/sse/src/main/java/org/glassfish/jersey/media/sse/internal/JerseySseBroadcaster.java
index 32b3889..5c3a6e7 100644
--- a/media/sse/src/main/java/org/glassfish/jersey/media/sse/internal/JerseySseBroadcaster.java
+++ b/media/sse/src/main/java/org/glassfish/jersey/media/sse/internal/JerseySseBroadcaster.java
@@ -16,6 +16,7 @@
package org.glassfish.jersey.media.sse.internal;
+import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutorService;
@@ -102,10 +103,8 @@
if (event == null) {
throw new IllegalArgumentException(LocalizationMessages.PARAM_NULL("event"));
}
- publish(event);
- // TODO JAX-RS 2.1
- return null;
+ return CompletableFuture.completedFuture(publish(event));
}
private void notifyOnCompleteHandlers(Flow.Subscriber<? super OutboundSseEvent> subscriber) {
diff --git a/media/sse/src/main/java/org/glassfish/jersey/media/sse/internal/JerseySseEventSource.java b/media/sse/src/main/java/org/glassfish/jersey/media/sse/internal/JerseySseEventSource.java
index 6a242b4..bb8b517 100644
--- a/media/sse/src/main/java/org/glassfish/jersey/media/sse/internal/JerseySseEventSource.java
+++ b/media/sse/src/main/java/org/glassfish/jersey/media/sse/internal/JerseySseEventSource.java
@@ -16,6 +16,7 @@
package org.glassfish.jersey.media.sse.internal;
+import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
@@ -121,7 +122,7 @@
final Consumer<Throwable> onError,
final Runnable onComplete) {
if (onSubscribe == null || onEvent == null || onError == null || onComplete == null) {
- throw new IllegalStateException(LocalizationMessages.PARAMS_NULL());
+ throw new IllegalArgumentException(LocalizationMessages.PARAMS_NULL());
}
publisher.subscribe(new Flow.Subscriber<InboundSseEvent>() {
@@ -203,6 +204,7 @@
@Override
protected Builder target(final WebTarget endpoint) {
+ Objects.requireNonNull(endpoint);
this.endpoint = endpoint;
return this;
}
diff --git a/media/sse/src/test/java/org/glassfish/jersey/media/sse/ClientCloseTest.java b/media/sse/src/test/java/org/glassfish/jersey/media/sse/ClientCloseTest.java
index 7dc7926..7fb22d2 100644
--- a/media/sse/src/test/java/org/glassfish/jersey/media/sse/ClientCloseTest.java
+++ b/media/sse/src/test/java/org/glassfish/jersey/media/sse/ClientCloseTest.java
@@ -43,6 +43,8 @@
*/
public class ClientCloseTest extends JerseyTest {
+ private static final int LATCH_WAIT_TIMEOUT = 16;
+
/**
* The test test that SSE connection is really closed when EventSource.close() is called.
* <p/>
@@ -66,7 +68,7 @@
// Server sends 3 events we are interested in.
IntStream.range(0, 3).forEach((i) -> assertEquals("OK",
target("sse/send").request().get().readEntity(String.class)));
- assertTrue(eventLatch.await(5, TimeUnit.SECONDS));
+ assertTrue(eventLatch.await(LATCH_WAIT_TIMEOUT, TimeUnit.SECONDS));
// After receiving the 3 events, we try to close.
eventSource.close();
@@ -74,7 +76,7 @@
// Unfortunately the HTTPURLConnection is blocked in read() method, so it will close only after receiving the next event.
assertEquals("OK", target("sse/send").request().get().readEntity(String.class));
// Wait for the event that will unblock the HTTPURLConnection and result in sending FIN.
- assertTrue(eventLatch2.await(5, TimeUnit.SECONDS));
+ assertTrue(eventLatch2.await(LATCH_WAIT_TIMEOUT, TimeUnit.SECONDS));
// Now it is interesting. Client has sent FIN, but Grizzly does not listen for client input (selector READ key is
// disabled), while streaming the response. For some reason we need to send 2 more events for Grizzly to notice
// that the client is gone.
diff --git a/media/sse/src/test/java/org/glassfish/jersey/media/sse/internal/JerseySseEventSourceTest.java b/media/sse/src/test/java/org/glassfish/jersey/media/sse/internal/JerseySseEventSourceTest.java
new file mode 100644
index 0000000..238ba82
--- /dev/null
+++ b/media/sse/src/test/java/org/glassfish/jersey/media/sse/internal/JerseySseEventSourceTest.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.jersey.media.sse.internal;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import javax.ws.rs.sse.SseEventSource;
+
+public class JerseySseEventSourceTest {
+
+ @Rule
+ public ExpectedException thrown = ExpectedException.none();
+
+ @Test
+ public void testNPEOnNull() {
+ thrown.expect(NullPointerException.class);
+ SseEventSource.target(null);
+ }
+}
diff --git a/pom.xml b/pom.xml
index 9399349..8810f3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -21,15 +21,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.java</groupId>
- <artifactId>jvnet-parent</artifactId>
- <version>4</version>
+ <groupId>org.eclipse.ee4j</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0.5</version>
</parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
<packaging>pom</packaging>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
<name>jersey</name>
<description>
Eclipse Jersey is the open source (under dual EPL+GPL license) JAX-RS 2.1 (JSR 370)
@@ -157,7 +157,13 @@
<name>EDL 1.0</name>
<url>http://www.eclipse.org/org/documents/edl-v10.php</url>
<distribution>repo</distribution>
- <comments>The examples</comments>
+ <comments>The examples except bookstore-webapp example</comments>
+ </license>
+ <license>
+ <name>BSD 2-Clause</name>
+ <url>https://opensource.org/licenses/BSD-2-Clause</url>
+ <distribution>repo</distribution>
+ <comments>The bookstore-webapp example</comments>
</license>
<license>
<name>Apache License, 2.0</name>
@@ -192,6 +198,12 @@
<comments>AngularJS, Bootstrap v3.3.7,
jQuery Barcode plugin 0.3, KineticJS v4.7.1</comments>
</license>
+ <license>
+ <name>W3C license</name>
+ <url>https://www.w3.org/Consortium/Legal/copyright-documents-19990405</url>
+ <distribution>repo</distribution>
+ <comments>Content of core-server/etc</comments>
+ </license>
</licenses>
<scm>
@@ -202,8 +214,8 @@
</scm>
<organization>
- <name>Oracle Corporation</name>
- <url>http://www.oracle.com/</url>
+ <name>Eclipse Foundation</name>
+ <url>https://www.eclipse.org/org/foundation/</url>
</organization>
<build>
@@ -217,7 +229,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
+ <version>3.0.0-M2</version>
<executions>
<execution>
<id>enforce-versions</id>
@@ -237,7 +249,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
+ <version>3.0.0</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -261,8 +273,8 @@
</plugin>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
- <version>2.6.1</version>
+ <artifactId>istack-commons-maven-plugin</artifactId>
+ <version>3.0.8</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -321,6 +333,72 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
+ <!-- Add legal information, NOTICE.md and LINCENSE.md to jars -->
+ <executions>
+ <execution>
+ <!-- copy the files to classes folder for maven-jar/war-plugin to grab it -->
+ <id>copy-legaldocs</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>process-sources</phase>
+ <configuration>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${legal.source.folder}</directory>
+ <targetPath>META-INF/</targetPath>
+ <includes>
+ <include>NOTICE.md</include>
+ <include>LICENSE.md</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <!-- copy the files to source folder for maven-source-plugin to grab it -->
+ <id>copy-legaldocs-to-sources</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>process-sources</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/generated-sources/rsrc-gen</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${legal.source.folder}</directory>
+ <targetPath>META-INF/</targetPath>
+ <includes>
+ <include>NOTICE.md</include>
+ <include>LICENSE.md</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <!-- copy the files to legal folder for felix plugin to grab it -->
+ <id>copy-legaldocs-to-osgi-bundles</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>process-sources</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/legal</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${legal.source.folder}</directory>
+ <targetPath>META-INF/</targetPath>
+ <includes>
+ <include>NOTICE.md</include>
+ <include>LICENSE.md</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -353,7 +431,7 @@
<doctitle>Jersey ${jersey.version} API Documentation</doctitle>
<windowtitle>Jersey ${jersey.version} API</windowtitle>
<bottom>
- <![CDATA[Copyright © 2007-2017,
+ <![CDATA[Copyright © 2007-2019,
<a href="http://www.oracle.com">Oracle</a>
and/or its affiliates.
All Rights Reserved. Use is subject to license terms.]]>
@@ -386,7 +464,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
+ <version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -406,27 +484,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.4</version>
- <!--
- mvn release:prepare -DreleaseVersion=<release-version> -DdevelopmentVersion=<next-dev-version> -Dtag=<release-version> \
- -Prelease
-
- mvn release:perform -DconnectionUrl="scm:git:file://<path-to-local-repo>" \
- -Prelease,testsSkip
- -->
- <configuration>
- <mavenExecutorId>forked-path</mavenExecutorId>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <preparationGoals>${release.preparationGoals}</preparationGoals>
- <pushChanges>false</pushChanges>
- <useReleaseProfile>false</useReleaseProfile>
- <arguments>${release.tests.args} ${release.arguments}</arguments>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>maven-paxexam-plugin</artifactId>
<version>${paxexam.mvn.plugin.version}</version>
@@ -569,7 +626,7 @@
<plugin>
<groupId>org.glassfish.copyright</groupId>
<artifactId>glassfish-copyright-maven-plugin</artifactId>
- <version>1.39</version>
+ <version>2.0</version>
<configuration>
<excludeFile>etc/config/copyright-exclude</excludeFile>
<!--svn|mercurial|git - defaults to svn-->
@@ -585,17 +642,19 @@
<!-- check that year is correct -->
<ignoreYear>false</ignoreYear>
<templateFile>etc/config/copyright.txt</templateFile>
+ <bsdTemplateFile>etc/config/edl-copyright.txt</bsdTemplateFile>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.5.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<_nodefaultversion>false</_nodefaultversion>
+ <Include-Resource>{maven-resources},${project.build.directory}/legal</Include-Resource>
</instructions>
</configuration>
<executions>
@@ -738,6 +797,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
</plugins>
<extensions>
<extension>
@@ -834,7 +897,7 @@
</modules>
</profile>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<modules>
<module>docs</module>
</modules>
@@ -842,20 +905,6 @@
<activeByDefault>false</activeByDefault>
</activation>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>${nexus-staging.mvn.plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>${gpg.mvn.plugin.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -863,33 +912,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>default-deploy</id>
- <phase>deploy</phase>
- <goals>
- <goal>deploy</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <serverId>jvnet-nexus-staging</serverId>
- <nexusUrl>https://maven.java.net/</nexusUrl>
- <stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
@@ -1193,7 +1220,7 @@
Profile is aimed to run the build on travis
due to travis limitations for output (max 4MB) this profile is used to run e2e tests only.
- the only thing which is happen using throfile is run of e2e tests (without additional build or so)
+ the only thing which is happen using profile is run of e2e tests (with additional build)
everything is already build using travis_e2e_skip profile
the whole build is run as test -Ptravis_e2e
@@ -1361,13 +1388,13 @@
<dependencyManagement>
<dependencies>
<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>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<version>${javax.annotation.version}</version>
</dependency>
@@ -1378,8 +1405,8 @@
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<version>${jta.api.version}</version>
</dependency>
@@ -1413,8 +1440,13 @@
<version>1.0.1</version>
</dependency>
<dependency>
+ <groupId>org.glassfish.main.hk2</groupId>
+ <artifactId>hk2-config</artifactId>
+ <version>${hk2.config.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
<version>${hk2.version}</version>
<exclusions>
<exclusion>
@@ -1529,10 +1561,9 @@
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
<version>${jaxb.api.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -1540,6 +1571,11 @@
<artifactId>jaxb-impl</artifactId>
<version>${jaxb.ri.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <version>${jaxb.ri.version}</version>
+ </dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
@@ -1548,15 +1584,15 @@
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
<version>${javax.persistence.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<version>${ejb.version}</version>
<scope>provided</scope>
</dependency>
@@ -1664,19 +1700,19 @@
<version>${fasterxml.classmate.version}</version>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
<version>${javax.el.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>javax.el</artifactId>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.el</artifactId>
<version>${javax.el.impl.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
+ <artifactId>jakarta.json</artifactId>
<version>${jsonp.ri.version}</version>
</dependency>
<dependency>
@@ -1686,13 +1722,13 @@
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
+ <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${validation.impl.version}</version>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
+ <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId>
<version>${validation.impl.version}</version>
</dependency>
@@ -1872,8 +1908,8 @@
</dependency>
<dependency>
- <groupId>javax.json.bind</groupId>
- <artifactId>javax.json.bind-api</artifactId>
+ <groupId>jakarta.json.bind</groupId>
+ <artifactId>jakarta.json.bind-api</artifactId>
<version>${jsonb.api.version}</version>
</dependency>
@@ -1911,6 +1947,7 @@
</findbugs.glassfish.logging.validLoggerPrefixes>
<java.version>1.8</java.version>
<jersey.repackaged.prefix>jersey.repackaged</jersey.repackaged.prefix>
+ <legal.source.folder>${maven.multiModuleProjectDirectory}</legal.source.folder>
<netbeans.hint.license>gf-cddl-gpl</netbeans.hint.license>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -1936,34 +1973,33 @@
<checkstyle.mvn.plugin.version>2.16</checkstyle.mvn.plugin.version>
<checkstyle.version>6.8.1</checkstyle.version>
<easymock.version>3.3</easymock.version>
- <ejb.version>3.2</ejb.version>
- <gf.impl.version>4.0</gf.impl.version>
+ <ejb.version>3.2.5</ejb.version>
+ <gf.impl.version>5.1.0-RC2</gf.impl.version>
<fasterxml.classmate.version>1.3.3</fasterxml.classmate.version>
- <findbugs.glassfish.version>1.3</findbugs.glassfish.version>
- <findbugs.version>3.0.2</findbugs.version>
+ <findbugs.glassfish.version>1.7</findbugs.glassfish.version>
+ <findbugs.version>3.0.3</findbugs.version>
<freemarker.version>2.3.27-incubating</freemarker.version>
<gae.version>1.9.59</gae.version>
- <gpg.mvn.plugin.version>1.6</gpg.mvn.plugin.version>
- <grizzly.client.version>1.13</grizzly.client.version>
- <grizzly2.version>2.4.0</grizzly2.version>
+ <grizzly.client.version>1.16</grizzly.client.version>
+ <grizzly2.version>2.4.4</grizzly2.version>
<guava.version>18.0</guava.version>
<hamcrest.version>1.3</hamcrest.version>
<xmlunit.version>1.6</xmlunit.version>
- <hk2.version>2.5.0-b42</hk2.version>
+ <hk2.version>2.5.0</hk2.version>
+ <hk2.config.version>5.1.0-RC2</hk2.config.version>
<httpclient.version>4.5</httpclient.version> <!-- TODO: 4.5.2 doesn't work; apache client connector tests -->
- <jackson.version>2.8.10</jackson.version>
+ <jackson.version>2.9.8</jackson.version>
<jackson1.version>1.9.13</jackson1.version>
- <javassist.version>3.22.0-CR2</javassist.version>
- <javax.annotation.version>1.2</javax.annotation.version>
- <javax.annotation.bundle.version>1.2</javax.annotation.bundle.version>
- <javax.el.version>2.2.4</javax.el.version>
- <javax.el.impl.version>2.2.4</javax.el.impl.version>
- <javax.interceptor.version>1.2</javax.interceptor.version>
- <javax.persistence.version>1.0</javax.persistence.version>
- <javax.validation.api.version>1.1.0.Final</javax.validation.api.version>
- <jaxb.api.version>2.2.7</jaxb.api.version>
- <jaxb.ri.version>2.2.7</jaxb.ri.version>
- <jsonb.api.version>1.0</jsonb.api.version>
+ <javassist.version>3.22.0-GA</javassist.version>
+ <javax.annotation.version>1.3.4</javax.annotation.version>
+ <javax.el.version>3.0.2</javax.el.version>
+ <javax.el.impl.version>3.0.2</javax.el.impl.version>
+ <javax.interceptor.version>1.2.4</javax.interceptor.version>
+ <javax.persistence.version>2.2.2</javax.persistence.version>
+ <javax.validation.api.version>2.0.1.Final</javax.validation.api.version>
+ <jaxb.api.version>2.3.2</jaxb.api.version>
+ <jaxb.ri.version>2.3.2</jaxb.ri.version>
+ <jsonb.api.version>1.0.1</jsonb.api.version>
<jaxrs.api.spec.version>2.2-SNAPSHOT</jaxrs.api.spec.version>
<jaxrs.api.impl.version>2.2-SNAPSHOT</jaxrs.api.impl.version>
<jboss.logging.version>3.3.0.Final</jboss.logging.version>
@@ -1971,24 +2007,21 @@
<jersey1.last.final.version>${jersey1.version}</jersey1.last.final.version>
<jettison.version>1.3.7</jettison.version> <!-- TODO: 1.3.8 doesn't work; AbstractJsonTest complexBeanWithAttributes -->
<jetty.plugin.version>6.1.26</jetty.plugin.version>
- <jetty.version>9.4.7.v20170914</jetty.version>
+ <jetty.version>9.4.12.v20180830</jetty.version>
<jetty.servlet.api.25.version>6.1.14</jetty.servlet.api.25.version>
<jmh.version>1.10.2</jmh.version>
- <jmockit.version>1.18</jmockit.version>
- <jsonp.ri.version>1.1</jsonp.ri.version>
- <jsonp.jaxrs.version>1.1.1</jsonp.jaxrs.version>
- <jsp.version>2.0</jsp.version>
- <jstl.version>1.2</jstl.version>
- <jta.api.version>1.2</jta.api.version>
+ <jmockit.version>1.41</jmockit.version>
+ <jsonp.ri.version>1.1.5</jsonp.ri.version>
+ <jsonp.jaxrs.version>1.1.5</jsonp.jaxrs.version>
+ <jsp.version>2.3.5</jsp.version>
+ <jstl.version>1.2.4</jstl.version>
+ <jta.api.version>1.3.2</jta.api.version>
<kryo.version>4.0.1</kryo.version>
- <logback.version>1.2.3</logback.version>
- <mimepull.version>1.9.6</mimepull.version>
+ <mimepull.version>1.9.11</mimepull.version>
<mockito.version>1.10.19</mockito.version>
- <moxy.version>2.6.4</moxy.version>
- <mockito.version>1.10.19</mockito.version>
+ <moxy.version>2.7.4</moxy.version>
<mustache.version>0.8.17</mustache.version>
<netty.version>4.1.5.Final</netty.version>
- <nexus-staging.mvn.plugin.version>1.6.7</nexus-staging.mvn.plugin.version>
<opentracing.version>0.30.0</opentracing.version>
<osgi.version>4.2.0</osgi.version>
<pax.exam.version>4.9.1</pax.exam.version>
@@ -1996,19 +2029,17 @@
<paxexam.mvn.plugin.version>1.2.4</paxexam.mvn.plugin.version>
<rxjava.version>1.2.5</rxjava.version>
<rxjava2.version>2.0.4</rxjava2.version>
- <rome.version>1.0</rome.version>
<servlet2.version>2.4</servlet2.version>
<servlet3.version>3.0.1</servlet3.version>
- <servlet4.version>4.0.0</servlet4.version>
+ <servlet4.version>4.0.2</servlet4.version>
<simple.version>6.0.1</simple.version>
- <slf4j.version>1.7.12</slf4j.version>
- <spring4.version>4.3.4.RELEASE</spring4.version>
- <validation.impl.version>5.1.3.Final</validation.impl.version> <!-- 5.3.3.Final doesn't work - osgi bv tests -->
+ <slf4j.version>1.7.21</slf4j.version>
+ <spring4.version>4.3.20.RELEASE</spring4.version>
+ <validation.impl.version>6.0.11.Final</validation.impl.version>
<weld.version>2.2.14.Final</weld.version> <!-- 2.4.1 doesn't work - bv tests -->
<weld3.version>3.0.0.Final</weld3.version>
<xerces.version>2.11.0</xerces.version>
- <xmlunit.version>1.6</xmlunit.version>
- <yasson.version>1.0.1</yasson.version>
+ <yasson.version>1.0.3</yasson.version>
<skip.e2e>false</skip.e2e>
</properties>
</project>
diff --git a/security/oauth1-client/pom.xml b/security/oauth1-client/pom.xml
index 56732a2..b0056d9 100644
--- a/security/oauth1-client/pom.xml
+++ b/security/oauth1-client/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.security</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>oauth1-client</artifactId>
@@ -42,7 +42,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -62,8 +62,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>
diff --git a/security/oauth1-server/pom.xml b/security/oauth1-server/pom.xml
index f1d7d38..c4af812 100644
--- a/security/oauth1-server/pom.xml
+++ b/security/oauth1-server/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.security</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>oauth1-server</artifactId>
@@ -52,4 +52,11 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/legal</directory>
+ </resource>
+ </resources>
+ </build>
</project>
diff --git a/security/oauth1-signature/pom.xml b/security/oauth1-signature/pom.xml
index 0ac8062..1871060 100644
--- a/security/oauth1-signature/pom.xml
+++ b/security/oauth1-signature/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.glassfish.jersey.security</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/security/oauth1-signature/src/test/java/org/glassfish/jersey/oauth1/signature/OAuthBase64Test.java b/security/oauth1-signature/src/test/java/org/glassfish/jersey/oauth1/signature/OAuthBase64Test.java
index 9187fa1..f72b023 100644
--- a/security/oauth1-signature/src/test/java/org/glassfish/jersey/oauth1/signature/OAuthBase64Test.java
+++ b/security/oauth1-signature/src/test/java/org/glassfish/jersey/oauth1/signature/OAuthBase64Test.java
@@ -31,17 +31,17 @@
public void test() throws IOException {
final String str = "Hello World123456789jhfsljkh347uweihd7834yfoiuhef5re4g54es35gf474w5/";
final String encoded = Base64.encode(str.getBytes());
- final String encodedUtil = new String(org.glassfish.jersey.internal.util.Base64.encode(str.getBytes()));
- final String encodedUtilStr = org.glassfish.jersey.internal.util.Base64.encodeAsString(str);
+ final String encodedUtil = new String(java.util.Base64.getEncoder().encode(str.getBytes()));
+ final String encodedUtilStr = java.util.Base64.getEncoder().encodeToString(str.getBytes());
System.out.println(encoded);
Assert.assertEquals(encoded, encodedUtil);
Assert.assertEquals(encoded, encodedUtilStr);
final String decoded = new String(Base64.decode(encoded));
- final String decodedUtil = new String(org.glassfish.jersey.internal.util.Base64.decode(encoded.getBytes()));
- final String decodedUtilStr = org.glassfish.jersey.internal.util.Base64.decodeAsString(encoded.getBytes());
- final String decodedUtilStr2 = org.glassfish.jersey.internal.util.Base64.decodeAsString(encoded);
+ final String decodedUtil = new String(java.util.Base64.getDecoder().decode(encoded.getBytes()));
+ final String decodedUtilStr = new String(java.util.Base64.getDecoder().decode(encoded.getBytes()));
+ final String decodedUtilStr2 = new String(java.util.Base64.getDecoder().decode(encoded));
Assert.assertEquals(decoded, decodedUtil);
Assert.assertEquals(decoded, decodedUtilStr);
diff --git a/security/oauth2-client/pom.xml b/security/oauth2-client/pom.xml
index 7a83a0d..30c571f 100644
--- a/security/oauth2-client/pom.xml
+++ b/security/oauth2-client/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.glassfish.jersey.security</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,7 +34,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -60,8 +60,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>-->
</dependencies>
diff --git a/security/pom.xml b/security/pom.xml
index 5a84821..6f36067 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.security</groupId>
diff --git a/test-framework/core/pom.xml b/test-framework/core/pom.xml
index b86a91f..d2860e0 100644
--- a/test-framework/core/pom.xml
+++ b/test-framework/core/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.test-framework</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-test-framework-core</artifactId>
@@ -44,9 +44,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet3.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
diff --git a/test-framework/maven/container-runner-maven-plugin/pom.xml b/test-framework/maven/container-runner-maven-plugin/pom.xml
index d346eb5..94d5419 100644
--- a/test-framework/maven/container-runner-maven-plugin/pom.xml
+++ b/test-framework/maven/container-runner-maven-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.test-framework.maven</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>container-runner-maven-plugin</artifactId>
diff --git a/test-framework/maven/container-runner-maven-plugin/src/main/resources/runner/gf4/download.sh b/test-framework/maven/container-runner-maven-plugin/src/main/resources/runner/gf4/download.sh
index 89081b3..4d10a81 100644
--- a/test-framework/maven/container-runner-maven-plugin/src/main/resources/runner/gf4/download.sh
+++ b/test-framework/maven/container-runner-maven-plugin/src/main/resources/runner/gf4/download.sh
@@ -47,7 +47,7 @@
if [ "$OVERWRITE" = "true" -o ! -d "$DIST_DIR"/"$DIST_SUBDIR" ]; then
rm -rf "$DIST_DIR"/"$DIST_SUBDIR"
-
+ mkdir -p "$DIST_DIR"
unzip -o "$DIST_TGT_LOCATION" -d "$DIST_DIR"
chmod -R 777 "$DIST_DIR"/"$DIST_SUBDIR"
fi
diff --git a/test-framework/maven/custom-enforcer-rules/pom.xml b/test-framework/maven/custom-enforcer-rules/pom.xml
index fe946c8..cdac1d7 100644
--- a/test-framework/maven/custom-enforcer-rules/pom.xml
+++ b/test-framework/maven/custom-enforcer-rules/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.test-framework.maven</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>custom-enforcer-rules</artifactId>
diff --git a/test-framework/maven/pom.xml b/test-framework/maven/pom.xml
index 104db79..a59e4fa 100644
--- a/test-framework/maven/pom.xml
+++ b/test-framework/maven/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.test-framework</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.test-framework.maven</groupId>
diff --git a/test-framework/memleak-test-common/pom.xml b/test-framework/memleak-test-common/pom.xml
index f6ab242..4001cfc 100644
--- a/test-framework/memleak-test-common/pom.xml
+++ b/test-framework/memleak-test-common/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.test-framework</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>memleak-test-common</artifactId>
diff --git a/test-framework/pom.xml b/test-framework/pom.xml
index f7d2fa5..fb0ca88 100644
--- a/test-framework/pom.xml
+++ b/test-framework/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.test-framework</groupId>
@@ -53,4 +53,15 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}/legal</directory>
+ </resource>
+ </resources>
+ </build>
</project>
diff --git a/test-framework/providers/bundle/pom.xml b/test-framework/providers/bundle/pom.xml
index 0e42841..928c84c 100644
--- a/test-framework/providers/bundle/pom.xml
+++ b/test-framework/providers/bundle/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-test-framework-provider-bundle</artifactId>
diff --git a/test-framework/providers/external/pom.xml b/test-framework/providers/external/pom.xml
index 33f3b21..cccc2d4 100644
--- a/test-framework/providers/external/pom.xml
+++ b/test-framework/providers/external/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-test-framework-provider-external</artifactId>
diff --git a/test-framework/providers/grizzly2/pom.xml b/test-framework/providers/grizzly2/pom.xml
index 9be48a0..5bd20df 100644
--- a/test-framework/providers/grizzly2/pom.xml
+++ b/test-framework/providers/grizzly2/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
@@ -34,8 +34,8 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<version>${servlet4.version}</version>
</dependency>
diff --git a/test-framework/providers/inmemory/pom.xml b/test-framework/providers/inmemory/pom.xml
index 6de378b..070b313 100644
--- a/test-framework/providers/inmemory/pom.xml
+++ b/test-framework/providers/inmemory/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-test-framework-provider-inmemory</artifactId>
diff --git a/test-framework/providers/jdk-http/pom.xml b/test-framework/providers/jdk-http/pom.xml
index e77bed5..2f6dc4d 100644
--- a/test-framework/providers/jdk-http/pom.xml
+++ b/test-framework/providers/jdk-http/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-test-framework-provider-jdk-http</artifactId>
diff --git a/test-framework/providers/jetty/pom.xml b/test-framework/providers/jetty/pom.xml
index bdedf63..7b90878 100644
--- a/test-framework/providers/jetty/pom.xml
+++ b/test-framework/providers/jetty/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/test-framework/providers/netty/pom.xml b/test-framework/providers/netty/pom.xml
index 66770ac..f29401a 100644
--- a/test-framework/providers/netty/pom.xml
+++ b/test-framework/providers/netty/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-test-framework-provider-netty</artifactId>
diff --git a/test-framework/providers/pom.xml b/test-framework/providers/pom.xml
index 912a76c..5c06cf1 100644
--- a/test-framework/providers/pom.xml
+++ b/test-framework/providers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.test-framework</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
diff --git a/test-framework/providers/simple/pom.xml b/test-framework/providers/simple/pom.xml
index cd74051..d0788a0 100644
--- a/test-framework/providers/simple/pom.xml
+++ b/test-framework/providers/simple/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/test-framework/util/pom.xml b/test-framework/util/pom.xml
index 938a75d..7e2c33c 100644
--- a/test-framework/util/pom.xml
+++ b/test-framework/util/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.test-framework</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-test-framework-util</artifactId>
diff --git a/tests/e2e-client/pom.xml b/tests/e2e-client/pom.xml
index 7414465..b6251ed 100644
--- a/tests/e2e-client/pom.xml
+++ b/tests/e2e-client/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>e2e-client</artifactId>
@@ -55,8 +55,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/HttpAuthorizationTest.java b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/HttpAuthorizationTest.java
index 24d8114..5741988 100644
--- a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/HttpAuthorizationTest.java
+++ b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/HttpAuthorizationTest.java
@@ -23,6 +23,7 @@
import java.lang.annotation.Target;
import java.nio.charset.Charset;
import java.security.Principal;
+import java.util.Base64;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -39,7 +40,6 @@
import javax.ws.rs.core.SecurityContext;
import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
-import org.glassfish.jersey.internal.util.Base64;
import org.glassfish.jersey.logging.LoggingFeature;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
@@ -157,7 +157,7 @@
String authHeader = request.getHeaders().getFirst(HttpHeaders.AUTHORIZATION);
if (authHeader != null && authHeader.trim().toUpperCase().startsWith("BASIC")) {
- String decoded = new String(Base64.decode(authHeader.substring(6).getBytes()), CHARACTER_SET);
+ String decoded = new String(Base64.getDecoder().decode(authHeader.substring(6).getBytes()), CHARACTER_SET);
// String decoded = Base64.decodeAsString(authHeader.substring(6));
final String[] split = decoded.split(":");
final String username = split[0];
diff --git a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/ssl/RootResource.java b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/ssl/RootResource.java
index bccbf94..23205f2 100644
--- a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/ssl/RootResource.java
+++ b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/ssl/RootResource.java
@@ -16,6 +16,7 @@
package org.glassfish.jersey.tests.e2e.client.connector.ssl;
+import java.util.Base64;
import java.util.logging.Logger;
import javax.ws.rs.GET;
@@ -23,7 +24,6 @@
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
-import org.glassfish.jersey.internal.util.Base64;
/**
* Simple resource demonstrating low level approach of getting user credentials.
@@ -60,7 +60,7 @@
String auth = headers.getRequestHeader("authorization").get(0);
auth = auth.substring("Basic ".length());
- String[] values = Base64.decodeAsString(auth).split(":");
+ String[] values = new String(Base64.getDecoder().decode(auth)).split(":");
// String username = values[0];
// String password = values[1];
diff --git a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/ssl/SecurityFilter.java b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/ssl/SecurityFilter.java
index 128d4cf..986b64c 100644
--- a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/ssl/SecurityFilter.java
+++ b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/connector/ssl/SecurityFilter.java
@@ -18,6 +18,7 @@
import java.io.IOException;
import java.security.Principal;
+import java.util.Base64;
import java.util.logging.Logger;
import javax.ws.rs.WebApplicationException;
@@ -31,7 +32,6 @@
import javax.ws.rs.core.UriInfo;
import javax.ws.rs.ext.Provider;
-import org.glassfish.jersey.internal.util.Base64;
import org.glassfish.jersey.server.ContainerRequest;
/**
@@ -73,7 +73,7 @@
// "Only HTTP Basic authentication is supported"
}
authentication = authentication.substring("Basic ".length());
- String[] values = Base64.decodeAsString(authentication).split(":");
+ String[] values = new String(Base64.getDecoder().decode(authentication)).split(":");
if (values.length < 2) {
throw new WebApplicationException(400);
// "Invalid syntax for username and password"
diff --git a/tests/e2e-core-common/pom.xml b/tests/e2e-core-common/pom.xml
index ea70000..aaf2b46 100644
--- a/tests/e2e-core-common/pom.xml
+++ b/tests/e2e-core-common/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>e2e-core-common</artifactId>
diff --git a/tests/e2e-entity/pom.xml b/tests/e2e-entity/pom.xml
index 335d5f5..d1d64ce 100644
--- a/tests/e2e-entity/pom.xml
+++ b/tests/e2e-entity/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>e2e-entity</artifactId>
@@ -55,8 +55,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JaxbTest.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JaxbTest.java
index 27a09da..7733e23 100644
--- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JaxbTest.java
+++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JaxbTest.java
@@ -20,7 +20,6 @@
import java.util.LinkedList;
import java.util.List;
-import org.eclipse.persistence.internal.helper.JavaVersion;
import org.glassfish.grizzly.utils.ArrayUtils;
import org.glassfish.jersey.internal.util.PropertiesHelper;
import org.glassfish.jersey.tests.e2e.json.entity.AnotherArrayTestBean;
@@ -99,6 +98,16 @@
}
/**
+ * checks provided string to be a number
+ *
+ * @param s string
+ * @return true if string is a number false otherwise
+ */
+ private static boolean isNumeric(String s) {
+ return java.util.regex.Pattern.matches("\\d+", s);
+ }
+
+ /**
* check if the current JVM is supported by this test.
*
* @return true if all tests can be run, false if some tests shall be excluded due to JRE bug
@@ -108,9 +117,14 @@
if (javaVersion != null) {
int pos = javaVersion.lastIndexOf("_");
if (pos > -1) {
- final Integer minorVersion = Integer.valueOf(javaVersion.substring(pos + 1));
+ final String rawMinorVersion = javaVersion.substring(pos + 1);
+ final Integer minorVersion = (isNumeric(rawMinorVersion)) ? Integer.valueOf(rawMinorVersion) : 0;
return minorVersion < 160 || minorVersion > 172; //only those between 161 and 172 minor
// releases are not supported
+ } else if (javaVersion.contains("adoptopenjdk")) {
+ return false; //because that is exactly that case when
+ // Eclipse Jenkins runs JVM of adoptopenjdk of not supported version
+ //and we even do not have a chance to recognize that
}
}
return true;
@@ -124,10 +138,7 @@
for (final JsonTestProvider jsonProvider : JsonTestProvider.JAXB_PROVIDERS) {
for (final Class<?> entityClass : filteredClasses) {
- // TODO - remove the condition after jsonb polymorphic adapter is implemented
- if (!(jsonProvider instanceof JsonTestProvider.JsonbTestProvider)) {
- jsonTestSetups.add(new JsonTestSetup[]{new JsonTestSetup(entityClass, jsonProvider)});
- }
+ jsonTestSetups.add(new JsonTestSetup[]{new JsonTestSetup(entityClass, jsonProvider)});
}
}
diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/sse/BroadcasterTest.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/sse/BroadcasterTest.java
index d7e285d..fc44b01 100644
--- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/sse/BroadcasterTest.java
+++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/sse/BroadcasterTest.java
@@ -16,11 +16,13 @@
package org.glassfish.jersey.tests.e2e.sse;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.server.ServerProperties;
+import org.glassfish.jersey.test.JerseyTest;
+import org.junit.Assert;
+import org.junit.Test;
+import javax.inject.Singleton;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
@@ -28,19 +30,15 @@
import javax.ws.rs.core.Application;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
+import javax.ws.rs.sse.OutboundSseEvent;
import javax.ws.rs.sse.Sse;
import javax.ws.rs.sse.SseBroadcaster;
import javax.ws.rs.sse.SseEventSink;
import javax.ws.rs.sse.SseEventSource;
-
-import javax.inject.Singleton;
-
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.server.ServerProperties;
-import org.glassfish.jersey.test.JerseyTest;
-
-import org.junit.Assert;
-import org.junit.Test;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
/**
* JAX-RS {@link javax.ws.rs.sse.SseBroadcaster} test.
@@ -53,11 +51,14 @@
static final CountDownLatch txLatch = new CountDownLatch(4);
private static boolean isSingleton = false;
+ private static int ASYNC_WAIT_TIMEOUT = 1000; //timeout for asynchronous events to complete activities
+
@Path("sse")
@Singleton
public static class SseResource {
private final Sse sse;
private SseBroadcaster broadcaster;
+ private OutboundSseEvent.Builder builder;
public SseResource(@Context final Sse sse) {
this.sse = sse;
@@ -69,9 +70,10 @@
@Path("events")
public void getServerSentEvents(@Context final SseEventSink eventSink, @Context final Sse sse) {
isSingleton = this.sse == sse;
- eventSink.send(sse.newEventBuilder().data("Event1").build());
- eventSink.send(sse.newEventBuilder().data("Event2").build());
- eventSink.send(sse.newEventBuilder().data("Event3").build());
+ builder = sse.newEventBuilder();
+ eventSink.send(builder.data("Event1").build());
+ eventSink.send(builder.data("Event2").build());
+ eventSink.send(builder.data("Event3").build());
broadcaster.register(eventSink);
broadcaster.onClose((subscriber) -> {
if (subscriber == eventSink) {
@@ -82,9 +84,10 @@
}
@Path("push/{msg}")
+ @Produces(MediaType.SERVER_SENT_EVENTS)
@GET
public String pushMessage(@PathParam("msg") final String msg) {
- broadcaster.broadcast(sse.newEventBuilder().data(msg).build());
+ broadcaster.broadcast(builder.data(msg).build());
txLatch.countDown();
return "Broadcasting message: " + msg;
}
@@ -97,6 +100,55 @@
}
}
+ /**
+ * Wrapper to hold results coming from events (including broadcast)
+ *
+ * @param <T> type of expected results
+ */
+ public static class EventListWrapper<T> {
+ private final List<T> data; //event results
+ private final CountDownLatch eventCountDown; //count down delay for expected results
+ private final CountDownLatch broadcastLag = new CountDownLatch(1); //broadcast lag
+ // which shall be hold until thread is ready to process events from broadcast
+ private static final int LAG_INTERVAL = 1000; //broadcast lag timeout - in milliseconds (1s)
+ private static final int EXPECTED_REGULAR_EVENTS_COUNT = 3; //expected regular outbound events
+
+ public EventListWrapper(List<T> data, CountDownLatch eventCountDown) {
+ this.data = data;
+ this.eventCountDown = eventCountDown;
+ }
+
+ public void add(T msg) {
+ data.add(msg);
+ eventCountDown.countDown();
+ if (eventCountDown.getCount() == EXPECTED_REGULAR_EVENTS_COUNT) { //all regular events are received,
+ //ready for broadcast
+ broadcastLag.countDown();
+ }
+ }
+
+ public CountDownLatch getEventCountDown() {
+ return eventCountDown;
+ }
+
+ public T get(int pos) {
+ return data.get(pos);
+ }
+
+ public int size() {
+ return data.size();
+ }
+
+ /**
+ * makes current thread to wait for predefined interval until broadcast is ready
+ *
+ * @throws InterruptedException in case of something went wrong
+ */
+ public boolean waitBroadcast() throws InterruptedException {
+ return broadcastLag.await(LAG_INTERVAL, TimeUnit.MILLISECONDS);
+ }
+ }
+
@Override
protected Application configure() {
final ResourceConfig rc = new ResourceConfig(SseResource.class);
@@ -106,50 +158,42 @@
@Test
public void test() throws InterruptedException {
- SseEventSource eventSourceA = SseEventSource.target(target().path("sse/events")).build();
- List<String> resultsA1 = new ArrayList<>();
- List<String> resultsA2 = new ArrayList<>();
- CountDownLatch a1Latch = new CountDownLatch(5);
- CountDownLatch a2Latch = new CountDownLatch(5);
- eventSourceA.register((event) -> {
- resultsA1.add(event.readData());
- a1Latch.countDown();
- });
- eventSourceA.register((event) -> {
- resultsA2.add(event.readData());
- a2Latch.countDown();
- });
+ final SseEventSource eventSourceA = SseEventSource.target(target().path("sse/events")).build();
+ final EventListWrapper<String> resultsA1 = new EventListWrapper(new ArrayList(), new CountDownLatch(5));
+ final EventListWrapper<String> resultsA2 = new EventListWrapper(new ArrayList(), new CountDownLatch(5));
+
+ eventSourceA.register(event -> resultsA1.add(event.readData()));
+ eventSourceA.register(event -> resultsA2.add(event.readData()));
eventSourceA.open();
+ Assert.assertTrue(resultsA1.waitBroadcast()); //some delay is required to process consumer and producer
+ Assert.assertTrue(resultsA2.waitBroadcast()); //some delay is required to process consumer and producer
+
target().path("sse/push/firstBroadcast").request().get(String.class);
- SseEventSource eventSourceB = SseEventSource.target(target().path("sse/events")).build();
- List<String> resultsB1 = new ArrayList<>();
- List<String> resultsB2 = new ArrayList<>();
- CountDownLatch b1Latch = new CountDownLatch(4);
- CountDownLatch b2Latch = new CountDownLatch(4);
- eventSourceB.register((event) -> {
- resultsB1.add(event.readData());
- b1Latch.countDown();
- });
- eventSourceB.register((event) -> {
- resultsB2.add(event.readData());
- b2Latch.countDown();
- });
+ final SseEventSource eventSourceB = SseEventSource.target(target().path("sse/events")).build();
+ final EventListWrapper<String> resultsB1 = new EventListWrapper(new ArrayList(), new CountDownLatch(4));
+ final EventListWrapper<String> resultsB2 = new EventListWrapper(new ArrayList(), new CountDownLatch(4));
+
+ eventSourceB.register(event -> resultsB1.add(event.readData()));
+ eventSourceB.register(event -> resultsB2.add(event.readData()));
eventSourceB.open();
+ Assert.assertTrue(resultsB1.waitBroadcast()); //some delay is required to process consumer and producer
+ Assert.assertTrue(resultsB2.waitBroadcast()); //some delay is required to process consumer and producer
+
target().path("sse/push/secondBroadcast").request().get(String.class);
Assert.assertTrue("Waiting for resultsA1 to be complete failed.",
- a1Latch.await(3000, TimeUnit.MILLISECONDS));
+ resultsA1.getEventCountDown().await(ASYNC_WAIT_TIMEOUT, TimeUnit.MILLISECONDS));
Assert.assertTrue("Waiting for resultsA2 to be complete failed.",
- a2Latch.await(3000, TimeUnit.MILLISECONDS));
+ resultsA2.getEventCountDown().await(ASYNC_WAIT_TIMEOUT, TimeUnit.MILLISECONDS));
Assert.assertTrue("Waiting for resultsB1 to be complete failed.",
- b1Latch.await(3000, TimeUnit.MILLISECONDS));
+ resultsB1.getEventCountDown().await(ASYNC_WAIT_TIMEOUT, TimeUnit.MILLISECONDS));
Assert.assertTrue("Waiting for resultsB2 to be complete failed.",
- b2Latch.await(3000, TimeUnit.MILLISECONDS));
+ resultsB2.getEventCountDown().await(ASYNC_WAIT_TIMEOUT, TimeUnit.MILLISECONDS));
Assert.assertTrue(txLatch.await(5000, TimeUnit.MILLISECONDS));
@@ -184,7 +228,7 @@
&& resultsB2.get(2).equals("Event3")
&& resultsB2.get(3).equals("secondBroadcast"));
target().path("sse/close").request().get();
- Assert.assertTrue(closeLatch.await(3000, TimeUnit.MILLISECONDS));
+ closeLatch.await();
Assert.assertTrue("Sse instances injected into resource and constructor differ. Sse should have been injected"
+ "as a singleton", isSingleton);
}
diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/sse/GenericEntityTest.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/sse/GenericEntityTest.java
index 307338d..a19e16c 100644
--- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/sse/GenericEntityTest.java
+++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/sse/GenericEntityTest.java
@@ -106,6 +106,13 @@
}
}
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testRegisterNull() {
+ final SseEventSource source = SseEventSource.target(target("genericentityresource/string")).build();
+ source.register(null);
+ }
+
@Singleton
@Path("genericentityresource")
public static class SSEGenericEntityResource {
diff --git a/tests/e2e-inject/cdi2-se/pom.xml b/tests/e2e-inject/cdi2-se/pom.xml
index 86c9156..cd450c5 100644
--- a/tests/e2e-inject/cdi2-se/pom.xml
+++ b/tests/e2e-inject/cdi2-se/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests</groupId>
<artifactId>e2e-inject</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>e2e-inject-cdi2-se</artifactId>
diff --git a/tests/e2e-inject/pom.xml b/tests/e2e-inject/pom.xml
index 97ed3f8..62f875e 100644
--- a/tests/e2e-inject/pom.xml
+++ b/tests/e2e-inject/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>e2e-inject</artifactId>
diff --git a/tests/e2e-server/pom.xml b/tests/e2e-server/pom.xml
index 00fe51c..1048bbb 100644
--- a/tests/e2e-server/pom.xml
+++ b/tests/e2e-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>e2e-server</artifactId>
@@ -55,8 +55,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tests/e2e-testng/pom.xml b/tests/e2e-testng/pom.xml
index 70991ba..d59e65c 100644
--- a/tests/e2e-testng/pom.xml
+++ b/tests/e2e-testng/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>e2e-testng</artifactId>
diff --git a/tests/e2e/pom.xml b/tests/e2e/pom.xml
index 223c51f..1f954c3 100644
--- a/tests/e2e/pom.xml
+++ b/tests/e2e/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>e2e</artifactId>
@@ -55,8 +55,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/ExecutorServiceProviderTest.java b/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/ExecutorServiceProviderTest.java
index c97f574..e2dbe03 100644
--- a/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/ExecutorServiceProviderTest.java
+++ b/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/ExecutorServiceProviderTest.java
@@ -16,12 +16,15 @@
package org.glassfish.jersey.tests.e2e;
+import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
import java.util.IdentityHashMap;
import java.util.List;
+import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -37,6 +40,8 @@
import javax.ws.rs.Produces;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestFilter;
import javax.ws.rs.container.AsyncResponse;
import javax.ws.rs.container.Suspended;
import javax.ws.rs.core.Application;
@@ -52,6 +57,7 @@
import org.glassfish.jersey.test.JerseyTest;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
/**
* {@link org.glassfish.jersey.spi.ExecutorServiceProvider} E2E tests.
@@ -137,17 +143,21 @@
executorService.shutdownNow();
}
- private class CustomExecutorService implements ExecutorService {
+ /* package private */ class CustomExecutorService implements ExecutorService {
private final ExecutorService delegate;
private final AtomicBoolean isCleanedUp;
public CustomExecutorService() {
- this.isCleanedUp = new AtomicBoolean(false);
- this.delegate = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder()
+ this(Executors.newSingleThreadExecutor(new ThreadFactoryBuilder()
.setNameFormat("async-request-%d")
.setUncaughtExceptionHandler(new JerseyProcessingUncaughtExceptionHandler())
- .build());
+ .build()));
+ }
+
+ public CustomExecutorService(ExecutorService delegate) {
+ this.isCleanedUp = new AtomicBoolean(false);
+ this.delegate = delegate;
executorCreationCount++;
executors.add(this);
@@ -231,6 +241,17 @@
}
}
+ public static class SecondCustomExecutorProvider extends CustomExecutorProvider {
+ public static final String NAME_FORMAT = "second-async-request";
+
+ public ExecutorService getExecutorService() {
+ return new CustomExecutorService(Executors.newSingleThreadExecutor(new ThreadFactoryBuilder()
+ .setNameFormat(NAME_FORMAT + "-%d")
+ .setUncaughtExceptionHandler(new JerseyProcessingUncaughtExceptionHandler())
+ .build()));
+ }
+ }
+
private static final CustomExecutorProvider serverExecutorProvider = new CustomExecutorProvider();
@Override
@@ -355,4 +376,56 @@
setUp(); // re-starting test container to ensure proper post-test tearDown.
}
+
+ @Test
+ public void testClientBuilderExecutorServiceTakesPrecedenceOverRegistered() throws Exception {
+ serverExecutorProvider.reset();
+ CountDownLatch nameLatch = new CountDownLatch(1);
+ Set<String> threadName = new HashSet<>(1);
+
+ final CustomExecutorProvider executorProvider = new CustomExecutorProvider();
+ Client client = ClientBuilder.newBuilder().register(new ClientRequestFilter() {
+ @Override
+ public void filter(ClientRequestContext requestContext) throws IOException {
+ threadName.add(Thread.currentThread().getName());
+ nameLatch.countDown();
+ }
+ }).executorService(new SecondCustomExecutorProvider().getExecutorService()).register(executorProvider).build();
+
+ client.target(getBaseUri()).path("resource").request().async().get(String.class).get();
+ assertTrue(nameLatch.await(10, TimeUnit.SECONDS));
+ assertEquals(threadName.size(), 1);
+ assertTrue(threadName.iterator().next().startsWith(SecondCustomExecutorProvider.NAME_FORMAT));
+
+ tearDown(); // stopping test container
+ client.close();
+
+ setUp(); // re-starting test container to ensure proper post-test tearDown.
+ }
+
+ @Test
+ public void testRegisteredExecutorServiceDoesNotTakesPrecedenceOverClientBuilder() throws Exception {
+ serverExecutorProvider.reset();
+ CountDownLatch nameLatch = new CountDownLatch(1);
+ Set<String> threadName = new HashSet<>(1);
+
+ final CustomExecutorProvider executorProvider = new CustomExecutorProvider();
+ Client client = ClientBuilder.newBuilder().register(executorProvider).register(new ClientRequestFilter() {
+ @Override
+ public void filter(ClientRequestContext requestContext) throws IOException {
+ threadName.add(Thread.currentThread().getName());
+ nameLatch.countDown();
+ }
+ }).executorService(new SecondCustomExecutorProvider().getExecutorService()).build();
+
+ client.target(getBaseUri()).path("resource").request().async().get(String.class).get();
+ assertTrue(nameLatch.await(10, TimeUnit.SECONDS));
+ assertEquals(threadName.size(), 1);
+ assertTrue(threadName.iterator().next().startsWith(SecondCustomExecutorProvider.NAME_FORMAT));
+
+ tearDown(); // stopping test container
+ client.close();
+
+ setUp(); // re-starting test container to ensure proper post-test tearDown.
+ }
}
diff --git a/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/container/ResponseWriterOutputStreamTest.java b/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/container/ResponseWriterOutputStreamTest.java
index 7edcbc4..c88468a 100644
--- a/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/container/ResponseWriterOutputStreamTest.java
+++ b/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/container/ResponseWriterOutputStreamTest.java
@@ -16,22 +16,26 @@
package org.glassfish.jersey.tests.e2e.container;
-import java.io.IOException;
-import java.io.OutputStream;
+import org.glassfish.jersey.server.ContainerRequest;
+import org.glassfish.jersey.server.ContainerResponse;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.junit.Test;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.InvocationCallback;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.Response;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
-import org.glassfish.jersey.server.ContainerRequest;
-import org.glassfish.jersey.server.ContainerResponse;
-import org.glassfish.jersey.server.ResourceConfig;
-
-import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
@@ -43,6 +47,8 @@
*/
public class ResponseWriterOutputStreamTest extends JerseyContainerTest {
+ private static final String CHECK_STRING = "RESOURCE";
+
@Path("/")
public static class Resource {
@@ -53,8 +59,8 @@
final ContainerResponse response = new ContainerResponse(context, Response.ok().build());
final OutputStream os = context.getResponseWriter()
- .writeResponseStatusAndHeaders("RESOURCE".getBytes().length, response);
- os.write("RESOURCE".getBytes());
+ .writeResponseStatusAndHeaders(CHECK_STRING.getBytes().length, response);
+ os.write(CHECK_STRING.getBytes());
os.close();
}
@@ -64,12 +70,12 @@
assertThat(context.getMethod(), is("POST"));
final String s = context.readEntity(String.class);
- assertEquals("RESOURCE", s);
+ assertEquals(CHECK_STRING, s);
final ContainerResponse response = new ContainerResponse(context, Response.ok().build());
final OutputStream os = context.getResponseWriter()
- .writeResponseStatusAndHeaders("RESOURCE".getBytes().length, response);
- os.write("RESOURCE".getBytes());
+ .writeResponseStatusAndHeaders(s.getBytes().length, response);
+ os.write(s.getBytes());
os.close();
}
}
@@ -81,16 +87,32 @@
@Test
public void testGet() {
- assertThat(target().request().get(String.class), is("RESOURCE"));
+ assertThat(target().request().get(String.class), is(CHECK_STRING));
}
@Test
- public void testPost() {
- assertThat(target().request().post(Entity.text("RESOURCE"), String.class), is("RESOURCE"));
+ public void testPost() throws InterruptedException, ExecutionException {
+ final CountDownLatch controlLatch = new CountDownLatch(1);
+ final Invocation invocation = target().request().buildPost(Entity.text(CHECK_STRING));
+ final Future<Response> resp = invocation.submit(new InvocationCallback<Response>() {
+ @Override
+ public void completed(Response response) {
+ controlLatch.countDown();
+ }
+
+ @Override
+ public void failed(Throwable throwable) {
+ controlLatch.countDown();
+
+ }
+ });
+ controlLatch.await();
+ final String response = resp.get().readEntity(String.class);
+ assertThat(response, is(CHECK_STRING));
}
@Test
- public void testAll() {
+ public void testAll() throws InterruptedException, ExecutionException {
testGet();
testPost();
}
diff --git a/tests/integration/JERSEY-2988/pom.xml b/tests/integration/JERSEY-2988/pom.xml
index 82dc34a..e47be83 100644
--- a/tests/integration/JERSEY-2988/pom.xml
+++ b/tests/integration/JERSEY-2988/pom.xml
@@ -61,12 +61,12 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>2.0-EDR1</version>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>org.jboss.weld.servlet</groupId>
<artifactId>weld-servlet-core</artifactId>
- <version>3.0.0.Alpha13</version>
+ <version>${weld3.version}</version>
</dependency>
</dependencies>
diff --git a/tests/integration/async-jersey-filter/pom.xml b/tests/integration/async-jersey-filter/pom.xml
index da8cd9b..0fe0d0f 100644
--- a/tests/integration/async-jersey-filter/pom.xml
+++ b/tests/integration/async-jersey-filter/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>async-jersey-filter</artifactId>
@@ -47,9 +47,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet3.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/tests/integration/cdi-beanvalidation-webapp/pom.xml b/tests/integration/cdi-beanvalidation-webapp/pom.xml
index df201d3..cbf58c3 100644
--- a/tests/integration/cdi-beanvalidation-webapp/pom.xml
+++ b/tests/integration/cdi-beanvalidation-webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>cdi-beanvalidation-webapp</artifactId>
@@ -33,19 +33,26 @@
<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>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <!-- Remove ancient javax.el that causes problems with Hibernate -->
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
@@ -53,7 +60,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
+ <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/tests/integration/cdi-ejb-test-webapp/pom.xml b/tests/integration/cdi-ejb-test-webapp/pom.xml
index 39b0521..0a1c35b 100644
--- a/tests/integration/cdi-ejb-test-webapp/pom.xml
+++ b/tests/integration/cdi-ejb-test-webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>cdi-ejb-test-webapp</artifactId>
@@ -33,13 +33,13 @@
<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>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -48,8 +48,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tests/integration/cdi-iface-with-non-jaxrs-impl-test-webapp/pom.xml b/tests/integration/cdi-iface-with-non-jaxrs-impl-test-webapp/pom.xml
index d0cf29f..e975525 100644
--- a/tests/integration/cdi-iface-with-non-jaxrs-impl-test-webapp/pom.xml
+++ b/tests/integration/cdi-iface-with-non-jaxrs-impl-test-webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>cdi-iface-with-non-jaxrs-impl-test-webapp</artifactId>
@@ -33,8 +33,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>
diff --git a/tests/integration/cdi-multimodule/ear/pom.xml b/tests/integration/cdi-multimodule/ear/pom.xml
index 5b01d1e..15df51e 100644
--- a/tests/integration/cdi-multimodule/ear/pom.xml
+++ b/tests/integration/cdi-multimodule/ear/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/tests/integration/cdi-multimodule/lib/pom.xml b/tests/integration/cdi-multimodule/lib/pom.xml
index 4e38c98..cfb0f41 100644
--- a/tests/integration/cdi-multimodule/lib/pom.xml
+++ b/tests/integration/cdi-multimodule/lib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -33,13 +33,13 @@
<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>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -48,8 +48,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/tests/integration/cdi-multimodule/pom.xml b/tests/integration/cdi-multimodule/pom.xml
index 803f972..2a7442c 100644
--- a/tests/integration/cdi-multimodule/pom.xml
+++ b/tests/integration/cdi-multimodule/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>cdi-multimodule</artifactId>
diff --git a/tests/integration/cdi-multimodule/war1/pom.xml b/tests/integration/cdi-multimodule/war1/pom.xml
index 6c9cea8..0506a71 100644
--- a/tests/integration/cdi-multimodule/war1/pom.xml
+++ b/tests/integration/cdi-multimodule/war1/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -33,14 +33,14 @@
<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>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tests/integration/cdi-multimodule/war2/pom.xml b/tests/integration/cdi-multimodule/war2/pom.xml
index 0c4352b..2f57ea8 100644
--- a/tests/integration/cdi-multimodule/war2/pom.xml
+++ b/tests/integration/cdi-multimodule/war2/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -33,8 +33,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>
diff --git a/tests/integration/cdi-multipart-webapp/pom.xml b/tests/integration/cdi-multipart-webapp/pom.xml
index 79f0bf4..c4da4b7 100644
--- a/tests/integration/cdi-multipart-webapp/pom.xml
+++ b/tests/integration/cdi-multipart-webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>cdi-multipart-webapp</artifactId>
@@ -33,13 +33,13 @@
<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>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tests/integration/cdi-test-webapp/pom.xml b/tests/integration/cdi-test-webapp/pom.xml
index bfddb0f..7aada14 100644
--- a/tests/integration/cdi-test-webapp/pom.xml
+++ b/tests/integration/cdi-test-webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>cdi-test-webapp</artifactId>
@@ -33,13 +33,13 @@
<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>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tests/integration/cdi-with-jersey-injection-custom-cfg-webapp/pom.xml b/tests/integration/cdi-with-jersey-injection-custom-cfg-webapp/pom.xml
index a491ec4..c65ef87 100644
--- a/tests/integration/cdi-with-jersey-injection-custom-cfg-webapp/pom.xml
+++ b/tests/integration/cdi-with-jersey-injection-custom-cfg-webapp/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>cdi-with-jersey-injection-custom-cfg-webapp</artifactId>
@@ -52,13 +52,13 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tests/integration/cdi-with-jersey-injection-custom-hk2-banned-webapp/pom.xml b/tests/integration/cdi-with-jersey-injection-custom-hk2-banned-webapp/pom.xml
index 5980238..2cc5479 100644
--- a/tests/integration/cdi-with-jersey-injection-custom-hk2-banned-webapp/pom.xml
+++ b/tests/integration/cdi-with-jersey-injection-custom-hk2-banned-webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>cdi-with-jersey-injection-custom-hk2-banned-webapp</artifactId>
@@ -45,8 +45,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -59,8 +59,8 @@
<artifactId>jersey-common</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>
</dependency>
@@ -70,8 +70,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tests/integration/cdi-with-jersey-injection-webapp/pom.xml b/tests/integration/cdi-with-jersey-injection-webapp/pom.xml
index d0e0c42..cc1e4ba 100644
--- a/tests/integration/cdi-with-jersey-injection-webapp/pom.xml
+++ b/tests/integration/cdi-with-jersey-injection-webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>cdi-with-jersey-injection-webapp</artifactId>
@@ -48,8 +48,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tests/integration/client-connector-provider/pom.xml b/tests/integration/client-connector-provider/pom.xml
index 465f8e6..2ac28a6 100644
--- a/tests/integration/client-connector-provider/pom.xml
+++ b/tests/integration/client-connector-provider/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>client-connector-provider</artifactId>
@@ -33,13 +33,13 @@
<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>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tests/integration/ejb-multimodule-reload/ear/pom.xml b/tests/integration/ejb-multimodule-reload/ear/pom.xml
index 09183cb..a91b98e 100644
--- a/tests/integration/ejb-multimodule-reload/ear/pom.xml
+++ b/tests/integration/ejb-multimodule-reload/ear/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/tests/integration/ejb-multimodule-reload/lib/pom.xml b/tests/integration/ejb-multimodule-reload/lib/pom.xml
index 730d296..5161619 100644
--- a/tests/integration/ejb-multimodule-reload/lib/pom.xml
+++ b/tests/integration/ejb-multimodule-reload/lib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -33,8 +33,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>
@@ -43,13 +43,13 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/tests/integration/ejb-multimodule-reload/pom.xml b/tests/integration/ejb-multimodule-reload/pom.xml
index 35fd46f..a70255e 100644
--- a/tests/integration/ejb-multimodule-reload/pom.xml
+++ b/tests/integration/ejb-multimodule-reload/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>ejb-multimodule-reload</artifactId>
diff --git a/tests/integration/ejb-multimodule-reload/war1/pom.xml b/tests/integration/ejb-multimodule-reload/war1/pom.xml
index f90e657..b270d60 100644
--- a/tests/integration/ejb-multimodule-reload/war1/pom.xml
+++ b/tests/integration/ejb-multimodule-reload/war1/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -33,8 +33,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>
@@ -49,12 +49,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
- <artifactId>javax.inject</artifactId>
+ <artifactId>jakarta.inject</artifactId>
<exclusions>
<exclusion>
<groupId>javax.inject</groupId>
diff --git a/tests/integration/ejb-multimodule-reload/war2/pom.xml b/tests/integration/ejb-multimodule-reload/war2/pom.xml
index 1a3bf25..fdfa36d 100644
--- a/tests/integration/ejb-multimodule-reload/war2/pom.xml
+++ b/tests/integration/ejb-multimodule-reload/war2/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -33,8 +33,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>
@@ -44,8 +44,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
diff --git a/tests/integration/ejb-multimodule/ear/pom.xml b/tests/integration/ejb-multimodule/ear/pom.xml
index 742f13d..35ea492 100644
--- a/tests/integration/ejb-multimodule/ear/pom.xml
+++ b/tests/integration/ejb-multimodule/ear/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/tests/integration/ejb-multimodule/lib/pom.xml b/tests/integration/ejb-multimodule/lib/pom.xml
index 916ead4..9530da4 100644
--- a/tests/integration/ejb-multimodule/lib/pom.xml
+++ b/tests/integration/ejb-multimodule/lib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -33,18 +33,18 @@
<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>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/tests/integration/ejb-multimodule/pom.xml b/tests/integration/ejb-multimodule/pom.xml
index 78a39c6..d708b3e 100644
--- a/tests/integration/ejb-multimodule/pom.xml
+++ b/tests/integration/ejb-multimodule/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>ejb-multimodule</artifactId>
diff --git a/tests/integration/ejb-multimodule/war/pom.xml b/tests/integration/ejb-multimodule/war/pom.xml
index 8c40b68..8e49c6d 100644
--- a/tests/integration/ejb-multimodule/war/pom.xml
+++ b/tests/integration/ejb-multimodule/war/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -33,8 +33,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>
@@ -44,8 +44,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
diff --git a/tests/integration/ejb-test-webapp/pom.xml b/tests/integration/ejb-test-webapp/pom.xml
index 6ca69fa..5319f9a 100644
--- a/tests/integration/ejb-test-webapp/pom.xml
+++ b/tests/integration/ejb-test-webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>ejb-test-webapp</artifactId>
@@ -33,24 +33,24 @@
<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>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1-b07</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tests/integration/j-376/pom.xml b/tests/integration/j-376/pom.xml
index 4908e7c..0721459 100644
--- a/tests/integration/j-376/pom.xml
+++ b/tests/integration/j-376/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.glassfish.jersey.tests.integration</groupId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>j-376</artifactId>
@@ -34,8 +34,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.test-framework.providers</groupId>
@@ -50,8 +50,8 @@
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
diff --git a/tests/integration/j-441/ear/pom.xml b/tests/integration/j-441/ear/pom.xml
index ffeb59f..2c5241c 100644
--- a/tests/integration/j-441/ear/pom.xml
+++ b/tests/integration/j-441/ear/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>j-441-ear</artifactId>
diff --git a/tests/integration/j-441/pom.xml b/tests/integration/j-441/pom.xml
index e8109bf..250a395 100644
--- a/tests/integration/j-441/pom.xml
+++ b/tests/integration/j-441/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>j-441</artifactId>
diff --git a/tests/integration/j-441/war1/pom.xml b/tests/integration/j-441/war1/pom.xml
index 067ef5e..d5e0856 100644
--- a/tests/integration/j-441/war1/pom.xml
+++ b/tests/integration/j-441/war1/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/tests/integration/j-441/war2/pom.xml b/tests/integration/j-441/war2/pom.xml
index cd385ad..a24e60b 100644
--- a/tests/integration/j-441/war2/pom.xml
+++ b/tests/integration/j-441/war2/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/tests/integration/j-59/ear/pom.xml b/tests/integration/j-59/ear/pom.xml
index fdce31a..f3f39e3 100644
--- a/tests/integration/j-59/ear/pom.xml
+++ b/tests/integration/j-59/ear/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/tests/integration/j-59/lib/pom.xml b/tests/integration/j-59/lib/pom.xml
index e90e520..34afee2 100644
--- a/tests/integration/j-59/lib/pom.xml
+++ b/tests/integration/j-59/lib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -33,18 +33,18 @@
<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>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/tests/integration/j-59/pom.xml b/tests/integration/j-59/pom.xml
index 2512403..0d0898b 100644
--- a/tests/integration/j-59/pom.xml
+++ b/tests/integration/j-59/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>j-59</artifactId>
diff --git a/tests/integration/j-59/war/pom.xml b/tests/integration/j-59/war/pom.xml
index 1783544..286c853 100644
--- a/tests/integration/j-59/war/pom.xml
+++ b/tests/integration/j-59/war/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -33,8 +33,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>
diff --git a/tests/integration/jaxrs-component-inject/pom.xml b/tests/integration/jaxrs-component-inject/pom.xml
index 9a392ab..bc86c65 100644
--- a/tests/integration/jaxrs-component-inject/pom.xml
+++ b/tests/integration/jaxrs-component-inject/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jaxrs-component-inject</artifactId>
diff --git a/tests/integration/jersey-1107/pom.xml b/tests/integration/jersey-1107/pom.xml
index d2ea930..7596855 100644
--- a/tests/integration/jersey-1107/pom.xml
+++ b/tests/integration/jersey-1107/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-1107</artifactId>
diff --git a/tests/integration/jersey-1223/pom.xml b/tests/integration/jersey-1223/pom.xml
index 4bc9d10..6a77570 100644
--- a/tests/integration/jersey-1223/pom.xml
+++ b/tests/integration/jersey-1223/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.glassfish.jersey.tests.integration</groupId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jersey-1223</artifactId>
diff --git a/tests/integration/jersey-1604/pom.xml b/tests/integration/jersey-1604/pom.xml
index c7ec7b2..4923530 100644
--- a/tests/integration/jersey-1604/pom.xml
+++ b/tests/integration/jersey-1604/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.glassfish.jersey.tests.integration</groupId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jersey-1604</artifactId>
diff --git a/tests/integration/jersey-1667/pom.xml b/tests/integration/jersey-1667/pom.xml
index 1e0243f..b83e829 100644
--- a/tests/integration/jersey-1667/pom.xml
+++ b/tests/integration/jersey-1667/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-1667</artifactId>
diff --git a/tests/integration/jersey-1829/pom.xml b/tests/integration/jersey-1829/pom.xml
index c4f1599..a6c7fd0 100644
--- a/tests/integration/jersey-1829/pom.xml
+++ b/tests/integration/jersey-1829/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.glassfish.jersey.tests.integration</groupId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jersey-1829</artifactId>
diff --git a/tests/integration/jersey-1883/pom.xml b/tests/integration/jersey-1883/pom.xml
index c9c8fc0..d866f6b 100644
--- a/tests/integration/jersey-1883/pom.xml
+++ b/tests/integration/jersey-1883/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-1883</artifactId>
diff --git a/tests/integration/jersey-1928/pom.xml b/tests/integration/jersey-1928/pom.xml
index 5bbc778..2a362d9 100644
--- a/tests/integration/jersey-1928/pom.xml
+++ b/tests/integration/jersey-1928/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.glassfish.jersey.tests.integration</groupId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jersey-1928</artifactId>
diff --git a/tests/integration/jersey-1960/pom.xml b/tests/integration/jersey-1960/pom.xml
index 4de96cb..d72905b 100644
--- a/tests/integration/jersey-1960/pom.xml
+++ b/tests/integration/jersey-1960/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-1960</artifactId>
diff --git a/tests/integration/jersey-1964/pom.xml b/tests/integration/jersey-1964/pom.xml
index b6615c6..5c763d2 100644
--- a/tests/integration/jersey-1964/pom.xml
+++ b/tests/integration/jersey-1964/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-1964</artifactId>
diff --git a/tests/integration/jersey-2031/pom.xml b/tests/integration/jersey-2031/pom.xml
index 7b0eea3..2715175 100644
--- a/tests/integration/jersey-2031/pom.xml
+++ b/tests/integration/jersey-2031/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2031</artifactId>
diff --git a/tests/integration/jersey-2136/pom.xml b/tests/integration/jersey-2136/pom.xml
index 5e797da..df7d91f 100644
--- a/tests/integration/jersey-2136/pom.xml
+++ b/tests/integration/jersey-2136/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2136</artifactId>
diff --git a/tests/integration/jersey-2137/pom.xml b/tests/integration/jersey-2137/pom.xml
index d5b48c5..148d8b8 100644
--- a/tests/integration/jersey-2137/pom.xml
+++ b/tests/integration/jersey-2137/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2137</artifactId>
@@ -33,13 +33,13 @@
<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>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -48,13 +48,13 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tests/integration/jersey-2154/pom.xml b/tests/integration/jersey-2154/pom.xml
index 6dc290f..22d8391 100644
--- a/tests/integration/jersey-2154/pom.xml
+++ b/tests/integration/jersey-2154/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2154</artifactId>
@@ -33,13 +33,13 @@
<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>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -48,8 +48,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>javax.ejb-api</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tests/integration/jersey-2160/pom.xml b/tests/integration/jersey-2160/pom.xml
index 8e32aac..eb00612 100644
--- a/tests/integration/jersey-2160/pom.xml
+++ b/tests/integration/jersey-2160/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2160</artifactId>
diff --git a/tests/integration/jersey-2164/pom.xml b/tests/integration/jersey-2164/pom.xml
index 24f6782..925c3c3 100644
--- a/tests/integration/jersey-2164/pom.xml
+++ b/tests/integration/jersey-2164/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2164</artifactId>
diff --git a/tests/integration/jersey-2167/pom.xml b/tests/integration/jersey-2167/pom.xml
index 943e894..ef73a04 100644
--- a/tests/integration/jersey-2167/pom.xml
+++ b/tests/integration/jersey-2167/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2167</artifactId>
diff --git a/tests/integration/jersey-2176/pom.xml b/tests/integration/jersey-2176/pom.xml
index c4c3877..28e85b4 100644
--- a/tests/integration/jersey-2176/pom.xml
+++ b/tests/integration/jersey-2176/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2176</artifactId>
diff --git a/tests/integration/jersey-2184/pom.xml b/tests/integration/jersey-2184/pom.xml
index 255156d..798e39b 100644
--- a/tests/integration/jersey-2184/pom.xml
+++ b/tests/integration/jersey-2184/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2184</artifactId>
diff --git a/tests/integration/jersey-2255/pom.xml b/tests/integration/jersey-2255/pom.xml
index 3b1f2ad..305ebe2 100644
--- a/tests/integration/jersey-2255/pom.xml
+++ b/tests/integration/jersey-2255/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2255</artifactId>
diff --git a/tests/integration/jersey-2322/pom.xml b/tests/integration/jersey-2322/pom.xml
index a64aa6b..d20e4cd 100644
--- a/tests/integration/jersey-2322/pom.xml
+++ b/tests/integration/jersey-2322/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2322</artifactId>
diff --git a/tests/integration/jersey-2335/pom.xml b/tests/integration/jersey-2335/pom.xml
index 075bed8..9704ab9 100644
--- a/tests/integration/jersey-2335/pom.xml
+++ b/tests/integration/jersey-2335/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2335</artifactId>
diff --git a/tests/integration/jersey-2421/pom.xml b/tests/integration/jersey-2421/pom.xml
index edae017..64b56cf 100644
--- a/tests/integration/jersey-2421/pom.xml
+++ b/tests/integration/jersey-2421/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2421</artifactId>
diff --git a/tests/integration/jersey-2551/pom.xml b/tests/integration/jersey-2551/pom.xml
index c3fd8fa..8cd50c6 100644
--- a/tests/integration/jersey-2551/pom.xml
+++ b/tests/integration/jersey-2551/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2551</artifactId>
diff --git a/tests/integration/jersey-2612/pom.xml b/tests/integration/jersey-2612/pom.xml
index 6fe55ac..c80f2b7 100644
--- a/tests/integration/jersey-2612/pom.xml
+++ b/tests/integration/jersey-2612/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2612</artifactId>
diff --git a/tests/integration/jersey-2637/pom.xml b/tests/integration/jersey-2637/pom.xml
index 8615792..004de41 100644
--- a/tests/integration/jersey-2637/pom.xml
+++ b/tests/integration/jersey-2637/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2637</artifactId>
diff --git a/tests/integration/jersey-2654/pom.xml b/tests/integration/jersey-2654/pom.xml
index 7ae7658..a6e4affa 100644
--- a/tests/integration/jersey-2654/pom.xml
+++ b/tests/integration/jersey-2654/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2654</artifactId>
diff --git a/tests/integration/jersey-2673/pom.xml b/tests/integration/jersey-2673/pom.xml
index 827aa30..3f114f9 100644
--- a/tests/integration/jersey-2673/pom.xml
+++ b/tests/integration/jersey-2673/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2673</artifactId>
@@ -63,7 +63,7 @@
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
</plugin>
</plugins>
diff --git a/tests/integration/jersey-2689/pom.xml b/tests/integration/jersey-2689/pom.xml
index c4583c8..0fc4d60 100644
--- a/tests/integration/jersey-2689/pom.xml
+++ b/tests/integration/jersey-2689/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2689</artifactId>
@@ -81,7 +81,7 @@
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
</plugin>
</plugins>
diff --git a/tests/integration/jersey-2704/pom.xml b/tests/integration/jersey-2704/pom.xml
index 5dea360..4ee7d7d 100644
--- a/tests/integration/jersey-2704/pom.xml
+++ b/tests/integration/jersey-2704/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2704</artifactId>
diff --git a/tests/integration/jersey-2776/pom.xml b/tests/integration/jersey-2776/pom.xml
index 0b484a9..421925a 100644
--- a/tests/integration/jersey-2776/pom.xml
+++ b/tests/integration/jersey-2776/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2776</artifactId>
diff --git a/tests/integration/jersey-2794/pom.xml b/tests/integration/jersey-2794/pom.xml
index f009641..6569a7b 100644
--- a/tests/integration/jersey-2794/pom.xml
+++ b/tests/integration/jersey-2794/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2794</artifactId>
diff --git a/tests/integration/jersey-2846/pom.xml b/tests/integration/jersey-2846/pom.xml
index 7e54819..55ca718 100644
--- a/tests/integration/jersey-2846/pom.xml
+++ b/tests/integration/jersey-2846/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2846</artifactId>
diff --git a/tests/integration/jersey-2878/pom.xml b/tests/integration/jersey-2878/pom.xml
index 2cf6ae1..734726c 100644
--- a/tests/integration/jersey-2878/pom.xml
+++ b/tests/integration/jersey-2878/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2878</artifactId>
diff --git a/tests/integration/jersey-2892/pom.xml b/tests/integration/jersey-2892/pom.xml
index 1e4647f..ae3ee2a 100644
--- a/tests/integration/jersey-2892/pom.xml
+++ b/tests/integration/jersey-2892/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-2892</artifactId>
diff --git a/tests/integration/jersey-780/pom.xml b/tests/integration/jersey-780/pom.xml
index 2962171..e4e20c1 100644
--- a/tests/integration/jersey-780/pom.xml
+++ b/tests/integration/jersey-780/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-780</artifactId>
diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml
index d28865c..e7cec86 100644
--- a/tests/integration/pom.xml
+++ b/tests/integration/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
@@ -236,6 +236,43 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <configuration>
+ <skip>${skip.tests}</skip>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <stopPort>9999</stopPort>
+ <stopKey>STOP</stopKey>
+ <webApp>
+ <contextPath>/</contextPath>
+ <webInfIncludeJarPattern>.*/.*jersey-[^/]\.jar$</webInfIncludeJarPattern>
+ </webApp>
+ <httpConnector>
+ <port>${jersey.config.test.container.port}</port>
+ <idleTimeout>60000</idleTimeout>
+ </httpConnector>
+ </configuration>
+ <executions>
+ <execution>
+ <id>start-jetty</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ <configuration>
+ <scanIntervalSeconds>0</scanIntervalSeconds>
+ </configuration>
+ </execution>
+ <execution>
+ <id>stop-jetty</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/tests/integration/portability-jersey-1/pom.xml b/tests/integration/portability-jersey-1/pom.xml
index c8499d7..e3167d7 100644
--- a/tests/integration/portability-jersey-1/pom.xml
+++ b/tests/integration/portability-jersey-1/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>portability-jersey-1</artifactId>
diff --git a/tests/integration/portability-jersey-2/pom.xml b/tests/integration/portability-jersey-2/pom.xml
index 0e63542..39491d3 100644
--- a/tests/integration/portability-jersey-2/pom.xml
+++ b/tests/integration/portability-jersey-2/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>portability-jersey-2</artifactId>
diff --git a/tests/integration/property-check/pom.xml b/tests/integration/property-check/pom.xml
index 7fd7e4b..429a30c 100644
--- a/tests/integration/property-check/pom.xml
+++ b/tests/integration/property-check/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>property-check</artifactId>
diff --git a/tests/integration/security-digest/pom.xml b/tests/integration/security-digest/pom.xml
index 4cffdf8..78e7df9 100644
--- a/tests/integration/security-digest/pom.xml
+++ b/tests/integration/security-digest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.glassfish.jersey.tests.integration</groupId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>security-digest</artifactId>
diff --git a/tests/integration/servlet-2.5-autodiscovery-1/pom.xml b/tests/integration/servlet-2.5-autodiscovery-1/pom.xml
index 65d81ff..7b1df57 100644
--- a/tests/integration/servlet-2.5-autodiscovery-1/pom.xml
+++ b/tests/integration/servlet-2.5-autodiscovery-1/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-2.5-autodiscovery-1</artifactId>
diff --git a/tests/integration/servlet-2.5-autodiscovery-2/pom.xml b/tests/integration/servlet-2.5-autodiscovery-2/pom.xml
index cc220e3..ce54a7a 100644
--- a/tests/integration/servlet-2.5-autodiscovery-2/pom.xml
+++ b/tests/integration/servlet-2.5-autodiscovery-2/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-2.5-autodiscovery-2</artifactId>
@@ -61,7 +61,7 @@
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
</plugin>
</plugins>
diff --git a/tests/integration/servlet-2.5-filter/pom.xml b/tests/integration/servlet-2.5-filter/pom.xml
index 60416db..b71c1d8 100644
--- a/tests/integration/servlet-2.5-filter/pom.xml
+++ b/tests/integration/servlet-2.5-filter/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-2.5-filter</artifactId>
diff --git a/tests/integration/servlet-2.5-inflector-1/pom.xml b/tests/integration/servlet-2.5-inflector-1/pom.xml
index a9f968c..133e54e 100644
--- a/tests/integration/servlet-2.5-inflector-1/pom.xml
+++ b/tests/integration/servlet-2.5-inflector-1/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-2.5-inflector-1</artifactId>
diff --git a/tests/integration/servlet-2.5-init-1/pom.xml b/tests/integration/servlet-2.5-init-1/pom.xml
index 71dd7e5..7271d36 100644
--- a/tests/integration/servlet-2.5-init-1/pom.xml
+++ b/tests/integration/servlet-2.5-init-1/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-2.5-init-1</artifactId>
diff --git a/tests/integration/servlet-2.5-init-2/pom.xml b/tests/integration/servlet-2.5-init-2/pom.xml
index b069eff..eb45ebb 100644
--- a/tests/integration/servlet-2.5-init-2/pom.xml
+++ b/tests/integration/servlet-2.5-init-2/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-2.5-init-2</artifactId>
diff --git a/tests/integration/servlet-2.5-init-3/pom.xml b/tests/integration/servlet-2.5-init-3/pom.xml
index 2271b3d..9df3d79 100644
--- a/tests/integration/servlet-2.5-init-3/pom.xml
+++ b/tests/integration/servlet-2.5-init-3/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-2.5-init-3</artifactId>
diff --git a/tests/integration/servlet-2.5-init-4/pom.xml b/tests/integration/servlet-2.5-init-4/pom.xml
index 2b119f0..e84b5c4 100644
--- a/tests/integration/servlet-2.5-init-4/pom.xml
+++ b/tests/integration/servlet-2.5-init-4/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-2.5-init-4</artifactId>
diff --git a/tests/integration/servlet-2.5-init-5/pom.xml b/tests/integration/servlet-2.5-init-5/pom.xml
index bce35f3..1911a63 100644
--- a/tests/integration/servlet-2.5-init-5/pom.xml
+++ b/tests/integration/servlet-2.5-init-5/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-2.5-init-5</artifactId>
diff --git a/tests/integration/servlet-2.5-init-6/pom.xml b/tests/integration/servlet-2.5-init-6/pom.xml
index aa89759..4fa6294 100644
--- a/tests/integration/servlet-2.5-init-6/pom.xml
+++ b/tests/integration/servlet-2.5-init-6/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-2.5-init-6</artifactId>
diff --git a/tests/integration/servlet-2.5-init-7/pom.xml b/tests/integration/servlet-2.5-init-7/pom.xml
index 231efe9..c620162 100644
--- a/tests/integration/servlet-2.5-init-7/pom.xml
+++ b/tests/integration/servlet-2.5-init-7/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-2.5-init-7</artifactId>
diff --git a/tests/integration/servlet-2.5-init-8/pom.xml b/tests/integration/servlet-2.5-init-8/pom.xml
index bb916ce..31b633b 100644
--- a/tests/integration/servlet-2.5-init-8/pom.xml
+++ b/tests/integration/servlet-2.5-init-8/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-2.5-init-8</artifactId>
diff --git a/tests/integration/servlet-2.5-mvc-1/pom.xml b/tests/integration/servlet-2.5-mvc-1/pom.xml
index 4423806..1a5e3ea 100644
--- a/tests/integration/servlet-2.5-mvc-1/pom.xml
+++ b/tests/integration/servlet-2.5-mvc-1/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-2.5-mvc-1</artifactId>
diff --git a/tests/integration/servlet-2.5-mvc-2/pom.xml b/tests/integration/servlet-2.5-mvc-2/pom.xml
index a34c50d..52e0803 100644
--- a/tests/integration/servlet-2.5-mvc-2/pom.xml
+++ b/tests/integration/servlet-2.5-mvc-2/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-2.5-mvc-2</artifactId>
diff --git a/tests/integration/servlet-2.5-mvc-3/pom.xml b/tests/integration/servlet-2.5-mvc-3/pom.xml
index 962b2ba..3579374 100644
--- a/tests/integration/servlet-2.5-mvc-3/pom.xml
+++ b/tests/integration/servlet-2.5-mvc-3/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-2.5-mvc-3</artifactId>
diff --git a/tests/integration/servlet-2.5-mvc-3/src/test/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_3/ItemITCase.java b/tests/integration/servlet-2.5-mvc-3/src/test/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_3/ItemITCase.java
index b3c3e39..df399fe 100644
--- a/tests/integration/servlet-2.5-mvc-3/src/test/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_3/ItemITCase.java
+++ b/tests/integration/servlet-2.5-mvc-3/src/test/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_3/ItemITCase.java
@@ -24,6 +24,8 @@
import org.junit.Test;
+import java.nio.charset.Charset;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -64,7 +66,7 @@
assertItemHtmlResponse(htmlIso);
assertFalse("Response shouldn't contain Ha\u0161ek but was: " + htmlIso, htmlIso.contains("Ha\u0161ek"));
- assertResponseContains(htmlIso, new String("Ha\u0161ek".getBytes(), "ISO-8859-2"));
+ assertResponseContains(htmlIso, new String("Ha\u0161ek".getBytes(Charset.forName("UTF-8")), "ISO-8859-2"));
}
@Test
diff --git a/tests/integration/servlet-2.5-reload/pom.xml b/tests/integration/servlet-2.5-reload/pom.xml
index 29de897..301b42d 100644
--- a/tests/integration/servlet-2.5-reload/pom.xml
+++ b/tests/integration/servlet-2.5-reload/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-2.5-reload</artifactId>
diff --git a/tests/integration/servlet-3-async/pom.xml b/tests/integration/servlet-3-async/pom.xml
index a959490..2890ee4 100644
--- a/tests/integration/servlet-3-async/pom.xml
+++ b/tests/integration/servlet-3-async/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-3-async</artifactId>
diff --git a/tests/integration/servlet-3-chunked-io/pom.xml b/tests/integration/servlet-3-chunked-io/pom.xml
index 4caa4b5..0aa797f 100644
--- a/tests/integration/servlet-3-chunked-io/pom.xml
+++ b/tests/integration/servlet-3-chunked-io/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-3-chunked-io</artifactId>
diff --git a/tests/integration/servlet-3-filter/pom.xml b/tests/integration/servlet-3-filter/pom.xml
index 1bbe427..841ca0a 100644
--- a/tests/integration/servlet-3-filter/pom.xml
+++ b/tests/integration/servlet-3-filter/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-3-filter</artifactId>
diff --git a/tests/integration/servlet-3-gf-async/pom.xml b/tests/integration/servlet-3-gf-async/pom.xml
index 9d53935..a516fe7 100644
--- a/tests/integration/servlet-3-gf-async/pom.xml
+++ b/tests/integration/servlet-3-gf-async/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-3-gf-async</artifactId>
diff --git a/tests/integration/servlet-3-inflector-1/pom.xml b/tests/integration/servlet-3-inflector-1/pom.xml
index 312ec21..eee5a4d 100644
--- a/tests/integration/servlet-3-inflector-1/pom.xml
+++ b/tests/integration/servlet-3-inflector-1/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-3-inflector-1</artifactId>
diff --git a/tests/integration/servlet-3-init-1/pom.xml b/tests/integration/servlet-3-init-1/pom.xml
index b0a1d04..cd02dc4 100644
--- a/tests/integration/servlet-3-init-1/pom.xml
+++ b/tests/integration/servlet-3-init-1/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-3-init-1</artifactId>
diff --git a/tests/integration/servlet-3-init-2/pom.xml b/tests/integration/servlet-3-init-2/pom.xml
index 0b37d39..356d41a 100644
--- a/tests/integration/servlet-3-init-2/pom.xml
+++ b/tests/integration/servlet-3-init-2/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-3-init-2</artifactId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.12</version>
<scope>compile</scope>
</dependency>
diff --git a/tests/integration/servlet-3-init-3/pom.xml b/tests/integration/servlet-3-init-3/pom.xml
index 71ea462..64762a2 100644
--- a/tests/integration/servlet-3-init-3/pom.xml
+++ b/tests/integration/servlet-3-init-3/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-3-init-3</artifactId>
diff --git a/tests/integration/servlet-3-init-4/pom.xml b/tests/integration/servlet-3-init-4/pom.xml
index 470666d..bf25f7a 100644
--- a/tests/integration/servlet-3-init-4/pom.xml
+++ b/tests/integration/servlet-3-init-4/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-3-init-4</artifactId>
diff --git a/tests/integration/servlet-3-init-5/pom.xml b/tests/integration/servlet-3-init-5/pom.xml
index e96aac6..09f1268 100644
--- a/tests/integration/servlet-3-init-5/pom.xml
+++ b/tests/integration/servlet-3-init-5/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-3-init-5</artifactId>
diff --git a/tests/integration/servlet-3-init-6/pom.xml b/tests/integration/servlet-3-init-6/pom.xml
index 709c875..30f9da1 100644
--- a/tests/integration/servlet-3-init-6/pom.xml
+++ b/tests/integration/servlet-3-init-6/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-3-init-6</artifactId>
diff --git a/tests/integration/servlet-3-init-7/pom.xml b/tests/integration/servlet-3-init-7/pom.xml
index 30869d5..69e1eaa 100644
--- a/tests/integration/servlet-3-init-7/pom.xml
+++ b/tests/integration/servlet-3-init-7/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-3-init-7</artifactId>
diff --git a/tests/integration/servlet-3-init-8/pom.xml b/tests/integration/servlet-3-init-8/pom.xml
index 094fcfa..dbe9bcf 100644
--- a/tests/integration/servlet-3-init-8/pom.xml
+++ b/tests/integration/servlet-3-init-8/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-3-init-8</artifactId>
diff --git a/tests/integration/servlet-3-init-provider/pom.xml b/tests/integration/servlet-3-init-provider/pom.xml
index 75417cb..cfce621 100644
--- a/tests/integration/servlet-3-init-provider/pom.xml
+++ b/tests/integration/servlet-3-init-provider/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-3-init-provider</artifactId>
diff --git a/tests/integration/servlet-3-params/pom.xml b/tests/integration/servlet-3-params/pom.xml
index c0a5ceb..496bc0b 100644
--- a/tests/integration/servlet-3-params/pom.xml
+++ b/tests/integration/servlet-3-params/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-3-params</artifactId>
diff --git a/tests/integration/servlet-3-sse-1/pom.xml b/tests/integration/servlet-3-sse-1/pom.xml
index d7ea408..ab51ac1 100644
--- a/tests/integration/servlet-3-sse-1/pom.xml
+++ b/tests/integration/servlet-3-sse-1/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-3-sse-1</artifactId>
diff --git a/tests/integration/servlet-request-wrapper-binding-2/pom.xml b/tests/integration/servlet-request-wrapper-binding-2/pom.xml
index b47561b..2b4c729 100644
--- a/tests/integration/servlet-request-wrapper-binding-2/pom.xml
+++ b/tests/integration/servlet-request-wrapper-binding-2/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-request-wrappper-binding-2</artifactId>
@@ -42,9 +42,9 @@
<artifactId>jersey-servlet-portability</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet3.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseWrapperProvider.java b/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseWrapperProvider.java
index db50a72..e2afcf1 100644
--- a/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseWrapperProvider.java
+++ b/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseWrapperProvider.java
@@ -31,6 +31,7 @@
import java.util.Set;
import java.util.function.Supplier;
+import javax.servlet.http.HttpUpgradeHandler;
import javax.ws.rs.core.GenericType;
import javax.inject.Inject;
@@ -402,6 +403,11 @@
}
@Override
+ public void setContentLengthLong(long length) {
+ getHttpServletResponse().setContentLengthLong(length);
+ }
+
+ @Override
public void setContentType(String s) {
getHttpServletResponse().setContentType(s);
}
@@ -825,6 +831,21 @@
public void login(String u, String p) throws ServletException {
getHttpServletRequest().login(u, p);
}
+
+ @Override
+ public String changeSessionId() {
+ return getHttpServletRequest().changeSessionId();
+ }
+
+ @Override
+ public long getContentLengthLong() {
+ return getHttpServletRequest().getContentLengthLong();
+ }
+
+ @Override
+ public <T extends HttpUpgradeHandler> T upgrade(Class<T> aClass) throws IOException, ServletException {
+ return getHttpServletRequest().upgrade(aClass);
+ }
}
private static ServiceLocator getServiceLocator(InjectionManager injectionManager) {
diff --git a/tests/integration/servlet-request-wrapper-binding/pom.xml b/tests/integration/servlet-request-wrapper-binding/pom.xml
index 8e869c4..73e8409 100644
--- a/tests/integration/servlet-request-wrapper-binding/pom.xml
+++ b/tests/integration/servlet-request-wrapper-binding/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-request-wrappper-binding</artifactId>
@@ -42,9 +42,9 @@
<artifactId>jersey-servlet-portability</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet3.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/tests/integration/servlet-tests/pom.xml b/tests/integration/servlet-tests/pom.xml
index 015852d..5d8594b 100644
--- a/tests/integration/servlet-tests/pom.xml
+++ b/tests/integration/servlet-tests/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>servlet-tests</artifactId>
diff --git a/tests/integration/sonar-test/pom.xml b/tests/integration/sonar-test/pom.xml
index b897be8..0d7c6f0 100644
--- a/tests/integration/sonar-test/pom.xml
+++ b/tests/integration/sonar-test/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>sonar-test</artifactId>
diff --git a/tests/integration/spring4/pom.xml b/tests/integration/spring4/pom.xml
index c5e93ab..668a299 100644
--- a/tests/integration/spring4/pom.xml
+++ b/tests/integration/spring4/pom.xml
@@ -39,15 +39,15 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet2.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<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>compile</scope>
</dependency>
diff --git a/tests/integration/tracing-support/pom.xml b/tests/integration/tracing-support/pom.xml
index 82e08eb..933bed9 100644
--- a/tests/integration/tracing-support/pom.xml
+++ b/tests/integration/tracing-support/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>tracing-support</artifactId>
diff --git a/tests/mem-leaks/pom.xml b/tests/mem-leaks/pom.xml
index 7a6b4c1..f3f7a68 100644
--- a/tests/mem-leaks/pom.xml
+++ b/tests/mem-leaks/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.tests.memleaks</groupId>
@@ -42,8 +42,6 @@
<properties>
- <memleak.jersey.version>2.28-SNAPSHOT</memleak.jersey.version>
-
<memleak.tmpdir>/tmp</memleak.tmpdir>
<memleak.jvm.maxheap>512m</memleak.jvm.maxheap>
@@ -325,7 +323,7 @@
<dependency>
<groupId>org.glassfish.jersey</groupId>
<artifactId>jersey-bom</artifactId>
- <version>${memleak.jersey.version}</version>
+ <version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/tests/mem-leaks/redeployment/pom.xml b/tests/mem-leaks/redeployment/pom.xml
index af2f872..d3f12a4 100644
--- a/tests/mem-leaks/redeployment/pom.xml
+++ b/tests/mem-leaks/redeployment/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.memleaks</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.tests.memleaks.redeployment</groupId>
diff --git a/tests/mem-leaks/redeployment/redeployment-hello-world-app-ref/pom.xml b/tests/mem-leaks/redeployment/redeployment-hello-world-app-ref/pom.xml
index 862fb6b..c27a19b 100644
--- a/tests/mem-leaks/redeployment/redeployment-hello-world-app-ref/pom.xml
+++ b/tests/mem-leaks/redeployment/redeployment-hello-world-app-ref/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.memleaks.redeployment</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>redeployment-hello-world-app-ref</artifactId>
@@ -132,7 +132,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>helloworld-webapp</artifactId>
<type>war</type>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/tests/mem-leaks/redeployment/redeployment-leaking-test-app/pom.xml b/tests/mem-leaks/redeployment/redeployment-leaking-test-app/pom.xml
index 951b572..160429b 100644
--- a/tests/mem-leaks/redeployment/redeployment-leaking-test-app/pom.xml
+++ b/tests/mem-leaks/redeployment/redeployment-leaking-test-app/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.memleaks.redeployment</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>redeployment-leaking-test-app</artifactId>
diff --git a/tests/mem-leaks/redeployment/redeployment-no-jersey-app/pom.xml b/tests/mem-leaks/redeployment/redeployment-no-jersey-app/pom.xml
index f6f924b..13e518d 100644
--- a/tests/mem-leaks/redeployment/redeployment-no-jersey-app/pom.xml
+++ b/tests/mem-leaks/redeployment/redeployment-no-jersey-app/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.memleaks.redeployment</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>redeployment-no-jersey-app</artifactId>
@@ -123,9 +123,9 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tests/mem-leaks/redeployment/redeployment-threadlocals-app/pom.xml b/tests/mem-leaks/redeployment/redeployment-threadlocals-app/pom.xml
index 79188df..487b9fc 100644
--- a/tests/mem-leaks/redeployment/redeployment-threadlocals-app/pom.xml
+++ b/tests/mem-leaks/redeployment/redeployment-threadlocals-app/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.memleaks.redeployment</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>redeployment-threadlocals-app</artifactId>
@@ -104,9 +104,9 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${servlet4.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/tests/mem-leaks/test-cases/bean-param-leak/pom.xml b/tests/mem-leaks/test-cases/bean-param-leak/pom.xml
index 306ee22..123b79a 100644
--- a/tests/mem-leaks/test-cases/bean-param-leak/pom.xml
+++ b/tests/mem-leaks/test-cases/bean-param-leak/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.memleaks.testcases</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>bean-param-leak</artifactId>
diff --git a/tests/mem-leaks/test-cases/leaking-test-app/pom.xml b/tests/mem-leaks/test-cases/leaking-test-app/pom.xml
index 7b7f76d..3a972a4 100644
--- a/tests/mem-leaks/test-cases/leaking-test-app/pom.xml
+++ b/tests/mem-leaks/test-cases/leaking-test-app/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.memleaks.testcases</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>leaking-test-app</artifactId>
diff --git a/tests/mem-leaks/test-cases/pom.xml b/tests/mem-leaks/test-cases/pom.xml
index c7fce61..06d9a68 100644
--- a/tests/mem-leaks/test-cases/pom.xml
+++ b/tests/mem-leaks/test-cases/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.memleaks</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.tests.memleaks.testcases</groupId>
diff --git a/tests/mem-leaks/test-cases/shutdown-hook-leak-client/pom.xml b/tests/mem-leaks/test-cases/shutdown-hook-leak-client/pom.xml
index b554b06..a5d7505 100644
--- a/tests/mem-leaks/test-cases/shutdown-hook-leak-client/pom.xml
+++ b/tests/mem-leaks/test-cases/shutdown-hook-leak-client/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.memleaks.testcases</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>shutdown-hook-leak-client</artifactId>
diff --git a/tests/mem-leaks/test-cases/shutdown-hook-leak/pom.xml b/tests/mem-leaks/test-cases/shutdown-hook-leak/pom.xml
index 24386bc..999aa31 100644
--- a/tests/mem-leaks/test-cases/shutdown-hook-leak/pom.xml
+++ b/tests/mem-leaks/test-cases/shutdown-hook-leak/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.memleaks.testcases</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>shutdown-hook-leak</artifactId>
diff --git a/tests/osgi/functional/pom.xml b/tests/osgi/functional/pom.xml
index 2eb1ba4..d9f0ca4 100644
--- a/tests/osgi/functional/pom.xml
+++ b/tests/osgi/functional/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.osgi</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>jersey-tests-osgi-functional</artifactId>
@@ -96,8 +96,8 @@
<dependencies>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -184,7 +184,7 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-osgi</artifactId>
<scope>test</scope>
- <version>4.4.3</version>
+ <version>4.4.6</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -274,7 +274,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
+ <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>test</scope>
</dependency>
@@ -289,13 +289,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.el</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
+ <artifactId>jakarta.json</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -366,6 +366,23 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ <version>1.2.1</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/AbstractJsonOsgiIntegrationTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/AbstractJsonOsgiIntegrationTest.java
index 7d3a5dc..cf3f3e7 100644
--- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/AbstractJsonOsgiIntegrationTest.java
+++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/AbstractJsonOsgiIntegrationTest.java
@@ -50,7 +50,7 @@
protected abstract Feature getJsonProviderFeature();
@Test
- public void testJson() throws Exception {
+ public void testJson() {
final Feature jsonProviderFeature = getJsonProviderFeature();
final Client client = ClientBuilder.newClient();
final ResourceConfig resourceConfig = new ResourceConfig(JsonResource.class);
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/BeanValidationTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/BeanValidationTest.java
index fc8076a..2220127 100644
--- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/BeanValidationTest.java
+++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/BeanValidationTest.java
@@ -68,10 +68,11 @@
// validation
mavenBundle().groupId("org.glassfish.jersey.ext").artifactId("jersey-bean-validation").versionAsInProject(),
- mavenBundle().groupId("org.hibernate").artifactId("hibernate-validator").versionAsInProject(),
+ mavenBundle().groupId("org.hibernate.validator").artifactId("hibernate-validator").versionAsInProject(),
mavenBundle().groupId("org.jboss.logging").artifactId("jboss-logging").versionAsInProject(),
mavenBundle().groupId("com.fasterxml").artifactId("classmate").versionAsInProject(),
- mavenBundle().groupId("javax.el").artifactId("javax.el-api").versionAsInProject()
+ mavenBundle().groupId("org.glassfish").artifactId("jakarta.el").versionAsInProject()
+
));
options = Helper.addPaxExamMavenLocalRepositoryProperty(options);
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JaxRsRiBundleTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JaxRsRiBundleTest.java
index 34c9977..6ee0ec8 100644
--- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JaxRsRiBundleTest.java
+++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JaxRsRiBundleTest.java
@@ -54,7 +54,7 @@
@Configuration
public static Option[] configuration() {
- List<Option> options = Helper.getCommonOsgiOptions(false);
+ List<Option> options = Helper.getCommonOsgiOptions();
options.addAll(Helper.expandedList(
// vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonJettisonTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonJettisonTest.java
index afa5cc0..d173643 100644
--- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonJettisonTest.java
+++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonJettisonTest.java
@@ -27,6 +27,7 @@
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.Configuration;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.systemPackage;
/**
* @author Michal Gajdos
@@ -41,8 +42,12 @@
options.addAll(Helper.expandedList(
// jersey-json dependencies
mavenBundle().groupId("org.glassfish.jersey.media").artifactId("jersey-media-json-jettison").versionAsInProject(),
- mavenBundle().groupId("org.codehaus.jettison").artifactId("jettison").versionAsInProject()
- ));
+ mavenBundle().groupId("org.codehaus.jettison").artifactId("jettison").versionAsInProject(),
+ //SUN JAXB IMPL OSGI
+ mavenBundle().groupId("com.sun.xml.bind").artifactId("jaxb-osgi").versionAsInProject().versionAsInProject(),
+ systemPackage("com.sun.source.tree"),
+ systemPackage("com.sun.source.util")
+ ));
return Helper.asArray(options);
}
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java
index d8bc1f0..c0bf924 100644
--- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java
+++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java
@@ -23,7 +23,6 @@
import javax.ws.rs.core.FeatureContext;
import org.glassfish.jersey.moxy.json.MoxyJsonConfig;
-import org.glassfish.jersey.moxy.json.MoxyJsonFeature;
import org.glassfish.jersey.osgi.test.util.Helper;
import org.eclipse.persistence.jaxb.BeanValidationMode;
@@ -58,13 +57,13 @@
mavenBundle().groupId("org.eclipse.persistence").artifactId("org.eclipse.persistence.moxy").versionAsInProject(),
mavenBundle().groupId("org.eclipse.persistence").artifactId("org.eclipse.persistence.core").versionAsInProject(),
mavenBundle().groupId("org.eclipse.persistence").artifactId("org.eclipse.persistence.asm").versionAsInProject(),
- mavenBundle().groupId("org.glassfish").artifactId("javax.json").versionAsInProject(),
+ mavenBundle().groupId("org.glassfish").artifactId("jakarta.json").versionAsInProject(),
// validation
- mavenBundle().groupId("org.hibernate").artifactId("hibernate-validator").versionAsInProject(),
+ mavenBundle().groupId("org.hibernate.validator").artifactId("hibernate-validator").versionAsInProject(),
mavenBundle().groupId("org.jboss.logging").artifactId("jboss-logging").versionAsInProject(),
mavenBundle().groupId("com.fasterxml").artifactId("classmate").versionAsInProject(),
- mavenBundle().groupId("javax.el").artifactId("javax.el-api").versionAsInProject()
+ mavenBundle().groupId("org.glassfish").artifactId("jakarta.el").versionAsInProject()
));
return Helper.asArray(options);
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonProcessingTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonProcessingTest.java
index 6ab4c56..5369d8b 100644
--- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonProcessingTest.java
+++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonProcessingTest.java
@@ -69,7 +69,7 @@
// JSON processing.
mavenBundle().groupId("org.glassfish.jersey.media").artifactId("jersey-media-json-processing")
.versionAsInProject(),
- mavenBundle().groupId("org.glassfish").artifactId("javax.json").versionAsInProject(),
+ mavenBundle().groupId("org.glassfish").artifactId("jakarta.json").versionAsInProject(),
mavenBundle().groupId("org.glassfish").artifactId("jsonp-jaxrs").versionAsInProject()
));
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/PackageScanningTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/PackageScanningTest.java
index 48480b2..dbc299c 100644
--- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/PackageScanningTest.java
+++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/PackageScanningTest.java
@@ -67,7 +67,7 @@
mavenBundle().groupId("org.glassfish.jersey.media").artifactId("jersey-media-sse").versionAsInProject(),
- mavenBundle().groupId("javax.servlet").artifactId("javax.servlet-api").versionAsInProject(),
+ mavenBundle().groupId("jakarta.servlet").artifactId("jakarta.servlet-api").versionAsInProject(),
mavenBundle().groupId("org.glassfish.grizzly").artifactId("grizzly-http-servlet").versionAsInProject(),
mavenBundle().groupId("org.glassfish.jersey.containers").artifactId("jersey-container-servlet-core")
.versionAsInProject(),
@@ -75,7 +75,7 @@
.versionAsInProject(),
// MBR/MBW for JSON-P is on the classpath.
- mavenBundle().groupId("org.glassfish").artifactId("javax.json").versionAsInProject()
+ mavenBundle().groupId("org.glassfish").artifactId("jakarta.json").versionAsInProject()
));
options = Helper.addPaxExamMavenLocalRepositoryProperty(options);
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/WebResourceFactoryTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/WebResourceFactoryTest.java
index 3f99393..faef96f 100644
--- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/WebResourceFactoryTest.java
+++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/WebResourceFactoryTest.java
@@ -49,6 +49,7 @@
import org.ops4j.pax.exam.junit.PaxExam;
import static org.junit.Assert.assertEquals;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.systemPackage;
/**
* @author Michal Gajdos
@@ -69,7 +70,13 @@
options.addAll(Helper.expandedList(
// jersey-multipart dependencies
- mavenBundle().groupId("org.glassfish.jersey.ext").artifactId("jersey-proxy-client").versionAsInProject()));
+ mavenBundle().groupId("org.glassfish.jersey.ext").artifactId("jersey-proxy-client").versionAsInProject(),
+ //SUN JAXB IMPL OSGI
+ mavenBundle().groupId("com.sun.xml.bind").artifactId("jaxb-osgi").versionAsInProject().versionAsInProject(),
+ systemPackage("com.sun.source.tree"),
+ systemPackage("com.sun.source.util")
+
+ ));
options = Helper.addPaxExamMavenLocalRepositoryProperty(options);
return Helper.asArray(options);
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java
index 2f9a46e..76f6bab 100644
--- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java
+++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java
@@ -135,8 +135,8 @@
systemProperty(JAXRS_RUNTIME_DELEGATE_PROPERTY).value("org.glassfish.jersey.internal.RuntimeDelegateImpl"),
// javax.annotation has to go first!
- mavenBundle().groupId("javax.annotation").artifactId("javax.annotation-api").versionAsInProject(),
-
+ mavenBundle().groupId("jakarta.annotation").artifactId("jakarta.annotation-api").versionAsInProject(),
+ mavenBundle().groupId("jakarta.xml.bind").artifactId("jakarta.xml.bind-api").versionAsInProject(),
junitBundles(),
// HK2
@@ -144,7 +144,7 @@
mavenBundle().groupId("org.glassfish.hk2").artifactId("osgi-resource-locator").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2").artifactId("hk2-locator").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2").artifactId("hk2-utils").versionAsInProject(),
- mavenBundle().groupId("org.glassfish.hk2.external").artifactId("javax.inject").versionAsInProject(),
+ mavenBundle().groupId("org.glassfish.hk2.external").artifactId("jakarta.inject").versionAsInProject(),
mavenBundle().groupId("org.glassfish.hk2.external").artifactId("aopalliance-repackaged").versionAsInProject(),
mavenBundle().groupId("org.javassist").artifactId("javassist").versionAsInProject(),
@@ -165,7 +165,7 @@
if (includeJerseyJaxRsLibs) {
options.addAll(expandedList(
// 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(),
@@ -174,7 +174,9 @@
mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-client").versionAsInProject(),
// Jersey Injection provider
- mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").versionAsInProject()
+ mavenBundle().groupId("org.glassfish.jersey.inject").artifactId("jersey-hk2").versionAsInProject(),
+// Jaxb - api
+ mavenBundle().groupId("com.sun.activation").artifactId("jakarta.activation").versionAsInProject()
));
}
diff --git a/tests/osgi/pom.xml b/tests/osgi/pom.xml
index e55fc8a..622bb33 100644
--- a/tests/osgi/pom.xml
+++ b/tests/osgi/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.tests.osgi</groupId>
diff --git a/tests/performance/benchmarks/pom.xml b/tests/performance/benchmarks/pom.xml
index 40314a0..a865a50 100644
--- a/tests/performance/benchmarks/pom.xml
+++ b/tests/performance/benchmarks/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>performance-test-benchmarks</artifactId>
diff --git a/tests/performance/pom.xml b/tests/performance/pom.xml
index 6434cf2..0178047 100644
--- a/tests/performance/pom.xml
+++ b/tests/performance/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.tests.performance</groupId>
diff --git a/tests/performance/runners/jersey-grizzly-runner/pom.xml b/tests/performance/runners/jersey-grizzly-runner/pom.xml
index 4718865..7994539 100644
--- a/tests/performance/runners/jersey-grizzly-runner/pom.xml
+++ b/tests/performance/runners/jersey-grizzly-runner/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance.runners</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
diff --git a/tests/performance/runners/pom.xml b/tests/performance/runners/pom.xml
index d0dc4d0..a9133da 100644
--- a/tests/performance/runners/pom.xml
+++ b/tests/performance/runners/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.tests.performance.runners</groupId>
diff --git a/tests/performance/test-cases/assemblies/pom.xml b/tests/performance/test-cases/assemblies/pom.xml
index cdd2c46..9dad3d7 100644
--- a/tests/performance/test-cases/assemblies/pom.xml
+++ b/tests/performance/test-cases/assemblies/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance.testcases</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>assemblies</artifactId>
diff --git a/tests/performance/test-cases/filter-dynamic/pom.xml b/tests/performance/test-cases/filter-dynamic/pom.xml
index 43208e4..347ff70 100644
--- a/tests/performance/test-cases/filter-dynamic/pom.xml
+++ b/tests/performance/test-cases/filter-dynamic/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance.testcases</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>filter-dynamic</artifactId>
@@ -38,8 +38,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>
diff --git a/tests/performance/test-cases/filter-global/pom.xml b/tests/performance/test-cases/filter-global/pom.xml
index 21c00ea..3af361f 100644
--- a/tests/performance/test-cases/filter-global/pom.xml
+++ b/tests/performance/test-cases/filter-global/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance.testcases</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>filter-global</artifactId>
@@ -38,8 +38,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>
diff --git a/tests/performance/test-cases/filter-name/pom.xml b/tests/performance/test-cases/filter-name/pom.xml
index 227739a..0e975be 100644
--- a/tests/performance/test-cases/filter-name/pom.xml
+++ b/tests/performance/test-cases/filter-name/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance.testcases</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>filter-name</artifactId>
@@ -38,8 +38,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>
diff --git a/tests/performance/test-cases/interceptor-dynamic/pom.xml b/tests/performance/test-cases/interceptor-dynamic/pom.xml
index e962e03..b626fae 100644
--- a/tests/performance/test-cases/interceptor-dynamic/pom.xml
+++ b/tests/performance/test-cases/interceptor-dynamic/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance.testcases</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>interceptor-dynamic</artifactId>
@@ -38,8 +38,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>
diff --git a/tests/performance/test-cases/interceptor-global/pom.xml b/tests/performance/test-cases/interceptor-global/pom.xml
index 264dd02..e2f34bf 100644
--- a/tests/performance/test-cases/interceptor-global/pom.xml
+++ b/tests/performance/test-cases/interceptor-global/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance.testcases</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>interceptor-global</artifactId>
@@ -38,8 +38,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>
diff --git a/tests/performance/test-cases/interceptor-name/pom.xml b/tests/performance/test-cases/interceptor-name/pom.xml
index b08fecf..1231aa8 100644
--- a/tests/performance/test-cases/interceptor-name/pom.xml
+++ b/tests/performance/test-cases/interceptor-name/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance.testcases</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>interceptor-name</artifactId>
@@ -38,8 +38,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>
diff --git a/tests/performance/test-cases/mbw-custom-provider/pom.xml b/tests/performance/test-cases/mbw-custom-provider/pom.xml
index 2077e42..5eba020 100644
--- a/tests/performance/test-cases/mbw-custom-provider/pom.xml
+++ b/tests/performance/test-cases/mbw-custom-provider/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance.testcases</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>custom-provider</artifactId>
@@ -37,8 +37,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>
diff --git a/tests/performance/test-cases/mbw-json-jackson/pom.xml b/tests/performance/test-cases/mbw-json-jackson/pom.xml
index 9121b28..4517fdf 100644
--- a/tests/performance/test-cases/mbw-json-jackson/pom.xml
+++ b/tests/performance/test-cases/mbw-json-jackson/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance.testcases</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>json-jackson</artifactId>
@@ -37,8 +37,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>
diff --git a/tests/performance/test-cases/mbw-json-moxy/pom.xml b/tests/performance/test-cases/mbw-json-moxy/pom.xml
index 0dd8244..0affa22 100644
--- a/tests/performance/test-cases/mbw-json-moxy/pom.xml
+++ b/tests/performance/test-cases/mbw-json-moxy/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance.testcases</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>json-moxy</artifactId>
diff --git a/tests/performance/test-cases/mbw-kryo/pom.xml b/tests/performance/test-cases/mbw-kryo/pom.xml
index 87d89c0..f22de56 100644
--- a/tests/performance/test-cases/mbw-kryo/pom.xml
+++ b/tests/performance/test-cases/mbw-kryo/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance.testcases</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>mbw-kryo</artifactId>
diff --git a/tests/performance/test-cases/mbw-text-plain/pom.xml b/tests/performance/test-cases/mbw-text-plain/pom.xml
index e97d4c7..9ea7147 100644
--- a/tests/performance/test-cases/mbw-text-plain/pom.xml
+++ b/tests/performance/test-cases/mbw-text-plain/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance.testcases</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>text-plain</artifactId>
@@ -37,8 +37,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>
diff --git a/tests/performance/test-cases/mbw-xml-jaxb/pom.xml b/tests/performance/test-cases/mbw-xml-jaxb/pom.xml
index 9644471..fbdb9cd 100644
--- a/tests/performance/test-cases/mbw-xml-jaxb/pom.xml
+++ b/tests/performance/test-cases/mbw-xml-jaxb/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance.testcases</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>xml-jaxb</artifactId>
@@ -37,8 +37,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>
diff --git a/tests/performance/test-cases/mbw-xml-moxy/pom.xml b/tests/performance/test-cases/mbw-xml-moxy/pom.xml
index 2b40b84..921d37f 100644
--- a/tests/performance/test-cases/mbw-xml-moxy/pom.xml
+++ b/tests/performance/test-cases/mbw-xml-moxy/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance.testcases</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>xml-moxy</artifactId>
diff --git a/tests/performance/test-cases/param-srl/pom.xml b/tests/performance/test-cases/param-srl/pom.xml
index 2baddfd..650a3eb 100644
--- a/tests/performance/test-cases/param-srl/pom.xml
+++ b/tests/performance/test-cases/param-srl/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance.testcases</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>param-srl</artifactId>
@@ -38,8 +38,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>
diff --git a/tests/performance/test-cases/pom.xml b/tests/performance/test-cases/pom.xml
index 6e29029..4b0852f 100644
--- a/tests/performance/test-cases/pom.xml
+++ b/tests/performance/test-cases/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.tests.performance.testcases</groupId>
diff --git a/tests/performance/test-cases/proxy-injection/pom.xml b/tests/performance/test-cases/proxy-injection/pom.xml
index 2a64052..89c9f15 100644
--- a/tests/performance/test-cases/proxy-injection/pom.xml
+++ b/tests/performance/test-cases/proxy-injection/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance.testcases</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>proxy-injection</artifactId>
@@ -38,8 +38,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>
diff --git a/tests/performance/tools/pom.xml b/tests/performance/tools/pom.xml
index 9ea3a3a..cce515f 100644
--- a/tests/performance/tools/pom.xml
+++ b/tests/performance/tools/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.tests.performance.tools</groupId>
<artifactId>performance-test-tools</artifactId>
diff --git a/tests/pom.xml b/tests/pom.xml
index 9d6e92a..589b811 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.jersey.tests</groupId>
@@ -92,7 +92,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>pre-release</id>
<build>
<plugins>
<plugin>
diff --git a/tests/stress/pom.xml b/tests/stress/pom.xml
index e9c359c..c9cd360 100644
--- a/tests/stress/pom.xml
+++ b/tests/stress/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.jersey.tests</groupId>
<artifactId>project</artifactId>
- <version>2.28-SNAPSHOT</version>
+ <version>2.29-SNAPSHOT</version>
</parent>
<artifactId>stress</artifactId>
diff --git a/tools/perftest-agent/pom.xml b/tools/perftest-agent/pom.xml
index f56c556..eddc447 100644
--- a/tools/perftest-agent/pom.xml
+++ b/tools/perftest-agent/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.14.0-GA</version>
+ <version>3.22.0-GA</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
