Skip to content

Commit

Permalink
Bump com.github.johnrengelman.shadow to version 8.1.1 (#3146)
Browse files Browse the repository at this point in the history
  • Loading branch information
violetagg authored Apr 10, 2024
1 parent d0d4088 commit 945cd39
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 13 deletions.
4 changes: 0 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ updates:
- dependency-name: org.jfrog.buildinfo:build-info-extractor-gradle
versions:
- "[5.a, 6]"
# Versions > 7 require Gradle8+
- dependency-name: com.github.johnrengelman.shadow
versions:
- "[8.a, 9]"
# Versions > 4 require JDK11+
- dependency-name: org.mockito:mockito-core
versions:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ plugins {
id 'com.google.osdetector' version '1.7.3'
id 'org.gradle.test-retry' version '1.5.8'
id 'io.spring.nohttp' version '0.0.11'
id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
//we now need version of Artifactory gradle plugin deployed on Maven Central, see above
id 'me.champeau.gradle.japicmp' version '0.4.2' apply false
id 'de.undercouch.download' version '5.6.0' apply false
Expand Down
11 changes: 3 additions & 8 deletions reactor-netty-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,9 @@ shadowJar {
}
bnd(bndOptions)

archiveClassifier.set(null)
enableRelocation true
relocationPrefix "reactor.netty.internal.shaded"
archiveClassifier.set('')

dependsOn(project.tasks.jar)

Expand Down Expand Up @@ -295,13 +297,6 @@ shadowJar {
exclude 'META-INF/maven*/**'
}

task relocateShadowJar(type: com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation) {
target = tasks.shadowJar
prefix = "reactor.netty.internal.shaded"
}

tasks.shadowJar.dependsOn(relocateShadowJar)

//delay the maven publishing so that the OSGi metadata is generated
//then add shadowJar to the publication
components.java.withVariantsFromConfiguration(configurations.shadowRuntimeElements) {
Expand Down

0 comments on commit 945cd39

Please sign in to comment.