Merge branch 'main' into rga-fa18

JeffersonLab · Dec 20, 2024 · 15991e7 · 15991e7
2 parents 6e9f168 + 8a7ea75
commit 15991e7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ defaults:
 env:
   dataset: ci_test
   # NOTE: if any of these versions are changed, update the POM files too
-  java_version: 17
+  java_version: 21
   java_distribution: zulu
   groovy_version: 4.x
 

diff --git a/monitoring/pom.xml b/monitoring/pom.xml
@@ -34,7 +34,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.13.0</version>
         <configuration>
-          <release>11</release>
+          <release>21</release>
         </configuration>
       </plugin>
     </plugins>

diff --git a/pom.xml b/pom.xml
@@ -17,8 +17,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <release>21</release>
   </properties>
 
   <dependencies>