Merge branch '3.1.x'

Author: graemerocher

grails-shell/src/main/groovy/org/grails/cli/profile/AbstractProfile.groovy

@@ -326,7 +326,7 @@ abstract class AbstractProfile implements Profile {
     @Override
     public Iterable<Profile> getExtends() {
         return parentNames.collect() { String name ->
-            def parent = profileRepository.getProfile(name)
+            def parent = profileRepository.getProfile(name, true)
             if(parent == null) {
                 throw new IllegalStateException("Profile [$name] declares an invalid dependency on parent profile [$name]")
             }

grails-shell/src/main/groovy/org/grails/cli/profile/ProfileRepository.groovy

@@ -37,6 +37,14 @@ interface ProfileRepository {
      */
     Profile getProfile(String profileName)
 
+    /**
+     * Obtains a named {@link Profile}
+     * @param profileName The name of the profile
+     * @param parentProfile Whether or not the profile is a parent of another profile
+     * @return The {@link Profile} or null
+     */
+    Profile getProfile(String profileName, Boolean parentProfile)
+
     /**
      * The directory where the profile is located
      *

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

@@ -39,13 +39,20 @@ abstract class AbstractJarProfileRepository implements ProfileRepository {
 
     protected final List<Profile> allProfiles = []
     protected final Map<String, Profile> profilesByName = [:]
+    protected static final String DEFAULT_PROFILE_GROUPID = "org.grails.profiles"
 
     private Set<URL> registeredUrls = []
+
     @Override
     Profile getProfile(String profileName) {
         return profilesByName[profileName]
     }
 
+    @Override
+    Profile getProfile(String profileName, Boolean parentProfile) {
+        return getProfile(profileName)
+    }
+
     List<Profile> getAllProfiles() {
         return allProfiles
     }
@@ -68,7 +75,7 @@ abstract class AbstractJarProfileRepository implements ProfileRepository {
             return new DefaultArtifact(profileName)
         }
 
-        String groupId = "org.grails.profiles"
+        String groupId = DEFAULT_PROFILE_GROUPID
         String version = null
 
         Map<String, Map> defaultValues = GrailsCli.getSetting("grails.profiles", Map, [:])

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

@@ -42,33 +42,44 @@ class MavenProfileRepository extends AbstractJarProfileRepository {
     AetherGrapeEngine grapeEngine
     GroovyClassLoader classLoader
     DependencyResolutionContext resolutionContext
+    GrailsDependencyVersions profileDependencyVersions
     private boolean resolved = false
 
     MavenProfileRepository(List<GrailsRepositoryConfiguration> repositoryConfigurations) {
         this.repositoryConfigurations = repositoryConfigurations
         classLoader = new GroovyClassLoader(Thread.currentThread().contextClassLoader)
         resolutionContext = new DependencyResolutionContext()
         this.grapeEngine = GrailsAetherGrapeEngineFactory.create(classLoader, repositoryConfigurations, resolutionContext)
-        resolutionContext.addDependencyManagement(new GrailsDependencyVersions(grapeEngine))
+        profileDependencyVersions = new GrailsDependencyVersions(grapeEngine)
+        resolutionContext.addDependencyManagement(profileDependencyVersions)
     }
 
     MavenProfileRepository() {
         this([DEFAULT_REPO])
     }
 
     @Override
-    Profile getProfile(String profileName) {
+    Profile getProfile(String profileName, Boolean parentProfile) {
         String profileShortName = profileName
         if(profileName.contains(':')) {
             def art = new DefaultArtifact(profileName)
             profileShortName = art.artifactId
         }
-        if(!resolved || !profilesByName.containsKey(profileShortName)) {
-            return resolveProfile(profileName)
+        if (!profilesByName.containsKey(profileShortName)) {
+            if(parentProfile && profileDependencyVersions.find(DEFAULT_PROFILE_GROUPID, profileShortName)) {
+                return resolveProfile(profileShortName)
+            } else {
+                return resolveProfile(profileName)
+            }
         }
         return super.getProfile(profileShortName)
     }
 
+    @Override
+    Profile getProfile(String profileName) {
+        getProfile(profileName, false)
+    }
+
     protected Profile resolveProfile(String profileName) {
         Artifact art = getProfileArtifact(profileName)
 

grails-shell/src/test/groovy/org/grails/cli/profile/ResourceProfileSpec.groovy

@@ -58,12 +58,12 @@ class ResourceProfileSpec extends Specification {
         def profileRepository = Mock(ProfileRepository)
 
         def profile = new ResourceProfile(profileRepository, "web", mockResource)
-        profileRepository.getProfile("web" ) >> profile
+        profileRepository.getProfile("web", true) >> profile
 
         def baseProfile = Mock(Profile)
         baseProfile.getDependencies() >> [ new Dependency(new DefaultArtifact("foo:bar:2.0"), "test")]
         baseProfile.getBuildPlugins() >> [ "foo-plug"]
-        profileRepository.getProfile("base" ) >> baseProfile
+        profileRepository.getProfile("base", true) >> baseProfile
 
 
         when:"The dependencies are accessed"
@@ -96,12 +96,12 @@ class ResourceProfileSpec extends Specification {
         def profileRepository = Mock(ProfileRepository)
 
         def profile = new ResourceProfile(profileRepository, "web", mockResource)
-        profileRepository.getProfile("web" ) >> profile
+        profileRepository.getProfile("web", true) >> profile
 
         def baseProfile = Mock(Profile)
         baseProfile.getDependencies() >> [ new Dependency(new DefaultArtifact("foo:bar:2.0"), "test")]
         baseProfile.getBuildPlugins() >> [ "foo-plug"]
-        profileRepository.getProfile("base" ) >> baseProfile
+        profileRepository.getProfile("base", true) >> baseProfile
 
 
         when:"The dependencies are accessed"