Merge pull request #48 from JackOehling/TEJ-2586

TEJ-2586: Compile TCL Regex Java with Java 21 and target Java 11

Author: juliencherry

Jenkinsfile

@@ -1,34 +1,64 @@
 env.project = "tcl-regex-java"
 
-properties([
-    parameters([
+def properties = [
+    buildParams: [
         booleanParam(
 	    name: 'release',
             defaultValue: false,
             description: 'Release the project'
-	),
+	    ),
         string(
 	    name: 'version',
             defaultValue: '',
             description: 'Version to release, or empty to use the default next version'
-	)
-     ])
-])
+	    ),
+        string(
+            name: 'buildJdk',
+            defaultValue: 'openjdk-21',
+            description: 'The JDK to use for building',
+        ),
+        string(
+            name: 'testJdks',
+            defaultValue: 'openjdk-11 openjdk-17',
+            description: 'The JDKs to use for tests, separated by spaces',
+        ),
+    ],
+]
 
 standardProperties(properties)
 
-def options = [
-    mavenOptionsExtra: [jdk: 'openjdk-17'],
+def afterBuildClosures = []
+
+def buildOptions = [
+    mavenOptionsExtra: [jdk: params.buildJdk],
+    afterBuild: { afterBuildClosures.each { it() } },
 ]
 
-options.afterBuild = {
-    withMaven([jdk: params.testJdk]) {
-        withSonarQubeEnv() {
-            sh "mvn -D sonar.login=${env.SONAR_AUTH_TOKEN} sonar:sonar -D sonar.host.url=${env.SONAR_HOST_URL}"
+
+afterBuildClosures += {
+    stage('sonar-report') {
+        withMaven() {
+            withSonarQubeEnv() {
+                sh "mvn -D sonar.login=${env.SONAR_AUTH_TOKEN} sonar:sonar -D sonar.host.url=${env.SONAR_HOST_URL}"
+            }
+        }
+    }
+}
+
+if (params.testJdks) {
+    afterBuildClosures += {
+        params.testJdks.split(' ').each { testJdk ->
+            stage("Tests in ${testJdk}") {
+                withMaven([
+                    jdk: testJdk,
+                ]) {
+                    sh 'mvn -B -e -D enforcer.skip -D maven.javadoc.skip verify'
+                }
+            }
         }
     }
 }
 
-options.buildArgs = ' '
+buildOptions.buildArgs = ' '
 
-standardBuildSteps(options)
+standardBuildSteps(buildOptions)

pom.xml

@@ -157,6 +157,27 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>${maven-enforcer-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>enforce-versions</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <phase>validate</phase>
+                        <configuration>
+                            <rules>
+                                <requireJavaVersion>
+                                    <version>[21,22)</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <reporting>