Skip to content

Upgrade to Log4j 2.9.1 #26750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 22, 2017
Merged

Upgrade to Log4j 2.9.1 #26750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67c5f75
Upgrade to Log4j 2.9.1
jasontedor Sep 22, 2017
25f1deb
Remove comment
jasontedor Sep 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions buildSrc/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ jts = 1.13
jackson = 2.8.6
snakeyaml = 1.15
# when updating log4j, please update also docs/java-api/index.asciidoc
# when updating this version, please check if https://github.com/apache/logging-log4j2/pull/109 is released into the version that you are
# bumping to; if it is, remove the assumeTrues in EvilLoggerTests
log4j = 2.9.0
log4j = 2.9.1
slf4j = 1.6.2

# when updating the JNA version, also update the version in buildSrc/build.gradle
Expand Down
1 change: 0 additions & 1 deletion core/licenses/log4j-1.2-api-2.9.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions core/licenses/log4j-1.2-api-2.9.1.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
894f96d677880d4ab834a1356f62b875e579caaa
1 change: 0 additions & 1 deletion core/licenses/log4j-api-2.9.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions core/licenses/log4j-api-2.9.1.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7a2999229464e7a324aa503c0a52ec0f05efe7bd
1 change: 0 additions & 1 deletion core/licenses/log4j-core-2.9.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions core/licenses/log4j-core-2.9.1.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c041978c686866ee8534f538c6220238db3bb6be
4 changes: 2 additions & 2 deletions docs/java-api/index.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ You need to also include Log4j 2 dependencies:
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.9.0</version>
<version>2.9.1</version>
</dependency>
--------------------------------------------------

Expand Down Expand Up @@ -111,7 +111,7 @@ If you want to use another logger than Log4j 2, you can use http://www.slf4j.org
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
<version>2.9.0</version>
<version>2.9.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
1 change: 0 additions & 1 deletion plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.9.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.9.1.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0a97a849b18b3798c4af1a2ca5b10c66cef17e3a
15 changes: 0 additions & 15 deletions qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ public void tearDown() throws Exception {
}

public void testLocationInfoTest() throws IOException, UserException {
assumeTrue(
"will be fixed when https://github.com/apache/logging-log4j2/pull/109 is integrated into to Log4j and we bump versions",
!Constants.JRE_IS_MINIMUM_JAVA9);
setupLogging("location_info");

final Logger testLogger = ESLoggerFactory.getLogger("test");
Expand All @@ -107,9 +104,6 @@ public void testLocationInfoTest() throws IOException, UserException {
}

public void testDeprecationLogger() throws IOException, UserException {
assumeTrue(
"will be fixed when https://github.com/apache/logging-log4j2/pull/109 is integrated into to Log4j and we bump versions",
!Constants.JRE_IS_MINIMUM_JAVA9);
setupLogging("deprecation");

final DeprecationLogger deprecationLogger = new DeprecationLogger(ESLoggerFactory.getLogger("deprecation"));
Expand Down Expand Up @@ -137,9 +131,6 @@ public void testDeprecationLogger() throws IOException, UserException {
}

public void testConcurrentDeprecationLogger() throws IOException, UserException, BrokenBarrierException, InterruptedException {
assumeTrue(
"will be fixed when https://github.com/apache/logging-log4j2/pull/109 is integrated into to Log4j and we bump versions",
!Constants.JRE_IS_MINIMUM_JAVA9);
setupLogging("deprecation");

final DeprecationLogger deprecationLogger = new DeprecationLogger(ESLoggerFactory.getLogger("deprecation"));
Expand Down Expand Up @@ -217,9 +208,6 @@ public void testConcurrentDeprecationLogger() throws IOException, UserException,
}

public void testDeprecationLoggerMaybeLog() throws IOException, UserException {
assumeTrue(
"will be fixed when https://github.com/apache/logging-log4j2/pull/109 is integrated into to Log4j and we bump versions",
!Constants.JRE_IS_MINIMUM_JAVA9);
setupLogging("deprecation");

final DeprecationLogger deprecationLogger = new DeprecationLogger(ESLoggerFactory.getLogger("deprecation"));
Expand Down Expand Up @@ -263,9 +251,6 @@ public void testDeprecationLoggerMaybeLog() throws IOException, UserException {
}

public void testDeprecatedSettings() throws IOException, UserException {
assumeTrue(
"will be fixed when https://github.com/apache/logging-log4j2/pull/109 is integrated into to Log4j and we bump versions",
!Constants.JRE_IS_MINIMUM_JAVA9);
setupLogging("settings");

final Setting<Boolean> setting = Setting.boolSetting("deprecated.foo", false, Setting.Property.Deprecated);
Expand Down