Skip to content

Commit 651b64f

Browse files
Will-Loautumnust
Will-Lo
authored and
autumnust
committed
[GOBBLIN-1293] Revert " Upgrades to gradle 5"
This reverts commit 9cbbfc1. Closes apache#3137 from Will-Lo/revert-gradle-5-upgrade- due-to-bintray-publish
1 parent 2d7fa74 commit 651b64f

File tree

64 files changed

+74
-343
lines changed

Some content is hidden

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

64 files changed

+74
-343
lines changed

‎build.gradle

+16-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ buildscript {
3232
classpath 'gradle.plugin.org.inferred:gradle-processors:1.1.2'
3333
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:1.0.2'
3434
classpath 'io.spring.gradle:dependency-management-plugin:0.6.0.RELEASE'
35-
classpath 'me.champeau.gradle:jmh-gradle-plugin:0.4.8'
35+
classpath 'me.champeau.gradle:jmh-gradle-plugin:0.4.4'
3636
}
3737

3838
repositories {
@@ -138,6 +138,21 @@ apply from: 'gradle/scripts/javaVersionCheck.gradle'
138138
apply from: 'gradle/scripts/rat.gradle'
139139
apply from: 'gradle/scripts/release.gradle'
140140

141+
task wrapper(type: Wrapper) { gradleVersion = '2.13' }
142+
143+
/*
144+
* Hack for upgrading pegasus to version 11.0.0. For some reason, the gradle-plugins in
145+
* that version fails to bring in "tools.jar" into the classpath. The rest.li team is actively
146+
* seeking for a clean fix. This part will be removed later when the fix is ready
147+
*/
148+
allprojects {
149+
tasks.matching { it.name == 'generateRestModel' }.all {
150+
doFirst {
151+
it.codegenClasspath += files("${System.getProperty('java.home')}/../lib/tools.jar")
152+
}
153+
}
154+
}
155+
141156
task printVersionName {
142157
doLast {
143158
println project.version

‎gobblin-api/build.gradle

+1-5
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@ dependencies {
2929
compile externalDependency.reflections
3030
compile externalDependency.typesafeConfig
3131
compile externalDependency.reactivex
32-
// Modified to work with Gradle 5
33-
compileOnly externalDependency.lombok
34-
annotationProcessor externalDependency.lombok
35-
testCompileOnly externalDependency.lombok
36-
testAnnotationProcessor externalDependency.lombok
32+
3733
testCompile externalDependency.testng
3834
testCompile externalDependency.mockito
3935
testCompile externalDependency.log4j

‎gobblin-audit/build.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ dependencies {
2727
compile externalDependency.avro
2828
compile externalDependency.typesafeConfig
2929
compile externalDependency.reflections
30-
// Gradle 5 compatibility
31-
compileOnly externalDependency.lombok
32-
annotationProcessor externalDependency.lombok
33-
testCompileOnly externalDependency.lombok
34-
testAnnotationProcessor externalDependency.lombok
3530

3631
testCompile externalDependency.testng
3732
testCompile externalDependency.log4j

‎gobblin-aws/build.gradle

-6
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,6 @@ dependencies {
6363
testCompile project(path: ':gobblin-cluster', configuration: 'tests')
6464
testCompile project(":gobblin-example")
6565

66-
// Gradle 5 compatibility
67-
compileOnly externalDependency.lombok
68-
annotationProcessor externalDependency.lombok
69-
testCompileOnly externalDependency.lombok
70-
testAnnotationProcessor externalDependency.lombok
71-
7266
testCompile externalDependency.testng
7367
testCompile externalDependency.curatorFramework
7468
testCompile externalDependency.curatorTest

‎gobblin-binary-management/build.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ dependencies {
3232
compile externalDependency.hiveExec
3333
compile externalDependency.orcMapreduce
3434
compile externalDependency.slf4j
35-
// Gradle 5 compatibility
36-
compileOnly externalDependency.lombok
37-
annotationProcessor externalDependency.lombok
38-
testCompileOnly externalDependency.lombok
39-
testAnnotationProcessor externalDependency.lombok
4035

4136
testCompile externalDependency.hamcrest
4237
testCompile externalDependency.testng

‎gobblin-cluster/build.gradle

-6
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,6 @@ dependencies {
4949
compile externalDependency.findBugsAnnotations
5050
compile externalDependency.helix
5151

52-
// Gradle 5 compatibility
53-
compileOnly externalDependency.lombok
54-
annotationProcessor externalDependency.lombok
55-
testCompileOnly externalDependency.lombok
56-
testAnnotationProcessor externalDependency.lombok
57-
5852
runtimeOnly project(":gobblin-modules:gobblin-service-kafka")
5953

6054
testCompile project(":gobblin-example")

‎gobblin-compaction/build.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ dependencies {
5353
runtimeOnly externalDependency.jdo2
5454
runtimeOnly externalDependency.datanucleusCore
5555
runtimeOnly externalDependency.datanucleusRdbms
56-
// Gradle 5 compatibility
57-
compileOnly externalDependency.lombok
58-
annotationProcessor externalDependency.lombok
59-
testCompileOnly externalDependency.lombok
60-
testAnnotationProcessor externalDependency.lombok
6156

6257
testCompile externalDependency.testng
6358
testCompile externalDependency.calciteAvatica

‎gobblin-config-management/gobblin-config-client/build.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ dependencies {
2424
compile externalDependency.guava
2525
compile externalDependency.slf4j
2626
compile externalDependency.typesafeConfig
27-
// Gradle 5 compatibility
28-
compileOnly externalDependency.lombok
29-
annotationProcessor externalDependency.lombok
30-
testCompileOnly externalDependency.lombok
31-
testAnnotationProcessor externalDependency.lombok
3227

3328
testCompile externalDependency.testng
3429
testCompile externalDependency.mockito

‎gobblin-config-management/gobblin-config-core/build.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ dependencies {
2626
compile externalDependency.commonsLang
2727
compile externalDependency.commonsIo
2828
compile externalDependency.reflections
29-
// Gradle 5 compatibility
30-
compileOnly externalDependency.lombok
31-
annotationProcessor externalDependency.lombok
32-
testCompileOnly externalDependency.lombok
33-
testAnnotationProcessor externalDependency.lombok
3429

3530
testCompile externalDependency.mockito
3631
testCompile externalDependency.testng

‎gobblin-core-base/build.gradle

-6
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@ dependencies {
3535
compile externalDependency.typesafeConfig
3636
compile externalDependency.findBugsAnnotations
3737

38-
// Gradle 5 compatibility
39-
compileOnly externalDependency.lombok
40-
annotationProcessor externalDependency.lombok
41-
testCompileOnly externalDependency.lombok
42-
testAnnotationProcessor externalDependency.lombok
43-
4438
testCompile externalDependency.testng
4539
testCompile externalDependency.mockito
4640
testCompile externalDependency.jmh

‎gobblin-core/build.gradle

+1-7
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,8 @@ dependencies {
5656
compile externalDependency.oltu
5757
compile externalDependency.opencsv
5858
compile externalDependency.hadoopHdfs
59-
60-
// Gradle 5 compatibility
61-
compileOnly externalDependency.lombok
62-
annotationProcessor externalDependency.lombok
63-
testCompileOnly externalDependency.lombok
64-
testAnnotationProcessor externalDependency.lombok
65-
6659
runtimeOnly externalDependency.protobuf
60+
6761
testRuntime externalDependency.hadoopAws
6862
testCompile externalDependency.calciteCore
6963
testCompile externalDependency.calciteAvatica

‎gobblin-data-management/build.gradle

+1-5
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@ dependencies {
4343
compile externalDependency.findBugsAnnotations
4444
compile externalDependency.testng
4545
compile externalDependency.junit
46-
// Gradle 5 compatibility
47-
compileOnly externalDependency.lombok
48-
annotationProcessor externalDependency.lombok
49-
testCompileOnly externalDependency.lombok
50-
testAnnotationProcessor externalDependency.lombok
46+
5147
testCompile project(":gobblin-test-utils")
5248
testCompile project(path: ":gobblin-metastore", configuration: "testFixtures")
5349

‎gobblin-example/build.gradle

-6
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ dependencies {
4141
compile externalDependency.commonsCli
4242
compile externalDependency.hiveJdbc
4343

44-
// Gradle 5 compatibility
45-
compileOnly externalDependency.lombok
46-
annotationProcessor externalDependency.lombok
47-
testCompileOnly externalDependency.lombok
48-
testAnnotationProcessor externalDependency.lombok
49-
5044
testCompile externalDependency.testng
5145
}
5246

‎gobblin-hive-registration/build.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@ dependencies {
3939
compile externalDependency.commonsPool
4040
compile externalDependency.findBugsAnnotations
4141
compile externalDependency.avroMapredH2
42-
// Gradle 5 compatibility
43-
compileOnly externalDependency.lombok
44-
annotationProcessor externalDependency.lombok
45-
testCompileOnly externalDependency.lombok
46-
testAnnotationProcessor externalDependency.lombok
4742

4843
testCompile externalDependency.testng
4944
testCompile project(":gobblin-binary-management")

‎gobblin-metastore/build.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@ dependencies {
3535
compile externalDependency.flyway
3636
compile externalDependency.commonsConfiguration
3737
compile externalDependency.reflections
38-
// Gradle 5 compatibility
39-
compileOnly externalDependency.lombok
40-
annotationProcessor externalDependency.lombok
41-
testCompileOnly externalDependency.lombok
42-
testAnnotationProcessor externalDependency.lombok
4338

4439
runtimeOnly externalDependency.mysqlConnector
4540

‎gobblin-metrics-libs/gobblin-metrics-base/build.gradle

+1-7
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
*/
1717

1818
plugins {
19-
// Bump up version to 0.9.1 in order for generateAvro task to work with Gradle 5
20-
id "com.commercehub.gradle.plugin.avro-base" version "0.9.1"
19+
id "com.commercehub.gradle.plugin.avro-base" version "0.9.0"
2120
}
2221

2322
apply plugin: 'java'
@@ -50,11 +49,6 @@ dependencies {
5049
compile externalDependency.typesafeConfig
5150
compile externalDependency.findBugsAnnotations
5251

53-
// Gradle 5 compatibility
54-
compileOnly externalDependency.lombok
55-
annotationProcessor externalDependency.lombok
56-
testCompileOnly externalDependency.lombok
57-
testAnnotationProcessor externalDependency.lombok
5852
testCompile externalDependency.testng
5953
testCompile externalDependency.mockito
6054
}

‎gobblin-metrics-libs/gobblin-metrics/build.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ dependencies {
3333
compile externalDependency.typesafeConfig
3434
compile externalDependency.findBugsAnnotations
3535

36-
// Gradle 5 compatibility
37-
compileOnly externalDependency.lombok
38-
annotationProcessor externalDependency.lombok
39-
testCompileOnly externalDependency.lombok
40-
testAnnotationProcessor externalDependency.lombok
4136
testCompile externalDependency.testng
4237
testCompile externalDependency.mockito
4338
}

‎gobblin-modules/gobblin-avro-json/build.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ dependencies {
2929
compile externalDependency.jacksonCore
3030
compile externalDependency.jacksonMapper
3131
compile externalDependency.slf4j
32-
// Gradle 5 compatibility
33-
compileOnly externalDependency.lombok
34-
annotationProcessor externalDependency.lombok
35-
testCompileOnly externalDependency.lombok
36-
testAnnotationProcessor externalDependency.lombok
3732

3833
testCompile project(":gobblin-test-utils")
3934
testCompile externalDependency.testng

‎gobblin-modules/gobblin-azkaban/build.gradle

-6
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@ dependencies {
4343
compile externalDependency.hadoopYarnApi
4444
compile externalDependency.findBugsAnnotations
4545

46-
// Gradle 5 compatibility
47-
compileOnly externalDependency.lombok
48-
annotationProcessor externalDependency.lombok
49-
testCompileOnly externalDependency.lombok
50-
testAnnotationProcessor externalDependency.lombok
51-
5246
testCompile externalDependency.mockito
5347
testCompile externalDependency.powermock
5448
}

‎gobblin-modules/gobblin-codecs/build.gradle

+1-5
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@ apply plugin: 'java'
1919

2020
dependencies {
2121
compile project(":gobblin-api")
22-
// Gradle 5 compatibility
23-
compileOnly externalDependency.lombok
24-
annotationProcessor externalDependency.lombok
25-
testCompileOnly externalDependency.lombok
26-
testAnnotationProcessor externalDependency.lombok
22+
2723
testCompile externalDependency.testng
2824
}
2925

‎gobblin-modules/gobblin-compliance/build.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ dependencies {
2121
compile project(":gobblin-data-management")
2222
compile externalDependency.azkaban
2323
compile externalDependency.hiveJdbc
24-
// Gradle 5 compatibility
25-
compileOnly externalDependency.lombok
26-
annotationProcessor externalDependency.lombok
27-
testCompileOnly externalDependency.lombok
28-
testAnnotationProcessor externalDependency.lombok
2924
}
3025

3126
test {

‎gobblin-modules/gobblin-couchbase/build.gradle

-6
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ dependencies {
3838
compile externalDependency.typesafeConfig
3939
compile externalDependency.findBugsAnnotations
4040

41-
// Gradle 5 compatibility
42-
compileOnly externalDependency.lombok
43-
annotationProcessor externalDependency.lombok
44-
testCompileOnly externalDependency.lombok
45-
testAnnotationProcessor externalDependency.lombok
46-
4741
testCompile project(":gobblin-runtime")
4842
testCompile project(":gobblin-test-utils")
4943
testCompile externalDependency.jsonAssert

‎gobblin-modules/gobblin-crypto-provider/build.gradle

+1-5
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@ dependencies {
2121
compile project(":gobblin-core-base")
2222
compile project(":gobblin-runtime")
2323
compile project(":gobblin-modules:gobblin-crypto")
24-
// Gradle 5 compatibility
25-
compileOnly externalDependency.lombok
26-
annotationProcessor externalDependency.lombok
27-
testCompileOnly externalDependency.lombok
28-
testAnnotationProcessor externalDependency.lombok
24+
2925
testCompile project(":gobblin-test-utils")
3026
testCompile externalDependency.testng
3127
testCompile project(path: ":gobblin-modules:gobblin-crypto", configuration: "tests")

‎gobblin-modules/gobblin-crypto/build.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ dependencies {
2929
compile externalDependency.bcpgJdk15on
3030
compile externalDependency.bcprovJdk15on
3131
compile externalDependency.slf4j
32-
// Gradle 5 compatibility
33-
compileOnly externalDependency.lombok
34-
annotationProcessor externalDependency.lombok
35-
testCompileOnly externalDependency.lombok
36-
testAnnotationProcessor externalDependency.lombok
3732

3833
testCompile project(":gobblin-core-base") // for EncryptionConfigParser
3934
testCompile project(":gobblin-test-utils")

‎gobblin-modules/gobblin-elasticsearch-deps/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ buildscript {
2121
jcenter()
2222
}
2323
dependencies {
24-
// Bump up shadow version to support Gradle 5.x https://github.com/johnrengelman/shadow
25-
classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
24+
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
2625
}
2726
}
2827

‎gobblin-modules/gobblin-elasticsearch/build.gradle

+2-8
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@ dependencies {
3939
compile externalDependency.typesafeConfig
4040
compile externalDependency.findBugsAnnotations
4141

42-
// Gradle 5 Compatibility
43-
compileOnly externalDependency.lombok
44-
annotationProcessor externalDependency.lombok
45-
testCompileOnly externalDependency.lombok
46-
testAnnotationProcessor externalDependency.lombok
47-
4842
testCompile project(":gobblin-runtime")
4943
testCompile project(":gobblin-test-utils")
5044
testCompile externalDependency.jsonAssert
@@ -60,15 +54,15 @@ task installTestDependencies(type:Exec) {
6054
task uninstallTestDependencies(type: Exec) {
6155
workingDir "${project.rootDir}/gobblin-modules/gobblin-elasticsearch/"
6256
commandLine './scripts/uninstall_test_deps.sh'
63-
57+
6458
}
6559

6660
test.dependsOn installTestDependencies
6761
test.finalizedBy uninstallTestDependencies
6862

6963
configurations {
7064
compile {
71-
transitive = false
65+
transitive = false
7266
}
7367
}
7468

‎gobblin-modules/gobblin-eventhub/build.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ dependencies {
3838
compile externalDependency.findBugsAnnotations
3939
compile externalDependency.eventhub
4040

41-
// Gradle 5 compatibility
42-
compileOnly externalDependency.lombok
43-
annotationProcessor externalDependency.lombok
44-
testCompileOnly externalDependency.lombok
45-
testAnnotationProcessor externalDependency.lombok
4641

4742
testCompile project(":gobblin-runtime")
4843
testCompile project(":gobblin-test-utils")

0 commit comments

Comments
 (0)