From 78828c472db4b38eb05fdc57d3439b9d4f8f1c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=CC=88rg=20Prante?= <joergprante@gmail.com>
Date: Fri, 29 Apr 2022 17:14:15 +0200
Subject: [PATCH] Groovy 4/JDK17

---
 gradle/compile/groovy.gradle             | 10 +++++-----
 gradle/compile/java.gradle               |  8 ++++----
 graphics-pdfbox-groovy/build.gradle      | 18 +++++++++---------
 graphics-pdfbox-groovy/gradle.properties |  4 ++--
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/gradle/compile/groovy.gradle b/gradle/compile/groovy.gradle
index c70f6b9..b7a58d4 100644
--- a/gradle/compile/groovy.gradle
+++ b/gradle/compile/groovy.gradle
@@ -1,17 +1,17 @@
 apply plugin: 'groovy'
 
 dependencies {
-    implementation "org.codehaus.groovy:groovy:${project.property('groovy.version')}"
+    implementation "org.apache.groovy:groovy:${project.property('groovy.version')}"
 }
 
 compileGroovy {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 compileTestGroovy {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 tasks.withType(GroovyCompile) {
diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle
index 73c6705..96f6e09 100644
--- a/gradle/compile/java.gradle
+++ b/gradle/compile/java.gradle
@@ -6,13 +6,13 @@ java {
 }
 
 compileJava {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 compileTestJava {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 jar {
diff --git a/graphics-pdfbox-groovy/build.gradle b/graphics-pdfbox-groovy/build.gradle
index 5706b4e..ca21782 100644
--- a/graphics-pdfbox-groovy/build.gradle
+++ b/graphics-pdfbox-groovy/build.gradle
@@ -3,17 +3,17 @@ apply from: rootProject.file('gradle/compile/groovy.gradle')
 dependencies {
     api project(':graphics-pdfbox')
     api project(':graphics-barcode')
-    api("org.codehaus.groovy:groovy-xml:${project.property('groovy.version')}")
+    api("org.apache.groovy:groovy-xml:${project.property('groovy.version')}")
     // spock need junit vintage
     testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.property('junit.version')}"
-    testImplementation("org.codehaus.groovy:groovy:${project.property('groovy.version')}")
-    testImplementation("org.codehaus.groovy:groovy-json:${project.property('groovy.version')}")
-    testImplementation("org.codehaus.groovy:groovy-nio:${project.property('groovy.version')}")
-    testImplementation("org.codehaus.groovy:groovy-sql:${project.property('groovy.version')}")
-    testImplementation("org.codehaus.groovy:groovy-xml:${project.property('groovy.version')}")
-    testImplementation("org.codehaus.groovy:groovy-macro:${project.property('groovy.version')}")
-    testImplementation("org.codehaus.groovy:groovy-templates:${project.property('groovy.version')}")
-    testImplementation("org.codehaus.groovy:groovy-test:${project.property('groovy.version')}")
+    testImplementation("org.apache.groovy:groovy:${project.property('groovy.version')}")
+    testImplementation("org.apache.groovy:groovy-json:${project.property('groovy.version')}")
+    testImplementation("org.apache.groovy:groovy-nio:${project.property('groovy.version')}")
+    testImplementation("org.apache.groovy:groovy-sql:${project.property('groovy.version')}")
+    testImplementation("org.apache.groovy:groovy-xml:${project.property('groovy.version')}")
+    testImplementation("org.apache.groovy:groovy-macro:${project.property('groovy.version')}")
+    testImplementation("org.apache.groovy:groovy-templates:${project.property('groovy.version')}")
+    testImplementation("org.apache.groovy:groovy-test:${project.property('groovy.version')}")
     testImplementation("org.spockframework:spock-core:${project.property('spock.version')}")
     testImplementation "cglib:cglib-nodep:${project.property('cglib.version')}" // for spock mock
     testImplementation "org.objenesis:objenesis:${project.property('objenesis.version')}" // for spock mock
diff --git a/graphics-pdfbox-groovy/gradle.properties b/graphics-pdfbox-groovy/gradle.properties
index edaf6f3..7f7b522 100644
--- a/graphics-pdfbox-groovy/gradle.properties
+++ b/graphics-pdfbox-groovy/gradle.properties
@@ -1,2 +1,2 @@
-groovy.version = 3.0.9
-spock.version = 2.0-groovy-3.0
+groovy.version = 4.0.2
+spock.version = 2.2-M1-groovy-4.0