This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5_x
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 51acc3c001fc3c8f07efce978fc623b6e9fb8267
Author: Andreas Veithen <veit...@apache.org>
AuthorDate: Thu Dec 22 11:18:42 2011 +0000
Merged r1221937 to the 1.5 branch to make OpenSAML work in the samples.
---
legal/{slf4j-jdk14-LICENSE.txt => slf4j-jcl-LICENSE.txt} | 0
modules/distribution/bin.xml | 2 +-
modules/distribution/pom.xml | 4 ++++
pom.xml | 5 +++++
4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/legal/slf4j-jdk14-LICENSE.txt b/legal/slf4j-jcl-LICENSE.txt
similarity index 100%
rename from legal/slf4j-jdk14-LICENSE.txt
rename to legal/slf4j-jcl-LICENSE.txt
diff --git a/modules/distribution/bin.xml b/modules/distribution/bin.xml
index bc32fdf..729b121 100644
--- a/modules/distribution/bin.xml
+++ b/modules/distribution/bin.xml
@@ -27,7 +27,7 @@
<include>org.opensaml:xmltooling:jar</include>
<include>joda-time:joda-time:jar</include>
<include>org.slf4j:slf4j-api:jar</include>
- <include>org.slf4j:slf4j-jdk14:jar</include>
+ <include>org.slf4j:slf4j-jcl:jar</include>
<include>velocity:velocity:jar</include>
<include>commons-collections:commons-collections:jar</include>
<include>org.opensaml:openws:jar</include>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 3f5b5bc..fa61489 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -144,6 +144,10 @@
<artifactId>bcprov-jdk15</artifactId>
<version>${bcprov.jdk15.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index f4afdfa..2773bb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -295,6 +295,11 @@
<version>1.5.5</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ <version>1.5.5</version>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.15</version>
