Merge pull request #14708 from apache/fix-web-profile-tooling-api

Additional outstanding issues for grails-shell-cli

Author: jamesfredley

gradle/assemble-config.gradle

@@ -19,14 +19,13 @@
 
 tasks.register('installToHomeDist').configure { Task task ->
     task.inputs.files(tasks.named('jar'))
-    task.inputs.files(tasks.named('sourcesJar'))
-    task.inputs.files(tasks.named('javadocJar'))
     task.outputs.dir(distInstallDir)
 
     doLast {
         copy {
             it.from layout.buildDirectory.dir('libs')
             it.into distInstallDir
+            it.exclude '*sources.jar', '*-javadoc.jar'
         }
     }
 }

gradle/assemble-root-config.gradle

@@ -116,8 +116,7 @@ tasks.register('assemble', Zip).configure {
 
     into("grails-$grailsVersion") {
         from(rootProject.layout.projectDirectory) {
-            // Some of these are probably not needed as they are not present in the project folder
-            include 'bin/grails', 'bin/grails.bat', 'lib/', 'media/', 'samples/', 'scripts/', 'LICENSE', 'INSTALL'
+            include 'bin/grails', 'bin/grails.bat', 'lib/', 'media/icons/grails.icns', 'LICENSE', 'INSTALL', 'NOTICE'
 
             def pathsToExclude = [
                     'ant/bin', 'src/grails', 'src/war'

grails-shell-cli/src/main/groovy/org/grails/cli/GrailsCli.groovy

@@ -507,12 +507,7 @@ class GrailsCli {
     private initializeProfile() {
         BuildSettings.TARGET_DIR?.mkdirs()
 
-        if(!new File(BuildSettings.BASE_DIR, "profile.yml").exists()) {
-            populateContextLoader()
-        }
-        else {
-            this.profileRepository = createMavenProfileRepository()
-        }
+        this.profileRepository = createMavenProfileRepository()
 
         String profileName = applicationConfig.get(BuildSettings.PROFILE) ?: getSetting(BuildSettings.PROFILE, String, DEFAULT_PROFILE_NAME)
         this.profile = profileRepository.getProfile(profileName)

grails-shell-cli/src/main/groovy/org/grails/cli/boot/GrailsDependencyVersions.groovy

@@ -76,6 +76,8 @@ class GrailsDependencyVersions implements DependencyManagement {
             grape.addResolver([name:"mavenCentral", root:"https://repo1.maven.org/maven2"] as Map<String, Object>)
         }
 
+        grape.addResolver([name:"grailsCentral", root:"https://repo.grails.org/grails/core"] as Map<String, Object>)
+
         grape
     }
 

grails-wrapper-impl/src/main/groovy/grails/init/RunCommand.groovy

@@ -51,11 +51,13 @@ class RunCommand {
 
         GroovyClassLoader groovyClassLoader = new GroovyClassLoader(RunCommand.classLoader)
 
-        List<RepositoryConfiguration> repositoryConfigurations = [new RepositoryConfiguration("mavenCentral", new URI("https://repo1.maven.org/maven2"), true)]
+        List<RepositoryConfiguration> repositoryConfigurations = [new RepositoryConfiguration("mavenCentral", new URI("https://repo1.maven.org/maven2"), false)]
+
+        repositoryConfigurations.add(new RepositoryConfiguration("grailsCentral", new URI("https://repo.grails.org/grails/core"), true))
 
         // Only add snapshot repository when grailsVersion is not set or groovyVersion or grailsVersion ends in SNAPSHOT
         if (!grailsVersion || grailsVersion.endsWith("SNAPSHOT") || groovyVersion?.endsWith("SNAPSHOT")) {
-            repositoryConfigurations.add(new RepositoryConfiguration("apacheSnapshot", new URI("https://repository.apache.org/content/groups/snapshots"), true))
+            repositoryConfigurations.add(new RepositoryConfiguration("apacheRepository", new URI("https://repository.apache.org/content/groups/public"), true))
         }
 
         MavenResolverGrapeEngine grapeEngine = MavenResolverGrapeEngineFactory.create(groovyClassLoader, repositoryConfigurations, new DependencyResolutionContext(), false)