Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Go back to com.github.johnrengelman.shadow and upgrade ASM to 9.6 #1114

Merged
merged 2 commits into from
Feb 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
// Needed until shadow plugin is updated for JDK21. For more details see
// https://github.com/Netflix/spectator/issues/1113
buildscript {
configurations.configureEach { configuration ->
configuration.resolutionStrategy {
eachDependency { DependencyResolveDetails details ->
if (details.requested.group == 'org.ow2.asm') {
details.useVersion '9.6'
details.because "Asm 9.6 is required for JDK 21+ support"
}
}
}
}
}

plugins {
id 'com.github.ben-manes.versions' version '0.50.0'
id 'com.github.spotbugs' version '5.2.5' apply false
id "com.github.johnrengelman.shadow" version "8.1.1" apply false
id 'me.champeau.jmh' version '0.7.2'
id 'com.netflix.nebula.dependency-recommender' version '12.2.0'
id 'com.netflix.nebula.netflixoss' version '11.4.0'
Expand Down
2 changes: 1 addition & 1 deletion spectator-agent/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'io.github.goooler.shadow' version '8.1.3'
id "com.github.johnrengelman.shadow"
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion spectator-ext-spark/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'io.github.goooler.shadow' version '8.1.3'
id "com.github.johnrengelman.shadow"
}

dependencies {
Expand Down
3 changes: 1 addition & 2 deletions spectator-reg-atlas/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import java.util.zip.ZipFile

plugins {
id 'io.github.goooler.shadow' version '8.1.3'
id "com.github.johnrengelman.shadow"
}

dependencies {
Expand Down Expand Up @@ -51,7 +51,6 @@ afterEvaluate {
publishing {
publications {
withType(MavenPublication) {
artifact(shadowJar)
pom.withXml {
asNode()
.dependencies
Expand Down
3 changes: 1 addition & 2 deletions spectator-web-spring/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import java.util.zip.ZipFile

plugins {
id 'io.github.goooler.shadow' version '8.1.3'
id "com.github.johnrengelman.shadow"
}

dependencies {
Expand Down Expand Up @@ -65,7 +65,6 @@ afterEvaluate {
publishing {
publications {
withType(MavenPublication) {
artifact(shadowJar)
pom.withXml {
asNode()
.dependencies
Expand Down
Loading