You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by jd...@apache.org on 2025/12/01 13:45:26 UTC
(grails-core) 02/02: remove source of duplicate sourceset inclusion in source jars
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch gradle-centralization
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit d76e25a17d67028e97de65487d62117e19770721
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Mon Dec 1 08:45:08 2025 -0500
remove source of duplicate sourceset inclusion in source jars
---
.../groovy/org/apache/grails/buildsrc/CompilePlugin.groovy | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/CompilePlugin.groovy b/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/CompilePlugin.groovy
index 395be33894..eb770a4918 100644
--- a/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/CompilePlugin.groovy
+++ b/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/CompilePlugin.groovy
@@ -52,16 +52,6 @@ class CompilePlugin implements Plugin<Project> {
it.withSourcesJar()
}
- // TODO: Causes the imports autoconfiguration file to be duplicated in grails-core b/c main gets copied twice
- // TODO: this was for grails-gradle specifically in the past, we need to figure out which additional source sets are included
-// project.tasks.named('sourcesJar', Jar).configure { Jar jar ->
-// SourceSetContainer sourceSets = project.extensions.getByType(JavaPluginExtension).sourceSets
-//
-// // don't only include main, but any source set
-// jar.from(sourceSets.collect { it.allSource })
-// jar.inputs.files(sourceSets.collect { it.allSource })
-// }
-
// Grails determines the grails version via the META-INF/MANIFEST.MF file
// Note: we exclude attributes such as Built-By, Build-Jdk, Created-By to ensure the build is reproducible.
project.tasks.withType(Jar).configureEach { Jar jar ->
@@ -75,7 +65,7 @@ class CompilePlugin implements Plugin<Project> {
'Implementation-Version': lookupPropertyByType(project, 'grailsVersion', String),
'Implementation-Vendor': 'grails.apache.org'
)
- // TODO: forge used to be include, grails used to exclude
+ // Explicitly fail since duplicates indicate a double configuration that needs fixed
jar.duplicatesStrategy = DuplicatesStrategy.FAIL
}
}