You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2021/12/10 19:28:32 UTC
[geode] branch support/1.12 updated: GEODE-9888: Bump log4j from 2.12.1 to 2.15.0 (#7187)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new 84e6977 GEODE-9888: Bump log4j from 2.12.1 to 2.15.0 (#7187)
84e6977 is described below
commit 84e69771580befdd1b817010403f75ac21db001b
Author: Owen Nichols <34...@users.noreply.github.com>
AuthorDate: Fri Dec 10 11:27:33 2021 -0800
GEODE-9888: Bump log4j from 2.12.1 to 2.15.0 (#7187)
* Bump log4j from 2.12.1 to 2.15.0
* [backport from 1.13] Convert Gradle from buildScript to plugin. Drop gradle-info-plugin
(cherry-picked from commit 2c26de89f1c78ddaab01531843826498b87f9eea)
Co-authored-by: Robert Houghton <rh...@pivotal.io>
---
.../src/test/resources/expected-pom.xml | 10 ++---
build.gradle | 45 ++++++++--------------
.../gradle/plugins/DependencyConstraints.groovy | 2 +-
geode-assembly/build.gradle | 8 ++--
.../integrationTest/resources/assembly_content.txt | 10 ++---
.../resources/dependency_classpath.txt | 10 ++---
geode-wan/build.gradle | 2 +-
gradle/standard-subproject-configuration.gradle | 4 +-
8 files changed, 40 insertions(+), 51 deletions(-)
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index 94f6396..58e7a66 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -586,31 +586,31 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>2.12.1</version>
+ <version>2.15.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>2.12.1</version>
+ <version>2.15.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
- <version>2.12.1</version>
+ <version>2.15.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jul</artifactId>
- <version>2.12.1</version>
+ <version>2.15.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <version>2.12.1</version>
+ <version>2.15.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/build.gradle b/build.gradle
index 1145028..6e06603 100755
--- a/build.gradle
+++ b/build.gradle
@@ -15,42 +15,28 @@
* limitations under the License.
*/
-buildscript {
- repositories {
- maven { url "https://plugins.gradle.org/m2/" }
- maven { url "https://dl.bintray.com/palantir/releases" }
- jcenter()
- }
-
- dependencies {
- classpath 'com.diffplug.spotless:spotless-plugin-gradle:3.21.1'
- classpath 'com.github.ben-manes:gradle-versions-plugin:0.21.0'
- classpath 'com.netflix.nebula:gradle-lint-plugin:16.4.0'
- classpath 'com.netflix.nebula:nebula-project-plugin:6.0.2'
- classpath 'gradle.plugin.com.palantir.gradle.docker:gradle-docker:0.22.1'
- classpath 'io.spring.gradle:dependency-management-plugin:1.0.7.RELEASE'
- classpath 'org.ajoberstar.grgit:grgit-gradle:3.1.1'
- classpath 'org.nosphere.apache:creadur-rat-gradle:0.4.0'
- classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7'
- classpath "me.champeau.gradle:japicmp-gradle-plugin:0.2.8"
- }
+plugins {
+ id "wrapper"
+ id "nebula.facet" version "6.0.2" apply false
+ id "base"
+ id "idea"
+ id "eclipse"
+ id "com.diffplug.gradle.spotless" version "3.28.0" apply false
+ id "com.github.ben-manes.versions" version "0.28.0" apply false
+ id "nebula.lint" version "16.4.0" apply false
+ id "com.palantir.docker" version "0.22.1" apply false
+ id "io.spring.dependency-management" version "1.0.9.RELEASE" apply false
+ id "org.ajoberstar.grgit" version "4.0.1" apply false
+ id "org.nosphere.apache.rat" version "0.6.0" apply false
+ id "org.sonarqube" version "2.8" apply false
}
-apply plugin: 'wrapper'
-apply plugin: 'nebula.facet'
-apply plugin: 'java-library'
-apply plugin: 'idea'
-apply plugin: 'eclipse'
apply from: "${scriptDir}/lint.gradle"
apply from: "${scriptDir}/resolve-dependencies.gradle"
apply from: "${scriptDir}/sonar.gradle"
apply from: "${scriptDir}/rat.gradle"
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-compileJava.options.encoding = 'UTF-8'
-
wrapper {
gradleVersion = minimumGradleVersion
distributionType = "all"
@@ -124,6 +110,9 @@ tasks.register('writeBuildInfo') {
}
}
}
+tasks.register('test') {
+ description "An all-project target for unit tests"
+}
tasks.register('devBuild') {
description "A convenience target for a typical developer workflow: apply spotless and assemble all classes."
diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 17817bf..7cd5ae0 100644
--- a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -40,7 +40,7 @@ class DependencyConstraints implements Plugin<Project> {
deps.put("fastutil.version", "8.3.0")
deps.put("javax.transaction-api.version", "1.3")
deps.put("jgroups.version", "3.6.14.Final")
- deps.put("log4j.version", "2.12.1")
+ deps.put("log4j.version", "2.15.0")
deps.put("micrometer.version", "1.6.3")
deps.put("shiro.version", "1.8.0")
deps.put("slf4j-api.version", "1.7.28")
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 1faf0b0..456f8e5 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -474,11 +474,13 @@ tasks.register('docs', Javadoc) {
include 'org/apache/geode/**/'
doLast {
- parent.subprojects.each { project ->
+ rootProject.subprojects.each { project ->
copy {
- from project.sourceSets.main.resources.srcDirs
- into docsDir
+ if (project.hasProperty('sourceSets')) {
+ from project.sourceSets.main.resources.srcDirs
+ }
include 'javadoc-images/*'
+ into docsDir
}
}
}
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index d0f2e50..1278ad5 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1031,11 +1031,11 @@ lib/jline-2.12.jar
lib/jna-5.5.0.jar
lib/jna-platform-5.5.0.jar
lib/jopt-simple-5.0.4.jar
-lib/log4j-api-2.12.1.jar
-lib/log4j-core-2.12.1.jar
-lib/log4j-jcl-2.12.1.jar
-lib/log4j-jul-2.12.1.jar
-lib/log4j-slf4j-impl-2.12.1.jar
+lib/log4j-api-2.15.0.jar
+lib/log4j-core-2.15.0.jar
+lib/log4j-jcl-2.15.0.jar
+lib/log4j-jul-2.15.0.jar
+lib/log4j-slf4j-impl-2.15.0.jar
lib/lucene-analyzers-common-6.6.6.jar
lib/lucene-analyzers-phonetic-6.6.6.jar
lib/lucene-core-6.6.6.jar
diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index 7fe3ffe..941fac0 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -25,8 +25,8 @@ geode-unsafe-0.0.0.jar
HikariCP-3.4.1.jar
commons-lang3-3.9.jar
jaxb-api-2.3.1.jar
-log4j-jcl-2.12.1.jar
-log4j-api-2.12.1.jar
+log4j-jcl-2.15.0.jar
+log4j-api-2.15.0.jar
spring-shell-1.2.0.RELEASE.jar
rmiio-2.1.2.jar
jaxb-impl-2.3.2.jar
@@ -78,9 +78,9 @@ jetty-http-9.4.39.v20210325.jar
jetty-io-9.4.39.v20210325.jar
jetty-util-ajax-9.4.39.v20210325.jar
jetty-util-9.4.39.v20210325.jar
-log4j-slf4j-impl-2.12.1.jar
-log4j-core-2.12.1.jar
-log4j-jul-2.12.1.jar
+log4j-slf4j-impl-2.15.0.jar
+log4j-core-2.15.0.jar
+log4j-jul-2.15.0.jar
lucene-analyzers-phonetic-6.6.6.jar
lucene-analyzers-common-6.6.6.jar
lucene-queryparser-6.6.6.jar
diff --git a/geode-wan/build.gradle b/geode-wan/build.gradle
index d1afc3f..043d1c6 100644
--- a/geode-wan/build.gradle
+++ b/geode-wan/build.gradle
@@ -32,7 +32,7 @@ dependencies {
implementation(project(':geode-tcp-server'))
compile(project(':geode-core'))
- compileOnly('org.apache.logging.log4j:log4j-api:2.12.1')
+ compileOnly('org.apache.logging.log4j:log4j-api:2.15.0')
testCompile(project(':geode-junit')) {
exclude module: 'geode-core'
diff --git a/gradle/standard-subproject-configuration.gradle b/gradle/standard-subproject-configuration.gradle
index 5215aaa..9cfea36 100644
--- a/gradle/standard-subproject-configuration.gradle
+++ b/gradle/standard-subproject-configuration.gradle
@@ -33,9 +33,7 @@ def thisProjectScoped = project
}
}
-
-
-rootProject.tasks.named('classes').configure {
+thisProjectScoped.tasks.named('assemble').configure {
// This is a semi-lazy hook so that our test sources are compiled most of the time.
dependsOn(
[