From c888968f147a0796c347e8dfd6d7e35a92d74cbc Mon Sep 17 00:00:00 2001
From: Manfred Riem <mriem@manorrock.com>
Date: Mon, 11 Nov 2024 17:09:12 -0600
Subject: [PATCH] Fixes #4186 - Update Angus to latest version (#4202)

---
 extension/{eclipse-angus => angus}/pom.xml                  | 4 ++--
 .../java/cloud/piranha/extension/angus/AngusExtension.java  | 0
 .../{eclipse-angus => angus}/src/main/java/module-info.java | 0
 extension/jaxb/pom.xml                                      | 2 +-
 extension/micro/pom.xml                                     | 2 +-
 extension/pom.xml                                           | 6 +++---
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename extension/{eclipse-angus => angus}/pom.xml (92%)
 rename extension/{eclipse-angus => angus}/src/main/java/cloud/piranha/extension/angus/AngusExtension.java (100%)
 rename extension/{eclipse-angus => angus}/src/main/java/module-info.java (100%)

diff --git a/extension/eclipse-angus/pom.xml b/extension/angus/pom.xml
similarity index 92%
rename from extension/eclipse-angus/pom.xml
rename to extension/angus/pom.xml
index 2504403dfe..d429887672 100644
--- a/extension/eclipse-angus/pom.xml
+++ b/extension/angus/pom.xml
@@ -7,9 +7,9 @@
         <artifactId>project</artifactId>
         <version>24.11.0-SNAPSHOT</version>
     </parent>
-    <artifactId>piranha-extension-eclipse-angus</artifactId>
+    <artifactId>piranha-extension-angus</artifactId>
     <packaging>jar</packaging>
-    <name>Piranha - Extension - Eclipse Angus</name>
+    <name>Piranha - Extension - Angus</name>
     <dependencies>
         <!-- compile -->
         <dependency>
diff --git a/extension/eclipse-angus/src/main/java/cloud/piranha/extension/angus/AngusExtension.java b/extension/angus/src/main/java/cloud/piranha/extension/angus/AngusExtension.java
similarity index 100%
rename from extension/eclipse-angus/src/main/java/cloud/piranha/extension/angus/AngusExtension.java
rename to extension/angus/src/main/java/cloud/piranha/extension/angus/AngusExtension.java
diff --git a/extension/eclipse-angus/src/main/java/module-info.java b/extension/angus/src/main/java/module-info.java
similarity index 100%
rename from extension/eclipse-angus/src/main/java/module-info.java
rename to extension/angus/src/main/java/module-info.java
diff --git a/extension/jaxb/pom.xml b/extension/jaxb/pom.xml
index a72e761ebb..9f4e1f56c1 100644
--- a/extension/jaxb/pom.xml
+++ b/extension/jaxb/pom.xml
@@ -21,7 +21,7 @@
         <!-- provided -->
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-angus</artifactId>
+            <artifactId>piranha-extension-angus</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/extension/micro/pom.xml b/extension/micro/pom.xml
index 76a6ae8e4c..27ad2ae151 100644
--- a/extension/micro/pom.xml
+++ b/extension/micro/pom.xml
@@ -38,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-angus</artifactId>
+            <artifactId>piranha-extension-angus</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
diff --git a/extension/pom.xml b/extension/pom.xml
index 2db8a86b1e..ffaea7b796 100644
--- a/extension/pom.xml
+++ b/extension/pom.xml
@@ -18,21 +18,23 @@
     <modules>
         <module>annotationscan</module>
         <module>annotationscan-classfile</module>
+        <module>angus</module>
         <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-epicyro</module>
         <module>eclipse-jstl</module>
         <module>eclipselink</module>
+        <module>exousia</module>
         <module>expressly</module>
         <module>fileupload</module>
         <module>hazelcast</module>
         <module>herring</module>
         <module>hibernate-validator</module>
+        <module>jaxb</module>
         <module>jersey</module>
         <module>micro</module>
         <module>microprofile</module>
@@ -61,8 +63,6 @@
         <module>weld</module>
         <module>yasson</module>
         <module>wasp</module>
-        <module>jaxb</module>
-        <module>exousia</module>
     </modules>
 
     <dependencyManagement>