diff --git a/build.gradle b/build.gradle index b93b85a4bbe9a..377fcfe16ca60 100644 --- a/build.gradle +++ b/build.gradle @@ -2,12 +2,13 @@ buildscript { apply from: './repositories.gradle' buildscript.repositories.addAll(project.repositories) dependencies { - classpath 'com.linkedin.pegasus:gradle-plugins:23.0.19' + classpath 'com.linkedin.pegasus:gradle-plugins:27.7.18' classpath 'com.moowork.gradle:gradle-node-plugin:1.3.1' + classpath "com.commercehub.gradle.plugin:gradle-avro-plugin:0.8.1" } } -final pegasusVersion = '23.0.19' +final pegasusVersion = '27.7.18' project.ext.spec = [ 'product' : [ 'pegasus' : [ @@ -24,7 +25,6 @@ project.ext.spec = [ project.ext.externalDependency = [ 'avro_1_7': 'org.apache.avro:avro:1.7.7', - 'avroMigrationHelper': 'com.linkedin.avroutil:avro-migration-helper:0.1.0', 'cacheApi' : 'javax.cache:cache-api:1.1.0', 'commonsIo': 'commons-io:commons-io:2.4', 'commonsLang': 'commons-lang:commons-lang:2.6', @@ -50,7 +50,7 @@ project.ext.externalDependency = [ 'kafkaSerializers': 'io.confluent:kafka-avro-serializer:3.3.1', 'kafkaStreams': 'org.apache.kafka:kafka-streams:2.3.0', 'logbackClassic': 'ch.qos.logback:logback-classic:1.2.3', - 'lombok': 'org.projectlombok:lombok:1.18.8', + 'lombok': 'org.projectlombok:lombok:1.18.12', 'mockito': 'org.mockito:mockito-core:3.0.0', 'mysqlConnector': 'mysql:mysql-connector-java:5.1.47', "neo4jHarness": "org.neo4j.test:neo4j-harness:3.4.11", diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961fd5a86a..0d4a9516871af 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1c727a2b8695b..5028f28f8e475 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Jul 17 16:41:55 PDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip diff --git a/gradlew b/gradlew index cccdd3d517fc5..2fe81a7d95e4f 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -109,8 +125,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` @@ -138,19 +154,19 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -159,14 +175,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index e95643d6a2ca6..24467a141f791 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/metadata-builders/build.gradle b/metadata-builders/build.gradle index cecd496b8586a..bc7502ac8c03a 100644 --- a/metadata-builders/build.gradle +++ b/metadata-builders/build.gradle @@ -7,6 +7,8 @@ dependencies { compileOnly externalDependency.lombok compileOnly externalDependency.findbugsAnnotations + annotationProcessor externalDependency.lombok + testCompile externalDependency.testng testCompile externalDependency.mockito testCompile project(':metadata-testing:metadata-test-utils') diff --git a/metadata-dao-impl/ebean-dao/build.gradle b/metadata-dao-impl/ebean-dao/build.gradle index 054d69c93ea11..66b21a747a15d 100644 --- a/metadata-dao-impl/ebean-dao/build.gradle +++ b/metadata-dao-impl/ebean-dao/build.gradle @@ -13,6 +13,8 @@ dependencies { compileOnly externalDependency.ebeanAgent compileOnly externalDependency.lombok + annotationProcessor externalDependency.lombok + testCompile project(':metadata-testing:metadata-test-models') testCompile project(':metadata-testing:metadata-test-utils') testCompile externalDependency.h2 @@ -26,7 +28,7 @@ project.compileJava { doLast { ant.taskdef(name: 'ebean', classname: 'io.ebean.enhance.ant.AntEnhanceTask', classpath: project.configurations.enhance.asPath) - ant.ebean(classSource: project.sourceSets.main.output.classesDir, packages: 'com.linkedin.metadata.dao', + ant.ebean(classSource: "${project.buildDir}/classes/java/main", packages: 'com.linkedin.metadata.dao', transformArgs: 'debug=1') } } diff --git a/metadata-dao-impl/elasticsearch-dao/build.gradle b/metadata-dao-impl/elasticsearch-dao/build.gradle index dbb3080a4b729..3ae464b5a501e 100644 --- a/metadata-dao-impl/elasticsearch-dao/build.gradle +++ b/metadata-dao-impl/elasticsearch-dao/build.gradle @@ -12,6 +12,8 @@ dependencies { compile externalDependency.jacksonCore compile externalDependency.jacksonDataBind + annotationProcessor externalDependency.lombok + testCompile project(':metadata-testing:metadata-test-utils') testCompile project(':metadata-testing:metadata-test-models') testCompile externalDependency.testng diff --git a/metadata-dao-impl/kafka-producer/build.gradle b/metadata-dao-impl/kafka-producer/build.gradle index b31f95af9700d..6cde29725a6db 100644 --- a/metadata-dao-impl/kafka-producer/build.gradle +++ b/metadata-dao-impl/kafka-producer/build.gradle @@ -9,6 +9,8 @@ dependencies { compileOnly externalDependency.lombok + annotationProcessor externalDependency.lombok + testCompile externalDependency.mockito testCompile externalDependency.testng } \ No newline at end of file diff --git a/metadata-dao/build.gradle b/metadata-dao/build.gradle index 4c209e87209c3..3136c52670c49 100644 --- a/metadata-dao/build.gradle +++ b/metadata-dao/build.gradle @@ -9,6 +9,8 @@ dependencies { compileOnly externalDependency.lombok + annotationProcessor externalDependency.lombok + testCompile project(':metadata-testing:metadata-test-models') testCompile project(':metadata-testing:metadata-test-utils') testCompile externalDependency.guava diff --git a/metadata-events/mxe-avro-1.7/build.gradle b/metadata-events/mxe-avro-1.7/build.gradle index 877d86efd67f8..6d53d39663bd7 100644 --- a/metadata-events/mxe-avro-1.7/build.gradle +++ b/metadata-events/mxe-avro-1.7/build.gradle @@ -1,7 +1,3 @@ -plugins { - id 'com.commercehub.gradle.plugin.avro' version '0.8.0' -} - configurations { avsc } diff --git a/metadata-events/mxe-utils-avro-1.7/build.gradle b/metadata-events/mxe-utils-avro-1.7/build.gradle index 4c335f094c3a5..586e1323bc537 100644 --- a/metadata-events/mxe-utils-avro-1.7/build.gradle +++ b/metadata-events/mxe-utils-avro-1.7/build.gradle @@ -8,12 +8,9 @@ dependencies { compile project(':metadata-events:mxe-avro-1.7') compile project(':metadata-models') compile spec.product.pegasus.dataAvro1_6 - compile externalDependency.lombok - compile externalDependency.commonsIo testCompile project(':metadata-dao') testCompile project(':metadata-testing:metadata-test-utils') - testCompile externalDependency.testng avroOriginal project(path: ':metadata-models', configuration: 'avroSchema') } diff --git a/metadata-jobs/mae-consumer-job/build.gradle b/metadata-jobs/mae-consumer-job/build.gradle index e8cf6a37659e4..88ade8c2a0fd1 100644 --- a/metadata-jobs/mae-consumer-job/build.gradle +++ b/metadata-jobs/mae-consumer-job/build.gradle @@ -27,6 +27,8 @@ dependencies { compileOnly externalDependency.lombok + annotationProcessor externalDependency.lombok + runtime externalDependency.logbackClassic } diff --git a/metadata-jobs/mce-consumer-job/build.gradle b/metadata-jobs/mce-consumer-job/build.gradle index 04c62af00ae1f..3d5959069018f 100644 --- a/metadata-jobs/mce-consumer-job/build.gradle +++ b/metadata-jobs/mce-consumer-job/build.gradle @@ -26,6 +26,8 @@ dependencies { compileOnly externalDependency.lombok + annotationProcessor externalDependency.lombok + runtime externalDependency.logbackClassic } diff --git a/metadata-utils/build.gradle b/metadata-utils/build.gradle index 78e75fc9fa694..5cb0c3522750d 100644 --- a/metadata-utils/build.gradle +++ b/metadata-utils/build.gradle @@ -17,6 +17,8 @@ dependencies { compileOnly externalDependency.lombok + annotationProcessor externalDependency.lombok + testCompile project(':metadata-testing:metadata-test-utils') testCompile externalDependency.testng } \ No newline at end of file diff --git a/metadata-validators/build.gradle b/metadata-validators/build.gradle index 7d125a3dafc41..256a82c686d22 100644 --- a/metadata-validators/build.gradle +++ b/metadata-validators/build.gradle @@ -7,5 +7,7 @@ dependencies { compileOnly externalDependency.lombok + annotationProcessor externalDependency.lombok + testCompile externalDependency.guava } \ No newline at end of file diff --git a/repositories.gradle b/repositories.gradle index ac99dcdc7f086..d306d7e785d89 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -1,11 +1,13 @@ repositories { + gradlePluginPortal() + jcenter() mavenLocal() mavenCentral() maven { url "https://packages.confluent.io/maven/" } maven { - url "https://dl.bintray.com/radai-rosenblatt/avro-util/" + url "https://dl.bintray.com/gradle/gradle-plugins" } maven { url "https://plugins.gradle.org/m2/"