Skip to content

Commit

Permalink
[CALCITE-6687] Add dependency constraints for org.ow2.asm for Gradle …
Browse files Browse the repository at this point in the history
…build environment in Avatica
  • Loading branch information
stoty committed Nov 12, 2024
1 parent 2baa36e commit ecb6c53
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
24 changes: 14 additions & 10 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,20 @@ import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApisExtension
import org.gradle.api.tasks.testing.logging.TestExceptionFormat

buildscript {
dependencies {
constraints {
// Looks like we cannot access the versions defined in gradle.properties from here
"classpath"("org.ow2.asm:asm:9.7.1")
"classpath"("org.ow2.asm:asm-all:9.7.1")
"classpath"("org.ow2.asm:asm-analysis:9.7.1")
"classpath"("org.ow2.asm:asm-commons:9.7.1")
"classpath"("org.ow2.asm:asm-tree:9.7.1")
"classpath"("org.ow2.asm:asm-util:9.7.1")
}
}
}

plugins {
publishing
// Verification
Expand Down Expand Up @@ -345,16 +359,6 @@ allprojects {
// By default spotbugs verifies TEST classes as well, and we do not want that
this.sourceSets = listOf(sourceSets["main"])
}
dependencies {
constraints {
"spotbugs"("org.ow2.asm:asm:${"asm".v}")
"spotbugs"("org.ow2.asm:asm-all:${"asm".v}")
"spotbugs"("org.ow2.asm:asm-analysis:${"asm".v}")
"spotbugs"("org.ow2.asm:asm-commons:${"asm".v}")
"spotbugs"("org.ow2.asm:asm-tree:${"asm".v}")
"spotbugs"("org.ow2.asm:asm-util:${"asm".v}")
}
}
}

configure<CheckForbiddenApisExtension> {
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ checkstyle.version=10.19.0
jdk8.checkstyle.version=9.3
spotbugs.version=3.1.11

# This only applies to the asm used in the tests. To override the asm used by the gradle plugins
# change the version in the buildScript block of build.gradle.kts directly
asm.version=9.7.1
bouncycastle.version=1.70
bytebuddy.version=1.15.1
Expand Down

0 comments on commit ecb6c53

Please sign in to comment.