Update commons-logging to 1.2 (#2806)

* Upgrade to Apache Commons Logging 1.2 Signed-off-by: Yoann Rodière <yoann@hibernate.org> * Clarify that Apache HTTP/commons-* dependencies are not just for tests Signed-off-by: Yoann Rodière <yoann@hibernate.org>
2025-02-16 09:54:55 +00:00 · 2022-04-08 22:43:51 +02:00 · 2022-04-08 22:43:51 +02:00 · b5d5616d44
commit b5d5616d44
parent 2d89bc7c61
24 changed files with 18 additions and 17 deletions
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@ -23,6 +23,13 @@ jna               = 5.5.0
 netty             = 4.1.73.Final
 joda              = 2.10.12

+# client dependencies
+httpclient        = 4.5.13
+httpcore          = 4.4.12
+httpasyncclient   = 4.1.4
+commonslogging    = 1.2
+commonscodec      = 1.13
+
 # when updating this version, you need to ensure compatibility with:
 #  - plugins/ingest-attachment (transitive dependency, check the upstream POM)
 #  - distribution/tools/plugin-cli
@ -30,11 +37,6 @@ bouncycastle=1.70
 # test dependencies
 randomizedrunner  = 2.7.1
 junit             = 4.13.2
-httpclient        = 4.5.13
-httpcore          = 4.4.12
-httpasyncclient   = 4.1.4
-commonslogging    = 1.1.3
-commonscodec      = 1.13
 hamcrest          = 2.1
 mockito           = 4.3.1
 objenesis         = 3.2
--- a/client/rest/build.gradle
+++ b/client/rest/build.gradle
@ -89,7 +89,6 @@ thirdPartyAudit.ignoreMissingClasses(
  'org.apache.avalon.framework.logger.Logger',
  'org.apache.log.Hierarchy',
  'org.apache.log.Logger',
-  'org.apache.log4j.Category',
  'org.apache.log4j.Level',
  'org.apache.log4j.Logger',
  'org.apache.log4j.Priority',
--- a/client/rest/licenses/commons-logging-1.1.3.jar.sha1
+++ b/client/rest/licenses/commons-logging-1.1.3.jar.sha1
@ -1 +0,0 @@
-f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f
--- a/client/rest/licenses/commons-logging-1.2.jar.sha1
+++ b/client/rest/licenses/commons-logging-1.2.jar.sha1
@ -0,0 +1 @@
+4bfc12adfe4842bf07b657f0369c4cb522955686
--- a/client/sniffer/build.gradle
+++ b/client/sniffer/build.gradle
@ -88,7 +88,6 @@ thirdPartyAudit.ignoreMissingClasses(
  'org.apache.avalon.framework.logger.Logger',
  'org.apache.log.Hierarchy',
  'org.apache.log.Logger',
-  'org.apache.log4j.Category',
  'org.apache.log4j.Level',
  'org.apache.log4j.Logger',
  'org.apache.log4j.Priority',
--- a/client/sniffer/licenses/commons-logging-1.1.3.jar.sha1
+++ b/client/sniffer/licenses/commons-logging-1.1.3.jar.sha1
@ -1 +0,0 @@
-f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f
--- a/client/sniffer/licenses/commons-logging-1.2.jar.sha1
+++ b/client/sniffer/licenses/commons-logging-1.2.jar.sha1
@ -0,0 +1 @@
+4bfc12adfe4842bf07b657f0369c4cb522955686
--- a/modules/repository-s3/licenses/commons-logging-1.2.jar.sha1
+++ b/modules/repository-s3/licenses/commons-logging-1.2.jar.sha1
@ -0,0 +1 @@
+4bfc12adfe4842bf07b657f0369c4cb522955686
--- a/plugins/discovery-azure-classic/licenses/commons-logging-1.1.3.jar.sha1
+++ b/plugins/discovery-azure-classic/licenses/commons-logging-1.1.3.jar.sha1
@ -1 +0,0 @@
-f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f
--- a/plugins/discovery-azure-classic/licenses/commons-logging-1.2.jar.sha1
+++ b/plugins/discovery-azure-classic/licenses/commons-logging-1.2.jar.sha1
@ -0,0 +1 @@
+4bfc12adfe4842bf07b657f0369c4cb522955686
--- a/plugins/discovery-ec2/licenses/commons-logging-1.1.3.jar.sha1
+++ b/plugins/discovery-ec2/licenses/commons-logging-1.1.3.jar.sha1
@ -1 +0,0 @@
-f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f
--- a/plugins/discovery-ec2/licenses/commons-logging-1.2.jar.sha1
+++ b/plugins/discovery-ec2/licenses/commons-logging-1.2.jar.sha1
@ -0,0 +1 @@
+4bfc12adfe4842bf07b657f0369c4cb522955686
--- a/plugins/discovery-gce/licenses/commons-logging-1.1.3.jar.sha1
+++ b/plugins/discovery-gce/licenses/commons-logging-1.1.3.jar.sha1
@ -1 +0,0 @@
-f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f
--- a/plugins/discovery-gce/licenses/commons-logging-1.2.jar.sha1
+++ b/plugins/discovery-gce/licenses/commons-logging-1.2.jar.sha1
@ -0,0 +1 @@
+4bfc12adfe4842bf07b657f0369c4cb522955686
--- a/plugins/ingest-attachment/licenses/commons-logging-1.1.3.jar.sha1
+++ b/plugins/ingest-attachment/licenses/commons-logging-1.1.3.jar.sha1
@ -1 +0,0 @@
-f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f
--- a/plugins/ingest-attachment/licenses/commons-logging-1.2.jar.sha1
+++ b/plugins/ingest-attachment/licenses/commons-logging-1.2.jar.sha1
@ -0,0 +1 @@
+4bfc12adfe4842bf07b657f0369c4cb522955686
--- a/plugins/repository-gcs/licenses/commons-logging-1.1.3.jar.sha1
+++ b/plugins/repository-gcs/licenses/commons-logging-1.1.3.jar.sha1
@ -1 +0,0 @@
-f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f
--- a/plugins/repository-gcs/licenses/commons-logging-1.2.jar.sha1
+++ b/plugins/repository-gcs/licenses/commons-logging-1.2.jar.sha1
@ -0,0 +1 @@
+4bfc12adfe4842bf07b657f0369c4cb522955686
--- a/plugins/repository-hdfs/licenses/commons-logging-1.1.3.jar.sha1
+++ b/plugins/repository-hdfs/licenses/commons-logging-1.1.3.jar.sha1
@ -1 +0,0 @@
-f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f
--- a/plugins/repository-hdfs/licenses/commons-logging-1.2.jar.sha1
+++ b/plugins/repository-hdfs/licenses/commons-logging-1.2.jar.sha1
@ -0,0 +1 @@
+4bfc12adfe4842bf07b657f0369c4cb522955686
--- a/plugins/repository-s3/licenses/commons-logging-1.1.3.jar.sha1
+++ b/plugins/repository-s3/licenses/commons-logging-1.1.3.jar.sha1
@ -1 +0,0 @@
-f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f
--- a/plugins/repository-s3/licenses/commons-logging-1.2.jar.sha1
+++ b/plugins/repository-s3/licenses/commons-logging-1.2.jar.sha1
@ -0,0 +1 @@
+4bfc12adfe4842bf07b657f0369c4cb522955686
--- a/test/framework/build.gradle
+++ b/test/framework/build.gradle
@ -71,7 +71,6 @@ thirdPartyAudit.ignoreMissingClasses(
  'org.apache.avalon.framework.logger.Logger',
  'org.apache.log.Hierarchy',
  'org.apache.log.Logger',
-  'org.apache.log4j.Category',
  'org.apache.log4j.Level',
  'org.apache.log4j.Logger',
  'org.apache.log4j.Priority',
--- a/x-pack/plugin/core/licenses/commons-logging-1.2.jar.sha1
+++ b/x-pack/plugin/core/licenses/commons-logging-1.2.jar.sha1
@ -0,0 +1 @@
+4bfc12adfe4842bf07b657f0369c4cb522955686