Merge pull request #14813 from apache/asset-pipeline-gradle-deprecations

Update to new asset pipeline coordinates

Author: jdaugherty

.gitignore

@@ -8,6 +8,7 @@
 *.swp
 .DS_Store
 .classpath
+.assetcache
 .gradle
 .gradle/
 .idea

build.gradle

@@ -53,13 +53,19 @@ allprojects {
             content { includeModule 'org.apache.grails', 'grails-bom' }
         }
         // mavenLocal() // Keep, this will be uncommented and used by CI (groovy-joint-workflow)
-        maven { url = 'https://repo.grails.org/grails/restricted' }
         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://central.sonatype.com/repository/maven-snapshots'
+            content {
+                includeVersionByRegex 'cloud[.]wondrify', '.*', '.*-SNAPSHOT'
             }
         }
+        maven { url = 'https://repo.grails.org/grails/restricted' }
     }
 }
 

buildSrc/build.gradle

@@ -31,15 +31,21 @@ compileJava.options.release = gradleProperties.javaVersion.toString().toInteger(
 
 repositories {
     // mavenLocal()
-    mavenCentral()
-    gradlePluginPortal()
-    maven { url = 'https://repo.grails.org/grails/restricted' }
     maven {
         url = 'https://repository.apache.org/content/groups/snapshots'
         content {
             includeVersionByRegex  'org[.]apache[.]((grails)|(groovy)).*', '.*','.*SNAPSHOT'
         }
     }
+    maven {
+        url = 'https://central.sonatype.com/repository/maven-snapshots'
+        content {
+            includeVersionByRegex 'cloud[.]wondrify', '.*', '.*-SNAPSHOT'
+        }
+    }
+    maven { url = 'https://repo.grails.org/grails/restricted' }
+    mavenCentral()
+    gradlePluginPortal()
 }
 
 dependencies {
@@ -48,7 +54,7 @@ dependencies {
         // Due to https://github.com/hierynomus/license-gradle-plugin/issues/161, spring must be excluded
         exclude group: 'org.springframework', module: 'spring-core'
     }
-    implementation 'com.bertramlabs.plugins:asset-pipeline-gradle'
+    implementation 'cloud.wondrify:asset-pipeline-gradle'
     implementation 'io.github.gradle-nexus:publish-plugin'
     implementation 'org.apache.grails:grails-docs-core'
     implementation 'org.apache.grails:grails-gradle-plugins'

dependencies.gradle

@@ -25,7 +25,7 @@ ext {
             'ant.version'                        : '1.10.15',
             'asciidoctor-gradle-jvm.version'     : '4.0.4',
             'asciidoctorj.version'               : '3.0.0',
-            'asset-pipeline-gradle.version'      : '5.0.9',
+            'asset-pipeline-gradle.version'      : '5.0.10-SNAPSHOT',
             'byte-buddy.version'                 : '1.15.5',
             'commons-text.version'               : '1.12.0',
             'directory-watcher.version'          : '0.18.0',
@@ -58,7 +58,7 @@ ext {
             'ant-junit'                  : "org.apache.ant:ant-junit:${gradleBomDependencyVersions['ant.version']}",
             'asciidoctorj-gradle-jvm'    : "org.asciidoctor:asciidoctor-gradle-jvm:${gradleBomDependencyVersions['asciidoctor-gradle-jvm.version']}",
             'asciidoctorj'               : "org.asciidoctor:asciidoctorj:${gradleBomDependencyVersions['asciidoctorj.version']}",
-            'asset-pipeline-gradle'      : "com.bertramlabs.plugins:asset-pipeline-gradle:${gradleBomDependencyVersions['asset-pipeline-gradle.version']}",
+            'asset-pipeline-gradle'      : "cloud.wondrify:asset-pipeline-gradle:${gradleBomDependencyVersions['asset-pipeline-gradle.version']}",
             'byte-buddy'                 : "net.bytebuddy:byte-buddy:${gradleBomDependencyVersions['byte-buddy.version']}",
             'commons-text'               : "org.apache.commons:commons-text:${gradleBomDependencyVersions['commons-text.version']}",
             'directory-watcher'          : "io.methvin:directory-watcher:${gradleBomDependencyVersions['directory-watcher.version']}",
@@ -77,7 +77,7 @@ ext {
     ]
 
     bomDependencyVersions = [
-            'asset-pipeline-grails.version': '5.0.9',
+            'asset-pipeline-grails.version': '5.0.10-SNAPSHOT',
             'bootstrap-icons.version'      : '1.11.3',
             'bootstrap.version'            : '5.3.3',
             'commons-codec.version'        : '1.17.1',
@@ -105,7 +105,7 @@ ext {
 
     // Note: the name of the dependency must be the prefix of the property name so properties in the pom are resolved correctly
     bomDependencies = [
-            'asset-pipeline-grails'    : "com.bertramlabs.plugins:asset-pipeline-grails:${bomDependencyVersions['asset-pipeline-grails.version']}",
+            'asset-pipeline-grails'    : "cloud.wondrify:asset-pipeline-grails:${bomDependencyVersions['asset-pipeline-grails.version']}",
             'bootstrap'                : "org.webjars.npm:bootstrap:${bomDependencyVersions['bootstrap.version']}",
             'bootstrap-icons'          : "org.webjars.npm:bootstrap-icons:${bomDependencyVersions['bootstrap-icons.version']}",
             'commons-codec'            : "commons-codec:commons-codec:${bomDependencyVersions['commons-codec.version']}",

gradle/hibernate5-test-config.gradle

@@ -37,8 +37,8 @@ tasks.withType(Test).configureEach {
 
     useJUnitPlatform()
     systemProperty('hibernate5.gorm.suite', System.getProperty('hibernate5.gorm.suite') ?: true)
-    reports.html.required = !System.getenv('CI')
-    reports.junitXml.required = !System.getenv('CI')
+    reports.html.required = !isCiBuild
+    reports.junitXml.required = !isCiBuild
     testLogging {
         events('passed', 'skipped', 'failed')
         showExceptions = true

grails-bom/build.gradle

@@ -101,16 +101,20 @@ tasks.register('extractConstraints', ExtractDependenciesTask).configure { Extrac
     it.destination = project.layout.buildDirectory.file('grails-bom-constraints.adoc')
     it.platformDefinitions = combinedPlatforms
     it.definitions = combinedDependencies
+    it.projectName = project.name
     it.versions = combinedVersions
-    Map<String, String> artifactIdMappings = [:]
     rootProject.subprojects.each { p ->
         evaluationDependsOn(p.path)
-        String artifactId = p.findProperty('pomArtifactId')
-        if(artifactId) {
-            artifactIdMappings[p.name] = artifactId
-        }
     }
-    it.projectArtifactIds.set(artifactIdMappings)
+    it.projectArtifactIds.set(project.provider{
+        Map<String, String> artifactIdMappings = [:]
+
+        rootProject.subprojects.each { p ->
+            artifactIdMappings[p.name] = p.findProperty('pomArtifactId') ?: p.name
+        }
+
+        artifactIdMappings
+    })
 
     it.dependsOn(project.tasks.named('generateMetadataFileForMavenPublication'), project.tasks.named('generatePomFileForMavenPublication'))
 }

grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle

@@ -41,7 +41,7 @@ dependencies {
     developmentOnly platform(project(':grails-bom'))
     developmentOnly 'org.webjars.npm:jquery'
 
-    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
+    runtimeOnly "cloud.wondrify:asset-pipeline-grails:$assetPipelineVersion"
     runtimeOnly "org.apache.grails:grails-scaffolding:$scaffoldingVersion"
     runtimeOnly "org.apache.grails:grails-fields:$fieldsVersion"
     runtimeOnly "org.apache.tomcat:tomcat-jdbc:9.0.36"

grails-data-neo4j/examples/grails3-neo4j/build.gradle

@@ -39,7 +39,7 @@ dependencies {
     developmentOnly platform(project(':grails-bom'))
     developmentOnly 'org.webjars.npm:jquery'
 
-    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
+    runtimeOnly "cloud.wondrify:asset-pipeline-grails:$assetPipelineVersion"
     runtimeOnly "org.apache.grails:grails-scaffolding:$scaffoldingVersion"
     runtimeOnly "org.apache.grails:grails-fields:$fieldsVersion"
 

grails-doc/src/en/guide/commandLine/gradleBuild/gradleDependencies.adoc

@@ -48,7 +48,7 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-tomcat"
     implementation "org.springframework.boot:spring-boot-starter-validation"
     console "org.apache.grails:grails-console"
-    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"

grails-doc/src/en/guide/commandLine/gradleBuild/gradlePlugins.adoc

@@ -35,7 +35,7 @@ plugins {
     id "eclipse"
 }
 
-apply plugin: "asset-pipeline"
+apply plugin: "cloud.wondrify.asset-pipeline"
 apply plugin: "org.apache.grails.gradle.grails-web"
 apply plugin: "org.apache.grails.gradle.grails-gsp"
 ----