From 24f282d2e99b76402e5ff2a7b1c1ea1225ffd4fc Mon Sep 17 00:00:00 2001
From: David Walluck <dwalluck@redhat.com>
Date: Wed, 2 Apr 2025 14:32:39 -0400
Subject: [PATCH] Fix build on JDKs greater than 8

---
 pom.xml                                                  | 2 +-
 rwx-test/pom.xml                                         | 8 ++------
 .../main/java/org/commonjava/rwx/core/AnnoProcessor.java | 9 ++++++---
 .../main/java/org/commonjava/rwx/vocab/ValueType.java    | 2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index c6d4d87..7d180e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
       <dependency>
         <groupId>org.codehaus.groovy</groupId>
         <artifactId>groovy-templates</artifactId>
-        <version>2.1.3</version>
+        <version>2.4.6</version>
       </dependency>
       <dependency>
         <groupId>commons-io</groupId>
diff --git a/rwx-test/pom.xml b/rwx-test/pom.xml
index 7762ff6..25df319 100644
--- a/rwx-test/pom.xml
+++ b/rwx-test/pom.xml
@@ -39,12 +39,8 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <encoding>UTF-8</encoding>
-                    <generatedSourcesDirectory>${project.build.directory}/generated-sources/</generatedSourcesDirectory>
+                    <generatedSourcesDirectory>${project.build.directory}/generated-sources</generatedSourcesDirectory>
                     <annotationProcessors>
                         <annotationProcessor>
                             org.commonjava.rwx.core.AnnoProcessor
@@ -55,4 +51,4 @@
         </plugins>
     </build>
     
-</project>
\ No newline at end of file
+</project>
diff --git a/rwx/src/main/java/org/commonjava/rwx/core/AnnoProcessor.java b/rwx/src/main/java/org/commonjava/rwx/core/AnnoProcessor.java
index 7c4f453..187b284 100644
--- a/rwx/src/main/java/org/commonjava/rwx/core/AnnoProcessor.java
+++ b/rwx/src/main/java/org/commonjava/rwx/core/AnnoProcessor.java
@@ -25,17 +25,15 @@
 
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.Filer;
-import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.MirroredTypeException;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.Elements;
-import javax.lang.model.util.Types;
 import javax.tools.Diagnostic;
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
@@ -80,6 +78,11 @@ private void debug( String message )
 
     final GStringTemplateEngine engine = new GStringTemplateEngine();
 
+    public SourceVersion getSupportedSourceVersion()
+    {
+        return SourceVersion.latest();
+    }
+
     @Override
     public boolean process( Set<? extends TypeElement> annotations, RoundEnvironment roundEnv )
     {
diff --git a/rwx/src/main/java/org/commonjava/rwx/vocab/ValueType.java b/rwx/src/main/java/org/commonjava/rwx/vocab/ValueType.java
index 18257db..62a5b47 100644
--- a/rwx/src/main/java/org/commonjava/rwx/vocab/ValueType.java
+++ b/rwx/src/main/java/org/commonjava/rwx/vocab/ValueType.java
@@ -117,7 +117,7 @@ public Object upgradeCast( Object value )
             }
             else if ( value instanceof Integer )
             {
-                return new Long( (Integer) value );
+                return Long.valueOf( (Integer) value );
             }
             throw new ClassCastException( "Can not cast " + value.getClass() + " to Long" );
         }