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/07/08 12:29:10 UTC
(grails-core) branch 7.0.x updated: [skip ci] fix: do not add licensing artifacts to javadoc jars
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new a0167d518e [skip ci] fix: do not add licensing artifacts to javadoc jars
a0167d518e is described below
commit a0167d518e5d66d0796b3e89d8d6454b9876cebd
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Tue Jul 8 08:29:00 2025 -0400
[skip ci] fix: do not add licensing artifacts to javadoc jars
---
gradle/publish-config.gradle | 8 ++++----
grails-forge/gradle/java-config.gradle | 21 --------------------
grails-forge/gradle/publish-config.gradle | 25 ++++++++++++++++++++++++
grails-gradle/gradle/java-config.gradle | 32 ++++++++++++++++---------------
4 files changed, 46 insertions(+), 40 deletions(-)
diff --git a/gradle/publish-config.gradle b/gradle/publish-config.gradle
index 082464985a..6ceb4acb35 100644
--- a/gradle/publish-config.gradle
+++ b/gradle/publish-config.gradle
@@ -34,11 +34,11 @@ extensions.configure(GrailsPublishExtension) {
}
tasks.withType(Jar).configureEach {
- from(rootProject.layout.projectDirectory.file('DISCLAIMER')) {
- into('META-INF')
- }
-
if(it.archiveClassifier.getOrNull() != 'javadoc') {
+ from(rootProject.layout.projectDirectory.file('DISCLAIMER')) {
+ into('META-INF')
+ }
+
def projectLicense = layout.projectDirectory.file('src/main/resources/META-INF/LICENSE')
if (!projectLicense.asFile.exists()) {
def basicLicense = rootProject.layout.projectDirectory.file('licenses/LICENSE-Apache-2.0.txt')
diff --git a/grails-forge/gradle/java-config.gradle b/grails-forge/gradle/java-config.gradle
index 567ebec28a..e7dc9438ce 100644
--- a/grails-forge/gradle/java-config.gradle
+++ b/grails-forge/gradle/java-config.gradle
@@ -53,27 +53,6 @@ tasks.withType(Jar).configureEach {
'Implementation-Vendor': 'grails.apache.org'
)
duplicatesStrategy = DuplicatesStrategy.INCLUDE
-
- from(rootProject.layout.projectDirectory.file('../DISCLAIMER')) {
- into('META-INF')
- }
-
- def projectLicense = layout.projectDirectory.file('src/main/resources/META-INF/LICENSE')
- if (!projectLicense.asFile.exists()) {
- def basicLicense = rootProject.layout.projectDirectory.file('../licenses/LICENSE-Apache-2.0.txt')
- from(basicLicense) {
- into('META-INF')
- rename { 'LICENSE' }
- }
- }
-
- def projectNotice = layout.projectDirectory.file('src/main/resources/META-INF/NOTICE')
- if (!projectNotice.asFile.exists()) {
- def basicNotice = rootProject.layout.projectDirectory.file('../grails-core/src/main/resources/META-INF/NOTICE')
- from(basicNotice) {
- into('META-INF')
- }
- }
}
// Any jar, zip, or archive should be reproducible
diff --git a/grails-forge/gradle/publish-config.gradle b/grails-forge/gradle/publish-config.gradle
index 8ec9621002..42cf44c0ab 100644
--- a/grails-forge/gradle/publish-config.gradle
+++ b/grails-forge/gradle/publish-config.gradle
@@ -33,6 +33,31 @@ extensions.configure(GrailsPublishExtension) {
it.publishTestSources = findProperty('pomPublishTestSources') ?: false
}
+tasks.withType(Jar).configureEach {
+ if(it.archiveClassifier.getOrNull() != 'javadoc') {
+ from(rootProject.layout.projectDirectory.file('../DISCLAIMER')) {
+ into('META-INF')
+ }
+
+ def projectLicense = layout.projectDirectory.file('src/main/resources/META-INF/LICENSE')
+ if (!projectLicense.asFile.exists()) {
+ def basicLicense = rootProject.layout.projectDirectory.file('../licenses/LICENSE-Apache-2.0.txt')
+ from(basicLicense) {
+ into('META-INF')
+ rename { 'LICENSE' }
+ }
+ }
+
+ def projectNotice = layout.projectDirectory.file('src/main/resources/META-INF/NOTICE')
+ if (!projectNotice.asFile.exists()) {
+ def basicNotice = rootProject.layout.projectDirectory.file('../grails-core/src/main/resources/META-INF/NOTICE')
+ from(basicNotice) {
+ into('META-INF')
+ }
+ }
+ }
+}
+
apply plugin: 'org.gradle.crypto.checksum'
afterEvaluate {
diff --git a/grails-gradle/gradle/java-config.gradle b/grails-gradle/gradle/java-config.gradle
index c0f9f1ae03..5990fbaabd 100644
--- a/grails-gradle/gradle/java-config.gradle
+++ b/grails-gradle/gradle/java-config.gradle
@@ -64,24 +64,26 @@ tasks.withType(Jar).configureEach {
'Implementation-Vendor': 'grails.apache.org'
)
- from(rootProject.layout.projectDirectory.file('../DISCLAIMER')) {
- into('META-INF')
- }
-
- def projectLicense = layout.projectDirectory.file('src/main/resources/META-INF/LICENSE')
- if (!projectLicense.asFile.exists()) {
- def basicLicense = rootProject.layout.projectDirectory.file('../licenses/LICENSE-Apache-2.0.txt')
- from(basicLicense) {
+ if(it.archiveClassifier.getOrNull() != 'javadoc') {
+ from(rootProject.layout.projectDirectory.file('../DISCLAIMER')) {
into('META-INF')
- rename { 'LICENSE' }
}
- }
- def projectNotice = layout.projectDirectory.file('src/main/resources/META-INF/NOTICE')
- if (!projectNotice.asFile.exists()) {
- def basicNotice = rootProject.layout.projectDirectory.file('../grails-core/src/main/resources/META-INF/NOTICE')
- from(basicNotice) {
- into('META-INF')
+ def projectLicense = layout.projectDirectory.file('src/main/resources/META-INF/LICENSE')
+ if (!projectLicense.asFile.exists()) {
+ def basicLicense = rootProject.layout.projectDirectory.file('../licenses/LICENSE-Apache-2.0.txt')
+ from(basicLicense) {
+ into('META-INF')
+ rename { 'LICENSE' }
+ }
+ }
+
+ def projectNotice = layout.projectDirectory.file('src/main/resources/META-INF/NOTICE')
+ if (!projectNotice.asFile.exists()) {
+ def basicNotice = rootProject.layout.projectDirectory.file('../grails-core/src/main/resources/META-INF/NOTICE')
+ from(basicNotice) {
+ into('META-INF')
+ }
}
}
}