Skip to content

Commit 83e08c8

Browse files
dmikurubedmikurube
authored
Merge pull request #36 from embulk/upgrade-utils-0.10.41
Upgrade embulk-util-* dependencies
2 parents 5496334 + c257353 commit 83e08c8

File tree

58 files changed

+636
-458
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+636
-458
lines changed

‎build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
id "java"
3-
id "java-library"
43
id "maven-publish"
54
id "org.embulk.embulk-plugins" version "0.5.5" apply false
65
}

‎embulk-decoder-bzip2/NOTICE‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎embulk-decoder-bzip2/build.gradle‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
apply plugin: "java"
2-
apply plugin: "maven-publish"
3-
apply plugin: "signing"
4-
apply plugin: "checkstyle"
5-
apply plugin: "org.embulk.embulk-plugins"
1+
plugins {
2+
id "java"
3+
id "maven-publish"
4+
id "signing"
5+
id "org.embulk.embulk-plugins" version "0.5.5"
6+
id "checkstyle"
7+
}
68

79
repositories {
810
mavenCentral()
@@ -34,8 +36,8 @@ java {
3436
dependencies {
3537
compileOnly "org.embulk:embulk-spi:0.10.44"
3638

37-
implementation "org.embulk:embulk-util-config:0.3.2"
38-
implementation "org.embulk:embulk-util-file:0.1.3"
39+
implementation "org.embulk:embulk-util-config:0.3.3"
40+
implementation "org.embulk:embulk-util-file:0.1.4"
3941
implementation "org.apache.commons:commons-compress:1.10"
4042
}
4143

@@ -48,21 +50,18 @@ embulkPlugin {
4850
jar {
4951
metaInf {
5052
from rootProject.file("LICENSE")
51-
from project.file("NOTICE")
5253
}
5354
}
5455

5556
sourcesJar {
5657
metaInf {
5758
from rootProject.file("LICENSE")
58-
from project.file("NOTICE")
5959
}
6060
}
6161

6262
javadocJar {
6363
metaInf {
6464
from rootProject.file("LICENSE")
65-
from project.file("NOTICE")
6665
}
6766
}
6867

@@ -92,6 +91,7 @@ publishing {
9291
// http://central.sonatype.org/pages/requirements.html#license-information
9392
name = "The Apache License, Version 2.0"
9493
url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
94+
distribution = "repo"
9595
}
9696
}
9797

@@ -115,6 +115,20 @@ publishing {
115115
developerConnection = "scm:git:git@github.com:embulk/embulk-standards.git"
116116
url = "https://github.com/embulk/embulk-standards"
117117
}
118+
119+
withXml {
120+
if (asNode().getAt("dependencies").isEmpty()) {
121+
asNode().appendNode("dependencies")
122+
}
123+
project.configurations.compileOnly.allDependencies.each { dependency ->
124+
asNode().dependencies[0].appendNode("dependency").with {
125+
it.appendNode("groupId", dependency.group)
126+
it.appendNode("artifactId", dependency.name)
127+
it.appendNode("version", dependency.version)
128+
it.appendNode("scope", "provided")
129+
}
130+
}
131+
}
118132
}
119133
}
120134
}

‎embulk-decoder-bzip2/gradle.lockfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.fasterxml.jackson.core:jackson-annotations:2.6.7=runtimeClasspath
5-
com.fasterxml.jackson.core:jackson-core:2.6.7=runtimeClasspath
6-
com.fasterxml.jackson.core:jackson-databind:2.6.7=runtimeClasspath
7-
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=runtimeClasspath
8-
javax.validation:validation-api:1.1.0.Final=runtimeClasspath
4+
com.fasterxml.jackson.core:jackson-annotations:2.6.7=compileClasspath,runtimeClasspath
5+
com.fasterxml.jackson.core:jackson-core:2.6.7=compileClasspath,runtimeClasspath
6+
com.fasterxml.jackson.core:jackson-databind:2.6.7.5=compileClasspath,runtimeClasspath
7+
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=compileClasspath,runtimeClasspath
8+
javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
99
org.apache.commons:commons-compress:1.10=compileClasspath,runtimeClasspath
1010
org.embulk:embulk-spi:0.10.44=compileClasspath
11-
org.embulk:embulk-util-config:0.3.2=compileClasspath,runtimeClasspath
12-
org.embulk:embulk-util-file:0.1.3=compileClasspath,runtimeClasspath
11+
org.embulk:embulk-util-config:0.3.3=compileClasspath,runtimeClasspath
12+
org.embulk:embulk-util-file:0.1.4=compileClasspath,runtimeClasspath
1313
org.msgpack:msgpack-core:0.8.24=compileClasspath
1414
org.slf4j:slf4j-api:2.0.6=compileClasspath
1515
empty=

‎embulk-decoder-gzip/NOTICE‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎embulk-decoder-gzip/build.gradle‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
apply plugin: "java"
2-
apply plugin: "maven-publish"
3-
apply plugin: "signing"
4-
apply plugin: "checkstyle"
5-
apply plugin: "org.embulk.embulk-plugins"
1+
plugins {
2+
id "java"
3+
id "maven-publish"
4+
id "signing"
5+
id "org.embulk.embulk-plugins" version "0.5.5"
6+
id "checkstyle"
7+
}
68

79
repositories {
810
mavenCentral()
@@ -34,8 +36,8 @@ java {
3436
dependencies {
3537
compileOnly "org.embulk:embulk-spi:0.10.44"
3638

37-
implementation "org.embulk:embulk-util-config:0.3.2"
38-
implementation "org.embulk:embulk-util-file:0.1.3"
39+
implementation "org.embulk:embulk-util-config:0.3.3"
40+
implementation "org.embulk:embulk-util-file:0.1.4"
3941
}
4042

4143
embulkPlugin {
@@ -47,21 +49,18 @@ embulkPlugin {
4749
jar {
4850
metaInf {
4951
from rootProject.file("LICENSE")
50-
from project.file("NOTICE")
5152
}
5253
}
5354

5455
sourcesJar {
5556
metaInf {
5657
from rootProject.file("LICENSE")
57-
from project.file("NOTICE")
5858
}
5959
}
6060

6161
javadocJar {
6262
metaInf {
6363
from rootProject.file("LICENSE")
64-
from project.file("NOTICE")
6564
}
6665
}
6766

@@ -91,6 +90,7 @@ publishing {
9190
// http://central.sonatype.org/pages/requirements.html#license-information
9291
name = "The Apache License, Version 2.0"
9392
url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
93+
distribution = "repo"
9494
}
9595
}
9696

@@ -118,6 +118,20 @@ publishing {
118118
developerConnection = "scm:git:git@github.com:embulk/embulk-standards.git"
119119
url = "https://github.com/embulk/embulk-standards"
120120
}
121+
122+
withXml {
123+
if (asNode().getAt("dependencies").isEmpty()) {
124+
asNode().appendNode("dependencies")
125+
}
126+
project.configurations.compileOnly.allDependencies.each { dependency ->
127+
asNode().dependencies[0].appendNode("dependency").with {
128+
it.appendNode("groupId", dependency.group)
129+
it.appendNode("artifactId", dependency.name)
130+
it.appendNode("version", dependency.version)
131+
it.appendNode("scope", "provided")
132+
}
133+
}
134+
}
121135
}
122136
}
123137
}

‎embulk-decoder-gzip/gradle.lockfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.fasterxml.jackson.core:jackson-annotations:2.6.7=runtimeClasspath
5-
com.fasterxml.jackson.core:jackson-core:2.6.7=runtimeClasspath
6-
com.fasterxml.jackson.core:jackson-databind:2.6.7=runtimeClasspath
7-
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=runtimeClasspath
8-
javax.validation:validation-api:1.1.0.Final=runtimeClasspath
4+
com.fasterxml.jackson.core:jackson-annotations:2.6.7=compileClasspath,runtimeClasspath
5+
com.fasterxml.jackson.core:jackson-core:2.6.7=compileClasspath,runtimeClasspath
6+
com.fasterxml.jackson.core:jackson-databind:2.6.7.5=compileClasspath,runtimeClasspath
7+
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=compileClasspath,runtimeClasspath
8+
javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
99
org.embulk:embulk-spi:0.10.44=compileClasspath
10-
org.embulk:embulk-util-config:0.3.2=compileClasspath,runtimeClasspath
11-
org.embulk:embulk-util-file:0.1.3=compileClasspath,runtimeClasspath
10+
org.embulk:embulk-util-config:0.3.3=compileClasspath,runtimeClasspath
11+
org.embulk:embulk-util-file:0.1.4=compileClasspath,runtimeClasspath
1212
org.msgpack:msgpack-core:0.8.24=compileClasspath
1313
org.slf4j:slf4j-api:2.0.6=compileClasspath
1414
empty=

‎embulk-encoder-bzip2/NOTICE‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎embulk-encoder-bzip2/build.gradle‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
apply plugin: "java"
2-
apply plugin: "maven-publish"
3-
apply plugin: "signing"
4-
apply plugin: "checkstyle"
5-
apply plugin: "org.embulk.embulk-plugins"
1+
plugins {
2+
id "java"
3+
id "maven-publish"
4+
id "signing"
5+
id "org.embulk.embulk-plugins" version "0.5.5"
6+
id "checkstyle"
7+
}
68

79
repositories {
810
mavenCentral()
@@ -34,8 +36,8 @@ java {
3436
dependencies {
3537
compileOnly "org.embulk:embulk-spi:0.10.44"
3638

37-
implementation "org.embulk:embulk-util-config:0.3.2"
38-
implementation "org.embulk:embulk-util-file:0.1.3"
39+
implementation "org.embulk:embulk-util-config:0.3.3"
40+
implementation "org.embulk:embulk-util-file:0.1.4"
3941
implementation "org.apache.commons:commons-compress:1.10"
4042
}
4143

@@ -48,21 +50,18 @@ embulkPlugin {
4850
jar {
4951
metaInf {
5052
from rootProject.file("LICENSE")
51-
from project.file("NOTICE")
5253
}
5354
}
5455

5556
sourcesJar {
5657
metaInf {
5758
from rootProject.file("LICENSE")
58-
from project.file("NOTICE")
5959
}
6060
}
6161

6262
javadocJar {
6363
metaInf {
6464
from rootProject.file("LICENSE")
65-
from project.file("NOTICE")
6665
}
6766
}
6867

@@ -92,6 +91,7 @@ publishing {
9291
// http://central.sonatype.org/pages/requirements.html#license-information
9392
name = "The Apache License, Version 2.0"
9493
url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
94+
distribution = "repo"
9595
}
9696
}
9797

@@ -111,6 +111,20 @@ publishing {
111111
developerConnection = "scm:git:git@github.com:embulk/embulk-standards.git"
112112
url = "https://github.com/embulk/embulk-standards"
113113
}
114+
115+
withXml {
116+
if (asNode().getAt("dependencies").isEmpty()) {
117+
asNode().appendNode("dependencies")
118+
}
119+
project.configurations.compileOnly.allDependencies.each { dependency ->
120+
asNode().dependencies[0].appendNode("dependency").with {
121+
it.appendNode("groupId", dependency.group)
122+
it.appendNode("artifactId", dependency.name)
123+
it.appendNode("version", dependency.version)
124+
it.appendNode("scope", "provided")
125+
}
126+
}
127+
}
114128
}
115129
}
116130
}

‎embulk-encoder-bzip2/gradle.lockfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.fasterxml.jackson.core:jackson-annotations:2.6.7=runtimeClasspath
5-
com.fasterxml.jackson.core:jackson-core:2.6.7=runtimeClasspath
6-
com.fasterxml.jackson.core:jackson-databind:2.6.7=runtimeClasspath
7-
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=runtimeClasspath
8-
javax.validation:validation-api:1.1.0.Final=runtimeClasspath
4+
com.fasterxml.jackson.core:jackson-annotations:2.6.7=compileClasspath,runtimeClasspath
5+
com.fasterxml.jackson.core:jackson-core:2.6.7=compileClasspath,runtimeClasspath
6+
com.fasterxml.jackson.core:jackson-databind:2.6.7.5=compileClasspath,runtimeClasspath
7+
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=compileClasspath,runtimeClasspath
8+
javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
99
org.apache.commons:commons-compress:1.10=compileClasspath,runtimeClasspath
1010
org.embulk:embulk-spi:0.10.44=compileClasspath
11-
org.embulk:embulk-util-config:0.3.2=compileClasspath,runtimeClasspath
12-
org.embulk:embulk-util-file:0.1.3=compileClasspath,runtimeClasspath
11+
org.embulk:embulk-util-config:0.3.3=compileClasspath,runtimeClasspath
12+
org.embulk:embulk-util-file:0.1.4=compileClasspath,runtimeClasspath
1313
org.msgpack:msgpack-core:0.8.24=compileClasspath
1414
org.slf4j:slf4j-api:2.0.6=compileClasspath
1515
empty=

0 commit comments

Comments
 (0)