Merge pull request #14689 from apache/grails-shell-cli-apache-coordinates

Fix profile resolution in grails-shell-cli

Author: jamesfredley

grails-profiles/base/profile.yml

@@ -17,13 +17,11 @@ skeleton:
     executable: ["**/gradlew*", "**/grailsw*"]
     binaryExtensions: ['png','gif','jpg','jpeg','ico','icns','pdf','zip','jar','class']
 repositories:
-    - "https://repo1.maven.org/maven2"
-    - "https://repository.apache.org/content/groups/snapshots"
+    - "https://repository.apache.org/content/groups/public"
     - "https://repo.grails.org/grails/core"
 build:
     repositories:
-        - "https://repo1.maven.org/maven2"
-        - "https://repository.apache.org/content/groups/snapshots"
+        - "https://repository.apache.org/content/groups/public"
         - "https://repo.grails.org/grails/core"
     plugins:
         - eclipse

grails-profiles/base/skeleton/build.gradle

@@ -1,7 +1,8 @@
 buildscript {
     repositories {
-@buildRepositories@
         mavenCentral()
+@buildRepositories@
+
     }
     dependencies {
         classpath platform("org.apache.grails:grails-bom:$grailsVersion")

grails-profiles/profile/skeleton/build.gradle

@@ -2,7 +2,7 @@ buildscript {
     repositories {
         gradlePluginPortal()
         mavenCentral()
-        maven { url = 'https://repo1.maven.org/maven2' }
+        maven { url = 'https://repository.apache.org/content/groups/public' }
         maven { url = 'https://repo.grails.org/grails/core' }
         // mavenLocal()  // for local testing, do not commit uncommented
     }
@@ -19,7 +19,7 @@ version = '1.0.0-SNAPSHOT'
 
 repositories {
     mavenCentral()
-    maven { url = 'https://repo1.maven.org/maven2' }
+    maven { url = 'https://repository.apache.org/content/groups/public' }
     maven { url = 'https://repo.grails.org/grails/core' }
     // mavenLocal()  // for local testing, do not commit uncommented
 }  

grails-shell-cli/src/main/groovy/org/grails/cli/boot/GrailsDependencyVersions.groovy

@@ -66,12 +66,16 @@ class GrailsDependencyVersions implements DependencyManagement {
 
     static GrapeEngine getDefaultEngine() {
         def grape = Grape.getInstance()
-        grape.addResolver([name:"mavenCentral", root:"https://repo1.maven.org/maven2"] as Map<String, Object>)
 
-        // Only add snapshot repository when grailsVersion is not set or it ends in SNAPSHOT
+        // Use apache repository with SNAPSHOTS when grailsVersion is not set or it ends in SNAPSHOT
+        // otherwise use only mavenCentral
         if (!Environment.grailsVersion || Environment.grailsVersion.endsWith("SNAPSHOT")) {
-            grape.addResolver([name:"apacheSnapshot", root:" https://repository.apache.org/content/groups/snapshots"] as Map<String, Object>)
+            grape.addResolver([name:"apacheRepository", root:"https://repository.apache.org/content/groups/public"] as Map<String, Object>)
         }
+        else {
+            grape.addResolver([name:"mavenCentral", root:"https://repo1.maven.org/maven2"] as Map<String, Object>)
+        }
+
         grape
     }
 

grails-shell-cli/src/main/groovy/org/grails/cli/profile/repository/MavenProfileRepository.groovy

@@ -40,8 +40,8 @@ import org.grails.cli.profile.Profile
 @CompileStatic
 class MavenProfileRepository extends AbstractJarProfileRepository {
 
-    public static final GrailsRepositoryConfiguration DEFAULT_REPO = new GrailsRepositoryConfiguration("mavenCentral", new URI("https://repo1.maven.org/maven2"), true)
-    public static final GrailsRepositoryConfiguration APACHE_SNAPSHOT = new GrailsRepositoryConfiguration("apacheSnapshot", new URI("https://repository.apache.org/content/groups/snapshots"), true)
+    public static final GrailsRepositoryConfiguration DEFAULT_REPO = new GrailsRepositoryConfiguration("apacheRepository", new URI("https://repository.apache.org/content/groups/public"), true)
+    public static final GrailsRepositoryConfiguration MAVEN_CENTRAL = new GrailsRepositoryConfiguration("mavenCentral", new URI("https://repo1.maven.org/maven2"), false)
 
     List<GrailsRepositoryConfiguration> repositoryConfigurations
     MavenResolverGrapeEngine grapeEngine
@@ -60,8 +60,9 @@ class MavenProfileRepository extends AbstractJarProfileRepository {
     }
 
     MavenProfileRepository() {
-        // Only add snapshot repository when grailsVersion is not set or it ends in SNAPSHOT
-        this((!Environment.grailsVersion || Environment.grailsVersion.endsWith("SNAPSHOT")) ? [DEFAULT_REPO, APACHE_SNAPSHOT] : [DEFAULT_REPO])
+        // Use apache repository with SNAPSHOTS when grailsVersion is not set or it ends in SNAPSHOT
+        // otherwise use only mavenCentral
+        this((!Environment.grailsVersion || Environment.grailsVersion.endsWith("SNAPSHOT")) ? [DEFAULT_REPO] : [MAVEN_CENTRAL])
     }
 
     @Override