[JENKINS-4433] Add log4j to dependency management section, exclude it…

… for acegi-security dependency.
jenkinsci · Jun 16, 2015 · 8886b04 · 8886b04
1 parent b6cdc39
commit 8886b04
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 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,10 +471,9 @@ THE SOFTWARE.
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
-    <dependency>
+    <dependency><!-- [JENKINS-4433] -->
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.17</version>
     </dependency>
     <dependency>
       <groupId>com.sun.xml.txw2</groupId>

diff --git a/pom.xml b/pom.xml
@@ -217,6 +217,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>