From 28bd59d7aaae4ce2d908b664845f8e74ef853829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Tue, 22 Feb 2022 18:04:44 +0100 Subject: [PATCH] reset to Groovy 3.0.9, Java 11 --- gradle.properties | 2 +- gradle/compile/groovy.gradle | 2 +- graphics-pdfbox-groovy/build.gradle | 18 +++++++++--------- graphics-pdfbox-groovy/gradle.properties | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gradle.properties b/gradle.properties index 26d7770..02233b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ group = org.xbib.graphics name = graphics -version = 5.0.0 +version = 4.2.0 org.gradle.warning.mode = ALL gradle.wrapper.version = 7.3.2 diff --git a/gradle/compile/groovy.gradle b/gradle/compile/groovy.gradle index d96434e..c70f6b9 100644 --- a/gradle/compile/groovy.gradle +++ b/gradle/compile/groovy.gradle @@ -1,7 +1,7 @@ apply plugin: 'groovy' dependencies { - implementation "org.apache.groovy:groovy:${project.property('groovy.version')}" + implementation "org.codehaus.groovy:groovy:${project.property('groovy.version')}" } compileGroovy { diff --git a/graphics-pdfbox-groovy/build.gradle b/graphics-pdfbox-groovy/build.gradle index ca21782..5706b4e 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.apache.groovy:groovy-xml:${project.property('groovy.version')}") + api("org.codehaus.groovy:groovy-xml:${project.property('groovy.version')}") // spock need junit vintage testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.property('junit.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.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.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 507fd09..edaf6f3 100644 --- a/graphics-pdfbox-groovy/gradle.properties +++ b/graphics-pdfbox-groovy/gradle.properties @@ -1,2 +1,2 @@ -groovy.version = 4.0.0-rc-2 +groovy.version = 3.0.9 spock.version = 2.0-groovy-3.0