From 335e308155d3345f2a0bb8a3decf76671eda3245 Mon Sep 17 00:00:00 2001 From: Marco Scoppetta Date: Thu, 4 Apr 2019 19:19:00 +0100 Subject: [PATCH] remove janino and conditional logging (#5088) Removes dependency on janino library which was only needed to enable conditional statements in logback.xml file. The conditional check we were doing is unnecessary, so removing that also allows us to get rid of the runtime dependency. --- console/BUILD | 3 --- daemon/BUILD | 1 - .../maven/artifacts/org/codehaus/janino/BUILD | 26 ------------------- dependencies/maven/dependencies.bzl | 2 -- dependencies/maven/dependencies.yaml | 5 ---- server/BUILD | 1 - server/conf/logback.xml | 12 +-------- 7 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 dependencies/maven/artifacts/org/codehaus/janino/BUILD diff --git a/console/BUILD b/console/BUILD index 906fc12482a..00a6920c4f8 100644 --- a/console/BUILD +++ b/console/BUILD @@ -44,9 +44,6 @@ java_library( "//dependencies/maven/artifacts/jline:jline", "//dependencies/maven/artifacts/org/slf4j:slf4j-api", ], - runtime_deps = [ - "//dependencies/maven/artifacts/org/codehaus/janino:janino", # Needed to avoid Logback error - ], visibility = ["//console/test:__subpackages__"], resources = ["LICENSE"], resource_strip_prefix = "console", diff --git a/daemon/BUILD b/daemon/BUILD index 2d19ec82318..20e401fd902 100644 --- a/daemon/BUILD +++ b/daemon/BUILD @@ -37,7 +37,6 @@ java_library( runtime_deps = [ "//dependencies/maven/artifacts/ch/qos/logback:logback-classic", "//dependencies/maven/artifacts/ch/qos/logback:logback-core", - "//dependencies/maven/artifacts/org/codehaus/janino:janino", ], resources = ["LICENSE"], resource_strip_prefix = "daemon", diff --git a/dependencies/maven/artifacts/org/codehaus/janino/BUILD b/dependencies/maven/artifacts/org/codehaus/janino/BUILD deleted file mode 100644 index ad0ff4468ff..00000000000 --- a/dependencies/maven/artifacts/org/codehaus/janino/BUILD +++ /dev/null @@ -1,26 +0,0 @@ -java_library( - name = "commons-compiler", - exports = [ - "//external:jar/org/codehaus/janino/commons-compiler" - ], - visibility = [ - "//dependencies/maven/artifacts:__subpackages__" - ] -) - - - -java_library( - name = "janino", - exports = [ - "//external:jar/org/codehaus/janino/janino" - ], - runtime_deps = [ - ":commons-compiler" - ], - visibility = [ - "//visibility:public" - ] -) - - diff --git a/dependencies/maven/dependencies.bzl b/dependencies/maven/dependencies.bzl index a81c73b68f4..40de24c2bfd 100644 --- a/dependencies/maven/dependencies.bzl +++ b/dependencies/maven/dependencies.bzl @@ -586,8 +586,6 @@ def list_dependencies(): # - com.sun.jersey:jersey-json:1.9 wanted version 1.8.3 # - org.apache.hadoop:hadoop-yarn-common:2.7.2 wanted version 1.9.13 {"artifact": "org.codehaus.jackson:jackson-xc:1.9.13", "lang": "java", "sha1": "e3480072bc95c202476ffa1de99ff7ee9149f29c", "sha256": "2d2905fcec7d1c55b775995617685dbb03672350704d9e40b492eab5b54d0be7", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/codehaus/jackson/jackson-xc/1.9.13/jackson-xc-1.9.13.jar", "source": {"sha1": "5b45f8e8027858e8a455f031a32638b615a307df", "sha256": "e8963ebfd0bfa4e23e45998914e224f5907f6bb516b8eb36823a91b3f5e98025", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/codehaus/jackson/jackson-xc/1.9.13/jackson-xc-1.9.13-sources.jar"} , "name": "org-codehaus-jackson-jackson-xc", "actual": "@org-codehaus-jackson-jackson-xc//jar", "bind": "jar/org/codehaus/jackson/jackson-xc"}, - {"artifact": "org.codehaus.janino:commons-compiler:2.7.8", "lang": "java", "sha1": "fe224c801f296af125316178300dfc633675a8ff", "sha256": "69094456b227ec07d908938c8f90eb57e51ca6d0e82f96475770af7224b508b2", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/codehaus/janino/commons-compiler/2.7.8/commons-compiler-2.7.8.jar", "source": {"sha1": "9b4872aac6baca858a8ca0466d5fb38aa686d7b6", "sha256": "ef20715b2eec0ea397023b40a836f60890d64a4e1c49fa9907d526ae662ede42", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/codehaus/janino/commons-compiler/2.7.8/commons-compiler-2.7.8-sources.jar"} , "name": "org-codehaus-janino-commons-compiler", "actual": "@org-codehaus-janino-commons-compiler//jar", "bind": "jar/org/codehaus/janino/commons-compiler"}, - {"artifact": "org.codehaus.janino:janino:2.7.8", "lang": "java", "sha1": "109852ba81725a1ca29cc9aa0688455bd7be4b0f", "sha256": "60f05562c22b6de06641a1f76148692ef336ad1f6712fe6a76f9e2611f766344", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/codehaus/janino/janino/2.7.8/janino-2.7.8.jar", "source": {"sha1": "70a377c52fa7d733cbfc1f94cded7b101bc5bc4b", "sha256": "02459209304a0fa412a0619dd1b0f1524cd57a68c39c5ca340caf63f266bf6da", "repository": "https://repo.maven.apache.org/maven2/", "url": "https://repo.maven.apache.org/maven2/org/codehaus/janino/janino/2.7.8/janino-2.7.8-sources.jar"} , "name": "org-codehaus-janino-janino", "actual": "@org-codehaus-janino-janino//jar", "bind": "jar/org/codehaus/janino/janino"}, # duplicates in org.codehaus.jettison:jettison promoted to 1.3.8 # - com.netflix.astyanax:astyanax-cassandra:3.10.2 wanted version 1.3.8 # - com.sun.jersey:jersey-json:1.9 wanted version 1.1 diff --git a/dependencies/maven/dependencies.yaml b/dependencies/maven/dependencies.yaml index 9e2e4132e73..41081a7b075 100644 --- a/dependencies/maven/dependencies.yaml +++ b/dependencies/maven/dependencies.yaml @@ -307,11 +307,6 @@ dependencies: exclude: - "org.slf4j:slf4j-log4j12" - org.codehaus.janino: - janino: - version: "2.7.8" - lang: java - org.hamcrest: hamcrest-all: version: "1.3" diff --git a/server/BUILD b/server/BUILD index 3c19e1b84df..9627d914e5d 100644 --- a/server/BUILD +++ b/server/BUILD @@ -82,7 +82,6 @@ java_library( "//dependencies/maven/artifacts/ch/qos/logback:logback-core", "//dependencies/maven/artifacts/io/grpc:grpc-netty", "//dependencies/maven/artifacts/javax/servlet:javax-servlet-api", # PREVIOUSLY UNDECLARED - "//dependencies/maven/artifacts/org/codehaus/janino:janino", ], resources = ["LICENSE"] + glob(["resources/*"]), resource_strip_prefix = "server", diff --git a/server/conf/logback.xml b/server/conf/logback.xml index 217a0bf9a08..484b62f3d24 100644 --- a/server/conf/logback.xml +++ b/server/conf/logback.xml @@ -22,18 +22,8 @@ + - - - - - - - - -