diff --git a/gradle.properties b/gradle.properties index b1d5159..e639f79 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ group = org.xbib.graphics name = graphics -version = 4.1.0 +version = 5.0.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 c70f6b9..d96434e 100644 --- a/gradle/compile/groovy.gradle +++ b/gradle/compile/groovy.gradle @@ -1,7 +1,7 @@ apply plugin: 'groovy' dependencies { - implementation "org.codehaus.groovy:groovy:${project.property('groovy.version')}" + implementation "org.apache.groovy:groovy:${project.property('groovy.version')}" } compileGroovy { 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 720dde5..507fd09 100644 --- a/graphics-pdfbox-groovy/gradle.properties +++ b/graphics-pdfbox-groovy/gradle.properties @@ -1,2 +1,2 @@ -groovy.version = 2.5.12 -spock.version = 2.0-groovy-2.5 +groovy.version = 4.0.0-rc-2 +spock.version = 2.0-groovy-3.0