Skip to content

Commit

Permalink
Merge pull request embulk#339 from embulk/upgrade-dependencies-0.10.5
Browse files Browse the repository at this point in the history
Upgrade the Gradle wrapper to 7.6.4, the Gradle plugin for Embulk plugins to 0.6.2, embulk-util-config to 0.3.4, and embulk-util-json to 0.3.0
  • Loading branch information
dmikurube authored Feb 22, 2024
2 parents aa44763 + 39dbbb2 commit 3f93b97
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 14 deletions.
7 changes: 4 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
id "maven-publish"
id "signing"
id 'checkstyle'
id "org.embulk.embulk-plugins" version "0.6.1" apply false
id "org.embulk.embulk-plugins" version "0.6.2" apply false
}

allprojects {
Expand Down Expand Up @@ -46,7 +46,7 @@ subprojects {
dependencies {
compileOnly "org.embulk:embulk-spi:0.10.49"

implementation("org.embulk:embulk-util-config:0.3.3") {
implementation("org.embulk:embulk-util-config:0.3.4") {
// They conflict with embulk-core. They are once excluded here,
// and added explicitly with versions exactly the same with embulk-core:0.10.31.
exclude group: "com.fasterxml.jackson.core", module: "jackson-annotations"
Expand All @@ -64,7 +64,7 @@ subprojects {
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7"
implementation "javax.validation:validation-api:1.1.0.Final"

implementation "org.embulk:embulk-util-json:0.2.1"
implementation "org.embulk:embulk-util-json:0.3.0"
implementation "org.embulk:embulk-util-timestamp:0.2.2"
implementation "org.embulk:embulk-util-retryhelper:0.8.2"

Expand Down Expand Up @@ -140,6 +140,7 @@ subprojects {
// http://central.sonatype.org/pages/requirements.html#license-information
name = "The Apache License, Version 2.0"
url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
distribution = "repo"
}
}

Expand Down
4 changes: 2 additions & 2 deletions embulk-output-jdbc/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ com.fasterxml.jackson.core:jackson-databind:2.6.7.5=compileClasspath,runtimeClas
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=compileClasspath,runtimeClasspath
javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
org.embulk:embulk-spi:0.10.49=compileClasspath
org.embulk:embulk-util-config:0.3.3=compileClasspath,runtimeClasspath
org.embulk:embulk-util-json:0.2.1=compileClasspath,runtimeClasspath
org.embulk:embulk-util-config:0.3.4=compileClasspath,runtimeClasspath
org.embulk:embulk-util-json:0.3.0=compileClasspath,runtimeClasspath
org.embulk:embulk-util-retryhelper:0.8.2=compileClasspath,runtimeClasspath
org.embulk:embulk-util-rubytime:0.3.3=compileClasspath,runtimeClasspath
org.embulk:embulk-util-timestamp:0.2.2=compileClasspath,runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions embulk-output-mysql/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=compileClasspath,runt
javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
mysql:mysql-connector-java:5.1.44=compileClasspath
org.embulk:embulk-spi:0.10.49=compileClasspath
org.embulk:embulk-util-config:0.3.3=compileClasspath,runtimeClasspath
org.embulk:embulk-util-json:0.2.1=compileClasspath,runtimeClasspath
org.embulk:embulk-util-config:0.3.4=compileClasspath,runtimeClasspath
org.embulk:embulk-util-json:0.3.0=compileClasspath,runtimeClasspath
org.embulk:embulk-util-retryhelper:0.8.2=compileClasspath,runtimeClasspath
org.embulk:embulk-util-rubytime:0.3.3=compileClasspath,runtimeClasspath
org.embulk:embulk-util-timestamp:0.2.2=compileClasspath,runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions embulk-output-postgresql/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ com.fasterxml.jackson.core:jackson-databind:2.6.7.5=compileClasspath,runtimeClas
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=compileClasspath,runtimeClasspath
javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
org.embulk:embulk-spi:0.10.49=compileClasspath
org.embulk:embulk-util-config:0.3.3=compileClasspath,runtimeClasspath
org.embulk:embulk-util-json:0.2.1=compileClasspath,runtimeClasspath
org.embulk:embulk-util-config:0.3.4=compileClasspath,runtimeClasspath
org.embulk:embulk-util-json:0.3.0=compileClasspath,runtimeClasspath
org.embulk:embulk-util-retryhelper:0.8.2=compileClasspath,runtimeClasspath
org.embulk:embulk-util-rubytime:0.3.3=compileClasspath,runtimeClasspath
org.embulk:embulk-util-timestamp:0.2.2=compileClasspath,runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions embulk-output-redshift/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ org.apache.httpcomponents:httpclient:4.5.5=compileClasspath,runtimeClasspath
org.apache.httpcomponents:httpcore:4.4.9=compileClasspath,runtimeClasspath
org.embulk:embulk-spi:0.10.49=compileClasspath
org.embulk:embulk-util-aws-credentials:0.4.2=compileClasspath,runtimeClasspath
org.embulk:embulk-util-config:0.3.3=compileClasspath,runtimeClasspath
org.embulk:embulk-util-json:0.2.1=compileClasspath,runtimeClasspath
org.embulk:embulk-util-config:0.3.4=compileClasspath,runtimeClasspath
org.embulk:embulk-util-json:0.3.0=compileClasspath,runtimeClasspath
org.embulk:embulk-util-retryhelper:0.8.2=compileClasspath,runtimeClasspath
org.embulk:embulk-util-rubytime:0.3.3=compileClasspath,runtimeClasspath
org.embulk:embulk-util-timestamp:0.2.2=compileClasspath,runtimeClasspath
Expand Down
4 changes: 2 additions & 2 deletions embulk-output-sqlserver/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ com.microsoft.sqlserver:mssql-jdbc:7.2.2.jre8=compileClasspath,runtimeClasspath
javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
net.sourceforge.jtds:jtds:1.3.1=compileClasspath,runtimeClasspath
org.embulk:embulk-spi:0.10.49=compileClasspath
org.embulk:embulk-util-config:0.3.3=compileClasspath,runtimeClasspath
org.embulk:embulk-util-json:0.2.1=compileClasspath,runtimeClasspath
org.embulk:embulk-util-config:0.3.4=compileClasspath,runtimeClasspath
org.embulk:embulk-util-json:0.3.0=compileClasspath,runtimeClasspath
org.embulk:embulk-util-retryhelper:0.8.2=compileClasspath,runtimeClasspath
org.embulk:embulk-util-rubytime:0.3.3=compileClasspath,runtimeClasspath
org.embulk:embulk-util-timestamp:0.2.2=compileClasspath,runtimeClasspath
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 3f93b97

Please sign in to comment.