Merge pull request #13967 from jdaugherty/7.0.x

Ensure plugins are published to the same location as they were prior …

Author: jdaugherty

build.gradle

@@ -176,6 +176,15 @@ subprojects { subproject ->
     ext.isCiBuild = subproject.hasProperty('isCiBuild') || System.getenv().get('CI') as Boolean
     ext.isAsyncProject = subproject.name.startsWith('grails-async') || subproject.name.startsWith('grails-events')
 
+    // Historically async mapped the core libraries to different artifact ids
+    ext.mappedArtifactIds = [
+            'grails-async-core'       : 'grails-async',
+            'grails-async-plugin'     : 'async',
+            'grails-events-core'      : 'grails-events',
+            'grails-events-plugin'    : 'events',
+            'grails-plugin-converters': 'converters'
+    ]
+
     if (isPlugin) {
         group = 'org.grails.plugins'
     } else {
@@ -247,7 +256,9 @@ subprojects { subproject ->
                             }
                         }
                         if (isGrailsRepoPublish) {
-                            url "https://repo.grails.org/grails/libs-snapshots-local"
+                            url = isPlugin ?
+                                    uri('https://repo.grails.org/grails/plugins3-snapshots-local') :
+                                    uri('https://repo.grails.org/grails/libs-snapshots-local')
                         } else {
                             url 'https://maven.pkg.github.com/grails/grails-core'
                         }
@@ -259,15 +270,6 @@ subprojects { subproject ->
 
             publications {
                 maven(MavenPublication) {
-                    // Historically async mapped the core libraries to different artifact ids
-                    Map mappedArtifactIds = [
-                            'grails-async-core'       : 'grails-async',
-                            'grails-async-plugin'     : 'async',
-                            'grails-events-core'      : 'grails-events',
-                            'grails-events-plugin'    : 'events',
-                            'grails-plugin-converters': 'converters'
-
-                    ]
                     if(mappedArtifactIds.containsKey(subproject.name)) {
                         artifactId = mappedArtifactIds[subproject.name]
                     }

grails-bom/build.gradle

@@ -140,7 +140,7 @@ publishing {
                 project.parent.subprojects.findResults {
                     if (it.name == 'grails-bom') return null
                     if (it.name.startsWith('grails-test-suite') || it.name.contains('grails-test-examples')) return null
-                    [groupId: it.group, artifactId: it.name, version: "${it.version}"] +
+                    [groupId: it.group, artifactId: mappedArtifactIds[it.name] ?: it.name, version: "${it.version}"] +
                         (it.name == 'grails-dependencies'? [type:'pom'] : [])
                 }.each {
                     appendNodes(deps.appendNode('dependency'), it)