Merge pull request #1137 from apache/wondrify-groupid

Update asset-pipeline to cloud.wondrify groupid

Author: jamesfredley

.sdkmanrc

@@ -1,2 +1,2 @@
 java=17.0.15-librca
-gradle=8.14
+gradle=8.14.2

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')
             }
         }
     }

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')}"

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

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'))

gradle/wrapper/gradle-wrapper.jar

@@ -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

gradle/wrapper/gradle-wrapper.properties

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -206,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -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'