Fixes issue #40 - Update dependencies (#41)

piranhacloud · Jun 10, 2023 · 0949e7d · 0949e7d
1 parent e08916c
commit 0949e7d
Show file tree

Hide file tree

Showing 16 changed files with 208 additions and 173 deletions.
diff --git a/coreprofile/arquillian/pom.xml b/coreprofile/arquillian/pom.xml
@@ -11,43 +11,47 @@
     <packaging>war</packaging>
     <name>Testing with JUnit 5 and Arquillian</name>
     <properties>
+        <arquillian.version>1.7.0.Final</arquillian.version>
+        <jakartaee.version>10.0.0</jakartaee.version>
+        <junit.version>5.10.0-M1</junit.version>
+        <piranha.version>23.5.0</piranha.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
         <dependency>
             <groupId>jakarta.platform</groupId>
             <artifactId>jakarta.jakartaee-core-api</artifactId>
-            <version>10.0.0</version>
+            <version>${jakartaee.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>cloud.piranha.arquillian</groupId>
             <artifactId>piranha-arquillian-jarcontainer</artifactId>
-            <version>23.2.0</version>
+            <version>${piranha.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.arquillian.junit5</groupId>
             <artifactId>arquillian-junit5-container</artifactId>
-            <version>1.7.0.Alpha14</version>
+            <version>${arquillian.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.9.2</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.2</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>5.9.2</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/coreprofile/json/pom.xml b/coreprofile/json/pom.xml
@@ -11,31 +11,33 @@
     <packaging>war</packaging>
     <name>Temperature JSON service</name>
     <properties>
+        <jakartaee.version>10.0.0</jakartaee.version>
+        <junit.version>5.10.0-M1</junit.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
         <dependency>
             <groupId>jakarta.platform</groupId>
             <artifactId>jakarta.jakartaee-core-api</artifactId>
-            <version>10.0.0</version>
+            <version>${jakartaee.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.2</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.2</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>5.9.2</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/coreprofile/netbeans-debug/pom.xml b/coreprofile/netbeans-debug/pom.xml
@@ -11,31 +11,33 @@
     <packaging>war</packaging>
     <name>Debugging a REST service with NetBeans</name>
     <properties>
+        <jakartaee.version>10.0.0</jakartaee.version>
+        <junit.version>5.10.0-M1</junit.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
         <dependency>
             <groupId>jakarta.platform</groupId>
             <artifactId>jakarta.jakartaee-core-api</artifactId>
-            <version>10.0.0</version>
+            <version>${jakartaee.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.2</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.2</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>5.9.2</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/coreprofile/rest/pom.xml b/coreprofile/rest/pom.xml
@@ -11,31 +11,33 @@
     <packaging>war</packaging>
     <name>REST service</name>
     <properties>
+        <jakartaee.version>10.0.0</jakartaee.version>
+        <junit.version>5.10.0-M1</junit.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
         <dependency>
             <groupId>jakarta.platform</groupId>
             <artifactId>jakarta.jakartaee-core-api</artifactId>
-            <version>10.0.0</version>
+            <version>${jakartaee.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.0</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.0</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>5.9.0</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/coreprofile/vscode-debug/pom.xml b/coreprofile/vscode-debug/pom.xml
@@ -11,31 +11,33 @@
     <packaging>war</packaging>
     <name>Debugging a REST service with VSCode</name>
     <properties>
+        <jakartaee.version>10.0.0</jakartaee.version>
+        <junit.version>5.10.0-M1</junit.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
         <dependency>
             <groupId>jakarta.platform</groupId>
             <artifactId>jakarta.jakartaee-core-api</artifactId>
-            <version>10.0.0</version>
+            <version>${jakartaee.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.0</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.0</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>5.9.0</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/embedded/springboot-loom/pom.xml b/embedded/springboot-loom/pom.xml
@@ -8,8 +8,8 @@
     <packaging>jar</packaging>
     <name>Running Piranha Embedded with Spring Boot using Virtual Threads</name>
     <properties>
-        <piranha.version>23.1.0</piranha.version>
-        <spring-boot.version>3.0.1</spring-boot.version>
+        <piranha.version>23.5.0</piranha.version>
+        <spring-boot.version>3.1.0</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencyManagement>
@@ -55,7 +55,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.10.1</version>
                 <configuration>
-                    <release>19</release>
+                    <release>20</release>
                     <enablePreview>true</enablePreview>
                 </configuration>
             </plugin>
@@ -75,6 +75,14 @@
                             </jvmArguments>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>default-cli</id>
+                        <configuration>
+                            <jvmArguments>
+                                --enable-preview --add-modules=jdk.incubator.concurrent
+                            </jvmArguments>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>

diff --git a/embedded/springboot-loom/src/main/java/hello/HelloApplication.java b/embedded/springboot-loom/src/main/java/hello/HelloApplication.java
@@ -1,5 +1,6 @@
 package hello;
 
+import cloud.piranha.http.virtual.VirtualHttpServer;
 import cloud.piranha.spring.starter.embedded.EmbeddedPiranhaServletWebServerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/embedded/springboot/pom.xml b/embedded/springboot/pom.xml
@@ -8,8 +8,8 @@
     <packaging>jar</packaging>
     <name>Running Piranha Embedded with Spring Boot</name>
     <properties>
-        <piranha.version>23.1.0</piranha.version>
-        <spring-boot.version>3.0.1</spring-boot.version>
+        <piranha.version>23.5.0</piranha.version>
+        <spring-boot.version>3.1.0</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencyManagement>

diff --git a/server/helloworld/pom.xml b/server/helloworld/pom.xml
@@ -9,29 +9,30 @@
     <artifactId>helloworld</artifactId>
     <version>1-SNAPSHOT</version>
     <packaging>war</packaging>
-    <name>HelloWorld web application</name>
+    <name>Piranha Server - HelloWorld web application</name>
     <properties>
+        <junit.version>5.10.0-M1</junit.version>
         <piranha.distribution>server</piranha.distribution>
-        <piranha.version>22.12.0</piranha.version>
+        <piranha.version>23.5.0</piranha.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.1</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.1</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>5.9.1</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/servlet/crac/pom.xml b/servlet/crac/pom.xml
@@ -9,12 +9,53 @@
     <artifactId>crac</artifactId>
     <version>1-SNAPSHOT</version>
     <packaging>war</packaging>
-    <name>CRaC web application</name>
+    <name>Piranha Servlet - CRaC web application</name>
     <properties>
+        <junit.version>5.10.0-M1</junit.version>
+        <mojarra.version>4.0.2</mojarra.version>
         <piranha.distribution>servlet</piranha.distribution>
-        <piranha.version>22.12.0</piranha.version>
+        <piranha.version>23.5.0</piranha.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <weld.version>5.1.0.Final</weld.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>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-weld</artifactId>
+            <version>${piranha.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <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>
     <build>
         <finalName>crac</finalName>
         <plugins>
@@ -73,42 +114,4 @@
             </plugin>
         </plugins>
     </build>
-    <dependencies>
-        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>jakarta.faces</artifactId>
-            <version>4.0.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.weld.servlet</groupId>
-            <artifactId>weld-servlet-shaded</artifactId>
-            <version>5.1.0.Final</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-weld</artifactId>
-            <version>${piranha.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
-            <version>5.9.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
 </project>