Apache Grails coordinate updates plus add Apache snapshot repository

jamesfredley · jamesfredley · commit fbcb2975d09c · 2025-05-06T15:03:04.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -1,30 +1,33 @@
 buildscript {
   repositories {
-    maven { url "https://plugins.gradle.org/m2/" }
-    maven { url "https://repo.grails.org/grails/core" }
+    maven { url = "https://repository.apache.org/content/groups/snapshots/" }
+    maven { url = "https://repo.grails.org/grails/core" }
   }
   dependencies {
-    classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
+    classpath platform("org.apache.grails:grails-bom:$grailsVersion")
+    classpath "org.apache.grails:grails-gradle-plugins"
+    classpath "com.bertramlabs.plugins:asset-pipeline-gradle"
   }
 }
 
 allprojects {
     repositories {
-      maven { url "https://repo.grails.org/grails/core" }
       mavenCentral()
+      maven { url = "https://repository.apache.org/content/groups/snapshots/" }
+      maven { url = 'https://repo.grails.org/grails/core' }
 //      mavenLocal() // for local testing, do not commit uncommented
     }
 }
 
-version project.projectVersion
-group "org.grails.plugins"
+version = project.projectVersion
+group = "org.grails.plugins"
 
 subprojects { Project project ->
-  project.version project.projectVersion
-  project.group "org.grails.plugins"
+  project.version = project.projectVersion
+  project.group = "org.grails.plugins"
 
   if(project.name.endsWith('audit-logging')) {
-    apply plugin: "org.grails.grails-publish"
+    apply plugin: "org.apache.grails.gradle.grails-publish"
     grailsPublish {
       githubSlug = 'grails-plugins/grails-audit-logging-plugin'
       license {
diff --git a/examples/audit-test-allow-update-outside-transaction/build.gradle b/examples/audit-test-allow-update-outside-transaction/build.gradle
@@ -1,24 +1,12 @@
-buildscript {
-    repositories {
-        maven { url "https://repo.grails.org/grails/core" }
-    }
-    dependencies {
-        classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
-    }
-}
-
-plugins {
-  id "com.bertramlabs.asset-pipeline" version "$assetPipelineVersion"
-}
-
-version project.projectVersion
-group "audit.test"
+version = project.projectVersion
+group = 'audit.test'
 
-apply plugin: "war"
+apply plugin: 'war'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
-apply plugin: "org.grails.grails-web"
-apply plugin: "org.grails.grails-gsp"
+apply plugin: 'org.apache.grails.gradle.grails-web'
+apply plugin: 'org.apache.grails.gradle.grails-gsp'
+apply plugin: 'asset-pipeline'
 
 assets {
     minifyJs = true
@@ -33,38 +21,38 @@ configurations {
 }
 
 dependencies {
-    implementation platform("org.grails:grails-bom:$grailsVersion")
+    implementation platform("org.apache.grails:grails-bom:$grailsVersion")
 
-    implementation "org.grails:grails-core"
-    implementation "org.grails:grails-logging"
-    implementation "org.grails:grails-plugin-databinding"
-    implementation "org.grails:grails-plugin-i18n"
-    implementation "org.grails:grails-plugin-interceptors"
-    implementation "org.grails:grails-plugin-rest"
-    implementation "org.grails:grails-plugin-services"
-    implementation "org.grails:grails-plugin-url-mappings"
-    implementation "org.grails:grails-web-boot"
-    implementation "org.grails.plugins:gsp"
-    implementation "org.grails.plugins:hibernate5"
-    implementation "org.grails.plugins:scaffolding"
+    implementation "org.apache.grails:grails-core"
+    implementation "org.apache.grails:grails-logging"
+    implementation "org.apache.grails:grails-databinding"
+    implementation "org.apache.grails:grails-i18n"
+    implementation "org.apache.grails:grails-interceptors"
+    implementation "org.apache.grails:grails-rest-transforms"
+    implementation "org.apache.grails:grails-services"
+    implementation "org.apache.grails:grails-url-mappings"
+    implementation "org.apache.grails:grails-web-boot"
+    implementation "org.apache.grails:grails-gsp"
+    implementation "org.apache.grails:grails-data-hibernate5"
+    implementation "org.apache.grails:grails-scaffolding"
     implementation "org.springframework.boot:spring-boot-autoconfigure"
     implementation "org.springframework.boot:spring-boot-starter"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation "org.springframework.boot:spring-boot-starter-logging"
     implementation "org.springframework.boot:spring-boot-starter-tomcat"
     implementation "org.springframework.boot:spring-boot-starter-validation"
-    console "org.grails:grails-console"
+    console "org.apache.grails:grails-console"
     runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
     runtimeOnly "com.h2database:h2"
     runtimeOnly "org.apache.tomcat:tomcat-jdbc"
     runtimeOnly "org.fusesource.jansi:jansi"
-    integrationTestImplementation testFixtures("org.grails.plugins:geb")
-    testImplementation "org.grails:grails-gorm-testing-support"
-    testImplementation "org.grails:grails-web-testing-support"
+    integrationTestImplementation testFixtures("org.apache.grails:grails-geb")
+    testImplementation "org.apache.grails:grails-testing-support-datamapping"
+    testImplementation "org.apache.grails:grails-testing-support-web"
     testImplementation "org.spockframework:spock-core"
 
     implementation project(":audit-logging")
-    profile "org.grails.profiles:web"
+    profile "org.apache.grails.profiles:web"
 }
 
 test {
diff --git a/examples/audit-test/build.gradle b/examples/audit-test/build.gradle
@@ -1,24 +1,12 @@
-buildscript {
-    repositories {
-        maven { url "https://repo.grails.org/grails/core" }
-    }
-    dependencies {
-        classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
-    }
-}
-
-plugins {
-  id "com.bertramlabs.asset-pipeline" version "$assetPipelineVersion"
-}
-
-version project.projectVersion
-group "audit.test"
+version = project.projectVersion
+group = 'audit.test'
 
-apply plugin: "war"
+apply plugin: 'war'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
-apply plugin: "org.grails.grails-web"
-apply plugin: "org.grails.grails-gsp"
+apply plugin: 'org.apache.grails.gradle.grails-web'
+apply plugin: 'org.apache.grails.gradle.grails-gsp'
+apply plugin: 'asset-pipeline'
 
 assets {
     minifyJs = true
@@ -34,39 +22,39 @@ configurations {
 
 dependencies {
 
-    implementation platform("org.grails:grails-bom:$grailsVersion")
+    implementation platform("org.apache.grails:grails-bom:$grailsVersion")
 
     developmentOnly "org.springframework.boot:spring-boot-devtools"
-    implementation "org.grails:grails-core"
-    implementation "org.grails:grails-logging"
-    implementation "org.grails:grails-plugin-databinding"
-    implementation "org.grails:grails-plugin-i18n"
-    implementation "org.grails:grails-plugin-interceptors"
-    implementation "org.grails:grails-plugin-rest"
-    implementation "org.grails:grails-plugin-services"
-    implementation "org.grails:grails-plugin-url-mappings"
-    implementation "org.grails:grails-web-boot"
-    implementation "org.grails.plugins:gsp"
-    implementation "org.grails.plugins:hibernate5"
-    implementation "org.grails.plugins:scaffolding"
+    implementation "org.apache.grails:grails-core"
+    implementation "org.apache.grails:grails-logging"
+    implementation "org.apache.grails:grails-databinding"
+    implementation "org.apache.grails:grails-i18n"
+    implementation "org.apache.grails:grails-interceptors"
+    implementation "org.apache.grails:grails-rest-transforms"
+    implementation "org.apache.grails:grails-services"
+    implementation "org.apache.grails:grails-url-mappings"
+    implementation "org.apache.grails:grails-web-boot"
+    implementation "org.apache.grails:grails-gsp"
+    implementation "org.apache.grails:grails-data-hibernate5"
+    implementation "org.apache.grails:grails-scaffolding"
     implementation "org.springframework.boot:spring-boot-autoconfigure"
     implementation "org.springframework.boot:spring-boot-starter"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation "org.springframework.boot:spring-boot-starter-logging"
     implementation "org.springframework.boot:spring-boot-starter-tomcat"
     implementation "org.springframework.boot:spring-boot-starter-validation"
-    console "org.grails:grails-console"
+    console "org.apache.grails:grails-console"
     runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
     runtimeOnly "com.h2database:h2"
     runtimeOnly "org.apache.tomcat:tomcat-jdbc"
     runtimeOnly "org.fusesource.jansi:jansi"
-    integrationTestImplementation testFixtures("org.grails.plugins:geb")
-    testImplementation "org.grails:grails-gorm-testing-support"
-    testImplementation "org.grails:grails-web-testing-support"
+    integrationTestImplementation testFixtures("org.apache.grails:grails-geb")
+    testImplementation "org.apache.grails:grails-testing-support-datamapping"
+    testImplementation "org.apache.grails:grails-testing-support-web"
     testImplementation "org.spockframework:spock-core"
 
     implementation project(":audit-logging")
-    profile "org.grails.profiles:web"
+    profile "org.apache.grails.profiles:web"
 }
 
 tasks.withType(Test).configureEach { Task it ->
diff --git a/gradle.properties b/gradle.properties
@@ -1,9 +1,7 @@
 projectVersion=6.0.0-SNAPSHOT
 
 asciidoctorJvmVersion=4.0.3
-assetPipelineVersion=5.0.5
-grailsVersion=7.0.0-M1
-grailsGradlePluginVersion=7.0.0-SNAPSHOT
+grailsVersion=7.0.0-SNAPSHOT
 
 org.gradle.daemon=true
 org.gradle.parallel=true
diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -1,54 +1,44 @@
-buildscript {
-    repositories {
-        maven { url "https://repo.grails.org/grails/core" }
-        mavenCentral()
-    }
-    dependencies {
-        classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
-    }
-}
-
 plugins {
     id "org.asciidoctor.jvm.convert" version "$asciidoctorJvmVersion"
     id "org.asciidoctor.jvm.pdf" version "$asciidoctorJvmVersion"
     id "org.asciidoctor.jvm.epub" version "$asciidoctorJvmVersion"
 }
 
-version project.projectVersion
-group "org.grails.plugins"
+version = project.projectVersion
+group = "org.grails.plugins"
 
 apply plugin: "eclipse"
 apply plugin: "idea"
-apply plugin: "org.grails.grails-plugin"
-apply plugin: "org.grails.grails-gsp"
+apply plugin: "org.apache.grails.gradle.grails-plugin"
+apply plugin: 'org.apache.grails.gradle.grails-gsp'
 
 compileJava.options.release = 17
 
 dependencies {
-    implementation platform("org.grails:grails-bom:$grailsVersion")
+    implementation platform("org.apache.grails:grails-bom:$grailsVersion")
 
-    profile "org.grails.profiles:web-plugin"
+    profile "org.apache.grails.profiles:web-plugin"
     compileOnly 'org.springframework.boot:spring-boot-starter-logging'
     compileOnly "org.springframework.boot:spring-boot-starter-actuator"
     compileOnly "org.springframework.boot:spring-boot-autoconfigure"
     compileOnly "org.springframework.boot:spring-boot-starter-tomcat"
-    compileOnly "org.grails:grails-web-boot"
-    compileOnly "org.grails:grails-core"
-    compileOnly "org.grails:grails-logging"
-    compileOnly "org.grails:grails-plugin-rest"
-    compileOnly "org.grails:grails-plugin-i18n"
-    compileOnly "org.grails:grails-plugin-services"
-    compileOnly "org.grails:grails-plugin-url-mappings"
-    compileOnly "org.grails:grails-plugin-interceptors"
-    compileOnly "org.grails.plugins:gsp"
-    compileOnly "org.grails:grails-console"
-    compileOnly "org.grails:grails-plugin-services"
-    compileOnly "org.grails:grails-plugin-domain-class"
+    compileOnly "org.apache.grails:grails-web-boot"
+    compileOnly "org.apache.grails:grails-core"
+    compileOnly "org.apache.grails:grails-logging"
+    compileOnly "org.apache.grails:grails-rest-transforms"
+    compileOnly "org.apache.grails:grails-i18n"
+    compileOnly "org.apache.grails:grails-services"
+    compileOnly "org.apache.grails:grails-url-mappings"
+    compileOnly "org.apache.grails:grails-interceptors"
+    compileOnly "org.apache.grails:grails-gsp"
+    compileOnly "org.apache.grails:grails-console"
+    compileOnly "org.apache.grails:grails-services"
+    compileOnly "org.apache.grails:grails-domain-class"
 
     // TODO: We need to make this configurable/pluggable
-    compileOnly "org.grails.plugins:hibernate5"
+    compileOnly "org.apache.grails:grails-data-hibernate5"
 
-    testCompileOnly "org.grails:grails-web-testing-support"
+    testCompileOnly "org.apache.grails:grails-testing-support-web"
 }
 
 bootJar.enabled = false
