Skip to content

Commit

Permalink
Excavator: Upgrade dependencies (#2342)
Browse files Browse the repository at this point in the history
  • Loading branch information
svc-excavator-bot authored Oct 8, 2022
1 parent 65d7f1f commit 2c966d9
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 10 deletions.
6 changes: 5 additions & 1 deletion baseline-refaster-rules/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ dependencies {
testImplementation project(':baseline-refaster-testing')
testImplementation 'org.immutables:value::annotations'

testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', {
because 'allows JUnit 3 and JUnit 4 tests to run'
}

compileOnly 'org.immutables:value::annotations'
}

Expand All @@ -35,4 +39,4 @@ moduleJvmArgs {
'jdk.compiler/com.sun.tools.javac.util'
]
opens = ['jdk.compiler/com.sun.tools.javac.comp']
}
}
6 changes: 5 additions & 1 deletion baseline-refaster-testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ dependencies {
api 'com.google.guava:guava'
api 'junit:junit'
api 'org.assertj:assertj-core'

testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', {
because 'allows JUnit 3 and JUnit 4 tests to run'
}
}

tasks.checkClassUniqueness.enabled = false
Expand All @@ -42,4 +46,4 @@ moduleJvmArgs {
'jdk.compiler/com.sun.tools.javac.tree',
'jdk.compiler/com.sun.tools.javac.util'
]
}
}
5 changes: 5 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ allprojects {
check("PreconditionsConstantMessage", CheckSeverity.OFF)
}
}
tasks.withType(Test) {
useJUnitPlatform {
includeEngines 'junit-vintage', 'junit-jupiter'
}
}
}

apply plugin: 'org.inferred.processors'
Expand Down
2 changes: 1 addition & 1 deletion gradle-baseline-java/src/main/resources/checkstyle.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.3.2
10.3.4
10 changes: 5 additions & 5 deletions versions.lock
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ org.assertj:assertj-core:3.23.1 (3 constraints: e42af49e)
org.checkerframework:checker-qual:3.23.0 (3 constraints: 08256088)
org.checkerframework:dataflow-errorprone:3.23.0 (4 constraints: fa3d685c)
org.checkerframework:dataflow-nullaway:3.23.0 (2 constraints: 671166f1)
org.codehaus.groovy:groovy:3.0.10 (3 constraints: e32879d6)
org.codehaus.groovy:groovy-xml:3.0.10 (1 constraints: 791161da)
org.codehaus.groovy:groovy:3.0.13 (3 constraints: 3a295322)
org.codehaus.groovy:groovy-xml:3.0.13 (1 constraints: 791161da)
org.codehaus.plexus:plexus-cipher:2.0 (1 constraints: 641174c7)
org.codehaus.plexus:plexus-classworlds:2.6.0 (3 constraints: 572b5104)
org.codehaus.plexus:plexus-component-annotations:2.1.0 (2 constraints: 241d860a)
Expand Down Expand Up @@ -129,10 +129,10 @@ org.junit.jupiter:junit-jupiter-engine:5.9.1 (1 constraints: 0c0ee13b)
org.junit.jupiter:junit-jupiter-migrationsupport:5.9.1 (1 constraints: 11052036)
org.junit.jupiter:junit-jupiter-params:5.9.1 (1 constraints: 0c0ee13b)
org.junit.platform:junit-platform-commons:1.9.1 (2 constraints: dd200f4b)
org.junit.platform:junit-platform-engine:1.9.1 (3 constraints: 602e777f)
org.junit.platform:junit-platform-engine:1.9.1 (3 constraints: 602e797f)
org.junit.vintage:junit-vintage-engine:5.9.1 (1 constraints: 11052036)
org.mockito:mockito-junit-jupiter:4.8.0 (1 constraints: 0e051736)
org.opentest4j:opentest4j:1.2.0 (2 constraints: cd205b49)
org.reactivestreams:reactive-streams:1.0.3 (1 constraints: ef07e77b)
org.spockframework:spock-core:2.1-M2-groovy-3.0 (2 constraints: e622905a)
org.spockframework:spock-junit4:2.1-M2-groovy-3.0 (1 constraints: 241154df)
org.spockframework:spock-core:2.3-groovy-3.0 (2 constraints: 3c22e7f5)
org.spockframework:spock-junit4:2.3-groovy-3.0 (1 constraints: 241154df)
5 changes: 3 additions & 2 deletions versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ org.slf4j:* = 1.7.36
org.immutables:* = 2.8.8
org.ow2.asm:asm = 9.4
com.googlecode.java-diff-utils:diffutils = 1.3.0
com.puppycrawl.tools:checkstyle = 10.3.2
com.puppycrawl.tools:checkstyle = 10.3.4
com.palantir.gradle.utils:* = 0.1.0

# test deps
Expand All @@ -35,7 +35,8 @@ org.junit.jupiter:* = 5.9.1
org.junit.vintage:* = 5.9.1
org.junit.platform:* = 1.9.1
org.mockito:* = 4.8.0
org.codehaus.groovy:* = 3.0.10
org.codehaus.groovy:* = 3.0.13
org.spockframework:* = 2.3-groovy-3.0

# dependency-upgrader:OFF
# Don't upgrade, we will remove this in a future release.
Expand Down

0 comments on commit 2c966d9

Please sign in to comment.