Merge pull request #1734 from eidottermihi/master

[FIXED JENKINS-4433] Explicitly set log4j version to 1.2.17.
jenkinsci · Jun 29, 2015 · bc744f9 · bc744f9
2 parents 5d00292 + 8886b04
commit bc744f9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -396,6 +396,10 @@ THE SOFTWARE.
           <groupId>org.springframework</groupId>
           <artifactId>spring-support</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -467,6 +471,10 @@ THE SOFTWARE.
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
+    <dependency><!-- [JENKINS-4433] -->
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.sun.xml.txw2</groupId>
       <artifactId>txw2</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -218,6 +218,11 @@ THE SOFTWARE.
         <artifactId>commons-logging</artifactId>
         <version>1.1.3</version>
       </dependency>
+      <dependency><!-- [JENKINS-4433] -->
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.17</version>
+      </dependency>
       <dependency>
         <groupId>org.samba.jcifs</groupId>
         <artifactId>jcifs</artifactId>