Home Explore Help
Sign In
lqb
/
elasticsearch
mirror of https://gitee.com/mirrors/elasticsearch.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

Upgrade to log4j 2.17.0 (#81902)

Chris Hegarty 3 years ago
parent
4cc56dea06
commit
1cc69f86fe
34 changed files with 19 additions and 18 deletions
Unified View Show Diff Stats
  1. 1 1
      build-tools-internal/version.properties
  2. 0 1
      modules/repository-url/licenses/log4j-1.2-api-2.15.0.jar.sha1
  3. 1 0
      modules/repository-url/licenses/log4j-1.2-api-2.17.0.jar.sha1
  4. 0 1
      plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.15.0.jar.sha1
  5. 1 0
      plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.17.0.jar.sha1
  6. 0 1
      plugins/discovery-ec2/licenses/log4j-1.2-api-2.15.0.jar.sha1
  7. 1 0
      plugins/discovery-ec2/licenses/log4j-1.2-api-2.17.0.jar.sha1
  8. 0 1
      plugins/discovery-gce/licenses/log4j-1.2-api-2.15.0.jar.sha1
  9. 1 0
      plugins/discovery-gce/licenses/log4j-1.2-api-2.17.0.jar.sha1
  10. 0 1
      plugins/repository-gcs/licenses/log4j-1.2-api-2.15.0.jar.sha1
  11. 1 0
      plugins/repository-gcs/licenses/log4j-1.2-api-2.17.0.jar.sha1
  12. 0 1
      plugins/repository-hdfs/licenses/log4j-1.2-api-2.15.0.jar.sha1
  13. 1 0
      plugins/repository-hdfs/licenses/log4j-1.2-api-2.17.0.jar.sha1
  14. 0 1
      plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
  15. 1 0
      plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.17.0.jar.sha1
  16. 0 1
      plugins/repository-s3/licenses/log4j-1.2-api-2.15.0.jar.sha1
  17. 1 0
      plugins/repository-s3/licenses/log4j-1.2-api-2.17.0.jar.sha1
  18. 0 1
      server/licenses/log4j-api-2.15.0.jar.sha1
  19. 1 0
      server/licenses/log4j-api-2.17.0.jar.sha1
  20. 0 1
      server/licenses/log4j-core-2.15.0.jar.sha1
  21. 1 0
      server/licenses/log4j-core-2.17.0.jar.sha1
  22. 2 1
      test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java
  23. 0 1
      x-pack/plugin/core/licenses/log4j-1.2-api-2.15.0.jar.sha1
  24. 1 0
      x-pack/plugin/core/licenses/log4j-1.2-api-2.17.0.jar.sha1
  25. 0 1
      x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
  26. 1 0
      x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-2.17.0.jar.sha1
  27. 0 1
      x-pack/plugin/security/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
  28. 1 0
      x-pack/plugin/security/licenses/log4j-slf4j-impl-2.17.0.jar.sha1
  29. 0 1
      x-pack/plugin/sql/sql-action/licenses/log4j-api-2.15.0.jar.sha1
  30. 1 0
      x-pack/plugin/sql/sql-action/licenses/log4j-api-2.17.0.jar.sha1
  31. 0 1
      x-pack/plugin/sql/sql-action/licenses/log4j-core-2.15.0.jar.sha1
  32. 1 0
      x-pack/plugin/sql/sql-action/licenses/log4j-core-2.17.0.jar.sha1
  33. 0 1
      x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
  34. 1 0
      x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-2.17.0.jar.sha1

+ 1 - 1
build-tools-internal/version.properties
View File 

@@ -14,7 +14,7 @@ snakeyaml         = 1.26
 
 icu4j             = 68.2
 
 icu4j             = 68.2
 
 supercsv          = 2.4.0
 
 supercsv          = 2.4.0
 
 # when updating log4j, please update also docs/java-api/index.asciidoc
 
 # when updating log4j, please update also docs/java-api/index.asciidoc
 
-log4j             = 2.15.0
 
+log4j             = 2.17.0
 
 slf4j             = 1.6.2
 
 slf4j             = 1.6.2
 
 ecsLogging        = 1.2.0
 
 ecsLogging        = 1.2.0

+ 0 - 1
modules/repository-url/licenses/log4j-1.2-api-2.15.0.jar.sha1
View File 

@@ -1 +0,0 @@
 
-bc960fe2acbe6f3952011f88a771de18301534e7

+ 1 - 0
modules/repository-url/licenses/log4j-1.2-api-2.17.0.jar.sha1
View File 

@@ -0,0 +1 @@
 
+aaf998968370edf738322fb750fbda118055508b

+ 0 - 1
plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.15.0.jar.sha1
View File 

@@ -1 +0,0 @@
 
-bc960fe2acbe6f3952011f88a771de18301534e7

+ 1 - 0
plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.17.0.jar.sha1
View File 

@@ -0,0 +1 @@
 
+aaf998968370edf738322fb750fbda118055508b

+ 0 - 1
plugins/discovery-ec2/licenses/log4j-1.2-api-2.15.0.jar.sha1
View File 

@@ -1 +0,0 @@
 
-bc960fe2acbe6f3952011f88a771de18301534e7

+ 1 - 0
plugins/discovery-ec2/licenses/log4j-1.2-api-2.17.0.jar.sha1
View File 

@@ -0,0 +1 @@
 
+aaf998968370edf738322fb750fbda118055508b

+ 0 - 1
plugins/discovery-gce/licenses/log4j-1.2-api-2.15.0.jar.sha1
View File 

@@ -1 +0,0 @@
 
-bc960fe2acbe6f3952011f88a771de18301534e7

+ 1 - 0
plugins/discovery-gce/licenses/log4j-1.2-api-2.17.0.jar.sha1
View File 

@@ -0,0 +1 @@
 
+aaf998968370edf738322fb750fbda118055508b

+ 0 - 1
plugins/repository-gcs/licenses/log4j-1.2-api-2.15.0.jar.sha1
View File 

@@ -1 +0,0 @@
 
-bc960fe2acbe6f3952011f88a771de18301534e7

+ 1 - 0
plugins/repository-gcs/licenses/log4j-1.2-api-2.17.0.jar.sha1
View File 

@@ -0,0 +1 @@
 
+aaf998968370edf738322fb750fbda118055508b

+ 0 - 1
plugins/repository-hdfs/licenses/log4j-1.2-api-2.15.0.jar.sha1
View File 

@@ -1 +0,0 @@
 
-bc960fe2acbe6f3952011f88a771de18301534e7

+ 1 - 0
plugins/repository-hdfs/licenses/log4j-1.2-api-2.17.0.jar.sha1
View File 

@@ -0,0 +1 @@
 
+aaf998968370edf738322fb750fbda118055508b

+ 0 - 1
plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
View File 

@@ -1 +0,0 @@
 
-8bb417869ab3baa19f2fc70e6d776d041f0a8ebc

+ 1 - 0
plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.17.0.jar.sha1
View File 

@@ -0,0 +1 @@
 
+1ec25ce0254749c94549ea9c3cea34bd0488c9c6

+ 0 - 1
plugins/repository-s3/licenses/log4j-1.2-api-2.15.0.jar.sha1
View File 

@@ -1 +0,0 @@
 
-bc960fe2acbe6f3952011f88a771de18301534e7

+ 1 - 0
plugins/repository-s3/licenses/log4j-1.2-api-2.17.0.jar.sha1
View File 

@@ -0,0 +1 @@
 
+aaf998968370edf738322fb750fbda118055508b

+ 0 - 1
server/licenses/log4j-api-2.15.0.jar.sha1
View File 

@@ -1 +0,0 @@
 
-4a5aa7e55a29391c6f66e0b259d5189aa11e45d0

+ 1 - 0
server/licenses/log4j-api-2.17.0.jar.sha1
View File 

@@ -0,0 +1 @@
 
+bbd791e9c8c9421e45337c4fe0a10851c086e36c

+ 0 - 1
server/licenses/log4j-core-2.15.0.jar.sha1
View File 

@@ -1 +0,0 @@
 
-ba55c13d7ac2fd44df9cc8074455719a33f375b9

+ 1 - 0
server/licenses/log4j-core-2.17.0.jar.sha1
View File 

@@ -0,0 +1 @@
 
+fe6e7a32c1228884b9691a744f953a55d0dd8ead

+ 2 - 1
test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java
View File 

@@ -628,7 +628,8 @@ public abstract class ESTestCase extends LuceneTestCase {
 
                     statusData.stream().map(status -> status.getMessage().getFormattedMessage()).collect(Collectors.toList()),
 
                     statusData.stream().map(status -> status.getMessage().getFormattedMessage()).collect(Collectors.toList()),
 
                     anyOf(
 
                     anyOf(
 
                         emptyCollectionOf(String.class),
 
                         emptyCollectionOf(String.class),
 
-                        contains(startsWith(LOG_4J_MSG_PREFIXES.get(0)), startsWith(LOG_4J_MSG_PREFIXES.get(1)))
 
+                        contains(startsWith(LOG_4J_MSG_PREFIXES.get(0)), startsWith(LOG_4J_MSG_PREFIXES.get(1))),
 
+                        contains(startsWith(LOG_4J_MSG_PREFIXES.get(1)))
 
                     )
 
                     )
 
                 );
 
                 );
 
             } finally {
 
             } finally {

+ 0 - 1
x-pack/plugin/core/licenses/log4j-1.2-api-2.15.0.jar.sha1
View File 

@@ -1 +0,0 @@
 
-bc960fe2acbe6f3952011f88a771de18301534e7

+ 1 - 0
x-pack/plugin/core/licenses/log4j-1.2-api-2.17.0.jar.sha1
View File 

@@ -0,0 +1 @@
 
+aaf998968370edf738322fb750fbda118055508b

+ 0 - 1
x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
View File 

@@ -1 +0,0 @@
 
-8bb417869ab3baa19f2fc70e6d776d041f0a8ebc

+ 1 - 0
x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-2.17.0.jar.sha1
View File 

@@ -0,0 +1 @@
 
+1ec25ce0254749c94549ea9c3cea34bd0488c9c6

+ 0 - 1
x-pack/plugin/security/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
View File 

@@ -1 +0,0 @@
 
-8bb417869ab3baa19f2fc70e6d776d041f0a8ebc

+ 1 - 0
x-pack/plugin/security/licenses/log4j-slf4j-impl-2.17.0.jar.sha1
View File 

@@ -0,0 +1 @@
 
+1ec25ce0254749c94549ea9c3cea34bd0488c9c6

+ 0 - 1
x-pack/plugin/sql/sql-action/licenses/log4j-api-2.15.0.jar.sha1
View File 

@@ -1 +0,0 @@
 
-4a5aa7e55a29391c6f66e0b259d5189aa11e45d0

+ 1 - 0
x-pack/plugin/sql/sql-action/licenses/log4j-api-2.17.0.jar.sha1
View File 

@@ -0,0 +1 @@
 
+bbd791e9c8c9421e45337c4fe0a10851c086e36c

+ 0 - 1
x-pack/plugin/sql/sql-action/licenses/log4j-core-2.15.0.jar.sha1
View File 

@@ -1 +0,0 @@
 
-ba55c13d7ac2fd44df9cc8074455719a33f375b9

+ 1 - 0
x-pack/plugin/sql/sql-action/licenses/log4j-core-2.17.0.jar.sha1
View File 

@@ -0,0 +1 @@
 
+fe6e7a32c1228884b9691a744f953a55d0dd8ead

+ 0 - 1
x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
View File 

@@ -1 +0,0 @@
 
-8bb417869ab3baa19f2fc70e6d776d041f0a8ebc

+ 1 - 0
x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-2.17.0.jar.sha1
View File 

@@ -0,0 +1 @@
 
+1ec25ce0254749c94549ea9c3cea34bd0488c9c6