[2.x] versions update Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/NOTICE.md b/NOTICE.md index 9709c6a..3d2f263 100644 --- a/NOTICE.md +++ b/NOTICE.md
@@ -65,15 +65,15 @@ * License: Apache License, 2.0 * Copyright (C) 2009 The JSR-330 Expert Group -Javassist Version 3.29.2-GA +Javassist Version 3.30.2-GA * License: Apache License, 2.0 * Project: http://www.javassist.org/ * Copyright (C) 1999- Shigeru Chiba. All Rights Reserved. -Jackson JAX-RS Providers Version 2.16.1 +Jackson JAX-RS Providers Version 2.16.2 * 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. +* Copyright: (c) 2009-2024 FasterXML, LLC. All rights reserved unless otherwise indicated. jQuery v1.12.4 * License: jquery.org/license
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 6d2d752..6bcec71 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
@@ -116,7 +116,7 @@ <properties> <jersey.version>${project.version}</jersey.version> - <jetty.version>9.4.51.v20230217</jetty.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> <war.mvn.plugin.version>3.4.0</war.mvn.plugin.version>
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 98b0d46..5bd5c9b 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
@@ -83,7 +83,7 @@ <properties> <jersey.version>${project.version}</jersey.version> - <junit-jupiter.version>5.9.3</junit-jupiter.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> </properties>
diff --git a/examples/NOTICE.md b/examples/NOTICE.md index 208fb0d..f5fb08c 100644 --- a/examples/NOTICE.md +++ b/examples/NOTICE.md
@@ -61,12 +61,12 @@ * License: Apache License, 2.0 * Copyright (C) 2009 The JSR-330 Expert Group -Javassist Version 3.29.2-GA +Javassist Version 3.30.2-GA * License: Apache License, 2.0 * Project: http://www.javassist.org/ * Copyright (C) 1999- Shigeru Chiba. All Rights Reserved. -Jackson JAX-RS Providers Version 2.16.1 +Jackson JAX-RS Providers Version 2.16.2 * 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/examples/helloworld-spring-webapp/pom.xml b/examples/helloworld-spring-webapp/pom.xml index 1b8ef3b..444a5ac 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, 2023 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2012, 2024 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 @@ -53,7 +53,7 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.2</version> + <version>${commons.logging.version}</version> <exclusions> <exclusion> <groupId>javax.servlet</groupId>
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 61edeb7..347b54b 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.1", "com.fasterxml.jackson.jaxrs", "jackson-jaxrs-json-provider"); + "2.16.2", "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 5b5dcd7..72bc99a 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.1 +Jackson JAX-RS Providers version 2.16.2 * 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 0c43a83..63e5b76 100644 --- a/pom.xml +++ b/pom.xml
@@ -2212,47 +2212,47 @@ <!-- Dependency versions --> <jersey.version>${project.version}</jersey.version> - <arquillian.version>1.7.0.Final</arquillian.version> + <arquillian.version>1.8.0.Final</arquillian.version> <arquillian.weld.version>2.1.0.Final</arquillian.weld.version> <!-- asm is now source integrated - keeping this property to see the version --> <!-- see core-server/src/main/java/jersey/repackaged/asm/.. --> <asm.version>9.6</asm.version> <!--required for spring (ext) modules integration --> - <aspectj.weaver.version>1.6.11</aspectj.weaver.version> + <aspectj.weaver.version>1.9.21.1</aspectj.weaver.version> <!-- <bnd.plugin.version>2.3.6</bnd.plugin.version>--> - <commons.io.version>2.13.0</commons.io.version> + <commons.io.version>2.15.1</commons.io.version> <!-- <commons-lang3.version>3.3.2</commons-lang3.version>--> - <commons.logging.version>1.2</commons.logging.version> - <fasterxml.classmate.version>1.5.1</fasterxml.classmate.version> + <commons.logging.version>1.3.0</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.14</gae.version> - <groovy.version>4.0.12</groovy.version> - <gson.version>2.9.1</gson.version> + <gae.version>2.0.25</gae.version> + <groovy.version>4.0.19</groovy.version> + <gson.version>2.10.1</gson.version> <guava.version>31.1-jre</guava.version> <hamcrest.version>2.2</hamcrest.version> - <helidon.version>1.4.13</helidon.version> + <helidon.version>1.4.14</helidon.version> <xmlunit.version>2.9.1</xmlunit.version> <httpclient.version>4.5.14</httpclient.version> - <httpclient5.version>5.2.1</httpclient5.version> - <jackson.version>2.16.1</jackson.version> + <httpclient5.version>5.3.1</httpclient5.version> + <jackson.version>2.16.2</jackson.version> <jackson1.version>1.9.13</jackson1.version> - <javassist.version>3.29.2-GA</javassist.version> + <javassist.version>3.30.2-GA</javassist.version> <jersey1.version>1.19.3</jersey1.version> <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 --> - <jmh.version>1.36</jmh.version> + <jmh.version>1.37</jmh.version> <jmockit.version>1.49</jmockit.version> <junit4.version>4.13.2</junit4.version> - <junit5.version>5.9.3</junit5.version> - <junit-platform-suite.version>1.9.3</junit-platform-suite.version> - <kryo.version>4.0.2</kryo.version> + <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.10</mustache.version> - <netty.version>4.1.93.Final</netty.version> + <mustache.version>0.9.11</mustache.version> + <netty.version>4.1.107.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> @@ -2263,11 +2263,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.7</slf4j.version> + <slf4j.version>2.0.12</slf4j.version> <smallrye.config.version>1.3.11</smallrye.config.version> <spring4.version>4.3.30.RELEASE</spring4.version> - <spring5.version>5.3.27</spring5.version> - <testng.version>7.6.1</testng.version> + <spring5.version>5.3.32</spring5.version> + <testng.version>7.9.0</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 --> @@ -2276,7 +2276,7 @@ <xerces.version>2.12.2</xerces.version> <!-- Graal VM --> - <graalvm.version>20.3.11</graalvm.version> + <graalvm.version>20.3.13</graalvm.version> <!-- do not need CQs --> <cdi.api.version>1.2</cdi.api.version> @@ -2300,12 +2300,12 @@ <javax.persistence.version>2.2.3</javax.persistence.version> <javax.validation.api.version>2.0.2</javax.validation.api.version> <jaxb.api.version>2.3.3</jaxb.api.version> - <jaxb.ri.version>2.3.8</jaxb.ri.version> + <jaxb.ri.version>2.3.9</jaxb.ri.version> <jaxrs.api.spec.version>2.1</jaxrs.api.spec.version> <jaxrs.api.impl.version>2.1.6</jaxrs.api.impl.version> <jetty.plugin.version>6.1.26</jetty.plugin.version> <jetty.osgi.version>org.eclipse.jetty.*;version="[9.4,11)"</jetty.osgi.version> - <jetty.version>9.4.51.v20230217</jetty.version> + <jetty.version>9.4.54.v20240208</jetty.version> <jetty.servlet.api.25.version>6.1.14</jetty.servlet.api.25.version> <jsonb.api.version>1.0.2</jsonb.api.version> <jsonp.ri.version>1.1.6</jsonp.ri.version> @@ -2313,12 +2313,12 @@ <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.12</micrometer.version> - <micrometer-tracing.version>1.0.9</micrometer-tracing.version> + <micrometer.version>1.10.13</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> <mimepull.version>1.9.15</mimepull.version> - <moxy.version>2.7.12</moxy.version> + <moxy.version>2.7.14</moxy.version> <osgi.service.cm.version>1.6.1</osgi.service.cm.version> <servlet2.version>2.5</servlet2.version> <servlet3.version>3.1.0</servlet3.version>
diff --git a/tests/osgi/functional/pom.xml b/tests/osgi/functional/pom.xml index c22e572..531b0fa 100644 --- a/tests/osgi/functional/pom.xml +++ b/tests/osgi/functional/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2010, 2023 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2010, 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 @@ -137,6 +137,12 @@ <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-container-forked</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> @@ -156,7 +162,13 @@ <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-aether</artifactId> - <version>2.6.2</version> + <version>2.6.14</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + </exclusions> <scope>test</scope> </dependency> <dependency> @@ -190,7 +202,7 @@ <groupId>org.ops4j.pax.logging</groupId> <artifactId>pax-logging-api</artifactId> <scope>test</scope> - <version>1.11.5</version> + <version>1.11.17</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -391,6 +403,12 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </dependency> + </dependencies> <profiles>