You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2014/07/27 19:33:53 UTC

svn commit: r1613820 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/rampart-trust/pom.xml modules/rampart-trust/src/test/resources/log4j.properties pom.xml

Author: veithen
Date: Sun Jul 27 17:33:53 2014
New Revision: 1613820

URL: http://svn.apache.org/r1613820
Log:
Merged r1240373 to the 1.6 branch.

Added:
    axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/test/resources/log4j.properties
      - copied unchanged from r1240373, axis/axis2/java/rampart/trunk/modules/rampart-trust/src/test/resources/log4j.properties
Modified:
    axis/axis2/java/rampart/branches/1_6/   (props changed)
    axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml
    axis/axis2/java/rampart/branches/1_6/pom.xml

Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
  Merged /axis/axis2/java/rampart/trunk:r1240373

Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml?rev=1613820&r1=1613819&r2=1613820&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml Sun Jul 27 17:33:53 2014
@@ -82,5 +82,15 @@
             <artifactId>rampart-policy</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

Modified: axis/axis2/java/rampart/branches/1_6/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/pom.xml?rev=1613820&r1=1613819&r2=1613820&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/pom.xml Sun Jul 27 17:33:53 2014
@@ -330,12 +330,12 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-log4j12</artifactId>
-                <version>1.5.5</version>
+                <version>1.6.1</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-jcl</artifactId>
-                <version>1.5.5</version>
+                <version>1.6.1</version>
             </dependency>
             <dependency>
                 <groupId>log4j</groupId>