Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Non-Jakarta dependencies version update #5452

Merged
merged 1 commit into from
Nov 1, 2023
Merged

Non-Jakarta dependencies version update #5452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NOTICE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Javassist Version 3.29.2-GA
* Project: http://www.javassist.org/
* Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.

Jackson JAX-RS Providers Version 2.15.2
Jackson JAX-RS Providers Version 2.15.3
* 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.
Expand Down
6 changes: 3 additions & 3 deletions archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@

<properties>
<jersey.version>${project.version}</jersey.version>
<jetty.version>11.0.17</jetty.version>
<jetty.version>11.0.18</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.1</surefire.mvn.plugin.version>
<war.mvn.plugin.version>3.4.0</war.mvn.plugin.version>
</properties>
</project>
</project>
4 changes: 2 additions & 2 deletions archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@

<properties>
<jersey.version>${project.version}</jersey.version>
<junit-jupiter.version>5.9.3</junit-jupiter.version>
<junit-jupiter.version>5.10.0</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.1</surefire.mvn.plugin.version>
</properties>
</project>
2 changes: 1 addition & 1 deletion examples/NOTICE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Javassist Version 3.29.2-GA
* Project: http://www.javassist.org/
* Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.

Jackson JAX-RS Providers Version 2.15.2
Jackson JAX-RS Providers Version 2.15.3
* 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.
Expand Down
11 changes: 10 additions & 1 deletion examples/configured-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<dependency>
<groupId>io.helidon.microprofile.config</groupId>
<artifactId>helidon-microprofile-config</artifactId>
<version>${helidon.version}</version>
<version>${helidon.config.version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.microprofile.config</groupId>
Expand Down Expand Up @@ -114,5 +114,14 @@
</plugins>
</build>
</profile>
<profile>
<id>jdk11-</id>
<activation>
<jdk>(,12)</jdk>
</activation>
<properties>
<helidon.config.version>${helidon.config.11.version}</helidon.config.version>
</properties>
</profile>
</profiles>
</project>
6 changes: 6 additions & 0 deletions examples/helloworld-cdi2-se/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</profile>
Expand Down
12 changes: 12 additions & 0 deletions ext/bean-validation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,4 +148,16 @@
</dependency>
</dependencies>

<profiles>
<profile>
<id>jdk8</id>
<activation>
<jdk>1.8</jdk>
</activation>
<properties>
<jboss.logging.version>${jboss.logging.8.version}</jboss.logging.version>
</properties>
</profile>
</profiles>

</project>
23 changes: 23 additions & 0 deletions inject/cdi2-se/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,18 @@
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>${jboss.logging.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -119,4 +131,15 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>jdk8</id>
<activation>
<jdk>1.8</jdk>
</activation>
<properties>
<jboss.logging.version>${jboss.logging.8.version}</jboss.logging.version>
</properties>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion media/json-jackson/src/main/resources/META-INF/NOTICE.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ The project maintains the following source code repositories:

## Third-party Content

Jackson JAX-RS Providers version 2.15.2
Jackson JAX-RS Providers version 2.15.3
* 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.
70 changes: 36 additions & 34 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2212,12 +2212,12 @@
<!-- 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>
<enforcer.mvn.plugin.version>3.3.0</enforcer.mvn.plugin.version>
<enforcer.mvn.plugin.version>3.4.1</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>
<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>
<checkstyle.mvn.plugin.version>3.3.1</checkstyle.mvn.plugin.version>
<checkstyle.version>10.12.4</checkstyle.version>
<compiler.mvn.plugin.version>3.11.0</compiler.mvn.plugin.version>
<!--
Special version of the compiler plugin just for the jersey-common. All versions above
Expand All @@ -2226,94 +2226,95 @@
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.0</dependency.mvn.plugin.version>
<dependency.mvn.plugin.version>3.6.1</dependency.mvn.plugin.version>
<deploy.mvn.plugin.version>3.1.1</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.1</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>
<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>
<javadoc.mvn.plugin.version>3.6.0</javadoc.mvn.plugin.version>
<jxr.mvn.plugin.version>3.3.1</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>
<resources.mvn.plugin.version>3.3.1</resources.mvn.plugin.version>
<shade.mvn.plugin.version>3.4.1</shade.mvn.plugin.version>
<shade.mvn.plugin.version>3.5.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>
<surefire.mvn.plugin.version>3.2.1</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 -->
<jersey.version>${project.version}</jersey.version>
<arquillian.version>1.7.0.Final</arquillian.version>
<arquillian.version>1.7.1.Final</arquillian.version>
<arquillian.weld.version>3.0.1.Final</arquillian.weld.version> <!-- 3.0.2.Final fails microprofile TCK tests -->
<!-- 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.20.1</aspectj.weaver.version>
<!-- <bnd.plugin.version>2.3.6</bnd.plugin.version>-->
<bouncycastle.version>1.70</bouncycastle.version>
<commons.io.version>2.13.0</commons.io.version>
<commons.io.version>2.15.0</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>
<fasterxml.classmate.version>1.6.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.21</gae.version>
<groovy.version>4.0.15</groovy.version>
<gson.version>2.10.1</gson.version>

<!--versions, extracted here due to maven-enforcer-plugin -->
<!-- <commons.codec.version>1.15</commons.codec.version>-->
<com.uber.jaeger.version>0.27.0</com.uber.jaeger.version>
<org.codehaus.gmavenplus.version>3.0.0</org.codehaus.gmavenplus.version>
<org.codehaus.gmavenplus.version>3.0.2</org.codehaus.gmavenplus.version>
<!-- end of versions extracted here due to maven-enforcer-plugin -->

<!-- micrometer -->
<micrometer.version>1.10.12</micrometer.version>
<micrometer-tracing.version>1.0.9</micrometer-tracing.version>
<micrometer.version>1.11.5</micrometer.version>
<micrometer-tracing.version>1.0.11</micrometer-tracing.version>

<!-- microprofile -->
<microprofile.config.version>3.0</microprofile.config.version>
<microprofile.config.version>3.0.3</microprofile.config.version>
<microprofile.rest.client.version>3.0.1</microprofile.rest.client.version>
<helidon.config.version>3.0.2</helidon.config.version>
<helidon.config.11.version>1.4.13</helidon.config.11.version> <!-- JDK 11- support -->
<smallrye.config.version>3.0.0</smallrye.config.version>

<guava.version>31.1-jre</guava.version>
<hamcrest.version>2.2</hamcrest.version>
<helidon.version>1.4.13</helidon.version>
<helidon.jersey.connector.version>3.0.2</helidon.jersey.connector.version>
<xmlunit.version>2.9.1</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>
<httpclient.version>4.5.14</httpclient.version>
<httpclient5.version>5.2.1</httpclient5.version>
<jackson.version>2.15.2</jackson.version>
<jackson.version>2.15.3</jackson.version>
<javassist.version>3.29.2-GA</javassist.version>
<jboss.logging.version>3.4.3.Final</jboss.logging.version>
<jboss.logging.version>3.5.3.Final</jboss.logging.version>
<jboss.logging.8.version>3.4.3.Final</jboss.logging.8.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>
<junit5.version>5.10.0</junit5.version>
<junit-platform-suite.version>1.10.0</junit-platform-suite.version>
<kryo.version>4.0.2</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>
<netty.version>4.1.100.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>
Expand All @@ -2325,9 +2326,9 @@
<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>
<spring6.version>6.0.10</spring6.version>
<testng.version>7.6.1</testng.version>
<slf4j.version>2.0.9</slf4j.version>
<spring6.version>6.0.13</spring6.version>
<testng.version>7.8.0</testng.version>
<testng6.version>6.9.13.6</testng6.version>
<!-- Jakartified, eligible for CQ -->
<weld.version>4.0.3.Final</weld.version>
Expand All @@ -2338,7 +2339,7 @@
<xerces.version>2.12.2</xerces.version>

<!-- Graal VM -->
<graalvm.version>20.3.11</graalvm.version>
<graalvm.version>20.3.12</graalvm.version>

<!-- do not need CQs (below this line till the end of version properties)-->
<gf.impl.version>6.2.5</gf.impl.version>
Expand Down Expand Up @@ -2373,9 +2374,10 @@
<jaxrs.api.spec.version>3.0</jaxrs.api.spec.version>
<jaxrs.api.impl.version>3.0.0</jaxrs.api.impl.version>
<jetty.osgi.version>org.eclipse.jetty.*;version="[11,15)"</jetty.osgi.version>
<jetty.version>11.0.17</jetty.version>
<jetty.version>11.0.18</jetty.version>
<jetty.tracing.version>11.0.15</jetty.tracing.version> <!-- special version for tracing support tests-->
<jetty9.version>9.4.53.v20231009</jetty9.version>
<jetty.plugin.version>11.0.15</jetty.plugin.version>
<jetty.plugin.version>11.0.18</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>1.0.5</jsonp.ri.version>
Expand Down
4 changes: 4 additions & 0 deletions test-framework/maven/container-runner-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down
9 changes: 9 additions & 0 deletions tests/e2e/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,15 @@
</plugins>
</build>
</profile>
<profile>
<id>jdk8</id>
<activation>
<jdk>1.8</jdk>
</activation>
<properties>
<jboss.logging.version>${jboss.logging.8.version}</jboss.logging.version>
</properties>
</profile>
<profile>
<id>sonar</id>
<build>
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/microprofile/rest-client-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
<plugin>
<groupId>uk.co.deliverymind</groupId>
<artifactId>wiremock-maven-plugin</artifactId>
<version>2.7.0</version>
<version>${wiremock.mvn.plugin.version}</version>
<executions>
<execution>
<phase>test-compile</phase>
Expand Down
1 change: 1 addition & 0 deletions tests/integration/tracing-support/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.tracing.version}</version>
<configuration>
<connectors>
<connector>
Expand Down