Merge rocker-test-java8 and rocker-test-java7 maven modules into rock…

…er-test-template (since we're dropping Java 7 support)

.github/workflows/java19.yaml → .github/workflows/java21.yaml

@@ -1,4 +1,4 @@
-name: Java 19
+name: Java 21
 on:
   - push
   - workflow_dispatch
@@ -8,10 +8,10 @@ jobs:
     timeout-minutes: 40
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Azul JDK 19
+      - name: Set up Azul JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: 19
+          java-version: 21
           distribution: 'zulu'
           cache: 'maven'
       - name: Test in Maven

pom.xml

@@ -21,48 +21,24 @@
         <main.java.package />
         <slf4j.version>1.7.7</slf4j.version>
         <antlr.version>4.5.3</antlr.version>
-        <java.version>1.7</java.version>
+        <java.version>1.8</java.version>
         <license.skip>true</license.skip>
         <!-- netbeans specific -->
         <netbeans.compile.on.save>false</netbeans.compile.on.save>
         <!-- workaround travis ci maven version requirement -->
         <maven.enforce.version>3.2.5</maven.enforce.version>
     </properties>
 
-    <!-- jdk 7+, profile below for java 8 stuff -->
     <modules>
         <module>rocker-runtime</module>
         <module>rocker-compiler</module>
         <module>rocker-maven-plugin</module>
         <module>rocker-gradle-plugin</module>
-        <module>rocker-test-java7</module>
+        <module>rocker-test-template</module>
         <module>rocker-test-reload</module>
         <module>rocker-bom</module>
     </modules>
 
-    <!-- things to do if running on JDK 8 -->
-    <profiles>
-        <profile>
-            <id>java8-settings</id>
-            <activation>
-                <jdk>[1.8,)</jdk>
-            </activation>
-            <properties>
-                <javadoc.opts>-Xdoclint:none</javadoc.opts>
-            </properties>
-            <modules>
-                <module>rocker-runtime</module>
-                <module>rocker-compiler</module>
-                <module>rocker-maven-plugin</module>
-                <module>rocker-gradle-plugin</module>
-                <module>rocker-test-java7</module>
-                <module>rocker-test-java8</module>
-                <module>rocker-test-reload</module>
-                <module>rocker-bom</module>
-            </modules>
-        </profile>
-    </profiles>
-
     <build>
         <plugins>
             <plugin>