From: Richard Millet <richard.millet@berkeley.edu>
Date: Mon, 3 Jan 2011 23:07:59 +0000 (+0000)
Subject: CSPACE-1841: slf4j-*.jars needed to be updated to 1.5.8.  Also, these jars were being... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=671fd7414c7f85199a7703a9d20f34afd08e082e;p=tmp%2Fjakarta-migration.git

CSPACE-1841: slf4j-*.jars needed to be updated to 1.5.8.  Also, these jars were being included/packaged in our WAR file which was not necessary and potentially dangerous. So needed to change Maven scope to "provided" since we copy these jars over to a JBoss deployment directory.  Be sure to perform an undeploy and deploy from the "commons" module.
---

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 98b3d1eb5..5fcd60d5c 100644
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -23,10 +23,12 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
+			<scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
+			<scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
diff --git a/services/common/lib/slf4j/slf4j-api-1.5.2.jar b/services/common/lib/slf4j/slf4j-api-1.5.2.jar
deleted file mode 100644
index 438286601..000000000
Binary files a/services/common/lib/slf4j/slf4j-api-1.5.2.jar and /dev/null differ
diff --git a/services/common/lib/slf4j/slf4j-api-1.5.8.jar b/services/common/lib/slf4j/slf4j-api-1.5.8.jar
new file mode 100644
index 000000000..20d1d3718
Binary files /dev/null and b/services/common/lib/slf4j/slf4j-api-1.5.8.jar differ
diff --git a/services/common/lib/slf4j/slf4j-log4j12-1.5.2.jar b/services/common/lib/slf4j/slf4j-log4j12-1.5.2.jar
deleted file mode 100644
index 2c040a168..000000000
Binary files a/services/common/lib/slf4j/slf4j-log4j12-1.5.2.jar and /dev/null differ
diff --git a/services/common/lib/slf4j/slf4j-log4j12-1.5.8.jar b/services/common/lib/slf4j/slf4j-log4j12-1.5.8.jar
new file mode 100644
index 000000000..a47eee4c3
Binary files /dev/null and b/services/common/lib/slf4j/slf4j-log4j12-1.5.8.jar differ