diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 1177e0ee766cf..6ff7468ab6cf4 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -3215,6 +3215,11 @@
+
+
+
+
+
diff --git a/modules/repository-azure/build.gradle b/modules/repository-azure/build.gradle
index 64c8d003da33a..70fa650518ba1 100644
--- a/modules/repository-azure/build.gradle
+++ b/modules/repository-azure/build.gradle
@@ -83,8 +83,7 @@ dependencies {
implementation project(":modules:transport-netty4")
implementation("org.slf4j:slf4j-api:${versions.slf4j}")
- runtimeOnly "org.slf4j:slf4j-nop:${versions.slf4j}"
-// runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}") https://github.com/elastic/elasticsearch/issues/93714
+ runtimeOnly("org.apache.logging.log4j:log4j-slf4j2-impl:${versions.log4j}")
testImplementation project(':test:fixtures:azure-fixture')
yamlRestTestImplementation project(':test:fixtures:azure-fixture')
@@ -104,6 +103,7 @@ tasks.named("dependencyLicenses").configure {
mapping from: /stax-.*/, to: 'stax'
mapping from: /reactor-netty-.*/, to: 'reactor-netty'
mapping from: /reactive-streams.*/, to: 'reactive-streams'
+ mapping from: /log4j.*/, to: 'log4j'
}
tasks.named("thirdPartyAudit").configure {
@@ -173,8 +173,6 @@ tasks.named("thirdPartyAudit").configure {
// from com.ctc.wstx.shaded.msv_core.driver.textui.Driver (woodstox-core)
'com.ctc.wstx.shaded.msv_core.driver.textui.Driver',
- // [missing classes] SLF4j includes an optional class that depends on an extension class. see Log4jLogger#createConverter
- // 'org.slf4j.ext.EventData' - bring back when https://github.com/elastic/elasticsearch/issues/93714 is done
// Optional dependency of tink
'com.google.crypto.tink.subtle.Ed25519Sign',
diff --git a/modules/repository-azure/licenses/log4j-LICENSE.txt b/modules/repository-azure/licenses/log4j-LICENSE.txt
new file mode 100644
index 0000000000000..6279e5206de13
--- /dev/null
+++ b/modules/repository-azure/licenses/log4j-LICENSE.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright 1999-2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/modules/repository-azure/licenses/log4j-NOTICE.txt b/modules/repository-azure/licenses/log4j-NOTICE.txt
new file mode 100644
index 0000000000000..bbb5fb3f66e2a
--- /dev/null
+++ b/modules/repository-azure/licenses/log4j-NOTICE.txt
@@ -0,0 +1,20 @@
+Apache Log4j
+Copyright 1999-2023 Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+ResolverUtil.java
+Copyright 2005-2006 Tim Fennell
+
+Dumbster SMTP test server
+Copyright 2004 Jason Paul Kitchen
+
+TypeUtil.java
+Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
+
+picocli (http://picocli.info)
+Copyright 2017 Remko Popma
+
+TimeoutBlockingWaitStrategy.java and parts of Util.java
+Copyright 2011 LMAX Ltd.
diff --git a/modules/repository-azure/licenses/slf4j-nop-LICENSE.txt b/modules/repository-azure/licenses/slf4j-nop-LICENSE.txt
deleted file mode 100644
index 508a27283f65f..0000000000000
--- a/modules/repository-azure/licenses/slf4j-nop-LICENSE.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2004-2007 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
diff --git a/modules/repository-azure/licenses/slf4j-nop-NOTICE.txt b/modules/repository-azure/licenses/slf4j-nop-NOTICE.txt
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/modules/repository-s3/build.gradle b/modules/repository-s3/build.gradle
index 55974565edcfa..83ba1823a29c0 100644
--- a/modules/repository-s3/build.gradle
+++ b/modules/repository-s3/build.gradle
@@ -46,6 +46,7 @@ dependencies {
runtimeOnly "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
runtimeOnly "org.reactivestreams:reactive-streams:${versions.reactive_streams}"
runtimeOnly "org.slf4j:slf4j-api:${versions.slf4j}"
+ runtimeOnly "org.apache.logging.log4j:log4j-slf4j2-impl:${versions.log4j}"
runtimeOnly "software.amazon.awssdk:arns:${versions.awsv2sdk}"
runtimeOnly "software.amazon.awssdk:aws-query-protocol:${versions.awsv2sdk}"
runtimeOnly "software.amazon.awssdk:checksums-spi:${versions.awsv2sdk}"
@@ -119,6 +120,7 @@ tasks.withType(AbstractDependenciesTask).configureEach {
mapping from: 'sts', to: 'aws-sdk-2'
mapping from: 'third-party-jackson-core', to: 'aws-sdk-2'
mapping from: 'utils', to: 'aws-sdk-2'
+ mapping from: /log4j.*/, to: 'log4j'
}
esplugin.bundleSpec.from('config/repository-s3') {
diff --git a/modules/repository-s3/src/javaRestTest/java/org/elasticsearch/repositories/s3/RepositoryS3BasicCredentialsRestIT.java b/modules/repository-s3/src/javaRestTest/java/org/elasticsearch/repositories/s3/RepositoryS3BasicCredentialsRestIT.java
index 9a6497d1cab24..7dfceab093b63 100644
--- a/modules/repository-s3/src/javaRestTest/java/org/elasticsearch/repositories/s3/RepositoryS3BasicCredentialsRestIT.java
+++ b/modules/repository-s3/src/javaRestTest/java/org/elasticsearch/repositories/s3/RepositoryS3BasicCredentialsRestIT.java
@@ -52,6 +52,8 @@ public class RepositoryS3BasicCredentialsRestIT extends AbstractRepositoryS3Rest
.keystore("s3.client." + CLIENT + ".access_key", ACCESS_KEY)
.keystore("s3.client." + CLIENT + ".secret_key", SECRET_KEY)
.setting("s3.client." + CLIENT + ".endpoint", s3Fixture::getAddress)
+ .systemProperty("es.insecure_network_trace_enabled", "true")
+ .setting("logger.org.apache.http.headers", "TRACE")
.build();
@ClassRule
diff --git a/modules/repository-s3/src/javaRestTest/java/org/elasticsearch/repositories/s3/RepositoryS3WireLoggingRestIT.java b/modules/repository-s3/src/javaRestTest/java/org/elasticsearch/repositories/s3/RepositoryS3WireLoggingRestIT.java
new file mode 100644
index 0000000000000..4871f26fa20cc
--- /dev/null
+++ b/modules/repository-s3/src/javaRestTest/java/org/elasticsearch/repositories/s3/RepositoryS3WireLoggingRestIT.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch.repositories.s3;
+
+import fixture.aws.DynamicRegionSupplier;
+import fixture.s3.S3ConsistencyModel;
+import fixture.s3.S3HttpFixture;
+
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
+
+import org.elasticsearch.common.bytes.BytesArray;
+import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.test.cluster.ElasticsearchCluster;
+import org.elasticsearch.test.cluster.LogType;
+import org.elasticsearch.test.fixtures.testcontainers.TestContainersThreadFilter;
+import org.elasticsearch.xcontent.XContentType;
+import org.junit.ClassRule;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TestRule;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.HashSet;
+import java.util.List;
+import java.util.function.Supplier;
+
+import static fixture.aws.AwsCredentialsUtils.fixedAccessKey;
+import static org.hamcrest.Matchers.hasSize;
+
+@ThreadLeakFilters(filters = { TestContainersThreadFilter.class })
+@ThreadLeakScope(ThreadLeakScope.Scope.NONE) // https://github.com/elastic/elasticsearch/issues/102482
+public class RepositoryS3WireLoggingRestIT extends AbstractRepositoryS3RestTestCase {
+
+ private static final String PREFIX = getIdentifierPrefix("RepositoryS3WireLoggingRestIT");
+ private static final String BUCKET = PREFIX + "bucket";
+ private static final String BASE_PATH = PREFIX + "base_path";
+ private static final String ACCESS_KEY = PREFIX + "access-key";
+ private static final String SECRET_KEY = PREFIX + "secret-key";
+ private static final String CLIENT = "wire_logging_client";
+
+ private static final Supplier regionSupplier = new DynamicRegionSupplier();
+ private static final S3HttpFixture s3Fixture = new S3HttpFixture(
+ true,
+ BUCKET,
+ BASE_PATH,
+ S3ConsistencyModel::randomConsistencyModel,
+ fixedAccessKey(ACCESS_KEY, regionSupplier, "s3")
+ );
+
+ public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
+ .module("repository-s3")
+ .systemProperty("aws.region", regionSupplier)
+ .systemProperty("es.insecure_network_trace_enabled", "true")
+ .setting("logger.org.apache.http.headers", "DEBUG")
+ .setting("logger.org.apache.http.wire", "DEBUG")
+ .setting("logger.software.amazon.awssdk.request", "DEBUG")
+ .keystore("s3.client." + CLIENT + ".access_key", ACCESS_KEY)
+ .keystore("s3.client." + CLIENT + ".secret_key", SECRET_KEY)
+ .setting("s3.client." + CLIENT + ".endpoint", s3Fixture::getAddress)
+ .build();
+
+ @ClassRule
+ public static TestRule ruleChain = RuleChain.outerRule(s3Fixture).around(cluster);
+
+ @Override
+ protected String getTestRestCluster() {
+ return cluster.getHttpAddresses();
+ }
+
+ @Override
+ protected String getBucketName() {
+ return BUCKET;
+ }
+
+ @Override
+ protected String getBasePath() {
+ return BASE_PATH;
+ }
+
+ @Override
+ protected String getClientName() {
+ return CLIENT;
+ }
+
+ @Override
+ public void testSnapshotAndRestore() throws Exception {
+ super.testSnapshotAndRestore();
+ try (
+ var logReader = new BufferedReader(
+ new InputStreamReader(cluster.getNodeLog(0, LogType.SERVER_JSON), StandardCharsets.ISO_8859_1)
+ )
+ ) {
+ final var neededLoggers = new HashSet<>(
+ List.of("org.apache.http.wire", "org.apache.http.headers", "software.amazon.awssdk.request")
+ );
+ String currentLine;
+
+ while ((currentLine = logReader.readLine()) != null && neededLoggers.isEmpty() == false) {
+ if (XContentHelper.convertToMap(new BytesArray(currentLine), false, XContentType.JSON)
+ .v2()
+ .get("log.logger") instanceof String loggerName) {
+ neededLoggers.remove(loggerName);
+ }
+ }
+ assertThat(neededLoggers, hasSize(0));
+ }
+ }
+}
diff --git a/server/src/main/java/org/elasticsearch/common/logging/Loggers.java b/server/src/main/java/org/elasticsearch/common/logging/Loggers.java
index decb1d4fdfd6c..a7e9be8f1b627 100644
--- a/server/src/main/java/org/elasticsearch/common/logging/Loggers.java
+++ b/server/src/main/java/org/elasticsearch/common/logging/Loggers.java
@@ -46,7 +46,7 @@ public class Loggers {
*/
static final List RESTRICTED_LOGGERS = NetworkTraceFlag.TRACE_ENABLED
? Collections.emptyList()
- : List.of("org.apache.http", "com.amazonaws.request");
+ : List.of("org.apache.http", "com.amazonaws.request", "software.amazon.awssdk");
public static final Setting LOG_DEFAULT_LEVEL_SETTING = new Setting<>(
"logger.level",
diff --git a/x-pack/plugin/core/build.gradle b/x-pack/plugin/core/build.gradle
index 2766f5dac4bcb..c56447bed3846 100644
--- a/x-pack/plugin/core/build.gradle
+++ b/x-pack/plugin/core/build.gradle
@@ -65,7 +65,7 @@ dependencies {
// And having a module dependency counts as using the jar, so we can't make it `runtimeOnly` :(
implementation "org.slf4j:slf4j-api:${versions.slf4j}"
- runtimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
+ runtimeOnly "org.apache.logging.log4j:log4j-slf4j2-impl:${versions.log4j}"
api "commons-logging:commons-logging:${versions.commonslogging}"
api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
@@ -161,8 +161,6 @@ tasks.named("thirdPartyAudit").configure {
'javax.jms.Message',
// HttpClient5 can use Conscrypt (TLS using BoringSSL), but we don't want that
'org.conscrypt.Conscrypt',
- // SLF4j via HttpClient5
- 'org.slf4j.ext.EventData'
)
}
diff --git a/x-pack/plugin/ent-search/build.gradle b/x-pack/plugin/ent-search/build.gradle
index b9802566b6c2f..3252c37740da5 100644
--- a/x-pack/plugin/ent-search/build.gradle
+++ b/x-pack/plugin/ent-search/build.gradle
@@ -25,8 +25,6 @@ dependencies {
implementation "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
implementation "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
implementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
- implementation "org.slf4j:slf4j-api:${versions.slf4j}"
- implementation "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
implementation "com.networknt:json-schema-validator:${versions.networknt_json_schema_validator}"
testImplementation(testArtifact(project(xpackModule('core'))))
@@ -63,13 +61,6 @@ tasks.named("dependencyLicenses") {
mapping from: /jackson.*/, to: 'jackson'
}
-tasks.named("thirdPartyAudit") {
- ignoreMissingClasses(
- // [missing classes] SLF4j includes an optional class that depends on an extension class (!)
- 'org.slf4j.ext.EventData'
- )
-}
-
tasks.named("yamlRestTest") {
usesDefaultDistribution("uses the xpack/usage api")
}
diff --git a/x-pack/plugin/ent-search/src/main/java/module-info.java b/x-pack/plugin/ent-search/src/main/java/module-info.java
index 2acf0654dcdc3..924ebc985838f 100644
--- a/x-pack/plugin/ent-search/src/main/java/module-info.java
+++ b/x-pack/plugin/ent-search/src/main/java/module-info.java
@@ -11,7 +11,6 @@
requires com.fasterxml.jackson.databind;
requires json.schema.validator;
requires org.apache.lucene.core;
- requires org.slf4j;
requires org.elasticsearch.base;
requires org.elasticsearch.logging;
diff --git a/x-pack/plugin/identity-provider/build.gradle b/x-pack/plugin/identity-provider/build.gradle
index 0b568a8538f2f..024efd69259b1 100644
--- a/x-pack/plugin/identity-provider/build.gradle
+++ b/x-pack/plugin/identity-provider/build.gradle
@@ -47,8 +47,8 @@ dependencies {
exclude group: 'org.bouncycastle'
}
- implementation "org.slf4j:slf4j-api:${versions.slf4j}"
- runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}")
+ // provided by x-pack-core
+ compileOnly "org.slf4j:slf4j-api:${versions.slf4j}"
api "org.apache.httpcomponents:httpclient:${versions.httpclient}"
api "org.apache.httpcomponents:httpcore:${versions.httpcore}"
api "org.apache.httpcomponents:httpasyncclient:${versions.httpasyncclient}"
@@ -251,8 +251,6 @@ tasks.named("thirdPartyAudit").configure {
'org.bouncycastle.operator.jcajce.JcaContentSignerBuilder',
'org.bouncycastle.util.Arrays',
'org.bouncycastle.util.io.Streams',
- // SLF4j
- 'org.slf4j.ext.EventData'
)
ignoreViolations(
diff --git a/x-pack/plugin/security/build.gradle b/x-pack/plugin/security/build.gradle
index 8db6d4c8b1800..2cf8d43d30cdf 100644
--- a/x-pack/plugin/security/build.gradle
+++ b/x-pack/plugin/security/build.gradle
@@ -70,8 +70,8 @@ dependencies {
exclude group: 'org.bouncycastle'
}
- implementation "org.slf4j:slf4j-api:${versions.slf4j}"
- runtimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
+ // provided by x-pack-core
+ compileOnly "org.slf4j:slf4j-api:${versions.slf4j}"
api "org.apache.httpcomponents:httpclient:${versions.httpclient}"
api "org.apache.httpcomponents:httpcore:${versions.httpcore}"
@@ -431,8 +431,6 @@ tasks.named("thirdPartyAudit").configure {
'javax.activation.DataSource',
'javax.activation.FileDataSource',
'javax.activation.FileTypeMap',
- // SLF4j
- 'org.slf4j.ext.EventData'
)
}