diff --git a/boot-plugin/build.gradle b/boot-plugin/build.gradle index 9af01d7d..1c19d20a 100644 --- a/boot-plugin/build.gradle +++ b/boot-plugin/build.gradle @@ -1,17 +1,16 @@ dependencies { - compileOnly "org.grails:grails-shell:$grailsShellVersion", { + compileOnly "org.grails:grails-shell", { exclude group:'org.apache.groovy', module:'groovy' } - api "org.apache.groovy:groovy:$groovyVersion" + api "org.apache.groovy:groovy" api "org.springframework.boot:spring-boot-autoconfigure" api project(":grails-datastore-gorm-hibernate5") - testImplementation "org.grails:grails-shell:$grailsShellVersion", { + testImplementation "org.grails:grails-shell", { exclude group:'org.apache.groovy', module:'groovy' } - testImplementation "org.spockframework:spock-core:$spockVersion" + testImplementation "org.spockframework:spock-core" - testRuntimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion" - testRuntimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatLog4jVersion" + testRuntimeOnly "org.apache.tomcat:tomcat-jdbc" testRuntimeOnly "com.h2database:h2" } diff --git a/build.gradle b/build.gradle index a70d5589..b35be856 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,6 @@ ext { ext."signing.keyId" = System.getenv("SIGNING_KEY") ?: project.hasProperty("signing.keyId") ? project.getProperty('signing.keyId') : null ext."signing.password" = System.getenv("SIGNING_PASSPHRASE") ?: project.hasProperty("signing.password") ? project.getProperty('signing.password') : null ext."signing.secretKeyRingFile" = project.hasProperty("signing.secretKeyRingFile") ? project.getProperty('signing.secretKeyRingFile') : null -ext['junit-jupiter.version'] = junitJupiterVersion if (isReleaseVersion) { apply plugin: 'maven-publish' diff --git a/docs/build.gradle b/docs/build.gradle index b0e4f69c..0fe578a8 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -18,17 +18,17 @@ apply plugin: 'groovy' apply plugin: 'org.asciidoctor.jvm.convert' dependencies { - documentation "org.grails:grails-core:$grailsVersion" - documentation "org.grails:grails-bootstrap:$grailsVersion" - documentation "org.grails:grails-spring:$grailsVersion" + documentation "org.grails:grails-core" + documentation "org.grails:grails-bootstrap" + documentation "org.grails:grails-spring" documentation "info.picocli:picocli:$picocliVersion" - documentation "org.fusesource.jansi:jansi:$jansiVersion" - documentation "org.apache.groovy:groovy-dateutil:$groovyVersion" - documentation "com.github.javaparser:javaparser-core:$javaParserCoreVersion" + documentation "org.fusesource.jansi:jansi" + documentation "org.apache.groovy:groovy-dateutil" + documentation "com.github.javaparser:javaparser-core" - documentation "org.fusesource.jansi:jansi:$jansiVersion" + documentation "org.fusesource.jansi:jansi" for(p in coreProjects) { - documentation "org.grails:grails-datastore-$p:$gormVersion" + documentation "org.grails:grails-datastore-$p" } project.rootProject.subprojects.each { subproject -> if(subproject.name != "docs" && !subproject.name.startsWith('examples')) { diff --git a/examples/grails-hibernate-groovy-proxy/build.gradle b/examples/grails-hibernate-groovy-proxy/build.gradle index 5afa796a..7d509796 100644 --- a/examples/grails-hibernate-groovy-proxy/build.gradle +++ b/examples/grails-hibernate-groovy-proxy/build.gradle @@ -10,7 +10,9 @@ dependencies { implementation project(':grails-plugin') implementation 'org.grails:grails-core' - implementation "org.yakworks:hibernate-groovy-proxy:$yakworksHibernateGroovyProxyVersion" + implementation "org.yakworks:hibernate-groovy-proxy:$yakworksHibernateGroovyProxyVersion", { + exclude group: "org.codehaus.groovy", module: "groovy" + } runtimeOnly 'com.h2database:h2' runtimeOnly 'com.zaxxer:HikariCP' diff --git a/gradle.properties b/gradle.properties index ed3d6097..22c554b9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,29 +1,16 @@ projectVersion=9.0.0-SNAPSHOT asciidoctorGradleVersion=4.0.1 -grolifantVersion=4.0.0 gormVersion=9.0.0-SNAPSHOT gradleNexusPublishPluginVersion=2.0.0 grailsGradlePluginVersion=7.0.0-SNAPSHOT -grailsShellVersion=7.0.0-SNAPSHOT -grailsSpringSecurityRestVersion=6.0.0-SNAPSHOT grailsVersion=7.0.0-SNAPSHOT groovydocGradlePluginVersion=1.0.1 groovyVersion=4.0.24 hibernateVersion=5.6.15.Final -hibernateValidatorVersion=8.0.1.Final yakworksHibernateGroovyProxyVersion=1.1 -jansiVersion=2.4.1 -javaParserCoreVersion=3.26.2 -junitJupiterVersion=5.11.3 micronautPlatformVersion=4.6.3 picocliVersion=4.7.6 -snakeYamlVersion=2.3 -slf4jVersion=2.0.16 -spockVersion=2.3-groovy-4.0 -springBootGradlePluginVersion=3.3.5 -testingSupportVersion=4.0.0-SNAPSHOT -tomcatLog4jVersion=8.5.2 -tomcatVersion=10.1.33 +springBootGradlePluginVersion=3.4.1 viewsGradleVersion=4.0.0-SNAPSHOT org.gradle.caching=true diff --git a/grails-datastore-gorm-hibernate/build.gradle b/grails-datastore-gorm-hibernate/build.gradle index 2ab568b2..78b41962 100644 --- a/grails-datastore-gorm-hibernate/build.gradle +++ b/grails-datastore-gorm-hibernate/build.gradle @@ -1,10 +1,10 @@ dependencies { - api "org.slf4j:slf4j-api:$slf4jVersion" + api "org.slf4j:slf4j-api" - api "org.apache.groovy:groovy:$groovyVersion" + api "org.apache.groovy:groovy" api "org.grails:grails-datastore-gorm" api "org.springframework:spring-orm" - api("org.hibernate:hibernate-core-jakarta:$hibernateVersion") { + api "org.hibernate:hibernate-core-jakarta:$hibernateVersion", { exclude group:'commons-logging', module:'commons-logging' exclude group:'com.h2database', module:'h2' exclude group:'commons-collections', module:'commons-collections' @@ -13,13 +13,13 @@ dependencies { exclude group:'org.slf4j', module:'slf4j-log4j12' exclude group:'xml-apis', module:'xml-apis' } - api("org.hibernate:hibernate-validator:$hibernateValidatorVersion") { + api "org.hibernate.validator:hibernate-validator", { exclude group:'commons-logging', module:'commons-logging' exclude group:'commons-collections', module:'commons-collections' exclude group:'org.slf4j', module:'slf4j-api' } - compileOnly ("org.hibernate:hibernate-ehcache:$hibernateVersion") { + compileOnly "org.hibernate:hibernate-ehcache:$hibernateVersion", { exclude group:'commons-collections', module:'commons-collections' exclude group:'commons-logging', module:'commons-logging' exclude group:'com.h2database', module:'h2' @@ -32,9 +32,9 @@ dependencies { exclude group:'xml-apis', module:'xml-apis' } - testImplementation "org.apache.groovy:groovy-test-junit5:$groovyVersion" - testImplementation "org.apache.groovy:groovy-sql:$groovyVersion" - testImplementation "org.apache.groovy:groovy-json:$groovyVersion" + testImplementation "org.apache.groovy:groovy-test-junit5" + testImplementation "org.apache.groovy:groovy-sql" + testImplementation "org.apache.groovy:groovy-json" testImplementation "org.grails:grails-datastore-gorm-tck:$gormVersion", { exclude group: "org.spockframework" } @@ -43,16 +43,17 @@ dependencies { testImplementation "org.hibernate:hibernate-ehcache:$hibernateVersion" // groovy proxy fixes bytebuddy to be a bit smarter when it comes to groovy metaClass - testImplementation "org.yakworks:hibernate-groovy-proxy:$yakworksHibernateGroovyProxyVersion" + testImplementation "org.yakworks:hibernate-groovy-proxy:$yakworksHibernateGroovyProxyVersion", { + exclude group: "org.codehaus.groovy", module: "groovy" + } - testImplementation "org.apache.tomcat:tomcat-jdbc:$tomcatVersion" + testImplementation "org.apache.tomcat:tomcat-jdbc" testRuntimeOnly "org.springframework:spring-aop" - testRuntimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatLog4jVersion" - testRuntimeOnly "org.slf4j:slf4j-simple:$slf4jVersion" - testRuntimeOnly "org.slf4j:jcl-over-slf4j:$slf4jVersion" + testRuntimeOnly "org.slf4j:slf4j-simple" + testRuntimeOnly "org.slf4j:jcl-over-slf4j" // The groovydoc task needs the Hibernate 4.x jars in the classpath - documentation("org.hibernate:hibernate-core-jakarta:${hibernateVersion}") + documentation "org.hibernate:hibernate-core-jakarta:${hibernateVersion}" } test { diff --git a/grails-plugin/build.gradle b/grails-plugin/build.gradle index 61dcffb4..d1a59c0e 100644 --- a/grails-plugin/build.gradle +++ b/grails-plugin/build.gradle @@ -9,14 +9,14 @@ configurations.all { } dependencies { - documentation ("org.grails:grails-core:$grailsVersion") - documentation ("org.grails:grails-bootstrap:$grailsVersion") - documentation ("org.grails:grails-spring:$grailsVersion") - documentation ("com.github.javaparser:javaparser-core:$javaParserCoreVersion") + documentation "org.grails:grails-core" + documentation "org.grails:grails-bootstrap" + documentation "org.grails:grails-spring" + documentation "com.github.javaparser:javaparser-core" - compileOnly("org.grails:grails-bootstrap:$grailsVersion") - compileOnly("org.grails:grails-core:$grailsVersion") - compileOnly "org.spockframework:spock-core:$spockVersion", { + compileOnly "org.grails:grails-bootstrap" + compileOnly "org.grails:grails-core" + compileOnly "org.spockframework:spock-core", { exclude group: "junit", module: "junit-dep" exclude group: 'org.codehaus.groovy', module: 'groovy-all' exclude group: 'org.hamcrest', module: 'hamcrest-core' @@ -24,10 +24,10 @@ dependencies { api "org.springframework.boot:spring-boot" api "org.springframework:spring-orm" - api "org.hibernate:hibernate-core-jakarta:${hibernateVersion}" + api "org.hibernate:hibernate-core-jakarta:$hibernateVersion" api "org.hibernate:hibernate-ehcache:$hibernateVersion" - api "org.grails:grails-datastore-web:$gormVersion" - api "org.grails:grails-datastore-gorm-support:$gormVersion" + api "org.grails:grails-datastore-web" + api "org.grails:grails-datastore-gorm-support" api project(":grails-datastore-gorm-hibernate5"), { exclude group:'org.springframework', module:'spring-context' exclude group:'org.springframework', module:'spring-core' @@ -38,11 +38,10 @@ dependencies { exclude group:'org.grails', module:'grails-core' exclude group:'javax.transaction', module:'jta' } - testRuntimeOnly "org.yaml:snakeyaml:$snakeYamlVersion" - testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion" + testRuntimeOnly "org.yaml:snakeyaml" + testImplementation "org.grails:grails-gorm-testing-support" testRuntimeOnly "com.h2database:h2" - testRuntimeOnly "org.apache.tomcat:tomcat-jdbc:$tomcatVersion" - testRuntimeOnly "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatLog4jVersion" + testRuntimeOnly "org.apache.tomcat:tomcat-jdbc" testRuntimeOnly "org.springframework:spring-aop" testRuntimeOnly "org.springframework:spring-expression" }