This is an automated email from the ASF dual-hosted git repository. jdaugherty pushed a commit to branch wrapper-rewrite in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit f983afa03a9c4f1df790c325289e96e4e1f731f2 Author: James Daugherty <[email protected]> AuthorDate: Tue May 13 22:43:05 2025 -0400 Rename DEFAULT_REPO to reflect it's origin & fix spring boot RC lookup --- .../main/groovy/org/grails/cli/GrailsCli.groovy | 2 +- .../repository/MavenProfileRepository.groovy | 33 +++++++++++----------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/grails-shell-cli/src/main/groovy/org/grails/cli/GrailsCli.groovy b/grails-shell-cli/src/main/groovy/org/grails/cli/GrailsCli.groovy index 7c7eaef17d..d35e93d222 100644 --- a/grails-shell-cli/src/main/groovy/org/grails/cli/GrailsCli.groovy +++ b/grails-shell-cli/src/main/groovy/org/grails/cli/GrailsCli.groovy @@ -116,7 +116,7 @@ class GrailsCli { CodeGenConfig applicationConfig ProjectContext projectContext Profile profile = null - List<GrailsRepositoryConfiguration> profileRepositories = [MavenProfileRepository.DEFAULT_REPO] + List<GrailsRepositoryConfiguration> profileRepositories = [MavenProfileRepository.APACHE_REPO] /** * Obtains a value from .grails/settings.yml 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 5e0ed34d0e..7afdc9be27 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 @@ -1,20 +1,18 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * https://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.grails.cli.profile.repository @@ -40,8 +38,8 @@ import org.grails.cli.profile.Profile @CompileStatic class MavenProfileRepository extends AbstractJarProfileRepository { - 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) + public static final GrailsRepositoryConfiguration GRAILS_REPO = new GrailsRepositoryConfiguration("grailsRepo", new URI("https://repo.grails.org/grails/restricted";), true) + public static final GrailsRepositoryConfiguration APACHE_REPO = new GrailsRepositoryConfiguration("apacheRepository", new URI("https://repository.apache.org/content/groups/public";), true) List<GrailsRepositoryConfiguration> repositoryConfigurations MavenResolverGrapeEngine grapeEngine @@ -62,7 +60,8 @@ class MavenProfileRepository extends AbstractJarProfileRepository { MavenProfileRepository() { // 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]) + this((!Environment.grailsVersion || Environment.grailsVersion.endsWith("SNAPSHOT")) ? [APACHE_REPO, GRAILS_REPO] : [GRAILS_REPO]) + // TODO: Remove GRAILS_REPO in snapshot section when Spring verison is released } @Override
