Skip to content

Commit

Permalink
Update Guice to 5, JDBC for PostgreSQL (#1683)
Browse files Browse the repository at this point in the history
* Update Guice to 5

* Update Guice to 5

* Update JDBC for Pg

Co-authored-by: You Yamagata <youy@bg8.so-net.ne.jp>
  • Loading branch information
yoyama and You Yamagata committed Jan 13, 2022
1 parent 736d92a commit b17340e
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ subprojects {
jacksonDatabindVersion = "2.9.10"
awsJavaSdkVersion = "1.11.686"
guavaVersion = "30.1.1-jre"
guiceVersion = "5.0.1"
}

tasks.withType(JavaCompile) {
Expand Down
4 changes: 2 additions & 2 deletions digdag-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies {
compile project(':digdag-plugin-utils')
compile project(':digdag-spi')

compile ('com.google.inject:guice:4.2.2') {
compile ("com.google.inject:guice:${project.ext.guiceVersion}") {
exclude group: 'com.google.guava', module: 'guava'
}
compile 'org.embulk:guice-bootstrap:0.3.2'
Expand All @@ -18,7 +18,7 @@ dependencies {
runtime 'org.antlr:stringtemplate:3.2.1' // Used by jdbi2's string template v3 at runtime
compile 'com.zaxxer:HikariCP:2.4.7'
compile 'com.h2database:h2:1.4.192'
compile 'org.postgresql:postgresql:9.4.1211'
compile 'org.postgresql:postgresql:42.3.1'
compile 'org.yaml:snakeyaml:1.23'
compile 'com.google.code.findbugs:annotations:3.0.1'
compile 'org.weakref:jmxutils:1.19'
Expand Down
2 changes: 1 addition & 1 deletion digdag-guice-rs/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

dependencies {
compile project(':digdag-commons')
compile 'com.google.inject:guice:4.2.2'
compile "com.google.inject:guice:${project.ext.guiceVersion}"
compile 'javax.servlet:javax.servlet-api:3.1.0'
compile 'org.jboss.resteasy:resteasy-jaxrs:3.0.13.Final'
compile 'org.jboss.resteasy:async-http-servlet-3.0:3.0.13.Final'
Expand Down
2 changes: 1 addition & 1 deletion digdag-spi/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

dependencies {
compile project(':digdag-client')
compile ('com.google.inject.extensions:guice-multibindings:4.2.2') {
compile ("com.google.inject.extensions:guice-multibindings:4.2.3") {
exclude group: 'com.google.guava', module: 'guava'
}
}

0 comments on commit b17340e

Please sign in to comment.