Skip to content

Commit

Permalink
Fixes #4207 - Update dependencies (#4208)
Browse files Browse the repository at this point in the history
  • Loading branch information
mnriem authored Nov 13, 2024
1 parent 8b5acf1 commit 323ed62
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 115 deletions.
10 changes: 5 additions & 5 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
<jakarta.authorization-api.version>3.0.0</jakarta.authorization-api.version>
<jakarta.enterprise.concurrent-api.version>3.1.1</jakarta.enterprise.concurrent-api.version>
<jakarta.ejb-api.version>4.0.1</jakarta.ejb-api.version>
<jakarta.el-api.version>6.0.0</jakarta.el-api.version>
<jakarta.el-api.version>6.0.1</jakarta.el-api.version>
<jakarta.enterprise.cdi-api.version>4.1.0</jakarta.enterprise.cdi-api.version>
<jakarta.faces-api.version>4.1.0</jakarta.faces-api.version>
<jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
<jakarta.faces-api.version>4.1.2</jakarta.faces-api.version>
<jakarta.inject-api.version>2.0.1.MR</jakarta.inject-api.version>
<jakarta.interceptor-api.version>2.2.0</jakarta.interceptor-api.version>
<jakarta.jakartaee-core-api.version>11.0.0-M4</jakarta.jakartaee-core-api.version>
<jakarta.jakartaee-core-api.version>11.0.0</jakarta.jakartaee-core-api.version>
<jakarta.jakartaee-web-api.version>11.0.0-M4</jakarta.jakartaee-web-api.version>
<jakarta.json-api.version>2.1.3</jakarta.json-api.version>
<jakarta.json.bind-api.version>3.0.1</jakarta.json.bind-api.version>
Expand All @@ -35,7 +35,7 @@
<jakarta.security.enterprise-api.version>4.0.0</jakarta.security.enterprise-api.version>
<jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
<jakarta.servlet.jsp-api.version>4.0.0</jakarta.servlet.jsp-api.version>
<jakarta.servlet.jsp.jstl-api.version>3.0.1</jakarta.servlet.jsp.jstl-api.version>
<jakarta.servlet.jsp.jstl-api.version>3.0.2</jakarta.servlet.jsp.jstl-api.version>
<jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
<jakarta.validation-api.version>3.1.0</jakarta.validation-api.version>
<jakarta.websocket-api.version>2.2.0</jakarta.websocket-api.version>
Expand Down
20 changes: 10 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@
<angus.mail.version>2.0.3</angus.mail.version>
<arquillian.version>1.8.0.Final</arquillian.version>
<bcel.version>6.10.0</bcel.version>
<checkstyle.version>10.18.2</checkstyle.version>
<checkstyle.version>10.20.1</checkstyle.version>
<commons-compress.version>1.27.1</commons-compress.version>
<commons-fileupload2-jakarta-servlet6.version>2.0.0-M2</commons-fileupload2-jakarta-servlet6.version>
<concurro.version>3.1.0-M1</concurro.version>
<crac.version>0.1.3</crac.version>
<eclipselink.version>5.0.0-B02</eclipselink.version>
<eclipselink.version>5.0.0-B03</eclipselink.version>
<epicyro.version>3.0.0</epicyro.version>
<exousia.version>3.0.0-M2</exousia.version>
<expressly.version>6.0.0-M2</expressly.version>
Expand All @@ -96,23 +96,23 @@
<herring.version>23.12.0</herring.version>
<hibernate-validator.version>9.0.0.Beta3</hibernate-validator.version>
<htmlunit.version>2.70.0</htmlunit.version>
<jandex.version>3.2.2</jandex.version>
<jandex.version>3.2.3</jandex.version>
<jaxb-runtime.version>4.0.5</jaxb-runtime.version>
<jboss-classfilewriter.version>1.3.1.Final</jboss-classfilewriter.version>
<jersey.version>4.0.0-M1</jersey.version>
<jstl.version>3.0.1</jstl.version>
<junit-pioneer.version>2.3.0</junit-pioneer.version>
<junit-platform-launcher.version>1.11.2</junit-platform-launcher.version>
<junit.version>5.11.2</junit.version>
<junit-platform-launcher.version>1.11.3</junit-platform-launcher.version>
<junit.version>5.11.3</junit.version>
<maven-plugin-annotations.version>3.15.0</maven-plugin-annotations.version>
<maven-plugin-api.version>3.9.9</maven-plugin-api.version>
<maven-plugin-tools-annotations.version>3.15.0</maven-plugin-tools-annotations.version>
<microprofile-config-api.version>3.1</microprofile-config-api.version>
<microprofile-jwt-auth-api.version>2.1</microprofile-jwt-auth-api.version>
<microprofile-jwt-auth.version>2.0.2</microprofile-jwt-auth.version>
<mojarra.version>4.1.1</mojarra.version>
<microprofile-jwt-auth.version>3.0.0</microprofile-jwt-auth.version>
<mojarra.version>4.1.2</mojarra.version>
<netty.version>4.1.114.Final</netty.version>
<nimbus-jose-jwt.version>9.41.2</nimbus-jose-jwt.version>
<nimbus-jose-jwt.version>9.46</nimbus-jose-jwt.version>
<omni-mp-config.version>3.0.0</omni-mp-config.version>
<omnibeans.version>0.3</omnibeans.version>
<omniservices.version>0.4</omniservices.version>
Expand All @@ -122,10 +122,10 @@
<shrinkwrap-descriptors-api-base.version>2.0.0</shrinkwrap-descriptors-api-base.version>
<shrinkwrap-resolver.version>3.3.0</shrinkwrap-resolver.version>
<soteria.version>4.0.0-M3</soteria.version>
<spring-boot.version>3.3.4</spring-boot.version>
<spring-boot.version>3.3.5</spring-boot.version>
<transact-cdi-beans.version>1.0.1</transact-cdi-beans.version>
<tyrus.version>2.2.0</tyrus.version>
<undertow.version>2.3.17.Final</undertow.version>
<undertow.version>2.3.18.Final</undertow.version>
<wasp.version>4.0.0-M2</wasp.version>
<weld.version>6.0.0.Beta4</weld.version>
<yasson.version>3.0.4</yasson.version>
Expand Down
9 changes: 0 additions & 9 deletions test/servlet/crac/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
<name>Piranha - Test - Servlet - CRaC application</name>
<properties>
<!-- dependencies -->
<junit.version>5.11.0-M1</junit.version>
<mojarra.version>4.1.1</mojarra.version>
<piranha.version>${project.version}</piranha.version>
<weld.version>6.0.0.Beta4</weld.version>
<!-- other -->
Expand All @@ -34,7 +32,6 @@
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.faces</artifactId>
<version>${mojarra.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -54,19 +51,16 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -109,7 +103,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven-failsafe-plugin.version}</version>
<executions>
<execution>
<goals>
Expand All @@ -128,15 +121,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${build-helper-maven-plugin.version}</version>
<executions>
<execution>
<id>reserve-network-port</id>
Expand Down
32 changes: 1 addition & 31 deletions test/servlet/faces/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,6 @@
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>
<!--
WARNING - Do not remove the versions in the properties section as this
particular project is used as a basis for the guide content at
docs/src/site/markdown/servlet/create_a_faces_application.md.
When updating the guide do the following:
1. Drop the parent part below
2. Change the name of the project to read 'Create a Jakarta Faces application'
3. Change the piranha.version to the latest released version of Piranha
-->
<parent>
<groupId>cloud.piranha.test.servlet</groupId>
<artifactId>project</artifactId>
Expand All @@ -29,32 +16,22 @@
<packaging>war</packaging>
<name>Piranha - Test - Servlet - Jakarta Faces application</name>
<properties>
<!-- dependencies -->
<junit.version>5.11.2</junit.version>
<mojarra.version>4.0.8</mojarra.version>
<weld.version>6.0.0.Beta4</weld.version>
<!-- other -->
<java.version>21</java.version>
<piranha.distribution>servlet</piranha.distribution>
<piranha.version>${project.version}</piranha.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- plugins -->
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-failsafe-plugin.version>3.5.1</maven-failsafe-plugin.version>
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
</properties>
<dependencies>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.faces</artifactId>
<version>${mojarra.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.weld.servlet</groupId>
<artifactId>weld-servlet-shaded</artifactId>
<version>${weld.version}</version>
<version>6.0.0.Beta4</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -66,19 +43,16 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -113,15 +87,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<release>${java.version}</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven-failsafe-plugin.version}</version>
<executions>
<execution>
<goals>
Expand All @@ -140,15 +112,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${build-helper-maven-plugin.version}</version>
<executions>
<execution>
<id>reserve-network-port</id>
Expand Down
15 changes: 0 additions & 15 deletions test/servlet/hello/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,6 @@
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<!--
This dependency is here to make sure piranha-dist-servlet.jar exists
prior to executing the tests when building in parallel.
-->
<dependency>
<groupId>cloud.piranha.dist</groupId>
<artifactId>piranha-dist-servlet</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<type>jar</type>
<optional>true</optional>
</dependency>
<!-- test -->
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down Expand Up @@ -75,7 +61,6 @@
<configuration>
<distribution>servlet</distribution>
<httpPort>9090</httpPort>
<!--<jvmArguments>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000</jvmArguments>-->
</configuration>
</execution>
<execution>
Expand Down
16 changes: 1 addition & 15 deletions test/servlet/pages/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,36 +14,25 @@
<packaging>war</packaging>
<name>Piranha - Test - Servlet - Pages application</name>
<properties>
<!-- dependencies -->
<junit.version>5.11.2</junit.version>
<piranha.version>${project.version}</piranha.version>
<!-- other -->
<java.version>21</java.version>
<piranha.distribution>servlet</piranha.distribution>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- plugins -->
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-failsafe-plugin.version>3.5.1</maven-failsafe-plugin.version>
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
</properties>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -53,7 +42,7 @@
<plugin>
<groupId>cloud.piranha.maven</groupId>
<artifactId>piranha-maven-plugin</artifactId>
<version>${piranha.version}</version>
<version>${project.version}</version>
<executions>
<execution>
<id>pre-integration-test</id>
Expand All @@ -78,15 +67,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<release>${java.version}</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven-failsafe-plugin.version}</version>
<executions>
<execution>
<goals>
Expand All @@ -113,7 +100,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>${build-helper-maven-plugin.version}</version>
<executions>
<execution>
<id>reserve-network-port</id>
Expand Down
Loading

0 comments on commit 323ed62

Please sign in to comment.