apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

maven: migrate short-term to reload4j v1.2.18 (#5878)

Browse Source 
* maven: migrate short-term to reload4j v1.2.18

This migrate to log4j 1.x fork, reload4j 1.2.18.0 which is drop-in
replacement and addresses some immediate CVE and issues.

* log4j migration to reload4j in pom xmls

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

* Exclude log4j from transitive dependencies (#73)

Co-authored-by: Marcus Sorensen <shadowsor@gmail.com>
Co-authored-by: Marcus Sorensen <mls@apple.com>
This commit is contained in:
Rohit Yadav 2022-02-08 15:00:38 +05:30 committed by GitHub
parent af58284560
commit da56a2a806
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
framework/managed-context/pom.xml
View File

@ -29,9 +29,9 @@
</parent> </parent>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<version>${cs.log4j.version}</version> <version>${cs.reload4j.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

4
plugins/alert-handlers/snmp-alerts/pom.xml
View File

@ -33,8 +33,8 @@
<artifactId>org.apache.servicemix.bundles.snmp4j</artifactId> <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

4
plugins/alert-handlers/syslog-alerts/pom.xml
View File

@ -29,8 +29,8 @@
</parent> </parent>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

4
plugins/hypervisors/ovm3/pom.xml
View File

@ -44,8 +44,8 @@
<version>${cs.commons-lang3.version}</version> <version>${cs.commons-lang3.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

6
plugins/integrations/kubernetes-service/pom.xml
View File

@ -86,9 +86,9 @@
<version>${cs.guava.version}</version> <version>${cs.guava.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<version>${cs.log4j.version}</version> <version>${cs.reload4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>

6
plugins/network-elements/juniper-contrail/pom.xml
View File

@ -112,6 +112,12 @@
<groupId>net.juniper.contrail</groupId> <groupId>net.juniper.contrail</groupId>
<artifactId>juniper-contrail-api</artifactId> <artifactId>juniper-contrail-api</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>

4
plugins/user-authenticators/ldap/pom.xml
View File

@ -175,6 +175,10 @@
<version>${ads.version}</version> <version>${ads.version}</version>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>
<exclusion>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
</exclusion>
<!-- <!--
shared-ldap-schema module needs to be excluded to avoid multiple schema resources on the classpath shared-ldap-schema module needs to be excluded to avoid multiple schema resources on the classpath
--> -->

14
pom.xml
View File

@ -76,7 +76,7 @@
<cs.clover-maven-plugin.version>4.4.1</cs.clover-maven-plugin.version> <cs.clover-maven-plugin.version>4.4.1</cs.clover-maven-plugin.version>
<!-- Logging versions --> <!-- Logging versions -->
<cs.log4j.version>1.2.17</cs.log4j.version> <cs.reload4j.version>1.2.18.4</cs.reload4j.version>
<cs.log4j.extras.version>1.2.17</cs.log4j.extras.version> <cs.log4j.extras.version>1.2.17</cs.log4j.extras.version>
<cs.logging.version>1.1.1</cs.logging.version> <cs.logging.version>1.1.1</cs.logging.version>
@ -439,9 +439,9 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<version>${cs.log4j.version}</version> <version>${cs.reload4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
@ -618,6 +618,12 @@
<groupId>org.owasp.esapi</groupId> <groupId>org.owasp.esapi</groupId>
<artifactId>esapi</artifactId> <artifactId>esapi</artifactId>
<version>2.1.0.1</version> <version>2.1.0.1</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- Test dependency in mysql for db tests --> <!-- Test dependency in mysql for db tests -->
<dependency> <dependency>

4
services/console-proxy/server/pom.xml
View File

@ -29,8 +29,8 @@
</parent> </parent>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>

4
services/secondary-storage/server/pom.xml
View File

@ -29,8 +29,8 @@
</parent> </parent>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>

4
test/pom.xml
View File

@ -33,8 +33,8 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jenkins-ci</groupId> <groupId>org.jenkins-ci</groupId>

8
utils/pom.xml
View File

@ -47,8 +47,8 @@
<artifactId>aspectjweaver</artifactId> <artifactId>aspectjweaver</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cglib</groupId> <groupId>cglib</groupId>
@ -143,6 +143,10 @@
<groupId>org.owasp.esapi</groupId> <groupId>org.owasp.esapi</groupId>
<artifactId>esapi</artifactId> <artifactId>esapi</artifactId>
<exclusions> <exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion> <exclusion>
<groupId>xml-apis</groupId> <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId> <artifactId>xml-apis</artifactId>