diff --git a/build.gradle b/build.gradle index b57419e285..9bdb10f0ff 100644 --- a/build.gradle +++ b/build.gradle @@ -10,6 +10,10 @@ buildscript { ext.testContainersVersion = '1.17.4' ext.jacksonVersion = '2.13.4' ext.jettyVersion = '9.4.46.v20220331' + ext.log4jVersion = '2.19.0' + ext.slf4jVersion = '1.7.32' + ext.logbackClassic = '1.2.11' + apply from: './repositories.gradle' buildscript.repositories.addAll(project.repositories) dependencies { @@ -112,9 +116,11 @@ project.ext.externalDependency = [ 'kafkaAvroSerde': 'io.confluent:kafka-streams-avro-serde:5.5.1', 'kafkaAvroSerializer': 'io.confluent:kafka-avro-serializer:5.1.4', 'kafkaClients': 'org.apache.kafka:kafka-clients:2.3.0', - 'logbackClassic': 'ch.qos.logback:logback-classic:1.2.9', - 'log4jCore': 'org.apache.logging.log4j:log4j-core:2.19.0', - 'log4jApi': 'org.apache.logging.log4j:log4j-api:2.19.0', + 'logbackClassic': "ch.qos.logback:logback-classic:$logbackClassic", + 'slf4jApi': "org.slf4j:slf4j-api:$slf4jVersion", + 'log4jCore': "org.apache.logging.log4j:log4j-core:$log4jVersion", + 'log4jApi': "org.apache.logging.log4j:log4j-api:$log4jVersion", + 'log4j12Api': "org.slf4j:log4j-over-slf4j:$slf4jVersion", 'lombok': 'org.projectlombok:lombok:1.18.12', 'mariadbConnector': 'org.mariadb.jdbc:mariadb-java-client:2.6.0', 'mavenArtifact': "org.apache.maven:maven-artifact:$mavenVersion", @@ -193,15 +199,12 @@ configure(subprojects.findAll {! it.name.startsWith('spark-lineage') }) { exclude group: "io.netty", module: "netty" exclude group: "log4j", module: "log4j" exclude group: "org.springframework.boot", module: "spring-boot-starter-logging" - exclude group: "ch.qos.logback", module: "logback-classic" exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" exclude group: "com.vaadin.external.google", module: "android-json" exclude group: "org.slf4j", module: "slf4j-reload4j" exclude group: "org.slf4j", module: "slf4j-log4j12" exclude group: "org.slf4j", module: "slf4j-nop" exclude group: "org.slf4j", module: "slf4j-ext" - exclude group: "org.slf4j", module: "jul-to-slf4j" - exclude group: "org.slf4j", module: "jcl-over-toslf4j" } } diff --git a/datahub-frontend/play.gradle b/datahub-frontend/play.gradle index 579449e9e3..f6ecd57534 100644 --- a/datahub-frontend/play.gradle +++ b/datahub-frontend/play.gradle @@ -55,13 +55,14 @@ dependencies { testImplementation externalDependency.playTest testCompile externalDependency.testng + implementation externalDependency.slf4jApi compileOnly externalDependency.lombok runtime externalDependency.guice runtime (externalDependency.playDocs) { exclude group: 'com.typesafe.akka', module: 'akka-http-core_2.12' } runtime externalDependency.playGuice - runtime externalDependency.logbackClassic + implementation externalDependency.logbackClassic annotationProcessor externalDependency.lombok } diff --git a/datahub-graphql-core/build.gradle b/datahub-graphql-core/build.gradle index aa13ce05d7..528054833b 100644 --- a/datahub-graphql-core/build.gradle +++ b/datahub-graphql-core/build.gradle @@ -15,6 +15,7 @@ dependencies { compile externalDependency.antlr4 compile externalDependency.guava + implementation externalDependency.slf4jApi compileOnly externalDependency.lombok annotationProcessor externalDependency.lombok diff --git a/datahub-ranger-plugin/build.gradle b/datahub-ranger-plugin/build.gradle index b3277a664a..a08d3f2b1e 100644 --- a/datahub-ranger-plugin/build.gradle +++ b/datahub-ranger-plugin/build.gradle @@ -28,7 +28,7 @@ dependencies { exclude group: "org.apache.htrace", module: "htrace-core4" } implementation externalDependency.hadoopCommon3 - implementation externalDependency.log4jApi + implementation externalDependency.log4j12Api constraints { implementation(externalDependency.woodstoxCore) { diff --git a/datahub-upgrade/build.gradle b/datahub-upgrade/build.gradle index 49872fa111..4d4d2b9939 100644 --- a/datahub-upgrade/build.gradle +++ b/datahub-upgrade/build.gradle @@ -14,7 +14,8 @@ dependencies { exclude group: 'com.nimbusds', module: 'nimbus-jose-jwt' exclude group: "org.apache.htrace", module: "htrace-core4" } - compile externalDependency.lombok + implementation externalDependency.slf4jApi + compileOnly externalDependency.lombok compile externalDependency.picocli compile externalDependency.parquet compile externalDependency.springBeans diff --git a/entity-registry/build.gradle b/entity-registry/build.gradle index 3594e0440f..af742d240d 100644 --- a/entity-registry/build.gradle +++ b/entity-registry/build.gradle @@ -4,7 +4,8 @@ dependencies { compile spec.product.pegasus.data compile spec.product.pegasus.generator compile project(path: ':metadata-models') - compile externalDependency.lombok + implementation externalDependency.slf4jApi + compileOnly externalDependency.lombok compile externalDependency.guava compile externalDependency.jacksonDataBind compile externalDependency.jacksonDataFormatYaml diff --git a/ingestion-scheduler/build.gradle b/ingestion-scheduler/build.gradle index 7023ce1208..3dec8ee400 100644 --- a/ingestion-scheduler/build.gradle +++ b/ingestion-scheduler/build.gradle @@ -4,12 +4,12 @@ dependencies { compile project(path: ':metadata-models') compile project(path: ':metadata-io') compile project(path: ':metadata-service:restli-client') - compile externalDependency.lombok + implementation externalDependency.slf4jApi + compileOnly externalDependency.lombok annotationProcessor externalDependency.lombok testCompile externalDependency.mockito testCompile externalDependency.testng - testAnnotationProcessor externalDependency.lombok constraints { implementation(externalDependency.log4jCore) { diff --git a/li-utils/build.gradle b/li-utils/build.gradle index 6a6971589a..d11cd86659 100644 --- a/li-utils/build.gradle +++ b/li-utils/build.gradle @@ -20,6 +20,7 @@ dependencies { } compile externalDependency.guava + implementation externalDependency.slf4jApi compileOnly externalDependency.lombok annotationProcessor externalDependency.lombok diff --git a/metadata-dao-impl/kafka-producer/build.gradle b/metadata-dao-impl/kafka-producer/build.gradle index 18b129297f..5b40eb5f32 100644 --- a/metadata-dao-impl/kafka-producer/build.gradle +++ b/metadata-dao-impl/kafka-producer/build.gradle @@ -9,6 +9,7 @@ dependencies { compile externalDependency.kafkaClients + implementation externalDependency.slf4jApi compileOnly externalDependency.lombok annotationProcessor externalDependency.lombok diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py index 0fded9e7ce..5547914236 100644 --- a/metadata-ingestion/setup.py +++ b/metadata-ingestion/setup.py @@ -221,7 +221,7 @@ data_lake_profiling = { delta_lake = { *s3_base, - "deltalake>=0.6.3", + "deltalake>=0.6.3, != 0.6.4", } powerbi_report_server = {"requests", "requests_ntlm"} diff --git a/metadata-integration/java/datahub-client/build.gradle b/metadata-integration/java/datahub-client/build.gradle index a8afb1afc1..ca97472db7 100644 --- a/metadata-integration/java/datahub-client/build.gradle +++ b/metadata-integration/java/datahub-client/build.gradle @@ -42,7 +42,8 @@ dependencies { implementation(externalDependency.kafkaAvroSerializer) { exclude group: "org.apache.avro" } - + + implementation externalDependency.slf4jApi compileOnly externalDependency.lombok annotationProcessor externalDependency.lombok testCompile externalDependency.mockito diff --git a/metadata-integration/java/datahub-protobuf/build.gradle b/metadata-integration/java/datahub-protobuf/build.gradle index bbd1880529..7f3616840b 100644 --- a/metadata-integration/java/datahub-protobuf/build.gradle +++ b/metadata-integration/java/datahub-protobuf/build.gradle @@ -35,6 +35,7 @@ dependencies { implementation externalDependency.gson implementation externalDependency.commonsCli + implementation externalDependency.slf4jApi compileOnly externalDependency.lombok annotationProcessor externalDependency.lombok testImplementation externalDependency.junitJupiterApi diff --git a/metadata-integration/java/spark-lineage/build.gradle b/metadata-integration/java/spark-lineage/build.gradle index ee4f02438d..3b69772af6 100644 --- a/metadata-integration/java/spark-lineage/build.gradle +++ b/metadata-integration/java/spark-lineage/build.gradle @@ -47,6 +47,7 @@ dependencies { force = true } // required for org.apache.commons.io.Charsets that is used internally + implementation externalDependency.slf4jApi compileOnly externalDependency.lombok annotationProcessor externalDependency.lombok @@ -109,6 +110,7 @@ shadowJar { exclude('module-info.class', 'META-INF/versions/**') relocate 'com.fasterxml.jackson', 'datahub.shaded.jackson' + relocate 'org.slf4j','datahub.shaded.org.slf4j' relocate 'org.apache.http','datahub.spark2.shaded.http' relocate 'org.apache.commons.codec', 'datahub.spark2.shaded.o.a.c.codec' relocate 'org.apache.commons.compress', 'datahub.spark2.shaded.o.a.c.compress' diff --git a/metadata-io/build.gradle b/metadata-io/build.gradle index 0ebee67656..f8c27ad93b 100644 --- a/metadata-io/build.gradle +++ b/metadata-io/build.gradle @@ -19,6 +19,8 @@ dependencies { compile spec.product.pegasus.generator compile externalDependency.dgraph4j exclude group: 'com.google.guava', module: 'guava' + implementation externalDependency.slf4jApi + runtime externalDependency.logbackClassic compileOnly externalDependency.lombok implementation externalDependency.commonsCollections compile externalDependency.datastaxOssNativeProtocol diff --git a/metadata-jobs/mae-consumer/build.gradle b/metadata-jobs/mae-consumer/build.gradle index 19540b2a4c..610fddde3c 100644 --- a/metadata-jobs/mae-consumer/build.gradle +++ b/metadata-jobs/mae-consumer/build.gradle @@ -33,6 +33,7 @@ dependencies { compile externalDependency.springKafka compile externalDependency.springActuator + implementation externalDependency.slf4jApi compileOnly externalDependency.lombok annotationProcessor externalDependency.lombok diff --git a/metadata-jobs/mce-consumer/build.gradle b/metadata-jobs/mce-consumer/build.gradle index 7423bb3c38..730cd56d47 100644 --- a/metadata-jobs/mce-consumer/build.gradle +++ b/metadata-jobs/mce-consumer/build.gradle @@ -30,6 +30,7 @@ dependencies { compile externalDependency.springKafka compile externalDependency.springActuator + implementation externalDependency.slf4jApi compileOnly externalDependency.lombok annotationProcessor externalDependency.lombok diff --git a/metadata-jobs/pe-consumer/build.gradle b/metadata-jobs/pe-consumer/build.gradle index ff4f1e577a..38b451fafc 100644 --- a/metadata-jobs/pe-consumer/build.gradle +++ b/metadata-jobs/pe-consumer/build.gradle @@ -18,6 +18,7 @@ dependencies { } compile externalDependency.springKafka compile externalDependency.springActuator + implementation externalDependency.slf4jApi compileOnly externalDependency.lombok annotationProcessor externalDependency.lombok runtime externalDependency.logbackClassic diff --git a/metadata-models-validator/build.gradle b/metadata-models-validator/build.gradle index 9a34255513..bd1ec9449f 100644 --- a/metadata-models-validator/build.gradle +++ b/metadata-models-validator/build.gradle @@ -9,5 +9,7 @@ dependencies { compile externalDependency.findbugsAnnotations compile externalDependency.guava + implementation externalDependency.slf4jApi + runtimeOnly externalDependency.logbackClassic compileOnly externalDependency.lombok } \ No newline at end of file diff --git a/metadata-service/auth-api/build.gradle b/metadata-service/auth-api/build.gradle index e0c563eb79..74d55abd18 100644 --- a/metadata-service/auth-api/build.gradle +++ b/metadata-service/auth-api/build.gradle @@ -3,6 +3,7 @@ apply plugin: 'java' dependencies { compile project(path: ':metadata-models') compile externalDependency.guava - compile externalDependency.lombok + implementation externalDependency.slf4jApi + compileOnly externalDependency.lombok annotationProcessor externalDependency.lombok } \ No newline at end of file diff --git a/metadata-service/auth-filter/build.gradle b/metadata-service/auth-filter/build.gradle index d76297e71a..8de29b75e3 100644 --- a/metadata-service/auth-filter/build.gradle +++ b/metadata-service/auth-filter/build.gradle @@ -5,7 +5,8 @@ dependencies { compile project(path: ':metadata-service:factories') compile externalDependency.servletApi - compile externalDependency.lombok + implementation externalDependency.slf4jApi + compileOnly externalDependency.lombok compile externalDependency.springWeb annotationProcessor externalDependency.lombok diff --git a/metadata-service/auth-impl/build.gradle b/metadata-service/auth-impl/build.gradle index 76b18f314e..5116c668c7 100644 --- a/metadata-service/auth-impl/build.gradle +++ b/metadata-service/auth-impl/build.gradle @@ -14,7 +14,8 @@ dependencies { runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.2', 'io.jsonwebtoken:jjwt-jackson:0.11.2' - compile externalDependency.lombok + implementation externalDependency.slf4jApi + compileOnly externalDependency.lombok annotationProcessor externalDependency.lombok diff --git a/metadata-service/auth-ranger-impl/build.gradle b/metadata-service/auth-ranger-impl/build.gradle index 8d13106bc6..da4946d3ed 100644 --- a/metadata-service/auth-ranger-impl/build.gradle +++ b/metadata-service/auth-ranger-impl/build.gradle @@ -28,7 +28,8 @@ dependencies { implementation 'org.apache.logging.log4j:log4j-1.2-api:2.17.1' implementation 'rome:rome:1.0' runtimeOnly externalDependency.jna - compile externalDependency.lombok + implementation externalDependency.slf4jApi + compileOnly externalDependency.lombok annotationProcessor externalDependency.lombok testCompile externalDependency.mockito diff --git a/metadata-service/auth-servlet-impl/build.gradle b/metadata-service/auth-servlet-impl/build.gradle index 9ffaa4f687..bb258a800b 100644 --- a/metadata-service/auth-servlet-impl/build.gradle +++ b/metadata-service/auth-servlet-impl/build.gradle @@ -10,7 +10,8 @@ dependencies { compile externalDependency.graphqlJava compile externalDependency.springBeans compile externalDependency.springContext - compile externalDependency.lombok + implementation externalDependency.slf4jApi + compileOnly externalDependency.lombok annotationProcessor externalDependency.lombok } diff --git a/metadata-service/factories/build.gradle b/metadata-service/factories/build.gradle index 1a82f4d52f..bfb7a62ccb 100644 --- a/metadata-service/factories/build.gradle +++ b/metadata-service/factories/build.gradle @@ -15,7 +15,7 @@ dependencies { compile externalDependency.gson compile externalDependency.kafkaClients compile externalDependency.kafkaAvroSerde - compile externalDependency.lombok + compileOnly externalDependency.lombok compile externalDependency.servletApi compile externalDependency.springBeans compile externalDependency.springBootAutoconfigure @@ -31,6 +31,7 @@ dependencies { compile spec.product.pegasus.restliSpringBridge testImplementation externalDependency.springBootTest + testCompile externalDependency.mockito testCompile externalDependency.testng diff --git a/metadata-service/graphql-servlet-impl/build.gradle b/metadata-service/graphql-servlet-impl/build.gradle index 041b484836..7c365bcdac 100644 --- a/metadata-service/graphql-servlet-impl/build.gradle +++ b/metadata-service/graphql-servlet-impl/build.gradle @@ -11,7 +11,8 @@ dependencies { compile externalDependency.graphqlJava compile externalDependency.springBeans compile externalDependency.springContext - compile externalDependency.lombok + implementation externalDependency.slf4jApi + compileOnly externalDependency.lombok annotationProcessor externalDependency.lombok } diff --git a/metadata-service/openapi-servlet/build.gradle b/metadata-service/openapi-servlet/build.gradle index 08f019bed7..3b947fee08 100644 --- a/metadata-service/openapi-servlet/build.gradle +++ b/metadata-service/openapi-servlet/build.gradle @@ -13,8 +13,10 @@ dependencies { compile externalDependency.springWebMVC compile externalDependency.springBeans compile externalDependency.springContext - compile externalDependency.lombok - compile externalDependency.antlr4 + implementation externalDependency.slf4jApi + compileOnly externalDependency.lombok + implementation externalDependency.antlr4Runtime + implementation externalDependency.antlr4 annotationProcessor externalDependency.lombok diff --git a/metadata-service/restli-client/build.gradle b/metadata-service/restli-client/build.gradle index 8f25cf7294..7cc643a626 100644 --- a/metadata-service/restli-client/build.gradle +++ b/metadata-service/restli-client/build.gradle @@ -7,7 +7,8 @@ dependencies { compile project(':metadata-events:mxe-schemas') compile project(':metadata-utils') - compile externalDependency.lombok + implementation externalDependency.slf4jApi + compileOnly externalDependency.lombok annotationProcessor externalDependency.lombok compile spec.product.pegasus.restliClient diff --git a/metadata-service/restli-servlet-impl/build.gradle b/metadata-service/restli-servlet-impl/build.gradle index 5e95bc6c64..08d3a1c2e3 100644 --- a/metadata-service/restli-servlet-impl/build.gradle +++ b/metadata-service/restli-servlet-impl/build.gradle @@ -40,6 +40,8 @@ dependencies { compile project(':metadata-utils') compile project(':metadata-io') compile spec.product.pegasus.restliServer + implementation externalDependency.slf4jApi + // This is compile and not compileOnly because of restli compile externalDependency.lombok compile externalDependency.neo4jJavaDriver compile externalDependency.opentelemetryAnnotations @@ -61,7 +63,6 @@ dependencies { modelValidation project(path: ':metadata-models-validator') dataModel project(path: ':metadata-models', configuration: 'dataTemplate') dataModel project(path: ':li-utils', configuration: 'dataTemplate') - } task integrationTest(type: Test) { diff --git a/metadata-service/war/build.gradle b/metadata-service/war/build.gradle index 3a3fdcb66e..cdb2b67b42 100644 --- a/metadata-service/war/build.gradle +++ b/metadata-service/war/build.gradle @@ -13,9 +13,9 @@ dependencies { runtime project(':metadata-jobs:mae-consumer') runtime project(':metadata-jobs:pe-consumer') + runtime externalDependency.logbackClassic runtime externalDependency.awsSecretsManagerJdbc runtime externalDependency.h2 - runtime externalDependency.logbackClassic runtime externalDependency.mariadbConnector runtime externalDependency.mysqlConnector runtime externalDependency.postgresql @@ -28,15 +28,15 @@ dependencies { } configurations { - jetty8 + jetty9 } dependencies { - jetty8 "org.eclipse.jetty:jetty-runner:9.4.46.v20220331" + jetty9 "org.eclipse.jetty:jetty-runner:9.4.46.v20220331" } task run(type: JavaExec, dependsOn: build) { main = "org.eclipse.jetty.runner.Runner" args = [war.archivePath] - classpath configurations.jetty8 + classpath configurations.jetty9 } diff --git a/metadata-utils/build.gradle b/metadata-utils/build.gradle index cb6593a1e5..3ab83a97d2 100644 --- a/metadata-utils/build.gradle +++ b/metadata-utils/build.gradle @@ -18,6 +18,7 @@ dependencies { compile project(':metadata-events:mxe-avro-1.7') compile project(':metadata-events:mxe-utils-avro-1.7') + implementation externalDependency.slf4jApi compileOnly externalDependency.lombok annotationProcessor externalDependency.lombok