From a36e8aff1159eb4264134fab53d51d61fee5be3b Mon Sep 17 00:00:00 2001
From: Manfred Riem <mriem@manorrock.com>
Date: Fri, 8 Nov 2024 18:54:38 -0600
Subject: [PATCH] Fixes #4179 - Update Concurro to latest version (#4195)

---
 extension/{eclipse-concurro => concurro}/pom.xml         | 8 ++------
 .../piranha/extension/concurro/ConcurroExtension.java    | 4 ++--
 .../src/main/java/module-info.java                       | 9 ++-------
 extension/platform/pom.xml                               | 2 +-
 extension/pom.xml                                        | 2 +-
 extension/webprofile/pom.xml                             | 2 +-
 pom.xml                                                  | 7 +++++++
 7 files changed, 16 insertions(+), 18 deletions(-)
 rename extension/{eclipse-concurro => concurro}/pom.xml (85%)
 rename extension/{eclipse-concurro => concurro}/src/main/java/cloud/piranha/extension/concurro/ConcurroExtension.java (94%)
 rename extension/{eclipse-concurro => concurro}/src/main/java/module-info.java (91%)

diff --git a/extension/eclipse-concurro/pom.xml b/extension/concurro/pom.xml
similarity index 85%
rename from extension/eclipse-concurro/pom.xml
rename to extension/concurro/pom.xml
index e405b8b303..554397f046 100644
--- a/extension/eclipse-concurro/pom.xml
+++ b/extension/concurro/pom.xml
@@ -7,12 +7,9 @@
         <artifactId>project</artifactId>
         <version>24.11.0-SNAPSHOT</version>
     </parent>
-    <artifactId>piranha-extension-eclipse-concurro</artifactId>
+    <artifactId>piranha-extension-concurro</artifactId>
     <packaging>jar</packaging>
-    <name>Piranha - Extension - Eclipse Concurro</name>
-    <properties>
-        <concurro.version>3.1.0-M1</concurro.version>
-    </properties>
+    <name>Piranha - Extension - Concurro</name>
     <dependencies>
         <!-- compile -->
         <dependency>
@@ -37,7 +34,6 @@
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>jakarta.enterprise.concurrent</artifactId>
-            <version>${concurro.version}</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/extension/eclipse-concurro/src/main/java/cloud/piranha/extension/concurro/ConcurroExtension.java b/extension/concurro/src/main/java/cloud/piranha/extension/concurro/ConcurroExtension.java
similarity index 94%
rename from extension/eclipse-concurro/src/main/java/cloud/piranha/extension/concurro/ConcurroExtension.java
rename to extension/concurro/src/main/java/cloud/piranha/extension/concurro/ConcurroExtension.java
index 66873e414a..fd7a0fcc8e 100644
--- a/extension/eclipse-concurro/src/main/java/cloud/piranha/extension/concurro/ConcurroExtension.java
+++ b/extension/concurro/src/main/java/cloud/piranha/extension/concurro/ConcurroExtension.java
@@ -33,7 +33,7 @@
 import static java.lang.System.Logger.Level.TRACE;
 
 /**
- * The extension that delivers Eclipse Concurro to Piranha.
+ * The extension that delivers Concurro to Piranha.
  *
  * @author Manfred Riem (mriem@manorrock.com)
  */
@@ -52,6 +52,6 @@ public class ConcurroExtension implements WebApplicationExtension {
      */
     @Override
     public void configure(WebApplication webApplication) {
-        LOGGER.log(TRACE, "Configuring Eclipse Concurro extension");
+        LOGGER.log(TRACE, "Configuring Concurro extension");
     }
 }
diff --git a/extension/eclipse-concurro/src/main/java/module-info.java b/extension/concurro/src/main/java/module-info.java
similarity index 91%
rename from extension/eclipse-concurro/src/main/java/module-info.java
rename to extension/concurro/src/main/java/module-info.java
index 2e27cd4b86..53e9b0d6f9 100644
--- a/extension/eclipse-concurro/src/main/java/module-info.java
+++ b/extension/concurro/src/main/java/module-info.java
@@ -27,13 +27,8 @@
  */
 
 /**
- * This module delivers the Eclipse Concurro integration extension.
- *
- * <p>
- *  This extension integrates Eclipse Conccuro into Piranha. See 
- *  https://github.com/eclipse-ee4j/concurro for more information about its
- *  project.
- * </p>
+ * This module integrates Conccuro into Piranha. See 
+ *  https://github.com/eclipse-ee4j/concurro for more information.
  * 
  * @author Manfred Riem (mriem@manorrock.com)
  */
diff --git a/extension/platform/pom.xml b/extension/platform/pom.xml
index 38f51099b9..8929b1f2b3 100644
--- a/extension/platform/pom.xml
+++ b/extension/platform/pom.xml
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-concurro</artifactId>
+            <artifactId>piranha-extension-concurro</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
diff --git a/extension/pom.xml b/extension/pom.xml
index 12179117c4..cde34bb65c 100644
--- a/extension/pom.xml
+++ b/extension/pom.xml
@@ -22,10 +22,10 @@
         <module>bytesstreamhandler</module>
         <module>compat-glassfish7x</module>
         <module>compat-tomcat10x</module>
+        <module>concurro</module>
         <module>coreprofile</module>
         <module>default-datasource</module>
         <module>eclipse-angus</module>
-        <module>eclipse-concurro</module>
         <module>eclipse-epicyro</module>
         <module>eclipse-exousia</module>
         <module>eclipse-jaxb</module>
diff --git a/extension/webprofile/pom.xml b/extension/webprofile/pom.xml
index 034042ef13..dbfd31d9b3 100644
--- a/extension/webprofile/pom.xml
+++ b/extension/webprofile/pom.xml
@@ -58,7 +58,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-concurro</artifactId>
+            <artifactId>piranha-extension-concurro</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
diff --git a/pom.xml b/pom.xml
index b9537f1d6a..f6fd03e7a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,7 @@
         <checkstyle.version>10.18.2</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>
         <epicyro.version>3.0.0</epicyro.version>
@@ -201,6 +202,12 @@
                 <artifactId>maven-plugin-tools-annotations</artifactId>
                 <version>${maven-plugin-tools-annotations.version}</version>
             </dependency>
+            <!-- Concurro -->
+            <dependency>
+                <groupId>org.glassfish</groupId>
+                <artifactId>jakarta.enterprise.concurrent</artifactId>
+                <version>${concurro.version}</version>
+            </dependency>
             <!-- Eclipse Angus -->
             <dependency>
                 <groupId>org.eclipse.angus</groupId>