Skip to content

Commit

Permalink
mass dependency updates
Browse files Browse the repository at this point in the history
  • Loading branch information
johnrengelman committed May 22, 2022
1 parent 4cc24e9 commit 262189c
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion buildSrc/buildSrc.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ repositories {
dependencies {
implementation localGroovy()
implementation gradleApi()
implementation('com.google.javascript:closure-compiler:v20190415') {
implementation('com.google.javascript:closure-compiler:v20220502') {
exclude module: 'junit'
}
implementation "com.github.ben-manes:gradle-versions-plugin:0.38.0"
Expand Down
2 changes: 1 addition & 1 deletion gradle/checkstyle.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
apply plugin: 'checkstyle'

dependencies {
checkstyle 'com.puppycrawl.tools:checkstyle:9.3'
checkstyle 'com.puppycrawl.tools:checkstyle:10.2'
}

def checkstyleConfigDir = new File(buildscript.sourceFile.parentFile, 'checkstyle')
Expand Down
26 changes: 13 additions & 13 deletions gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,27 @@ ext {
commonsCodec : "1.14",
commonsLang3 : "3.12.0",
commonsLogging : "1.2",
dropwizardMetrics: "4.2.8",
groovy : "3.0.9",
guava : "31.0.1-jre",
dropwizardMetrics: "4.2.9",
groovy : "3.0.9", // Gradle 7.4 uses Groovy 3.0.9
guava : "31.1-jre",
guice : "5.1.0",
jackson : "2.13.1",
javassist : "3.28.0-GA"
log4j : "2.17.1",
netty : "4.1.73.Final",
nettyTCNative : "2.0.48.Final",
jackson : "2.13.3",
javassist : "3.29.0-GA",
log4j : "2.17.2",
netty : "4.1.77.Final",
nettyTCNative : "2.0.52.Final",
newrelic : "5.13.0",
pegdown : "1.6.0",
prometheusClient : "0.15.0",
reactiveStreams : "1.0.3",
reactor : "3.4.14",
reactor : "3.4.18",
retrofit : "2.9.0",
rxjava2 : "2.2.21",
shadow : "7.1.2",
slf4j : "1.7.36",
snakeyaml : "1.30",
spock : "2.1-groovy-3.0",
springBoot : "2.6.3",
springBoot : "2.7.0",
]

if (System.getenv('CI_GROOVY_VERSION')) {
Expand Down Expand Up @@ -87,7 +87,7 @@ ext {
reactorTest: "io.projectreactor:reactor-test:${commonVersions.reactor}",
jackson : "com.fasterxml.jackson.core:jackson-databind:${commonVersions.jackson}",
slf4j : "org.slf4j:slf4j-api:${commonVersions.slf4j}",
h2 : "com.h2database:h2:2.1.210",
h2 : "com.h2database:h2:2.1.212",
toolingApi : dependencies.create("org.gradle:gradle-tooling-api:${gradle.gradleVersion}", {
exclude group: "org.slf4j", module: "slf4j-api"
}),
Expand All @@ -102,10 +102,10 @@ ext {
],
commonsLang3: "org.apache.commons:commons-lang3:${commonVersions.commonsLang3}",
jsass : [
dependencies.create("io.freefair.gradle:jsass-plugin:6.4.1") {
dependencies.create("io.freefair.gradle:jsass-plugin:6.4.3") {
exclude group: "io.bit3", module: "jsass"
},
dependencies.create("io.bit3:jsass:5.7.0")
dependencies.create("io.bit3:jsass:5.7.0") //Force jsass version to 5.7.0 due to https://gitlab.com/jsass/jsass/-/issues/92
]
]
}
2 changes: 1 addition & 1 deletion ratpack-core/ratpack-core.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ dependencies {
testImplementation "org.apache.logging.log4j:log4j-api:${commonVersions.log4j}"
testImplementation "org.apache.logging.log4j:log4j-core:${commonVersions.log4j}"

testImplementation('com.opencsv:opencsv:5.5.2') {
testImplementation('com.opencsv:opencsv:5.6') {
exclude group: "org.apache.commons", module: "commons-lang3"
}
testImplementation('com.github.tomakehurst:wiremock:2.27.2') {
Expand Down
6 changes: 3 additions & 3 deletions ratpack-exec/ratpack-exec.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
api project(":ratpack-func")
api "io.netty:netty-buffer:$commonVersions.netty"
api "io.netty:netty-transport-native-epoll:${commonVersions.netty}:linux-x86_64"
api "io.netty:netty-tcnative:${commonVersions.nettyTCNative}:linux-x86_64"
api "io.netty:netty-tcnative-boringssl-static:${commonVersions.nettyTCNative}:linux-x86_64"
api "org.reactivestreams:reactive-streams:${commonVersions.reactiveStreams}"
api commonDependencies.slf4j

Expand All @@ -32,8 +32,8 @@ dependencies {
exclude group: "org.yaml", module: "snakeyaml"
exclude group: "org.testng", module: "testng"
}
testImplementation('org.testng:testng:7.5')
testImplementation('org.mockito:mockito-core:4.3.1') {
testImplementation('org.testng:testng:7.5') //7.6.0 requires Java 11
testImplementation('org.mockito:mockito-core:4.5.1') {
exclude group: "org.hamcrest", module: "hamcrest-core"
}

Expand Down
2 changes: 1 addition & 1 deletion ratpack-gradle/ratpack-gradle.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
}
}
dependencies {
classpath "com.gradle.publish:plugin-publish-plugin:0.20.0"
classpath "com.gradle.publish:plugin-publish-plugin:0.18.0"
}
}

Expand Down
2 changes: 1 addition & 1 deletion ratpack-manual/ratpack-manual.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ buildscript {
classpath "org.pegdown:pegdown:${commonVersions.pegdown}"
// Use the master version of gradle-js-plugin since it fixes a Gradle 6 deprecation (from JitPack.io)
classpath "com.github.eriwen:gradle-js-plugin:d15f4ae"
classpath "com.google.javascript:closure-compiler:v20150315"
classpath "com.google.javascript:closure-compiler:v20220502"
classpath commonDependencies.jsass
}
}
Expand Down
2 changes: 1 addition & 1 deletion ratpack-session-redis/ratpack-session-redis.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies {
api project(":ratpack-guice")
api project(":ratpack-session")

implementation('io.lettuce:lettuce-core:6.1.6.RELEASE') {
implementation('io.lettuce:lettuce-core:6.1.8.RELEASE') {
exclude group: "io.netty", module: "netty-common"
exclude group: "io.netty", module: "netty-handler"
exclude group: "io.netty", module: "netty-transport"
Expand Down
4 changes: 2 additions & 2 deletions ratpack-site/ratpack-site.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ buildscript {
classpath commonDependencies.jsass
// Use the master version of gradle-js-plugin since it fixes a Gradle 6 deprecation (from JitPack.io)
classpath "com.github.eriwen:gradle-js-plugin:d15f4ae"
classpath "com.google.javascript:closure-compiler:v20220202" //v20150315
classpath "com.google.javascript:closure-compiler:v20220502" //v20150315
}
}

Expand Down Expand Up @@ -157,7 +157,7 @@ dependencies {
testImplementation project(":ratpack-groovy-test")
testImplementation project(":ratpack-test-internal")
testImplementation commonDependencies.spock
testImplementation 'org.jsoup:jsoup:1.14.3'
testImplementation 'org.jsoup:jsoup:1.15.1'
latestManual isHeroku ? "io.ratpack:ratpack-manual:$version" : project(path: ":ratpack-manual", configuration: "zip")

browserTestImplementation("org.gebish:geb-spock:5.1") {
Expand Down
4 changes: 2 additions & 2 deletions ratpack-spring-boot/ratpack-spring-boot.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ dependencies {
api project(":ratpack-core")
api project(":ratpack-guice")
api "org.springframework.boot:spring-boot-autoconfigure:$commonVersions.springBoot"
testImplementation "org.springframework:spring-web:5.3.15"
testImplementation "org.springframework:spring-test:5.3.15"
testImplementation "org.springframework:spring-web:5.3.20"
testImplementation "org.springframework:spring-test:5.3.20"
testImplementation "org.springframework.boot:spring-boot-test:$commonVersions.springBoot"
testImplementation project(":ratpack-groovy")
}
2 changes: 1 addition & 1 deletion ratpack-test-internal/ratpack-test-internal.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ apply from: "$rootDir/gradle/groovyModule.gradle"
dependencies {
api project(":ratpack-groovy-test")
api commonDependencies.spock
api 'org.java-websocket:Java-WebSocket:1.5.2'
api 'org.java-websocket:Java-WebSocket:1.5.3'
api "org.junit.jupiter:junit-jupiter-api:5.8.2"
api("org.apiguardian:apiguardian-api:1.1.2") {
because "Needed after upgrading to junit-jupiter-api:5.8.2, otherwise javadoc snippet tests fail. Somehow related to https://github.com/junit-team/junit5/issues/1104"
Expand Down

0 comments on commit 262189c

Please sign in to comment.