Merge pull request #9745 from Schlogen/3.1.x

Profile feature - specify repos

Author: graemerocher

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

@@ -55,7 +55,9 @@ abstract class AbstractProfile implements Profile {
     protected NavigableMap navigableConfig
     protected ProfileRepository profileRepository
     protected List<Dependency> dependencies = []
+    protected List<String> repositories = []
     protected List<String> parentNames = []
+    protected List<String> buildRepositories = []
     protected List<String> buildPlugins = []
     protected List<String> buildExcludes = []
     protected final List<Command> internalCommands = []
@@ -193,6 +195,9 @@ abstract class AbstractProfile implements Profile {
             }
         }
 
+        this.repositories = (List<String>)navigableConfig.get("repositories", [])
+
+        this.buildRepositories = (List<String>)navigableConfig.get("build.repositories", [])
         this.buildPlugins = (List<String>)navigableConfig.get("build.plugins", [])
         this.buildExcludes = (List<String>)navigableConfig.get("build.excludes", [])
         this.buildMerge = (List<String>)navigableConfig.get("build.merge", null)
@@ -243,6 +248,17 @@ abstract class AbstractProfile implements Profile {
         }
     }
 
+    @Override
+    List<String> getBuildRepositories() {
+        List<String> calculatedRepositories = []
+        def parents = getExtends()
+        for(profile in parents) {
+            calculatedRepositories.addAll(profile.buildRepositories)
+        }
+        calculatedRepositories.addAll(buildRepositories)
+        return calculatedRepositories
+    }
+
     @Override
     List<String> getBuildPlugins() {
         List<String> calculatedPlugins = []
@@ -258,6 +274,17 @@ abstract class AbstractProfile implements Profile {
         return calculatedPlugins
     }
 
+    @Override
+    List<String> getRepositories() {
+        List<String> calculatedRepositories = []
+        def parents = getExtends()
+        for(profile in parents) {
+            calculatedRepositories.addAll(profile.repositories)
+        }
+        calculatedRepositories.addAll(repositories)
+        return calculatedRepositories
+    }
+
     List<Dependency> getDependencies() {
         List<Dependency> calculatedDependencies = []
         def parents = getExtends()

grails-shell/src/main/groovy/org/grails/cli/profile/Profile.java

@@ -62,7 +62,7 @@ public interface Profile {
     Iterable<Feature> getDefaultFeatures();
 
     /**
-     * @return The default features for this profile
+     * @return The required features for this profile
      */
     Iterable<Feature> getRequiredFeatures();
 
@@ -72,6 +72,11 @@ public interface Profile {
      */
     Iterable<Profile> getExtends();
 
+    /**
+     * @return The maven repository definitions for this profile
+     */
+    List<String> getRepositories();
+
     /**
      * @return The dependency definitions for this profile
      */
@@ -134,11 +139,16 @@ public interface Profile {
      */
     boolean handleCommand(ExecutionContext context);
 
+    /**
+     * @return The buildscript maven repository definitions for this profile
+     */
+    List<String> getBuildRepositories();
 
     /**
      * @return The profile names to participate in build merge
      */
     List<String> getBuildMergeProfileNames();
+
     /**
      * @return The list of build plugins for this profile
      */

grails-shell/src/main/groovy/org/grails/cli/profile/commands/CreateAppCommand.groovy

@@ -222,6 +222,11 @@ class CreateAppCommand extends ArgumentCompletingCommand implements ProfileRepos
     @CompileDynamic
     protected void replaceBuildTokens(String profileCoords, Profile profile, List<Feature> features, File targetDirectory) {
         AntBuilder ant = new GrailsConsoleAntBuilder()
+        def ln = System.getProperty("line.separator")
+
+        def repositories = profile.repositories.collect() { String url ->
+            "    maven { url \"${url}\" }".toString()
+        }.unique().join(ln)
 
         def profileDependencies = profile.dependencies
         def dependencies = profileDependencies.findAll() { Dependency dep ->
@@ -248,14 +253,17 @@ class CreateAppCommand extends ArgumentCompletingCommand implements ProfileRepos
             def art = new DefaultArtifact('org.grails.profiles', profile.name, '', profile.version)
             dependencies.add(new Dependency(art, "profile"))
         }
-        def ln = System.getProperty("line.separator")
         dependencies = dependencies.unique()
 
         dependencies = dependencies.sort({ Dependency dep -> dep.scope }).collect() { Dependency dep ->
             String artifactStr = resolveArtifactString(dep)
             "    ${dep.scope} \"${artifactStr}\"".toString()
         }.unique().join(ln)
 
+        def buildRepositories = profile.buildRepositories.collect() { String url ->
+            "        maven { url \"${url}\" }".toString()
+        }.unique().join(ln)
+
         buildDependencies = buildDependencies.collect() { Dependency dep ->
             String artifactStr = resolveArtifactString(dep)
             "        classpath \"${artifactStr}\"".toString()
@@ -287,8 +295,12 @@ class CreateAppCommand extends ArgumentCompletingCommand implements ProfileRepos
                 replacevalue(buildDependencies)
             }
             replacefilter {
-                replacetoken("@buildPlugins@")
-                replacevalue(buildDependencies)
+                replacetoken("@buildRepositories@")
+                replacevalue(buildRepositories)
+            }
+            replacefilter {
+                replacetoken("@repositories@")
+                replacevalue(repositories)
             }
             variables.each { k, v ->
                 replacefilter {