ci: fix build on java 11/17/21

juherr · ctrimble · commit c75de38d4fac · 2025-10-16T20:43:47.000-07:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
     continue-on-error: true # allow jobs to complete even if some fail
     strategy:
       matrix:
-        java: [8]
+        java: [8, 11, 17, 21]
       max-parallel: 4
     name: JDK ${{ matrix.java }} | Project
     steps:
@@ -47,7 +47,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build-java: [8]
+        build-java: [8, 11, 17, 21]
         run:
           - { java: 8,  gradle: '7.6.4' }  # AGP Java 8 => Gradle 7.6.4 (MavenPlugin legacy)
           - { java: 11, gradle: '7.6.4' }
@@ -87,7 +87,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build-java: [8]
+        build-java: [8, 11, 17, 21]
         run-java: [8, 11, 17, 21]
     name: JDK ${{ matrix.build-java }} | Example Gradle (Java) | run on Java ${{ matrix.run-java }}
     steps:
diff --git a/jsonschema2pojo-gradle-plugin/example/android/app/build.gradle b/jsonschema2pojo-gradle-plugin/example/android/app/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'jsonschema2pojo'
 
 android {
+    namespace "jsonschema2pojo.joelittlejohn.github.com.androidexample"
     compileSdkVersion 30
 
     defaultConfig {
diff --git a/jsonschema2pojo-gradle-plugin/example/android/app/src/main/AndroidManifest.xml b/jsonschema2pojo-gradle-plugin/example/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="jsonschema2pojo.joelittlejohn.github.com.androidexample" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/jsonschema2pojo-gradle-plugin/example/android/build.gradle b/jsonschema2pojo-gradle-plugin/example/android/build.gradle
@@ -5,7 +5,11 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
+            classpath 'com.android.tools.build:gradle:8.5.2'
+        } else {
+            classpath 'com.android.tools.build:gradle:4.2.2'
+        }
         classpath 'org.jsonschema2pojo:jsonschema2pojo-gradle-plugin:latest.integration'
     }
 }
diff --git a/jsonschema2pojo-gradle-plugin/example/android/lib/build.gradle b/jsonschema2pojo-gradle-plugin/example/android/lib/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'jsonschema2pojo'
 
 
 android {
+    namespace "jsonschema2pojo.joelittlejohn.github.com.androidexample"
     compileSdkVersion 30
 
     defaultConfig {
diff --git a/jsonschema2pojo-gradle-plugin/example/android/lib/src/main/AndroidManifest.xml b/jsonschema2pojo-gradle-plugin/example/android/lib/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<manifest package="jsonschema2pojo.joelittlejohn.github.com.androidlibexample">
+<manifest>
 
     <application/>
 </manifest>
diff --git a/jsonschema2pojo-gradle-plugin/example/android/libMoshi/build.gradle b/jsonschema2pojo-gradle-plugin/example/android/libMoshi/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'jsonschema2pojo'
 
 
 android {
+    namespace "jsonschema2pojo.joelittlejohn.github.com.androidexample"
     compileSdkVersion 30
 
     defaultConfig {
diff --git a/jsonschema2pojo-gradle-plugin/example/android/libMoshi/src/main/AndroidManifest.xml b/jsonschema2pojo-gradle-plugin/example/android/libMoshi/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<manifest package="jsonschema2pojo.joelittlejohn.github.com.androidlibexample">
+<manifest>
 
     <application/>
 </manifest>
diff --git a/jsonschema2pojo-gradle-plugin/example/java/build.gradle b/jsonschema2pojo-gradle-plugin/example/java/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'jsonschema2pojo'
 buildscript {
   repositories {
     mavenLocal()
-    jcenter()
+    mavenCentral()
   }
 
   dependencies {
@@ -16,6 +16,7 @@ buildscript {
 }
 
 repositories {
+  mavenLocal()
   mavenCentral()
 }
 
diff --git a/jsonschema2pojo-gradle-plugin/pom.xml b/jsonschema2pojo-gradle-plugin/pom.xml
@@ -26,6 +26,12 @@
             <artifactId>gradle-api</artifactId>
             <version>${gradle.version}</version>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.codehaus.groovy</groupId>
+                    <artifactId>groovy-all</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
@@ -43,10 +49,6 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <integrationTestSourceDirectory>src/integrationTest/groovy</integrationTestSourceDirectory>
-    </properties>
-
     <build>
         <sourceDirectory>${project.basedir}/src/main/groovy</sourceDirectory>
         <testSourceDirectory>${project.basedir}/src/test/groovy</testSourceDirectory>
@@ -79,18 +81,6 @@
                             </sources>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>add-integration-test-sources</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${integrationTestSourceDirectory}</source>
-                            </sources>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -133,22 +123,6 @@
                     </includes>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <useFile>false</useFile>
-                    <testSourceDirectory>${integrationTestSourceDirectory}</testSourceDirectory>
-                </configuration>
-            </plugin>
             <plugin>
                   <groupId>org.codehaus.mojo</groupId>
                   <artifactId>codenarc-maven-plugin</artifactId>
diff --git a/jsonschema2pojo-gradle-plugin/src/integrationTest/groovy/org/jsonschema2pojo/gradle/GradleBuildIT.groovy b/jsonschema2pojo-gradle-plugin/src/integrationTest/groovy/org/jsonschema2pojo/gradle/GradleBuildIT.groovy
diff --git a/jsonschema2pojo-gradle-plugin/src/main/groovy/org/jsonschema2pojo/gradle/GenerateJsonSchemaAndroidTask.groovy b/jsonschema2pojo-gradle-plugin/src/main/groovy/org/jsonschema2pojo/gradle/GenerateJsonSchemaAndroidTask.groovy
@@ -62,11 +62,8 @@ class GenerateJsonSchemaAndroidTask extends SourceTask {
 
   void setTargetVersion(JsonSchemaExtension configuration) {
     if (!configuration.targetVersion) {
-      if (project.plugins.hasPlugin("com.android.application")) {
-        configuration.targetVersion = project.plugins.getPlugin("com.android.application").extension.compileOptions.sourceCompatibility
-        logger.info 'Using android.compileOptions.sourceCompatibility as targetVersion for jsonschema2pojo: ' + configuration.targetVersion
-      } else if (project.plugins.hasPlugin("com.android.library")) {
-        configuration.targetVersion = project.plugins.getPlugin("com.android.library").extension.compileOptions.sourceCompatibility
+      if (project.hasProperty("android")) {
+        configuration.targetVersion = project.property("android").compileOptions.sourceCompatibility
         logger.info 'Using android.compileOptions.sourceCompatibility as targetVersion for jsonschema2pojo: ' + configuration.targetVersion
       }
     }
diff --git a/jsonschema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/DynamicPropertiesIT.java b/jsonschema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/DynamicPropertiesIT.java
@@ -20,16 +20,18 @@
 import static org.hamcrest.Matchers.*;
 import static org.jsonschema2pojo.integration.util.CodeGenerationHelper.*;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.condition.JRE.JAVA_21;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
 
 import org.jsonschema2pojo.integration.util.Jsonschema2PojoRule;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledForJreRange;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class DynamicPropertiesIT {
-    
+
     @RegisterExtension public Jsonschema2PojoRule schemaRule = new Jsonschema2PojoRule();
 
     @Test
@@ -44,6 +46,8 @@ public void shouldSetStringField() throws Throwable {
     }
 
     @Test
+    // jdk21 cannot build 1.7 target
+    @DisabledForJreRange(max = JAVA_21)
     public void shouldSetStringFieldJava7() throws Throwable {
         setDeclaredPropertyTest(
                 config("includeDynamicAccessors", true, "includeDynamicGetters", true,
@@ -56,6 +60,19 @@ public void shouldSetStringFieldJava7() throws Throwable {
                 "value");
     }
 
+    @Test
+    public void shouldSetStringFieldJava8() throws Throwable {
+        setDeclaredPropertyTest(
+                config("includeDynamicAccessors", true, "includeDynamicGetters", true,
+                    "includeDynamicSetters", true, "includeDynamicBuilders", true, "targetVersion", "1.8"),
+                "/schema/dynamic/parentType.json",
+                "ParentType",
+                String.class,
+                "stringValue",
+                "getStringValue",
+                "value");
+  }
+
     @Test
     public void shouldSetNumericField() throws Throwable {
         setDeclaredPropertyTest(
diff --git a/pom.xml b/pom.xml
@@ -51,7 +51,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <gradle.version>5.6</gradle.version>
+        <gradle.version>8.9</gradle.version>
         <gson.version>2.11.0</gson.version>
         <moshi.version>1.12.0</moshi.version>
         <jackson.version>2.17.2</jackson.version>
@@ -355,45 +355,45 @@
             </build>
         </profile>
         <profile>
-            <id>java-8-profile</id>
+            <id>java-9-plus</id>
             <activation>
-                <jdk>1.8</jdk>
+                <jdk>[9,)</jdk>
             </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.jdt</groupId>
-                        <artifactId>ecj</artifactId>
-                        <!--
-                          Version 3.25.0 is the last version supporting Java 8.
-                          Starting at 3.26.0, the Eclipse Compiler is looking for MODULE_SOURCE_PATH (Part of Jigsaw).
-                          -->
-                        <version>3.25.0</version>
-                        <scope>test</scope>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
+            <properties>
+                <!--
+                  Version 3.33.0 is the last version supporting Java 11.
+                  Starting at 3.34.0, the Eclipse Compiler ships with class version 61.0 (Java 17)
+                -->
+                <ecj.version>3.33.0</ecj.version>
+            </properties>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <artifactId>maven-surefire-plugin</artifactId>
+                            <configuration>
+                                <useModulePath>false</useModulePath>
+                                <argLine>
+                                    --add-opens=java.base/java.lang=ALL-UNNAMED
+                                    --add-opens=java.base/java.lang.invoke=ALL-UNNAMED
+                                    --add-opens=java.base/java.lang.reflect=ALL-UNNAMED
+                                </argLine>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
         </profile>
 
         <profile>
-            <id>java-11-profile</id>
+            <id>java-17-plus</id>
             <activation>
-                <jdk>11</jdk>
+                <jdk>[17,)</jdk>
             </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.jdt</groupId>
-                        <artifactId>ecj</artifactId>
-                        <!--
-                          Version 3.33.0 is the last version supporting Java 11.
-                          Starting at 3.34.0, the Eclipse Compiler ships with class version 61.0 (Java 17)
-                          -->
-                        <version>3.33.0</version>
-                        <scope>test</scope>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
+            <properties>
+                <ecj.version>3.42.0</ecj.version>
+                <mockito.version>5.19.0</mockito.version>
+            </properties>
         </profile>
     </profiles>
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,11 @@ buildscript {`
`5`	`5`	`mavenCentral()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:4.2.2'`
	`8`	`+ if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {`
	`9`	`+ classpath 'com.android.tools.build:gradle:8.5.2'`
	`10`	`+ } else {`
	`11`	`+ classpath 'com.android.tools.build:gradle:4.2.2'`
	`12`	`+ }`
`9`	`13`	`classpath 'org.jsonschema2pojo:jsonschema2pojo-gradle-plugin:latest.integration'`
`10`	`14`	`}`
`11`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ apply plugin: 'jsonschema2pojo'`
`4`	`4`	`buildscript {`
`5`	`5`	`repositories {`
`6`	`6`	`mavenLocal()`
`7`		`- jcenter()`
	`7`	`+ mavenCentral()`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`dependencies {`
`@@ -16,6 +16,7 @@ buildscript {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`repositories {`
	`19`	`+ mavenLocal()`
`19`	`20`	`mavenCentral()`
`20`	`21`	`}`
`21`	`22`