Browse Source

Upgrade Apache Commons Logging to 1.2 (#85745)

* Upgrade to Apache Commons Logging 1.2 (#40305)
* Clarify that Apache HTTP/commons-* dependencies are not just for tests
Yoann Rodière 3 years ago
parent
commit
841ac8e43a

+ 7 - 5
build-tools-internal/version.properties

@@ -30,15 +30,17 @@ bouncycastle=1.64
 # used by security and idp (need to be in sync due to cross-dependency in testing)
 opensaml = 4.0.1
 
-# test dependencies
-randomizedrunner  = 2.8.0
-junit             = 4.12
-junit5            = 5.7.1
+# client dependencies
 httpclient        = 4.5.13
 httpcore          = 4.4.13
 httpasyncclient   = 4.1.5
-commonslogging    = 1.1.3
+commonslogging    = 1.2
 commonscodec      = 1.14
+
+# test dependencies
+randomizedrunner  = 2.8.0
+junit             = 4.12
+junit5            = 5.7.1
 hamcrest          = 2.1
 mocksocket        = 1.2
 

+ 0 - 1
client/rest/build.gradle

@@ -86,7 +86,6 @@ tasks.named("thirdPartyAudit").configure {
           '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',

+ 0 - 1
client/sniffer/build.gradle

@@ -78,7 +78,6 @@ tasks.named("thirdPartyAudit").configure {
           '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',

+ 6 - 0
docs/changelog/85745.yaml

@@ -0,0 +1,6 @@
+pr: 85745
+summary: Upgrade Apache Commons Logging to 1.2
+area: Client
+type: upgrade
+issues:
+  - 40305

+ 0 - 5
gradle/verification-metadata.xml

@@ -1034,11 +1034,6 @@
             <sha256 value="50f11b09f877c294d56f24463f47d28f929cf5044f648661c0f0cfbae9a2f49c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="commons-logging" name="commons-logging" version="1.1.3">
-         <artifact name="commons-logging-1.1.3.jar">
-            <sha256 value="70903f6fc82e9908c8da9f20443f61d90f0870a312642991fe8462a0b9391784" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="commons-logging" name="commons-logging" version="1.2">
          <artifact name="commons-logging-1.2.jar">
             <sha256 value="daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636" origin="Generated by Gradle"/>

+ 1 - 1
plugins/repository-hdfs/build.gradle

@@ -48,7 +48,7 @@ dependencies {
     runtimeOnly "org.apache.hadoop:hadoop-client-runtime:${versions.hadoop}"
     implementation "org.apache.hadoop:hadoop-hdfs:${versions.hadoop}"
     api 'com.google.protobuf:protobuf-java:3.4.0'
-    api 'commons-logging:commons-logging:1.1.3'
+    api "commons-logging:commons-logging:${versions.commonslogging}"
     api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
     api 'commons-cli:commons-cli:1.2'
     api "commons-codec:commons-codec:${versions.commonscodec}"

+ 0 - 1
test/framework/build.gradle

@@ -55,7 +55,6 @@ tasks.named("thirdPartyAudit").configure {
           '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',