Skip to content

Commit be9b7ab

Browse files
committed
exclude LICENSE/NOTICE in intermediate jar task.
also, use a different directory so -agent-intermediate is not picked up by releases
1 parent 8d79146 commit be9b7ab

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

agent/build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ shadowJar() {
3434

3535
archiveClassifier = 'intermediate'
3636
mergeServiceFiles()
37-
37+
destinationDirectory = file("${project.buildDir}/intermediate")
3838
dependencies {
3939
exclude(dependency {
4040
it.moduleGroup == 'org.glowroot.instrumentation' &&
@@ -66,6 +66,10 @@ shadowJar() {
6666
exclude 'META-INF/NOTICE*'
6767
exclude 'META-INF/services/javax.servlet.ServletContainerInitializer'
6868

69+
// prevent duplicate files
70+
exclude 'LICENSE'
71+
exclude 'NOTICE'
72+
6973
// errorprone annotations are a problem in the bootstrap class loader for Java 9 because they depend on
7074
// javax.lang.model.element.Modifier which is no longer in the bootstrap class loader in Java 9, and this causes
7175
// spring class path scanning to fail when trying to read com.google.errorprone.annotations.ForOverride

0 commit comments

Comments
 (0)