2.x versions update Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/NOTICE.md b/NOTICE.md index e94c5ea..6a4c169 100644 --- a/NOTICE.md +++ b/NOTICE.md
@@ -70,7 +70,7 @@ * Project: http://www.javassist.org/ * Copyright (C) 1999- Shigeru Chiba. All Rights Reserved. -Jackson JAX-RS Providers Version 2.16.2 +Jackson JAX-RS Providers Version 2.17.0 * License: Apache License, 2.0 * Project: https://github.com/FasterXML/jackson-jaxrs-providers * Copyright: (c) 2009-2024 FasterXML, LLC. All rights reserved unless otherwise indicated.
diff --git a/archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml b/archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml index 6bcec71..d1073c9 100644 --- a/archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml
@@ -118,7 +118,7 @@ <jersey.version>${project.version}</jersey.version> <jetty.version>9.4.54.v20240208</jetty.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <surefire.mvn.plugin.version>3.1.2</surefire.mvn.plugin.version> + <surefire.mvn.plugin.version>3.2.5</surefire.mvn.plugin.version> <war.mvn.plugin.version>3.4.0</war.mvn.plugin.version> </properties> </project>
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 5bd5c9b..779f080 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
@@ -85,6 +85,6 @@ <jersey.version>${project.version}</jersey.version> <junit-jupiter.version>5.10.2</junit-jupiter.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <surefire.mvn.plugin.version>3.1.2</surefire.mvn.plugin.version> + <surefire.mvn.plugin.version>3.2.5</surefire.mvn.plugin.version> </properties> </project>
diff --git a/bom/pom.xml b/bom/pom.xml index 289bad1..b5213f8 100644 --- a/bom/pom.xml +++ b/bom/pom.xml
@@ -24,7 +24,7 @@ <parent> <groupId>org.eclipse.ee4j</groupId> <artifactId>project</artifactId> - <version>1.0.8</version> + <version>1.0.9</version> <relativePath/> </parent>
diff --git a/core-client/src/test/java/org/glassfish/jersey/client/ClientRequestTest.java b/core-client/src/test/java/org/glassfish/jersey/client/ClientRequestTest.java index 58f689c..d813173 100644 --- a/core-client/src/test/java/org/glassfish/jersey/client/ClientRequestTest.java +++ b/core-client/src/test/java/org/glassfish/jersey/client/ClientRequestTest.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2024 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 @@ -46,8 +46,8 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.same; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.same; /** * {@code ClientRequest} unit tests.
diff --git a/core-common/pom.xml b/core-common/pom.xml index 357b2e9..4410939 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml
@@ -81,6 +81,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> + <version>${compiler.common.mvn.plugin.version}</version> <inherited>false</inherited> <configuration> <source>${java.version}</source> @@ -412,6 +413,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> + <version>${compiler.common.mvn.plugin.version}</version> <executions> <execution> <id>default-compile</id>
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 abd4d54..bfaeec9 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
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2024 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 @@ -32,8 +32,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when;
diff --git a/examples/NOTICE.md b/examples/NOTICE.md index 4dff288..3e1e8f8 100644 --- a/examples/NOTICE.md +++ b/examples/NOTICE.md
@@ -66,7 +66,7 @@ * Project: http://www.javassist.org/ * Copyright (C) 1999- Shigeru Chiba. All Rights Reserved. -Jackson JAX-RS Providers Version 2.16.2 +Jackson JAX-RS Providers Version 2.17.0 * License: Apache License, 2.0 * Project: https://github.com/FasterXML/jackson-jaxrs-providers * Copyright: (c) 2009-2023 FasterXML, LLC. All rights reserved unless otherwise indicated.
diff --git a/media/json-jackson/src/main/java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/json/PackageVersion.java b/media/json-jackson/src/main/java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/json/PackageVersion.java index 347b54b..88e3168 100644 --- a/media/json-jackson/src/main/java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/json/PackageVersion.java +++ b/media/json-jackson/src/main/java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/json/PackageVersion.java
@@ -11,7 +11,7 @@ */ public final class PackageVersion implements Versioned { public final static Version VERSION = VersionUtil.parseVersion( - "2.16.2", "com.fasterxml.jackson.jaxrs", "jackson-jaxrs-json-provider"); + "2.17.0", "com.fasterxml.jackson.jaxrs", "jackson-jaxrs-json-provider"); @Override public Version version() {
diff --git a/media/json-jackson/src/main/resources/META-INF/NOTICE.markdown b/media/json-jackson/src/main/resources/META-INF/NOTICE.markdown index 72bc99a..6034c04 100644 --- a/media/json-jackson/src/main/resources/META-INF/NOTICE.markdown +++ b/media/json-jackson/src/main/resources/META-INF/NOTICE.markdown
@@ -31,7 +31,7 @@ ## Third-party Content -Jackson JAX-RS Providers version 2.16.2 +Jackson JAX-RS Providers version 2.17.0 * License: Apache License, 2.0 * Project: https://github.com/FasterXML/jackson-jaxrs-providers * Copyright: (c) 2009-2023 FasterXML, LLC. All rights reserved unless otherwise indicated.
diff --git a/pom.xml b/pom.xml index d0744b0..57d587c 100644 --- a/pom.xml +++ b/pom.xml
@@ -23,7 +23,7 @@ <parent> <groupId>org.eclipse.ee4j</groupId> <artifactId>project</artifactId> - <version>1.0.8</version> + <version>1.0.9</version> </parent> <groupId>org.glassfish.jersey</groupId> @@ -783,7 +783,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.12</version> + <version>${mvn.ant.version}</version> </dependency> </dependencies> </plugin> @@ -984,7 +984,6 @@ <properties> <release.tests.args>-Dskip.tests=true</release.tests.args> <skip.tests>true</skip.tests> - <skip.e2e>true</skip.e2e> </properties> </profile> <profile> @@ -1168,7 +1167,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>3.4.5</version> + <version>${project.info.reports.mvn.plugin.version}</version> <reportSets> <reportSet> <reports> @@ -1328,37 +1327,6 @@ </build> </profile> <profile> - <!-- - Profile is aimed to run the build on travis - due to travis limitations for output (max 4MB) this profile is used along with grep which reduces - the output. - However some e2e tests produce output which is not grepped (thus is not visible) and run longer than - 10 minutes which results in the whole build is being murdered by Travis because of death suspection - - the whole build is run as clean install but excludes several e2e tests because of the not grepped output - --> - <id>travis_e2e_skip</id> - <properties> - <skip.e2e>true</skip.e2e> - </properties> - </profile> - <profile> - <!-- - 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 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 - --> - <id>travis_e2e</id> - <properties> - <skip.e2e>false</skip.e2e> - <skip.tests>true</skip.tests> - </properties> - </profile> - <profile> <id>license_check</id> <pluginRepositories> <pluginRepository> @@ -1381,7 +1349,7 @@ <plugin> <groupId>org.eclipse.dash</groupId> <artifactId>license-tool-plugin</artifactId> - <version>1.0.2</version> + <version>1.1.0</version> <executions> <execution> <id>license-check</id> @@ -2143,7 +2111,6 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <release.tests.args>-Dmaven.test.skip=false</release.tests.args> <release.preparationGoals>clean install</release.preparationGoals> - <skip.e2e>false</skip.e2e> <skip.tests>false</skip.tests> <xdk.absolute.path /> <surefire.security.argline /> @@ -2154,37 +2121,44 @@ <!-- Versions of Maven plugins --> <antrun.mvn.plugin.version>3.1.0</antrun.mvn.plugin.version> - <assembly.mvn.plugin.version>3.6.0</assembly.mvn.plugin.version> + <mvn.ant.version>1.10.14</mvn.ant.version> + <assembly.mvn.plugin.version>3.7.1</assembly.mvn.plugin.version> <clean.mvn.plugin.version>3.3.2</clean.mvn.plugin.version> - <enforcer.mvn.plugin.version>3.3.0</enforcer.mvn.plugin.version> - <exec.mvn.plugin.version>3.1.0</exec.mvn.plugin.version> - <buildhelper.mvn.plugin.version>3.4.0</buildhelper.mvn.plugin.version> + <enforcer.mvn.plugin.version>3.4.1</enforcer.mvn.plugin.version> + <exec.mvn.plugin.version>3.2.0</exec.mvn.plugin.version> + <buildhelper.mvn.plugin.version>3.5.0</buildhelper.mvn.plugin.version> <buildnumber.mvn.plugin.version>3.2.0</buildnumber.mvn.plugin.version> - <checkstyle.mvn.plugin.version>3.3.0</checkstyle.mvn.plugin.version> - <checkstyle.version>10.9.3</checkstyle.version> - <compiler.mvn.plugin.version>3.9.0</compiler.mvn.plugin.version> - <dependency.mvn.plugin.version>3.6.0</dependency.mvn.plugin.version> - <deploy.mvn.plugin.version>3.1.1</deploy.mvn.plugin.version> + <checkstyle.mvn.plugin.version>3.3.1</checkstyle.mvn.plugin.version> + <checkstyle.version>10.16.0</checkstyle.version> + <compiler.mvn.plugin.version>3.13.0</compiler.mvn.plugin.version> + <!-- + Special version of the compiler plugin just for the jersey-common. All versions above + generate too much for OSGi manifest.mf imports (awt etc). The version 3.11.0 however + introduces the fix for the excludeTests issue. Which makes it preferable for the whole project + but the jersey-common module which has to have the separate version for OSGi reasons. + --> + <compiler.common.mvn.plugin.version>3.9.0</compiler.common.mvn.plugin.version> + <dependency.mvn.plugin.version>3.6.1</dependency.mvn.plugin.version> + <deploy.mvn.plugin.version>3.1.2</deploy.mvn.plugin.version> <ear.mvn.plugin.version>3.3.0</ear.mvn.plugin.version> - <failsafe.mvn.plugin.version>3.1.2</failsafe.mvn.plugin.version> + <failsafe.mvn.plugin.version>3.2.5</failsafe.mvn.plugin.version> <felix.mvn.plugin.version>5.1.9</felix.mvn.plugin.version> <findbugs.mvn.plugin.version>3.0.5</findbugs.mvn.plugin.version> <gfembedded.mvn.plugin.version>5.1</gfembedded.mvn.plugin.version> - <install.mvn.plugin.version>3.1.1</install.mvn.plugin.version> + <install.mvn.plugin.version>3.1.2</install.mvn.plugin.version> <istack.mvn.plugin.version>4.2.0</istack.mvn.plugin.version> - <jar.mvn.plugin.version>3.3.0</jar.mvn.plugin.version> - <javadoc.mvn.plugin.version>3.5.0</javadoc.mvn.plugin.version> - <jxr.mvn.plugin.version>3.3.0</jxr.mvn.plugin.version> + <jar.mvn.plugin.version>3.4.1</jar.mvn.plugin.version> + <javadoc.mvn.plugin.version>3.6.3</javadoc.mvn.plugin.version> + <jxr.mvn.plugin.version>3.3.2</jxr.mvn.plugin.version> <paxexam.mvn.plugin.version>1.2.4</paxexam.mvn.plugin.version> - <proguard.mvn.plugin.version>2.6.0</proguard.mvn.plugin.version> + <project.info.reports.mvn.plugin.version>3.5.0</project.info.reports.mvn.plugin.version> <resources.mvn.plugin.version>3.3.1</resources.mvn.plugin.version> - <shade.mvn.plugin.version>3.4.1</shade.mvn.plugin.version> - <site.mvn.plugin.version>3.9.1</site.mvn.plugin.version> - <source.mvn.plugin.version>3.3.0</source.mvn.plugin.version> - <surefire.mvn.plugin.version>3.1.2</surefire.mvn.plugin.version> + <shade.mvn.plugin.version>3.5.3</shade.mvn.plugin.version> + <source.mvn.plugin.version>3.3.1</source.mvn.plugin.version> + <surefire.mvn.plugin.version>3.2.5</surefire.mvn.plugin.version> <war.mvn.plugin.version>3.4.0</war.mvn.plugin.version> <wiremock.mvn.plugin.version>2.11.0</wiremock.mvn.plugin.version> - <xml.mvn.plugin.version>1.0.2</xml.mvn.plugin.version> + <xml.mvn.plugin.version>1.1.0</xml.mvn.plugin.version> <!-- END of Versions of Maven plugins --> <!-- Dependency versions --> @@ -2195,27 +2169,27 @@ <!-- see core-server/src/main/java/jersey/repackaged/asm/.. --> <asm.version>9.7</asm.version> <!--required for spring (ext) modules integration --> - <aspectj.weaver.version>1.9.21.1</aspectj.weaver.version> + <aspectj.weaver.version>1.9.22</aspectj.weaver.version> <!-- <bnd.plugin.version>2.3.6</bnd.plugin.version>--> - <commons.io.version>2.15.1</commons.io.version> + <commons.io.version>2.16.1</commons.io.version> <!-- <commons-lang3.version>3.3.2</commons-lang3.version>--> - <commons.logging.version>1.3.0</commons.logging.version> + <commons.logging.version>1.3.1</commons.logging.version> <fasterxml.classmate.version>1.7.0</fasterxml.classmate.version> <felix.eventadmin.version>1.6.4</felix.eventadmin.version> <felix.framework.security.version>2.8.4</felix.framework.security.version> <felix.framework.version>7.0.5</felix.framework.version> <findbugs.glassfish.version>1.7</findbugs.glassfish.version> <freemarker.version>2.3.32</freemarker.version> - <gae.version>2.0.25</gae.version> - <groovy.version>4.0.19</groovy.version> + <gae.version>2.0.26</gae.version> + <groovy.version>4.0.21</groovy.version> <gson.version>2.10.1</gson.version> - <guava.version>31.1-jre</guava.version> + <guava.version>33.1.0-jre</guava.version> <hamcrest.version>2.2</hamcrest.version> <helidon.version>1.4.14</helidon.version> - <xmlunit.version>2.9.1</xmlunit.version> + <xmlunit.version>2.10.0</xmlunit.version> <httpclient.version>4.5.14</httpclient.version> <httpclient5.version>5.3.1</httpclient5.version> - <jackson.version>2.16.2</jackson.version> + <jackson.version>2.17.0</jackson.version> <jackson1.version>1.9.13</jackson1.version> <javassist.version>3.30.2-GA</javassist.version> <jersey1.version>1.19.3</jersey1.version> @@ -2227,9 +2201,9 @@ <junit5.version>5.10.2</junit5.version> <junit-platform-suite.version>1.10.2</junit-platform-suite.version> <kryo.version>4.0.3</kryo.version> - <mockito.version>3.12.4</mockito.version> <!-- CQ 17673 --> - <mustache.version>0.9.11</mustache.version> - <netty.version>4.1.107.Final</netty.version> + <mockito.version>4.11.0</mockito.version> <!-- CQ 17673 --> + <mustache.version>0.9.12</mustache.version> + <netty.version>4.1.109.Final</netty.version> <opentracing.version>0.33.0</opentracing.version> <osgi.version>6.0.0</osgi.version> <osgi.framework.version>1.10.0</osgi.framework.version> @@ -2240,11 +2214,11 @@ <rxjava.version>1.3.8</rxjava.version> <rxjava2.version>2.2.21</rxjava2.version> <simple.version>6.0.1</simple.version> - <slf4j.version>2.0.12</slf4j.version> + <slf4j.version>2.0.13</slf4j.version> <smallrye.config.version>1.3.11</smallrye.config.version> <spring4.version>4.3.30.RELEASE</spring4.version> - <spring5.version>5.3.32</spring5.version> - <testng.version>7.9.0</testng.version> + <spring5.version>5.3.34</spring5.version> + <testng.version>7.10.2</testng.version> <testng6.version>6.9.13.6</testng6.version> <validation.impl.version>6.2.5.Final</validation.impl.version> <!--<weld.version>2.2.14.Final</weld.version>--> <!-- 2.4.1 doesn't work - bv tests --> @@ -2253,7 +2227,7 @@ <xerces.version>2.12.2</xerces.version> <!-- Graal VM --> - <graalvm.version>20.3.13</graalvm.version> + <graalvm.version>20.3.14</graalvm.version> <!-- do not need CQs --> <cdi.api.version>1.2</cdi.api.version> @@ -2290,7 +2264,7 @@ <jsp.version>2.3.6</jsp.version> <jstl.version>1.2.7</jstl.version> <jta.api.version>1.3.3</jta.api.version> - <micrometer.version>1.10.13</micrometer.version> + <micrometer.version>1.12.5</micrometer.version> <micrometer-tracing.version>1.0.12</micrometer-tracing.version> <microprofile.config.version>2.0.1</microprofile.config.version> <microprofile.rest.client.version>2.0</microprofile.rest.client.version>
diff --git a/tests/e2e-client/pom.xml b/tests/e2e-client/pom.xml index 693d93e..2821063 100644 --- a/tests/e2e-client/pom.xml +++ b/tests/e2e-client/pom.xml
@@ -41,7 +41,6 @@ <forkCount>1</forkCount> <reuseForks>false</reuseForks> <enableAssertions>false</enableAssertions> - <skipTests>${skip.e2e}</skipTests> <systemPropertyVariables> <sun.net.http.allowRestrictedHeaders>true</sun.net.http.allowRestrictedHeaders> </systemPropertyVariables>
diff --git a/tests/e2e-entity/pom.xml b/tests/e2e-entity/pom.xml index 64efe2b..0653684 100644 --- a/tests/e2e-entity/pom.xml +++ b/tests/e2e-entity/pom.xml
@@ -41,7 +41,6 @@ <forkCount>1</forkCount> <reuseForks>false</reuseForks> <enableAssertions>false</enableAssertions> - <skipTests>${skip.e2e}</skipTests> </configuration> <executions> <execution>
diff --git a/tests/e2e-jdk-specifics/pom.xml b/tests/e2e-jdk-specifics/pom.xml index 9082808..fb26f8c 100644 --- a/tests/e2e-jdk-specifics/pom.xml +++ b/tests/e2e-jdk-specifics/pom.xml
@@ -41,7 +41,6 @@ <forkCount>1</forkCount> <reuseForks>false</reuseForks> <enableAssertions>false</enableAssertions> - <skipTests>${skip.e2e}</skipTests> <argLine> ${http.patch.addopens} </argLine>
diff --git a/tests/e2e-server/pom.xml b/tests/e2e-server/pom.xml index 890c99f..f288bd3 100644 --- a/tests/e2e-server/pom.xml +++ b/tests/e2e-server/pom.xml
@@ -41,7 +41,6 @@ <forkCount>1</forkCount> <reuseForks>false</reuseForks> <enableAssertions>false</enableAssertions> - <skipTests>${skip.e2e}</skipTests> </configuration> <executions> <execution>
diff --git a/tests/e2e-testng/pom.xml b/tests/e2e-testng/pom.xml index dd5cedf..8e78779 100644 --- a/tests/e2e-testng/pom.xml +++ b/tests/e2e-testng/pom.xml
@@ -45,7 +45,6 @@ <forkCount>1</forkCount> <reuseForks>false</reuseForks> <enableAssertions>false</enableAssertions> - <skipTests>${skip.e2e}</skipTests> </configuration> <dependencies> <dependency>
diff --git a/tests/e2e-tls/pom.xml b/tests/e2e-tls/pom.xml index 8f4ef24..7784636 100644 --- a/tests/e2e-tls/pom.xml +++ b/tests/e2e-tls/pom.xml
@@ -40,7 +40,6 @@ <configuration> <forkCount>1</forkCount> <reuseForks>false</reuseForks> - <skipTests>${skip.e2e}</skipTests> <systemPropertyVariables> <sun.net.http.allowRestrictedHeaders>true</sun.net.http.allowRestrictedHeaders> <property>
diff --git a/tests/e2e/pom.xml b/tests/e2e/pom.xml index d8b63fd..43eaaa2 100644 --- a/tests/e2e/pom.xml +++ b/tests/e2e/pom.xml
@@ -41,7 +41,6 @@ <forkCount>1</forkCount> <reuseForks>false</reuseForks> <enableAssertions>false</enableAssertions> - <skipTests>${skip.e2e}</skipTests> </configuration> </plugin> </plugins>
diff --git a/tests/integration/cdi-integration/gf-cdi-inject/pom.xml b/tests/integration/cdi-integration/gf-cdi-inject/pom.xml index 2d90302..97542e8 100644 --- a/tests/integration/cdi-integration/gf-cdi-inject/pom.xml +++ b/tests/integration/cdi-integration/gf-cdi-inject/pom.xml
@@ -52,7 +52,7 @@ <dependency> <groupId>org.omnifaces.arquillian</groupId> <artifactId>arquillian-glassfish-server-managed</artifactId> - <version>1.2</version> + <version>1.4</version> <scope>test</scope> </dependency> @@ -77,7 +77,7 @@ <dependency> <groupId>org.jboss.arquillian.junit5</groupId> <artifactId>arquillian-junit5-container</artifactId> - <version>1.7.0.Alpha12</version> + <version>1.8.0.Final</version> <scope>test</scope> </dependency> @@ -106,7 +106,7 @@ <!-- <artifactId>glassfish</artifactId>--> <groupId>fish.payara.distributions</groupId> <artifactId>payara</artifactId> - <version>5.2022.2</version> + <version>5.2022.5</version> <type>zip</type> <overWrite>false</overWrite> <outputDirectory>${project.build.directory}</outputDirectory>
diff --git a/tests/integration/jetty-response-close/pom.xml b/tests/integration/jetty-response-close/pom.xml index 22a2d32..019bed3 100644 --- a/tests/integration/jetty-response-close/pom.xml +++ b/tests/integration/jetty-response-close/pom.xml
@@ -55,11 +55,6 @@ </dependency> </dependencies> - <properties> - <surefire.security.argline>-Djava.security.manager -Djava.security.policy=${project.build.directory}/test-classes/surefire.policy</surefire.security.argline> - <surefire.mvn.plugin.version>3.0.0-M5</surefire.mvn.plugin.version> - </properties> - <build> <plugins> <plugin> @@ -70,4 +65,16 @@ </plugin> </plugins> </build> + <profiles> + <profile> + <id>jdk_8_11</id> + <activation> + <jdk>[1.8, 12)</jdk> + </activation> + <properties> + <surefire.mvn.plugin.version>3.0.0-M7</surefire.mvn.plugin.version> <!-- Legacy version for older JDKs --> + <surefire.security.argline>-Djava.security.manager -Djava.security.policy=${project.build.directory}/test-classes/surefire.policy</surefire.security.argline> + </properties> + </profile> + </profiles> </project> \ No newline at end of file
diff --git a/tests/release-test/src/test/resources/non-bom-pom-deps.xml b/tests/release-test/src/test/resources/non-bom-pom-deps.xml index 7ced6b0..e3aca57 100644 --- a/tests/release-test/src/test/resources/non-bom-pom-deps.xml +++ b/tests/release-test/src/test/resources/non-bom-pom-deps.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2023, 2024 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.eclipse.ee4j</groupId> <artifactId>project</artifactId> - <version>1.0.8</version> + <version>1.0.9</version> </parent> <groupId>org.glassfish.jersey.tests</groupId>
diff --git a/tests/release-test/src/test/resources/release-test-pom.xml b/tests/release-test/src/test/resources/release-test-pom.xml index 4fac652..58966b3 100644 --- a/tests/release-test/src/test/resources/release-test-pom.xml +++ b/tests/release-test/src/test/resources/release-test-pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2022, 2024 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.eclipse.ee4j</groupId> <artifactId>project</artifactId> - <version>1.0.8</version> + <version>1.0.9</version> </parent> <groupId>org.glassfish.jersey.tests</groupId>
diff --git a/tools/jersey-doc-modulelist-maven-plugin/pom.xml b/tools/jersey-doc-modulelist-maven-plugin/pom.xml index 53df1f1..876adef 100644 --- a/tools/jersey-doc-modulelist-maven-plugin/pom.xml +++ b/tools/jersey-doc-modulelist-maven-plugin/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2013, 2024 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.eclipse.ee4j</groupId> <artifactId>project</artifactId> - <version>1.0.8</version> + <version>1.0.9</version> </parent> <groupId>org.glassfish.jersey.tools.plugins</groupId>
diff --git a/tools/jersey-release-notes-maven-plugin/pom.xml b/tools/jersey-release-notes-maven-plugin/pom.xml index e1f8091..8a050b6 100644 --- a/tools/jersey-release-notes-maven-plugin/pom.xml +++ b/tools/jersey-release-notes-maven-plugin/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2019, 2022 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2019, 2024 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.eclipse.ee4j</groupId> <artifactId>project</artifactId> - <version>1.0.8</version> + <version>1.0.9</version> </parent> <groupId>org.glassfish.jersey.tools.plugins</groupId>