This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch wrapper-profiles-merge
in repository https://gitbox.apache.org/repos/asf/grails-core.git
The following commit(s) were added to refs/heads/wrapper-profiles-merge by this
push:
new d1f7bac5e4 renaming wrapper projects for clarity
d1f7bac5e4 is described below
commit d1f7bac5e4aa354607e079f6d55a3251d31679c8
Author: James Daugherty <[email protected]>
AuthorDate: Wed Apr 30 11:10:01 2025 -0400
renaming wrapper projects for clarity
---
gradle/publish-root-config.gradle | 2 +-
.../build.gradle | 0
.../src/main/groovy/grails/init/RunCommand.groovy | 0
grails-wrapper/build.gradle | 35 ++++++----------------
.../main/java/grails/init/FindReleaseHandler.java | 0
.../src/main/java/grails/init/Start.java | 7 +++--
.../proxy/SystemPropertiesAuthenticator.java | 0
settings.gradle | 2 +-
8 files changed, 15 insertions(+), 31 deletions(-)
diff --git a/gradle/publish-root-config.gradle
b/gradle/publish-root-config.gradle
index f4989e67a7..a37a0b0079 100644
--- a/gradle/publish-root-config.gradle
+++ b/gradle/publish-root-config.gradle
@@ -117,7 +117,7 @@ def publishedProjects = [
'grails-data-mongodb',
'grails-data-mongodb-gson-templates',
// wrapper
- 'grails-wrapper-downloader',
+ 'grails-wrapper-impl',
'grails-wrapper'
]
diff --git a/grails-wrapper/build.gradle b/grails-wrapper-impl/build.gradle
similarity index 100%
copy from grails-wrapper/build.gradle
copy to grails-wrapper-impl/build.gradle
diff --git a/grails-wrapper/src/main/groovy/grails/init/RunCommand.groovy
b/grails-wrapper-impl/src/main/groovy/grails/init/RunCommand.groovy
similarity index 100%
rename from grails-wrapper/src/main/groovy/grails/init/RunCommand.groovy
rename to grails-wrapper-impl/src/main/groovy/grails/init/RunCommand.groovy
diff --git a/grails-wrapper/build.gradle b/grails-wrapper/build.gradle
index 1bdd5dfed0..7ecdc5508a 100644
--- a/grails-wrapper/build.gradle
+++ b/grails-wrapper/build.gradle
@@ -1,10 +1,13 @@
plugins {
- id 'groovy'
+ id 'java'
}
+version = projectVersion
+group = 'org.apache.grails'
+
ext {
- pomTitle = 'Grails Wrapper'
- pomDescription = 'Facilitates downloading the grails shell command to
interact with a Grails project.'
+ pomTitle = 'Grails Wrapper Downloader'
+ pomDescription = 'Downloads necessary libraries for the Grails Wrapper'
pomDevelopers = [
'graemerocher' : 'Graeme Rocher',
'jeffscottbrown': 'Jeff Brown',
@@ -13,19 +16,7 @@ ext {
cliProject = true
}
-version = projectVersion
-group = 'org.apache.grails'
-
-dependencies {
- implementation platform(project(':grails-bom'))
- implementation project(':grails-shell-cli')
- implementation "org.springframework.boot:spring-boot-cli"
- implementation "org.apache.groovy:groovy"
- implementation "org.apache.groovy:groovy-ant"
- implementation "org.apache.groovy:groovy-templates"
- // TODO: This is using an ancient version of the plexus-sec-dispatcher
- implementation
"org.sonatype.plexus:plexus-sec-dispatcher:$plexusSecDispatcherVersion"
-}
+// Intentionally no dependencies to prevent bloat
apply {
from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
@@ -33,20 +24,12 @@ apply {
}
tasks.named('jar', Jar).configure { Jar it ->
- it.from {
- (configurations.runtimeClasspath).collect {
- it.isDirectory() ? it : zipTree(it)
- }
- }
+ it.archiveFileName = "grails-wrapper.jar"
it.manifest {
- attributes 'Main-Class': 'grails.init.RunCommand'
+ attributes 'Main-Class': 'grails.init.Start'
}
}
-tasks.named('groovydoc') { Task it ->
- it.enabled = false
-}
-
tasks.named('javadocJar') { Task it ->
it.enabled = false
}
diff --git
a/grails-wrapper-downloader/src/main/java/grails/init/FindReleaseHandler.java
b/grails-wrapper/src/main/java/grails/init/FindReleaseHandler.java
similarity index 100%
rename from
grails-wrapper-downloader/src/main/java/grails/init/FindReleaseHandler.java
rename to grails-wrapper/src/main/java/grails/init/FindReleaseHandler.java
diff --git a/grails-wrapper-downloader/src/main/java/grails/init/Start.java
b/grails-wrapper/src/main/java/grails/init/Start.java
similarity index 94%
rename from grails-wrapper-downloader/src/main/java/grails/init/Start.java
rename to grails-wrapper/src/main/java/grails/init/Start.java
index b5a0e2def5..3d69ca9b91 100644
--- a/grails-wrapper-downloader/src/main/java/grails/init/Start.java
+++ b/grails-wrapper/src/main/java/grails/init/Start.java
@@ -19,11 +19,12 @@ import java.nio.file.Files;
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+//TODO: snapshot locations need supported
public class Start {
- private static final String PROJECT_NAME = "grails-wrapper";
+ private static final String PROJECT_NAME = "grails-wrapper-impl";
private static final String WRAPPER_PATH = "/org/apache/grails/" +
PROJECT_NAME;
- private static final String GRAILS_MAVEN_REPO_BASE_URL =
"https://repo1.maven.org/maven2/";;
+ private static final String GRAILS_RELEASE_MAVEN_REPO_BASE_URL =
"https://repo1.maven.org/maven2/";;
private static final File WRAPPER_DIR = new
File(System.getProperty("user.home") + "/.grails/wrapper");
private static final File NO_VERSION_JAR = new File(WRAPPER_DIR,
PROJECT_NAME + ".jar");
@@ -36,7 +37,7 @@ public class Start {
if (baseUrl != null) {
return baseUrl;
}
- return GRAILS_MAVEN_REPO_BASE_URL;
+ return GRAILS_RELEASE_MAVEN_REPO_BASE_URL;
}
private static String getVersion() {
diff --git
a/grails-wrapper-downloader/src/main/java/grails/proxy/SystemPropertiesAuthenticator.java
b/grails-wrapper/src/main/java/grails/proxy/SystemPropertiesAuthenticator.java
similarity index 100%
rename from
grails-wrapper-downloader/src/main/java/grails/proxy/SystemPropertiesAuthenticator.java
rename to
grails-wrapper/src/main/java/grails/proxy/SystemPropertiesAuthenticator.java
diff --git a/settings.gradle b/settings.gradle
index 7cbee56b97..99469e2ed9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -156,7 +156,7 @@ include (
'grails-data-test-report',
// wrapper
- 'grails-wrapper-downloader',
+ 'grails-wrapper-impl',
'grails-wrapper'
)
