Updated dependencies for 3.0.5 Signed-off-by: jansupol <jan.supol@oracle.com>
diff --git a/containers/glassfish/jersey-gf-ejb/pom.xml b/containers/glassfish/jersey-gf-ejb/pom.xml index b261c00..ecfd83b 100644 --- a/containers/glassfish/jersey-gf-ejb/pom.xml +++ b/containers/glassfish/jersey-gf-ejb/pom.xml
@@ -61,21 +61,6 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.glassfish.main.ejb</groupId> - <artifactId>ejb-container</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.glassfish.main.common</groupId> - <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> @@ -127,4 +112,58 @@ </plugins> </build> + <profiles> + <profile> + <id>jdk8</id> + <activation> + <jdk>1.8</jdk> + </activation> + <dependencies> + <dependency> + <groupId>org.glassfish.main.ejb</groupId> + <artifactId>ejb-container</artifactId> + <version>6.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.glassfish.main.common</groupId> + <artifactId>container-common</artifactId> + <version>6.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.glassfish.main.hk2</groupId> + <artifactId>hk2-config</artifactId> + <version>6.0.0</version> + <scope>provided</scope> + <optional>true</optional> + </dependency> + </dependencies> + </profile> + <profile> + <id>jdk11</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>org.glassfish.main.ejb</groupId> + <artifactId>ejb-container</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.glassfish.main.common</groupId> + <artifactId>container-common</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.glassfish.main.hk2</groupId> + <artifactId>hk2-config</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + </dependencies> + </profile> + </profiles> + </project>
diff --git a/etc/jenkins/jenkins_build.sh b/etc/jenkins/jenkins_build.sh index dbebc86..4e96c4e 100644 --- a/etc/jenkins/jenkins_build.sh +++ b/etc/jenkins/jenkins_build.sh
@@ -2,5 +2,5 @@ export DEBUG=true -mvn -V -U -B -e clean install glassfish-copyright:check -Dcopyright.quiet=false +mvn -V -U -B -e -Pstaging clean install glassfish-copyright:check -Dcopyright.quiet=false
diff --git a/ext/microprofile/mp-rest-client/pom.xml b/ext/microprofile/mp-rest-client/pom.xml index 4a60f32..cc11d33 100644 --- a/ext/microprofile/mp-rest-client/pom.xml +++ b/ext/microprofile/mp-rest-client/pom.xml
@@ -72,7 +72,6 @@ <dependency> <groupId>jakarta.json</groupId> <artifactId>jakarta.json-api</artifactId> - <version>${jsonp.ri.version}</version> </dependency> <dependency> <groupId>jakarta.enterprise</groupId> @@ -80,8 +79,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.glassfish</groupId> - <artifactId>jsonp-jaxrs</artifactId> + <groupId>org.eclipse.parsson</groupId> + <artifactId>parsson-media</artifactId> </dependency> <dependency> <groupId>org.reactivestreams</groupId>
diff --git a/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientModel.java b/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientModel.java index 94c5fa4..8219865 100644 --- a/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientModel.java +++ b/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientModel.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2019 Payara Foundation and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -22,13 +22,7 @@ import java.util.HashMap; import java.util.Map; -import jakarta.enterprise.inject.spi.BeanManager; import jakarta.ws.rs.client.WebTarget; -import jakarta.ws.rs.ext.ParamConverterProvider; - -import org.eclipse.microprofile.rest.client.ext.AsyncInvocationInterceptorFactory; -import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper; -import org.glassfish.jersey.internal.inject.InjectionManager; /** * Model of the rest client interface.
diff --git a/media/json-binding/pom.xml b/media/json-binding/pom.xml index f5395b1..3ae3b87 100644 --- a/media/json-binding/pom.xml +++ b/media/json-binding/pom.xml
@@ -78,9 +78,8 @@ <artifactId>jakarta.json.bind-api</artifactId> </dependency> <dependency> - <groupId>org.glassfish</groupId> - <artifactId>jakarta.json</artifactId> - <classifier>module</classifier> + <groupId>org.eclipse.parsson</groupId> + <artifactId>parsson</artifactId> </dependency> <dependency>
diff --git a/media/json-processing/pom.xml b/media/json-processing/pom.xml index 10dee3a..373b174 100644 --- a/media/json-processing/pom.xml +++ b/media/json-processing/pom.xml
@@ -57,8 +57,7 @@ <!-- TODO: change to ${range;[==,+);${jsonp.api.version}} once the version is final--> <Import-Package> ${jakarta.annotation.osgi.version}, - jakarta.json.*;version="[0,3)", - org.glassfish.json.*;version="[0,3)", + jakarta.json.*;version="[2,3)", * </Import-Package> </instructions> @@ -81,13 +80,12 @@ <artifactId>jakarta.json-api</artifactId> </dependency> <dependency> - <groupId>org.glassfish</groupId> - <artifactId>jakarta.json</artifactId> - <classifier>module</classifier> + <groupId>org.eclipse.parsson</groupId> + <artifactId>parsson</artifactId> </dependency> <dependency> - <groupId>org.glassfish</groupId> - <artifactId>jsonp-jaxrs</artifactId> + <groupId>org.eclipse.parsson</groupId> + <artifactId>parsson-media</artifactId> </dependency> <dependency>
diff --git a/media/json-processing/src/main/java/org/glassfish/jersey/jsonp/JsonProcessingFeature.java b/media/json-processing/src/main/java/org/glassfish/jersey/jsonp/JsonProcessingFeature.java index cc1c913..aa3e96c 100644 --- a/media/json-processing/src/main/java/org/glassfish/jersey/jsonp/JsonProcessingFeature.java +++ b/media/json-processing/src/main/java/org/glassfish/jersey/jsonp/JsonProcessingFeature.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2022 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 @@ -20,10 +20,10 @@ import jakarta.ws.rs.core.Feature; import jakarta.ws.rs.core.FeatureContext; -import org.glassfish.jersey.CommonProperties; +import org.eclipse.parsson.media.JsonValueBodyReader; +import org.eclipse.parsson.media.JsonValueBodyWriter; -import org.glassfish.json.jaxrs.JsonValueBodyReader; -import org.glassfish.json.jaxrs.JsonValueBodyWriter; +import org.glassfish.jersey.CommonProperties; /** * {@link Feature} used to register JSON-P providers.
diff --git a/media/moxy/pom.xml b/media/moxy/pom.xml index 2a36b2c..f590550 100644 --- a/media/moxy/pom.xml +++ b/media/moxy/pom.xml
@@ -101,9 +101,8 @@ <artifactId>jakarta.json.bind-api</artifactId> </dependency> <dependency> - <groupId>org.glassfish</groupId> - <artifactId>jakarta.json</artifactId> - <classifier>module</classifier> + <groupId>org.eclipse.parsson</groupId> + <artifactId>parsson</artifactId> </dependency> <dependency>
diff --git a/pom.xml b/pom.xml index 1d8f553..a2d73bc 100644 --- a/pom.xml +++ b/pom.xml
@@ -1841,14 +1841,13 @@ <version>${jakarta.jsonp.version}</version> </dependency> <dependency> - <groupId>org.glassfish</groupId> - <artifactId>jakarta.json</artifactId> - <classifier>module</classifier> + <groupId>org.eclipse.parsson</groupId> + <artifactId>parsson</artifactId> <version>${jsonp.ri.version}</version> </dependency> <dependency> - <groupId>org.glassfish</groupId> - <artifactId>jsonp-jaxrs</artifactId> + <groupId>org.eclipse.parsson</groupId> + <artifactId>parsson-media</artifactId> <version>${jsonp.jaxrs.version}</version> </dependency> @@ -2122,11 +2121,10 @@ <xmlunit.version>1.6</xmlunit.version> <hk2.osgi.version>org.glassfish.hk2.*;version="[2.5,4)"</hk2.osgi.version> <hk2.jvnet.osgi.version>org.jvnet.hk2.*;version="[2.5,4)"</hk2.jvnet.osgi.version> - <hk2.config.version>6.0.0</hk2.config.version> <httpclient.version>4.5.13</httpclient.version> <httpclient5.version>5.1.2</httpclient5.version> <jackson.version>2.13.3</jackson.version> - <javassist.version>3.25.0-GA</javassist.version> + <javassist.version>3.28.0-GA</javassist.version> <jboss.logging.version>3.3.0.Final</jboss.logging.version> <jersey1.version>1.19.3</jersey1.version> <jersey1.last.final.version>${jersey1.version}</jersey1.last.final.version> @@ -2169,16 +2167,17 @@ <graalvm.version>20.3.2</graalvm.version> <!-- do not need CQs (below this line till the end of version properties)--> - <gf.impl.version>6.0.0</gf.impl.version> + <gf.impl.version>6.2.5</gf.impl.version> + <hk2.config.version>6.2.5</hk2.config.version> <!-- Jakartified --> <cdi.api.version>3.0.0</cdi.api.version> - <ejb.version>4.0.0</ejb.version> + <ejb.version>4.0.1</ejb.version> <grizzly2.version>3.0.1</grizzly2.version> <grizzly.npn.version>2.0.0</grizzly.npn.version> - <hk2.version>3.0.2</hk2.version> + <hk2.version>3.0.3</hk2.version> <jsp.version>3.0.0</jsp.version> <jstl.version>2.0.0</jstl.version> - <jta.api.version>2.0.0</jta.api.version> + <jta.api.version>2.0.1</jta.api.version> <servlet5.version>5.0.0</servlet5.version> <istack.commons.runtime.version>4.0.0</istack.commons.runtime.version> <jakarta.activation-api.version>2.0.1</jakarta.activation-api.version> @@ -2188,22 +2187,22 @@ <jakarta.annotation.osgi.version>jakarta.annotation.*;version="[2.0,3)"</jakarta.annotation.osgi.version> <jakarta.annotation.version>2.0.0</jakarta.annotation.version> <jakarta.inject.version>2.0.1</jakarta.inject.version> - <jakarta.interceptor.version>2.0.0</jakarta.interceptor.version> - <jakarta.jsonp.version>2.0.1</jakarta.jsonp.version> + <jakarta.interceptor.version>2.0.1</jakarta.interceptor.version> + <jakarta.jsonp.version>2.0.2</jakarta.jsonp.version> <jakarta.persistence.version>3.0.0</jakarta.persistence.version> <jakarta.validation.api.version>3.0.0</jakarta.validation.api.version> <!--Can't be updated to 3.0.1 /OSGi incompatibility with JDK 1.8 --> <jakarta.jaxb.api.version>3.0.1</jakarta.jaxb.api.version> <jaxb.ri.version>3.0.2</jaxb.ri.version> <jaxrs.api.spec.version>3.0</jaxrs.api.spec.version> <jaxrs.api.impl.version>3.0.0</jaxrs.api.impl.version> - <jetty.version>11.0.7</jetty.version> - <jetty.plugin.version>11.0.7</jetty.plugin.version> + <jetty.version>11.0.9</jetty.version> + <jetty.plugin.version>11.0.9</jetty.plugin.version> <jetty.servlet.api.25.version>6.1.14</jetty.servlet.api.25.version> <jsonb.api.version>2.0.0</jsonb.api.version> - <jsonp.ri.version>2.0.1</jsonp.ri.version> - <jsonp.jaxrs.version>2.0.1</jsonp.jaxrs.version> + <jsonp.ri.version>1.0.0</jsonp.ri.version> + <jsonp.jaxrs.version>1.0.0</jsonp.jaxrs.version> <moxy.version>3.0.2</moxy.version> - <yasson.version>2.0.3</yasson.version> + <yasson.version>2.0.4</yasson.version> <!-- END of Jakartified --> <javax.annotation.version>1.3.2</javax.annotation.version> <!--Deprecated, used only for @generated annotation in perf tests -->
diff --git a/tests/osgi/functional/pom.xml b/tests/osgi/functional/pom.xml index 23317ba..b898c4e 100644 --- a/tests/osgi/functional/pom.xml +++ b/tests/osgi/functional/pom.xml
@@ -309,14 +309,13 @@ <artifactId>jakarta.json-api</artifactId> </dependency> <dependency> - <groupId>org.glassfish</groupId> - <artifactId>jakarta.json</artifactId> - <classifier>module</classifier> + <groupId>org.eclipse.parsson</groupId> + <artifactId>parsson</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.glassfish</groupId> - <artifactId>jsonp-jaxrs</artifactId> + <groupId>org.eclipse.parsson</groupId> + <artifactId>parsson-media</artifactId> <scope>test</scope> </dependency> <dependency>
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 ca3a7a0..4d4ca72 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
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2022 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 @@ -69,8 +69,9 @@ // JSON processing. mavenBundle().groupId("org.glassfish.jersey.media").artifactId("jersey-media-json-processing") .versionAsInProject(), - mavenBundle().groupId("org.glassfish").artifactId("jakarta.json").versionAsInProject(), - mavenBundle().groupId("org.glassfish").artifactId("jsonp-jaxrs").versionAsInProject() + mavenBundle().groupId("jakarta.json").artifactId("jakarta.json-api").versionAsInProject(), + mavenBundle().groupId("org.eclipse.parsson").artifactId("parsson").versionAsInProject(), + mavenBundle().groupId("org.eclipse.parsson").artifactId("parsson-media").versionAsInProject() )); options = Helper.addPaxExamMavenLocalRepositoryProperty(options);