diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml
index 115be0767c0..5748ad03480 100644
--- a/.github/workflows/ci-actions.yml
+++ b/.github/workflows/ci-actions.yml
@@ -96,6 +96,10 @@ jobs:
             name: "21",
             java-version: 21,
           }
+          - {
+            name: "25",
+            java-version: 25,
+          }
     steps:
       - uses: actions/checkout@v5
       - name: Set up JDK ${{ matrix.java.name }}
@@ -162,6 +166,10 @@ jobs:
             name: "21",
             java-version: 21,
           }
+          - {
+            name: "25",
+            java-version: 25,
+          }
     steps:
       - uses: actions/checkout@v5
       - name: Set up JDK ${{ matrix.java.name }}
@@ -300,6 +308,10 @@ jobs:
             name: "21",
             java-version: 21,
           }
+          - {
+            name: "25",
+            java-version: 25,
+          }
     steps:
       - uses: actions/checkout@v5
       - name: Set up JDK ${{ matrix.java.name }}
@@ -409,6 +421,10 @@ jobs:
             name: "21",
             java-version: 21,
           }
+          - {
+            name: "25",
+            java-version: 25,
+          }
     steps:
       - uses: actions/checkout@v5
       - name: Set up JDK ${{ matrix.java.name }}
diff --git a/environments/se/core/pom.xml b/environments/se/core/pom.xml
index cba071a4356..2800aaf0d9c 100644
--- a/environments/se/core/pom.xml
+++ b/environments/se/core/pom.xml
@@ -98,18 +98,18 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-all</artifactId>
             <optional>true</optional>
             <type>pom</type>
             <exclusions>
                 <!-- Exclude these otherwise surefire doesn't find any tests to run -->
                 <exclusion>
-                    <groupId>org.codehaus.groovy</groupId>
+                    <groupId>org.apache.groovy</groupId>
                     <artifactId>groovy-test-junit5</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.codehaus.groovy</groupId>
+                    <groupId>org.apache.groovy</groupId>
                     <artifactId>groovy-testng</artifactId>
                 </exclusion>
             </exclusions>
@@ -149,6 +149,8 @@
                     </execution>
                 </executions>
                 <configuration>
+                    <!-- IIUIC, this should be the same as what we compile Weld into -->
+                    <targetBytecode>${maven.compiler.argument.target}</targetBytecode>
                     <testSources>
                         <testSource>
                             <directory>${project.basedir}/src/test/groovy</directory>
@@ -169,10 +171,6 @@
                         <goals>
                             <goal>compile</goal>
                         </goals>
-                        <configuration>
-                            <source>${maven.compiler.source}</source>
-                            <target>${maven.compiler.target}</target>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/examples/se/groovy-numberguess/pom.xml b/examples/se/groovy-numberguess/pom.xml
index 9d782b02064..8cf06c18086 100644
--- a/examples/se/groovy-numberguess/pom.xml
+++ b/examples/se/groovy-numberguess/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-all</artifactId>
             <type>pom</type>
         </dependency>
@@ -72,6 +72,7 @@
                     </execution>
                 </executions>
                 <configuration>
+                    <targetBytecode>${maven.compiler.argument.target}</targetBytecode>
                     <sources>
                         <source>
                             <directory>${project.basedir}/src/main/java</directory>
diff --git a/pom.xml b/pom.xml
index b2125b63c84..86c61b8e7dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
         <!-- Our variant is under src/test/tck/tck-tests.xml -->
         <cdi.tck.suite.xml.file />
         <classfilewriter.version>1.3.1.Final</classfilewriter.version>
-        <groovy.version>3.0.25</groovy.version>
+        <groovy.version>5.0.2</groovy.version>
         <htmlunit.version>2.70.0</htmlunit.version>
         <jacoco.version>0.8.13</jacoco.version>
         <jandex.version>3.5.0</jandex.version>
@@ -118,7 +118,7 @@
             </dependency>
 
             <dependency>
-                <groupId>org.codehaus.groovy</groupId>
+                <groupId>org.apache.groovy</groupId>
                 <artifactId>groovy-all</artifactId>
                 <version>${groovy.version}</version>
                 <type>pom</type>
@@ -474,7 +474,9 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <compilerArgs>
-                        <arg>-Aorg.jboss.logging.tools.addGeneratedAnnotation=false</arg>
+                        <!-- Needed since Java 23 to enable annotation processors (JBoss Logging) -->
+                        <!-- 'full' means that annotation processing happens alongside source code compilation -->
+                        <arg>-proc:full</arg>
                     </compilerArgs>
                 </configuration>
             </plugin>