Merge branch 'current' into issue-4521

piranhacloud · Jan 12, 2025 · 9f7a6ab · 9f7a6ab
2 parents 02ff813 + a80ff9c
commit 9f7a6ab
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -114,8 +114,8 @@
         <microprofile-jwt-auth-api.version>2.1</microprofile-jwt-auth-api.version>
         <microprofile-jwt-auth.version>3.0.0</microprofile-jwt-auth.version>
         <mojarra.version>4.1.2</mojarra.version>
-        <netty.version>4.1.115.Final</netty.version>
-        <nimbus-jose-jwt.version>9.47</nimbus-jose-jwt.version>
+        <netty.version>4.1.116.Final</netty.version>
+        <nimbus-jose-jwt.version>10.0.1</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>
@@ -125,12 +125,12 @@
         <shrinkwrap-descriptors-api-base.version>2.0.0</shrinkwrap-descriptors-api-base.version>
         <shrinkwrap-resolver.version>3.3.3</shrinkwrap-resolver.version>
         <soteria.version>4.0.0-M3</soteria.version>
-        <spring-boot.version>3.4.0</spring-boot.version>
+        <spring-boot.version>3.4.1</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.18.Final</undertow.version>
-        <wasp.version>4.0.0-M2</wasp.version>
-        <weld.version>6.0.0.CR2</weld.version>
+        <wasp.version>4.0.0</wasp.version>
+        <weld.version>6.0.0.Final</weld.version>
         <yasson.version>3.0.4</yasson.version>
         <!-- plugins -->
         <build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>

diff --git a/test/coreprofile/arquillian/pom.xml b/test/coreprofile/arquillian/pom.xml
@@ -14,8 +14,6 @@
     <packaging>war</packaging>
     <name>Piranha - Test - Core Profile - Testing with JUnit 5 and Arquillian</name>
     <properties>
-        <!-- dependencies -->
-        <piranha.version>${project.version}</piranha.version>
         <!-- other -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -28,7 +26,7 @@
         <dependency>
             <groupId>cloud.piranha.arquillian</groupId>
             <artifactId>piranha-arquillian-managed</artifactId>
-            <version>${piranha.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/test/coreprofile/json/pom.xml b/test/coreprofile/json/pom.xml
@@ -15,7 +15,6 @@
     <name>Piranha - Test - Core Profile - Create a JSON temperature service</name>
     <properties>
         <!-- other -->
-        <piranha.version>${project.version}</piranha.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
@@ -46,7 +45,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>

diff --git a/test/coreprofile/no_servlet_class/pom.xml b/test/coreprofile/no_servlet_class/pom.xml
@@ -15,7 +15,6 @@
     <name>Piranha - Test - Core Profile - No servlet-class specified</name>
     <properties>
         <!-- other -->
-        <piranha.version>${project.version}</piranha.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
@@ -46,7 +45,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>

diff --git a/test/coreprofile/rest/pom.xml b/test/coreprofile/rest/pom.xml
@@ -12,7 +12,6 @@
     <name>Piranha - Test - Core Profile - REST</name>
     <properties>
         <!-- other -->
-        <piranha.version>${project.version}</piranha.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
@@ -35,7 +34,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>

diff --git a/test/micro/helloworld/pom.xml b/test/micro/helloworld/pom.xml
@@ -18,7 +18,6 @@
         <!-- other -->
         <java.version>21</java.version>
         <piranha.distribution>micro</piranha.distribution>
-        <piranha.version>${project.version}</piranha.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- plugins -->
     </properties>
@@ -29,7 +28,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>

diff --git a/test/servlet/helloworld/pom.xml b/test/servlet/helloworld/pom.xml
@@ -16,7 +16,6 @@
     <properties>
         <!-- other -->
         <piranha.distribution>servlet</piranha.distribution>
-        <piranha.version>${project.version}</piranha.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
@@ -43,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>