You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2021/12/21 04:20:40 UTC
[beam] branch master updated: Use a patched shadow 6.1.0 plugin using Log4j 2.16.0 (#16269)
This is an automated email from the ASF dual-hosted git repository.
lcwik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new c0921f7 Use a patched shadow 6.1.0 plugin using Log4j 2.16.0 (#16269)
c0921f7 is described below
commit c0921f7b90e3dabe66601e04d3347034b84a39cd
Author: Ahmet Altay <aa...@gmail.com>
AuthorDate: Mon Dec 20 20:19:37 2021 -0800
Use a patched shadow 6.1.0 plugin using Log4j 2.16.0 (#16269)
* Use a patched shadow jar using Log4j 2.16.0
* Use a better version identifier
* update runtime dependency too
---
buildSrc/build.gradle.kts | 5 +++--
buildSrc/jarlibs/shadow-6.1.0-log4jfix-SNAPSHOT.jar | Bin 0 -> 5628292 bytes
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 60d037b..7ec9537 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -31,13 +31,14 @@ repositories {
url = uri("https://repo.spring.io/plugins-release/")
content { includeGroup("io.spring.gradle") }
}
+ flatDir { dirs("jarlibs") }
}
// Dependencies on other plugins used when this plugin is invoked
dependencies {
compile(gradleApi())
compile(localGroovy())
- compile("com.github.jengelman.gradle.plugins:shadow:6.1.0")
+ compile("com.github.jengelman.gradle.plugins:shadow:6.1.0-log4jfix-SNAPSHOT")
compile("gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.5.0")
runtime("net.ltgt.gradle:gradle-apt-plugin:0.21") // Enable a Java annotation processor
@@ -48,7 +49,7 @@ dependencies {
runtime("gradle.plugin.com.github.blindpirate:gogradle:0.11.4") // Enable Go code compilation
runtime("gradle.plugin.com.palantir.gradle.docker:gradle-docker:0.22.0") // Enable building Docker containers
runtime("gradle.plugin.com.dorongold.plugins:task-tree:1.5") // Adds a 'taskTree' task to print task dependency tree
- runtime("com.github.jengelman.gradle.plugins:shadow:6.1.0") // Enable shading Java dependencies
+ runtime("com.github.jengelman.gradle.plugins:shadow:6.1.0-log4jfix-SNAPSHOT") // Enable shading Java dependencies
runtime("ca.coglinc:javacc-gradle-plugin:2.4.0") // Enable the JavaCC parser generator
runtime("net.linguica.gradle:maven-settings-plugin:0.5")
runtime("gradle.plugin.io.pry.gradle.offline_dependencies:gradle-offline-dependencies-plugin:0.5.0") // Enable creating an offline repository
diff --git a/buildSrc/jarlibs/shadow-6.1.0-log4jfix-SNAPSHOT.jar b/buildSrc/jarlibs/shadow-6.1.0-log4jfix-SNAPSHOT.jar
new file mode 100644
index 0000000..8ebd239
Binary files /dev/null and b/buildSrc/jarlibs/shadow-6.1.0-log4jfix-SNAPSHOT.jar differ