File tree Expand file tree Collapse file tree 4 files changed +12
-10
lines changed
conventions/src/main/kotlin
testing/agent-for-testing Expand file tree Collapse file tree 4 files changed +12
-10
lines changed Original file line number Diff line number Diff line change @@ -152,11 +152,13 @@ afterEvaluate {
152152// shadowJar is only used for creating a jar for testing, but the shadow plugin automatically adds
153153// it to a project's published Java component. Skip it if publishing is configured for this
154154// project.
155- plugins.withId(" maven-publish" ) {
156- configure<PublishingExtension > {
157- (components[" java" ] as AdhocComponentWithVariants ).run {
158- withVariantsFromConfiguration(configurations[" shadowRuntimeElements" ]) {
159- skip()
155+ afterEvaluate {
156+ plugins.withId(" maven-publish" ) {
157+ configure<PublishingExtension > {
158+ (components[" java" ] as AdhocComponentWithVariants ).run {
159+ withVariantsFromConfiguration(configurations[" shadowRuntimeElements" ]) {
160+ skip()
161+ }
160162 }
161163 }
162164 }
Original file line number Diff line number Diff line change @@ -64,7 +64,7 @@ tasks {
6464 task relocateJavaagentLibs(type : ShadowJar ) {
6565 configurations = [project. configurations. javaagentLibs]
6666
67- duplicatesStrategy = DuplicatesStrategy . FAIL
67+ duplicatesStrategy = DuplicatesStrategy . INCLUDE
6868
6969 archiveFileName. set(" javaagentLibs-relocated.jar" )
7070
@@ -105,7 +105,7 @@ tasks {
105105
106106 archiveClassifier. set(" all" )
107107
108- duplicatesStrategy = DuplicatesStrategy . EXCLUDE
108+ duplicatesStrategy = DuplicatesStrategy . INCLUDE
109109
110110 mergeServiceFiles {
111111 include(" inst/META-INF/services/*" )
Original file line number Diff line number Diff line change @@ -59,7 +59,7 @@ tasks {
5959 task relocateJavaagentLibs(type : ShadowJar ) {
6060 configurations = [project. configurations. javaagentLibs]
6161
62- duplicatesStrategy = DuplicatesStrategy . FAIL
62+ duplicatesStrategy = DuplicatesStrategy . INCLUDE
6363
6464 archiveFileName. set(" javaagentLibs-relocated.jar" )
6565
Original file line number Diff line number Diff line change @@ -161,7 +161,7 @@ tasks {
161161
162162 excludeBootstrapClasses()
163163
164- duplicatesStrategy = DuplicatesStrategy .FAIL
164+ duplicatesStrategy = DuplicatesStrategy .INCLUDE
165165
166166 archiveFileName.set(" baseJavaagentLibs-relocated-tmp.jar" )
167167 }
@@ -183,7 +183,7 @@ tasks {
183183 // remove MPL licensed content
184184 exclude(" okhttp3/internal/publicsuffix/PublicSuffixDatabase.list" )
185185
186- duplicatesStrategy = DuplicatesStrategy .FAIL
186+ duplicatesStrategy = DuplicatesStrategy .INCLUDE
187187
188188 archiveFileName.set(" javaagentLibs-relocated-tmp.jar" )
189189 }
You can’t perform that action at this time.
0 commit comments