Skip to content

Commit

Permalink
[BEAM-4583] Upgrade dependencies of Java SDK
Browse files Browse the repository at this point in the history
  • Loading branch information
Yifan Zou committed Jun 19, 2018
1 parent 6889792 commit 7d9d13f
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ buildscript {
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.5" // Enable proto code generation
classpath "io.spring.gradle:propdeps-plugin:0.0.9.RELEASE" // Enable provided and optional configurations
classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.3.1" // Enable Apache license enforcement
classpath "com.commercehub.gradle.plugin:gradle-avro-plugin:0.11.0" // Enable Avro code generation
classpath "com.diffplug.spotless:spotless-plugin-gradle:3.6.0" // Enable a code formatting plugin
classpath "com.commercehub.gradle.plugin:gradle-avro-plugin:0.14.2" // Enable Avro code generation
classpath "com.diffplug.spotless:spotless-plugin-gradle:3.13.0" // Enable a code formatting plugin
classpath "gradle.plugin.com.github.blindpirate:gogradle:0.9" // Enable Go code compilation
classpath "gradle.plugin.com.palantir.gradle.docker:gradle-docker:0.13.0" // Enable building Docker containers
classpath "cz.malohlava:visteg:1.0.3" // Enable generating Gradle task dependencies as ".dot" files
Expand Down
4 changes: 2 additions & 2 deletions sdks/java/extensions/sql/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def avatica_version = "1.11.0"
dependencies {
javacc "net.java.dev.javacc:javacc:4.0"
fmppTask "com.googlecode.fmpp-maven-plugin:fmpp-maven-plugin:1.0"
fmppTask "org.freemarker:freemarker:2.3.25-incubating"
fmppTask "org.freemarker:freemarker:2.3.28"
fmppTemplates "org.apache.calcite:calcite-core:$calcite_version"
compile library.java.guava
compile "org.apache.calcite:calcite-core:$calcite_version"
Expand All @@ -72,7 +72,7 @@ dependencies {
shadow library.java.commons_lang3
shadow library.java.jackson_databind
shadow library.java.joda_time
shadow "com.alibaba:fastjson:1.2.12"
shadow "com.alibaba:fastjson:1.2.47"
shadow project(path: ":beam-runners-direct-java", configuration: "shadow")
provided project(path: ":beam-sdks-java-io-kafka", configuration: "shadow")
provided project(path: ":beam-sdks-java-io-google-cloud-platform", configuration: "shadow")
Expand Down
2 changes: 1 addition & 1 deletion sdks/java/io/amazon-web-services/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies {
shadow library.java.jackson_databind
shadow library.java.findbugs_jsr305
shadow library.java.slf4j_api
runtime 'commons-codec:commons-codec:1.9'
runtime 'commons-codec:commons-codec:1.11'
runtime "org.apache.httpcomponents:httpclient:4.5.2"
testCompile project(path: ":beam-runners-direct-java", configuration: "shadow")
testCompileOnly library.java.findbugs_annotations
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ enableJavaPerformanceTesting()
description = "Apache Beam :: SDKs :: Java :: IO :: Elasticsearch-Tests :: 2.x"
ext.summary = "Tests of ElasticsearchIO on Elasticsearch 2.x"

def jna_version = "4.1.0"
def jna_version = "4.5.1"
def log4j_version = "2.6.2"
def elastic_search_version = "2.4.1"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ test {
systemProperty "tests.security.manager", "false"
}

def jna_version = "4.1.0"
def jna_version = "4.5.1"
def log4j_version = "2.6.2"
def elastic_search_version = "5.6.3"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ applyJavaNature(failOnWarning: true)
description = "Apache Beam :: SDKs :: Java :: IO :: Elasticsearch-Tests :: Common"
ext.summary = "Common test classes for ElasticsearchIO"

def jna_version = "4.1.0"
def jna_version = "4.5.1"
def log4j_version = "2.6.2"

dependencies {
Expand Down
8 changes: 4 additions & 4 deletions sdks/java/io/jdbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies {
compileOnly library.java.findbugs_annotations
shadow project(path: ":beam-sdks-java-core", configuration: "shadow")
shadow library.java.findbugs_jsr305
shadow "org.apache.commons:commons-dbcp2:2.1.1"
shadow "org.apache.commons:commons-dbcp2:2.3.0"
testCompile project(path: ":beam-sdks-java-core", configuration: "shadowTest")
testCompile project(path: ":beam-runners-direct-java", configuration: "shadow")
testCompile project(path: ":beam-sdks-java-io-common", configuration: "shadow")
Expand All @@ -40,8 +40,8 @@ dependencies {
testCompile library.java.slf4j_api
testCompile library.java.slf4j_jdk14
testCompile library.java.postgres
testCompile group: "org.apache.derby", name: "derby", version:"10.12.1.1"
testCompile group: "org.apache.derby", name: "derbyclient", version:"10.12.1.1"
testCompile group: "org.apache.derby", name: "derbynet", version:"10.12.1.1"
testCompile group: "org.apache.derby", name: "derby", version:"10.14.2.0"
testCompile group: "org.apache.derby", name: "derbyclient", version:"10.14.2.0"
testCompile group: "org.apache.derby", name: "derbynet", version:"10.14.2.0"
testCompileOnly library.java.findbugs_annotations
}

0 comments on commit 7d9d13f

Please sign in to comment.