Merge pull request #1137 from apache/wondrify-groupid

jamesfredley · web-flow · commit f2168ab292f0 · 2025-06-25T10:18:08.000-04:00
Update asset-pipeline to cloud.wondrify groupid
diff --git a/.sdkmanrc b/.sdkmanrc
@@ -1,2 +1,2 @@
 java=17.0.15-librca
-gradle=8.14
+gradle=8.14.2
diff --git a/build.gradle b/build.gradle
@@ -39,13 +39,19 @@ allprojects {
         maven {
             url = 'https://repository.apache.org/content/groups/snapshots'
             content {
-                includeVersionByRegex  'org[.]apache[.]((grails)|(groovy)).*', '.*','.*SNAPSHOT'
+                includeVersionByRegex('org[.]apache[.]((grails)|(groovy)).*', '.*','.*SNAPSHOT')
             }
         }
         maven {
             url = 'https://repository.apache.org/content/groups/staging'
             content {
-                includeGroupByRegex 'org[.]apache[.]grails.*'
+                includeGroupByRegex('org[.]apache[.]grails.*')
+            }
+        }
+        maven {
+            url = 'https://central.sonatype.com/repository/maven-snapshots'
+            content {
+                includeVersionByRegex('cloud[.]wondrify', '.*', '.*-SNAPSHOT')
             }
         }
     }
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -32,21 +32,27 @@ repositories {
     maven {
         url = 'https://repository.apache.org/content/groups/snapshots'
         content {
-            includeVersionByRegex  'org[.]apache[.]((grails)|(groovy)).*', '.*','.*SNAPSHOT'
+            includeVersionByRegex('org[.]apache[.]((grails)|(groovy)).*', '.*','.*SNAPSHOT')
         }
     }
     maven {
         url = 'https://repository.apache.org/content/groups/staging'
         content {
-            includeGroupByRegex 'org[.]apache[.]grails.*'
+            includeGroupByRegex('org[.]apache[.]grails.*')
+        }
+    }
+    maven {
+        url = 'https://central.sonatype.com/repository/maven-snapshots'
+        content {
+            includeVersionByRegex('cloud[.]wondrify', '.*', '.*-SNAPSHOT')
         }
     }
 }
 
 dependencies {
     implementation platform("org.apache.grails:grails-gradle-bom:${versions.get('grailsVersion')}")
     implementation "org.asciidoctor:asciidoctor-gradle-jvm:${versions.get('asciidoctorGradlePluginVersion')}"
-    implementation 'com.bertramlabs.plugins:asset-pipeline-gradle'
+    implementation 'cloud.wondrify:asset-pipeline-gradle'
     implementation 'org.apache.grails:grails-gradle-plugins'
     implementation "org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:${versions.get('ratVersion')}"
     implementation "org.gradle.crypto.checksum:org.gradle.crypto.checksum.gradle.plugin:${versions.get('gradleCryptoChecksumVersion')}"
diff --git a/gradle.properties b/gradle.properties
@@ -17,7 +17,7 @@
 #  under the License.
 #
 projectVersion=7.0.0-SNAPSHOT
-grailsVersion=7.0.0-M4
+grailsVersion=7.0.0-SNAPSHOT
 javaVersion=17
 
 # TODO: This is a work around since the bom does not support exclusions and spring forces groovy version 4.0.26
diff --git a/gradle/examples-config.gradle b/gradle/examples-config.gradle
@@ -21,7 +21,7 @@ tasks.withType(Groovydoc).configureEach {
     enabled = false
 }
 
-// Workaround for parallel builds due to https://github.com/bertramdev/asset-pipeline/issues/177
+// Workaround for parallel builds due to https://github.com/wondrify/asset-pipeline/issues/177
 if ('assetCompile' in tasks.names) {
     tasks.named('assetCompile') {
         outputs.dir(rootProject.layout.buildDirectory.dir('asset-serialize'))
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/plugin-cas/examples/spring-security-cas-test1/build.gradle b/plugin-cas/examples/spring-security-cas-test1/build.gradle
@@ -19,7 +19,7 @@
 
 plugins {
     id 'org.apache.grails.gradle.grails-web'
-    id 'com.bertramlabs.asset-pipeline'
+    id 'cloud.wondrify.asset-pipeline'
 }
 
 group = 'spring.security.cas'
@@ -37,7 +37,7 @@ dependencies {
     implementation 'org.webjars:bootstrap:3.3.6'
     implementation 'org.webjars:jquery:2.2.0'
 
-    runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
+    runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.zaxxer:HikariCP'
     runtimeOnly 'org.apache.grails:grails-databinding'
diff --git a/plugin-core/examples/functional-test-app/build.gradle b/plugin-core/examples/functional-test-app/build.gradle
@@ -19,7 +19,7 @@
 
 plugins {
     id 'org.apache.grails.gradle.grails-web'
-    id 'com.bertramlabs.asset-pipeline'
+    id 'cloud.wondrify.asset-pipeline'
 }
 
 group = 'examples.test'
@@ -32,7 +32,7 @@ dependencies {
     implementation 'org.apache.grails:grails-gsp'
     implementation 'org.apache.grails:grails-rest-transforms'
 
-    runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
+    runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.zaxxer:HikariCP'
     runtimeOnly 'org.apache.grails:grails-data-hibernate5'
diff --git a/plugin-ldap/examples/custom-user-details-context-mapper/build.gradle b/plugin-ldap/examples/custom-user-details-context-mapper/build.gradle
@@ -19,7 +19,7 @@
 
 plugins {
     id 'org.apache.grails.gradle.grails-web'
-    id 'com.bertramlabs.asset-pipeline'
+    id 'cloud.wondrify.asset-pipeline'
 }
 
 group = 'misc.functional.test.app'
@@ -40,7 +40,7 @@ dependencies {
     // to not depend on an external ldap server
     implementation "com.unboundid:unboundid-ldapsdk:$unboundidLdapSdk"
 
-    runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
+    runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.zaxxer:HikariCP'
     runtimeOnly 'org.fusesource.jansi:jansi'
diff --git a/plugin-ldap/examples/functional-test-app/build.gradle b/plugin-ldap/examples/functional-test-app/build.gradle
@@ -21,7 +21,7 @@ import asset.pipeline.gradle.AssetPipelineExtension
 
 plugins {
     id 'org.apache.grails.gradle.grails-web'
-    id 'com.bertramlabs.asset-pipeline'
+    id 'cloud.wondrify.asset-pipeline'
 }
 
 group = 'com.test'
@@ -41,7 +41,7 @@ dependencies {
     implementation 'org.webjars:bootstrap:4.1.3'
     implementation 'org.webjars:jquery:3.3.1'
 
-    runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
+    runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.zaxxer:HikariCP'
     runtimeOnly 'org.fusesource.jansi:jansi'
diff --git a/plugin-ldap/examples/retrieve-db-roles/build.gradle b/plugin-ldap/examples/retrieve-db-roles/build.gradle
@@ -19,7 +19,7 @@
 
 plugins {
     id 'org.apache.grails.gradle.grails-web'
-    id 'com.bertramlabs.asset-pipeline'
+    id 'cloud.wondrify.asset-pipeline'
 }
 
 group = 'misc.functional.test.app'
@@ -37,7 +37,7 @@ dependencies {
     implementation 'org.webjars:bootstrap:4.1.3'
     implementation 'org.webjars:jquery:3.3.1'
 
-    runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
+    runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.zaxxer:HikariCP'
     runtimeOnly 'org.fusesource.jansi:jansi'
diff --git a/plugin-ldap/examples/retrieve-group-roles/build.gradle b/plugin-ldap/examples/retrieve-group-roles/build.gradle
@@ -19,7 +19,7 @@
 
 plugins {
     id 'org.apache.grails.gradle.grails-web'
-    id 'com.bertramlabs.asset-pipeline'
+    id 'cloud.wondrify.asset-pipeline'
 }
 
 group = 'misc.functional.test.app'
@@ -39,7 +39,7 @@ dependencies {
     // to not depend on an external ldap server
     implementation "com.unboundid:unboundid-ldapsdk:$unboundidLdapSdk"
 
-    runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
+    runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.zaxxer:HikariCP'
     runtimeOnly 'org.fusesource.jansi:jansi'
diff --git a/plugin-ui/docs/src/docs/customization.adoc b/plugin-ui/docs/src/docs/customization.adoc
@@ -166,7 +166,7 @@ The role name required to be able to run as another user defaults to `ROLE_SWITC
 
 === CSS and JavaScript
 
-The plugin uses the https://github.com/bertramdev/asset-pipeline[Asset Pipeline] plugin to manage its resources. This makes it very easy to provide your own version of some or all of the static resources since asset-pipeline will always use a file in the application's `assets` directory instead of a plugin's if it exists.
+The plugin uses the https://github.com/wondrify/asset-pipeline[Asset Pipeline] plugin to manage its resources. This makes it very easy to provide your own version of some or all of the static resources since asset-pipeline will always use a file in the application's `assets` directory instead of a plugin's if it exists.
 
 Instead of depending on either the jQuery or jQuery UI plugins, this plugin includes its own copy of jquery.js, jquery-ui.js, and jquery-ui.css. Note that the versions are not hard-coded, but instead they take advantage of the feature in asset-pipeline where you can embed Groovy code in a file to specify the name and path.
 
diff --git a/plugin-ui/examples/extended/build.gradle b/plugin-ui/examples/extended/build.gradle
@@ -18,7 +18,7 @@
  */
 
 plugins {
-    id 'com.bertramlabs.asset-pipeline'
+    id 'cloud.wondrify.asset-pipeline'
     id 'org.apache.grails.gradle.grails-web'
     id 'org.apache.grails.gradle.grails-gsp'
 }
@@ -42,7 +42,7 @@ dependencies {
 
     compileOnly 'org.slf4j:slf4j-nop' // Remove warning about missing slf4j implementation during gsp compilation
 
-    runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
+    runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.zaxxer:HikariCP'
     runtimeOnly 'org.apache.grails:grails-i18n'
diff --git a/plugin-ui/examples/simple/build.gradle b/plugin-ui/examples/simple/build.gradle
@@ -20,7 +20,7 @@
 plugins {
     id 'org.apache.grails.gradle.grails-web'
     id 'org.apache.grails.gradle.grails-gsp'
-    id 'com.bertramlabs.asset-pipeline'
+    id 'cloud.wondrify.asset-pipeline'
 }
 
 group = 'functional.test'
@@ -40,7 +40,7 @@ dependencies {
 
     compileOnly 'org.slf4j:slf4j-nop' // Remove warning about missing slf4j implementation during gsp compilation
 
-    runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
+    runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.zaxxer:HikariCP'
     runtimeOnly 'org.apache.grails:grails-i18n'
diff --git a/plugin-ui/plugin/build.gradle b/plugin-ui/plugin/build.gradle
@@ -21,7 +21,7 @@ plugins {
     id 'java-library'
     id 'org.apache.grails.gradle.grails-gsp'
     id 'org.apache.grails.gradle.grails-plugin'
-    id 'com.bertramlabs.asset-pipeline'
+    id 'cloud.wondrify.asset-pipeline'
 }
 
 group = 'org.apache.grails'
@@ -61,7 +61,7 @@ dependencies {
     compileOnly 'org.apache.grails:grails-services'
     compileOnly 'org.apache.grails:grails-domain-class'
 
-    runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
+    runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
     runtimeOnly 'org.apache.grails:grails-i18n'
 
     testImplementation 'org.apache.grails:grails-testing-support-web'

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`java=17.0.15-librca`
`2`		`-gradle=8.14`
	`2`	`+gradle=8.14.2`
Original file line number	Diff line number	Diff line change
`@@ -39,13 +39,19 @@ allprojects {`
`39`	`39`	`maven {`
`40`	`40`	`url = 'https://repository.apache.org/content/groups/snapshots'`
`41`	`41`	`content {`
`42`		`- includeVersionByRegex 'org[.]apache[.]((grails)\|(groovy)).', '.','.*SNAPSHOT'`
	`42`	`+ includeVersionByRegex('org[.]apache[.]((grails)\|(groovy)).', '.','.*SNAPSHOT')`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`maven {`
`46`	`46`	`url = 'https://repository.apache.org/content/groups/staging'`
`47`	`47`	`content {`
`48`		`- includeGroupByRegex 'org[.]apache[.]grails.*'`
	`48`	`+ includeGroupByRegex('org[.]apache[.]grails.*')`
	`49`	`+ }`
	`50`	`+ }`
	`51`	`+ maven {`
	`52`	`+ url = 'https://central.sonatype.com/repository/maven-snapshots'`
	`53`	`+ content {`
	`54`	`+ includeVersionByRegex('cloud[.]wondrify', '.', '.-SNAPSHOT')`
`49`	`55`	`}`
`50`	`56`	`}`
`51`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`# under the License.`
`18`	`18`	`#`
`19`	`19`	`projectVersion=7.0.0-SNAPSHOT`
`20`		`-grailsVersion=7.0.0-M4`
	`20`	`+grailsVersion=7.0.0-SNAPSHOT`
`21`	`21`	`javaVersion=17`
`22`	`22`
`23`	`23`	`# TODO: This is a work around since the bom does not support exclusions and spring forces groovy version 4.0.26`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ tasks.withType(Groovydoc).configureEach {`
`21`	`21`	`enabled = false`
`22`	`22`	`}`
`23`	`23`
`24`		`-// Workaround for parallel builds due to https://github.com/bertramdev/asset-pipeline/issues/177`
	`24`	`+// Workaround for parallel builds due to https://github.com/wondrify/asset-pipeline/issues/177`
`25`	`25`	`if ('assetCompile' in tasks.names) {`
`26`	`26`	`tasks.named('assetCompile') {`
`27`	`27`	`outputs.dir(rootProject.layout.buildDirectory.dir('asset-serialize'))`