You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by ja...@apache.org on 2025/05/01 23:12:34 UTC
(grails-core) 01/01: Simplify back to a single maven repository
This is an automated email from the ASF dual-hosted git repository.
jamesfredley pushed a commit to branch grails-shell-cli-apache-coordinates
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit c15f2f21a67a80858474ac358b50d47ac57e82c1
Author: James Fredley <ja...@users.noreply.github.com>
AuthorDate: Thu May 1 19:12:19 2025 -0400
Simplify back to a single maven repository
---
.../groovy/org/grails/cli/boot/GrailsDependencyVersions.groovy | 8 +-------
.../grails/cli/profile/repository/MavenProfileRepository.groovy | 7 ++-----
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/grails-shell-cli/src/main/groovy/org/grails/cli/boot/GrailsDependencyVersions.groovy b/grails-shell-cli/src/main/groovy/org/grails/cli/boot/GrailsDependencyVersions.groovy
index c7b026f8f2..db525e75b6 100644
--- a/grails-shell-cli/src/main/groovy/org/grails/cli/boot/GrailsDependencyVersions.groovy
+++ b/grails-shell-cli/src/main/groovy/org/grails/cli/boot/GrailsDependencyVersions.groovy
@@ -18,7 +18,6 @@
*/
package org.grails.cli.boot
-import grails.util.Environment
import groovy.grape.Grape
import groovy.grape.GrapeEngine
import groovy.transform.CompileDynamic
@@ -66,12 +65,7 @@ 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
- 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>)
grape
}
diff --git a/grails-shell-cli/src/main/groovy/org/grails/cli/profile/repository/MavenProfileRepository.groovy b/grails-shell-cli/src/main/groovy/org/grails/cli/profile/repository/MavenProfileRepository.groovy
index 404e71be96..2c765f0f79 100644
--- a/grails-shell-cli/src/main/groovy/org/grails/cli/profile/repository/MavenProfileRepository.groovy
+++ b/grails-shell-cli/src/main/groovy/org/grails/cli/profile/repository/MavenProfileRepository.groovy
@@ -18,7 +18,6 @@
*/
package org.grails.cli.profile.repository
-import grails.util.Environment
import groovy.transform.CompileDynamic
import groovy.transform.CompileStatic
import groovy.xml.XmlSlurper
@@ -40,8 +39,7 @@ import org.grails.cli.compiler.grape.DependencyResolutionFailedException
@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)
List<GrailsRepositoryConfiguration> repositoryConfigurations
AetherGrapeEngine grapeEngine
@@ -60,8 +58,7 @@ 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])
+ this([DEFAULT_REPO])
}
@Override