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
The following commit(s) were added to refs/heads/wrapper-rewrite by this push:
new 96a688a9a5 Fix dependency resolution for profiles
96a688a9a5 is described below
commit 96a688a9a5b16b00f3c0f662583e85f72ad64180
Author: James Daugherty <[email protected]>
AuthorDate: Wed May 14 00:59:46 2025 -0400
Fix dependency resolution for profiles
---
.../src/main/groovy/org/grails/cli/GrailsCli.groovy | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 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 d35e93d222..5c6dd2dc91 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
@@ -42,7 +42,14 @@ import
org.grails.cli.interactive.completers.EscapingFileNameCompletor
import org.grails.cli.interactive.completers.RegexCompletor
import org.grails.cli.interactive.completers.SortedAggregateCompleter
import org.grails.cli.interactive.completers.StringsCompleter
-import org.grails.cli.profile.*
+import org.grails.cli.profile.Command
+import org.grails.cli.profile.CommandArgument
+import org.grails.cli.profile.CommandCancellationListener
+import org.grails.cli.profile.ExecutionContext
+import org.grails.cli.profile.Profile
+import org.grails.cli.profile.ProfileRepoConfig
+import org.grails.cli.profile.ProfileRepository
+import org.grails.cli.profile.ProjectContext
import org.grails.cli.profile.commands.CommandCompleter
import org.grails.cli.profile.commands.CommandRegistry
import org.grails.cli.profile.repository.GrailsRepositoryConfiguration
@@ -52,7 +59,11 @@ import org.grails.config.CodeGenConfig
import org.grails.config.NavigableMap
import org.grails.exceptions.ExceptionUtils
-import java.util.concurrent.*
+import java.util.concurrent.Callable
+import java.util.concurrent.ExecutionException
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import java.util.concurrent.Future
/**
* Main class for the Grails command line. Handles interactive mode and
running Grails commands within the context of a profile
@@ -116,7 +127,7 @@ class GrailsCli {
CodeGenConfig applicationConfig
ProjectContext projectContext
Profile profile = null
- List<GrailsRepositoryConfiguration> profileRepositories =
[MavenProfileRepository.APACHE_REPO]
+ List<GrailsRepositoryConfiguration> profileRepositories =
[MavenProfileRepository.APACHE_REPO, MavenProfileRepository.GRAILS_REPO]
/**
* Obtains a value from .grails/settings.yml
@@ -303,9 +314,8 @@ class GrailsCli {
protected MavenProfileRepository createMavenProfileRepository() {
List<ProfileRepoConfig> profileRepoOverrides =
ProfileRepoConfig.getConfiguredRepositories()
if (profileRepoOverrides) {
- profileRepositories.clear()
for (ProfileRepoConfig override : profileRepoOverrides) {
- profileRepositories.add(new
GrailsRepositoryConfiguration(override.name, new URI(override.url),
override.snapshots, override.username, override.password))
+ profileRepositories.add(0, new
GrailsRepositoryConfiguration(override.name, new URI(override.url),
override.snapshots, override.username, override.password))
}
}
return new MavenProfileRepository(profileRepositories)
