This is an automated email from the ASF dual-hosted git repository. jamesfredley pushed a commit to branch wrapper-profiles-merge-additional in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 395d9a64ba59b1a6f0887ec8ee7a196939e79eb6 Author: James Fredley <[email protected]> AuthorDate: Wed Apr 30 22:29:48 2025 -0400 Use mavenCentral and Apache snapshot repositories instead of repo.grails.org --- grails-profiles/base/profile.yml | 4 ++-- grails-profiles/profile/skeleton/build.gradle | 4 ++-- .../groovy/org/grails/cli/boot/GrailsDependencyVersions.groovy | 7 ++++++- .../grails/cli/profile/repository/MavenProfileRepository.groovy | 6 ++++-- grails-wrapper-impl/src/main/groovy/grails/init/RunCommand.groovy | 6 +++--- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/grails-profiles/base/profile.yml b/grails-profiles/base/profile.yml index 6d29b866bc..1458257345 100644 --- a/grails-profiles/base/profile.yml +++ b/grails-profiles/base/profile.yml @@ -3,11 +3,11 @@ skeleton: executable: ["**/gradlew*", "**/grailsw*"] binaryExtensions: ['png','gif','jpg','jpeg','ico','icns','pdf','zip','jar','class'] repositories: - - "https://repository.apache.org/content/groups/snapshots"; + - "https://repo1.maven.org/maven2"; - "https://repo.grails.org/grails/core"; build: repositories: - - "https://repository.apache.org/content/groups/snapshots"; + - "https://repo1.maven.org/maven2"; - "https://repo.grails.org/grails/core"; plugins: - eclipse diff --git a/grails-profiles/profile/skeleton/build.gradle b/grails-profiles/profile/skeleton/build.gradle index ca28eac9b4..44a34b06bf 100644 --- a/grails-profiles/profile/skeleton/build.gradle +++ b/grails-profiles/profile/skeleton/build.gradle @@ -2,7 +2,7 @@ buildscript { repositories { gradlePluginPortal() mavenCentral() - maven { url = 'https://repository.apache.org/content/groups/snapshots' } + maven { url = 'https://repo1.maven.org/maven2' } 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://repository.apache.org/content/groups/snapshots' } + maven { url = 'https://repo1.maven.org/maven2' } maven { url = 'https://repo.grails.org/grails/core' } // mavenLocal() // for local testing, do not commit uncommented } 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 36f95df4b7..13869482a9 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,6 +18,7 @@ */ package org.grails.cli.boot +import grails.util.Environment import groovy.grape.Grape import groovy.grape.GrapeEngine import groovy.transform.CompileDynamic @@ -65,7 +66,11 @@ class GrailsDependencyVersions implements DependencyManagement { static GrapeEngine getDefaultEngine() { def grape = Grape.getInstance() - grape.addResolver([name:"grailsCentral", root:"https://repo.grails.org/grails/core";] as Map<String, Object>) + grape.addResolver([name:"mavenCentral", root:"https://repo1.maven.org/maven2";] as Map<String, Object>) + + if (Environment.grailsVersion?.endsWith("SNAPSHOT")) { + grape.addResolver([name:"apacheSnapshot", root:" https://repository.apache.org/content/groups/snapshots";] 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 53d39f0687..987f198c9c 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,6 +18,7 @@ */ package org.grails.cli.profile.repository +import grails.util.Environment import groovy.transform.CompileDynamic import groovy.transform.CompileStatic import groovy.xml.XmlSlurper @@ -39,7 +40,8 @@ import org.grails.cli.compiler.grape.DependencyResolutionFailedException @CompileStatic class MavenProfileRepository extends AbstractJarProfileRepository { - public static final GrailsRepositoryConfiguration DEFAULT_REPO = new GrailsRepositoryConfiguration("grailsCentral", new URI("https://repo.grails.org/grails/core";), true) + 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) List<GrailsRepositoryConfiguration> repositoryConfigurations AetherGrapeEngine grapeEngine @@ -58,7 +60,7 @@ class MavenProfileRepository extends AbstractJarProfileRepository { } MavenProfileRepository() { - this([DEFAULT_REPO]) + this(Environment.grailsVersion?.endsWith("SNAPSHOT") ? [DEFAULT_REPO, APACHE_SNAPSHOT] : [DEFAULT_REPO]) } @Override diff --git a/grails-wrapper-impl/src/main/groovy/grails/init/RunCommand.groovy b/grails-wrapper-impl/src/main/groovy/grails/init/RunCommand.groovy index 28e2868f8e..75acc97fb3 100644 --- a/grails-wrapper-impl/src/main/groovy/grails/init/RunCommand.groovy +++ b/grails-wrapper-impl/src/main/groovy/grails/init/RunCommand.groovy @@ -33,9 +33,9 @@ class RunCommand { GroovyClassLoader groovyClassLoader = new GroovyClassLoader(RunCommand.classLoader) - List<RepositoryConfiguration> repositoryConfigurations = [new RepositoryConfiguration("grailsCentral", new URI("https://repo.grails.org/grails/core";), true)] - if (groovyVersion && groovyVersion.endsWith("SNAPSHOT")) { - repositoryConfigurations.add(new RepositoryConfiguration("JFrog OSS snapshot repo", new URI("https://oss.jfrog.org/oss-snapshot-local";), true)) + List<RepositoryConfiguration> repositoryConfigurations = [new RepositoryConfiguration("mavenCentral", new URI("https://repo1.maven.org/maven2";), true)] + if (groovyVersion?.endsWith("SNAPSHOT") || grailsVersion?.endsWith("SNAPSHOT")) { + repositoryConfigurations.add(new RepositoryConfiguration("apacheSnapshot", new URI("https://repository.apache.org/content/groups/snapshots";), true)) } MavenResolverGrapeEngine grapeEngine = MavenResolverGrapeEngineFactory.create(groovyClassLoader, repositoryConfigurations, new DependencyResolutionContext(), false)
