Skip to content

Commit e4864f0

Browse files
committed
[skip ci] workaround: temporarily fix shadowJar projects
1 parent a0167d5 commit e4864f0

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

grails-forge/grails-cli/build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
* limitations under the License.
1616
*/
1717
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
18+
import com.github.jengelman.gradle.plugins.shadow.transformers.ApacheLicenseResourceTransformer
19+
import com.github.jengelman.gradle.plugins.shadow.transformers.ApacheNoticeResourceTransformer
1820

1921
plugins {
2022
id 'groovy'
@@ -77,6 +79,11 @@ TaskProvider<Jar> shadowJarTask = tasks.named('shadowJar', ShadowJar)
7779
shadowJarTask.configure { ShadowJar it ->
7880
it.archiveClassifier.set('')
7981

82+
// TODO: This needs reworked so we have one consistent license view, for now the disclaimer is shipped so this should suffice until this is fixed.
83+
it.transform(ApacheLicenseResourceTransformer)
84+
it.transform(ApacheNoticeResourceTransformer)
85+
it.exclude('DISCLAIMER', 'license.header', 'licenses/**', 'META-INF/NOTICE.md', 'META-INF/NOTICE', 'META-INF/NOTICE.md', 'META-INF/licenses/**', 'META-INF/LICENSE.md')
86+
8087
// services & custom grails.factories have to be merged since commands can be created from both sources
8188
it.mergeServiceFiles()
8289
it.mergeServiceFiles('META-INF/grails.factories')

grails-forge/grails-forge-cli/build.gradle

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
* under the License.
1818
*/
1919

20-
2120
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
21+
import com.github.jengelman.gradle.plugins.shadow.transformers.ApacheLicenseResourceTransformer
22+
import com.github.jengelman.gradle.plugins.shadow.transformers.ApacheNoticeResourceTransformer
2223
import org.grails.forge.internal.tasks.GenerateManpageAsciidoc
2324
import org.grails.forge.internal.tasks.PicocliBuildCompletionTask
2425

@@ -165,6 +166,12 @@ distributions {
165166
}
166167

167168
tasks.named('shadowJar', ShadowJar) {
169+
170+
// TODO: This needs reworked so we have one consistent license view, for now the disclaimer is shipped so this should suffice until this is fixed.
171+
it.transform(ApacheLicenseResourceTransformer)
172+
it.transform(ApacheNoticeResourceTransformer)
173+
it.exclude('DISCLAIMER', 'license.header', 'licenses/**', 'META-INF/NOTICE.md', 'META-INF/NOTICE', 'META-INF/NOTICE.md', 'META-INF/licenses/**', 'META-INF/LICENSE.md')
174+
168175
mergeServiceFiles()
169176
}
170177

@@ -175,6 +182,10 @@ tasks.named('shadowDistTar') {
175182
enabled = false
176183
}
177184

185+
tasks.named('distTar') {
186+
enabled = false
187+
}
188+
178189
tasks.register('copyShadowJar', Sync) {
179190
from shadowJar.outputs
180191
into project.rootProject.layout.buildDirectory.dir('libs')

0 commit comments

Comments
 (0)