Update SLF4J and add logback.

ted-zzz · Nov 19, 2010 · 4664503 · 4664503
1 parent 8047a1b
commit 4664503
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/ivy.xml b/ivy.xml
@@ -9,10 +9,11 @@
 		<!-- For Encryption -->
 		<dependency org="com.jordanzimmerman" name="srpforjava" rev="1.0"/>
 
-		<!-- From Thrift -->
-		<dependency org="org.slf4j" name="slf4j-api" rev="1.5.8" conf="* -> *,!sources,!javadoc"/>
-		<dependency org="org.slf4j" name="slf4j-simple" rev="1.5.8" conf="* -> *,!sources,!javadoc"/>
-		<dependency org="commons-lang" name="commons-lang" rev="2.4" conf="* -> *,!sources,!javadoc"/>
+		<!-- Logging -->
+		<dependency org="org.slf4j" name="slf4j-api" rev="1.6.1" conf="* -> *,!sources,!javadoc"/>
+		<dependency org="ch.qos.logback" name="logback-classic" rev="0.9.26" conf="* -> *,!sources,!javadoc"/>
+
+		<!-- Thrift -->
 		<dependency org="org.apache" name="thrift" rev="0.5.0"/>
 
 		<!-- For RSS Parsing -->

diff --git a/ted-api/pom.xml b/ted-api/pom.xml
@@ -113,17 +113,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.5.8</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>1.5.8</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.4</version>
+      <version>1.6.1</version>
     </dependency>
   </dependencies>
 

diff --git a/ted-server/.classpath b/ted-server/.classpath
@@ -3,11 +3,8 @@
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="TED_LIB_DIR/commons-lang-2.4.jar"/>
 	<classpathentry kind="var" path="TED_LIB_DIR/junit-4.8.1-sources.jar"/>
 	<classpathentry kind="var" path="TED_LIB_DIR/junit-4.8.1.jar"/>
-	<classpathentry kind="var" path="TED_LIB_DIR/slf4j-api-1.5.8.jar"/>
-	<classpathentry kind="var" path="TED_LIB_DIR/slf4j-simple-1.5.8.jar"/>
 	<classpathentry kind="var" path="TED_LIB_DIR/thrift-0.5.0.jar"/>
 	<classpathentry kind="var" path="TED_LIB_DIR/ted-api-0.1-SNAPSHOT.jar" sourcepath="/TED_LIB_DIR/ted-api-0.1-SNAPSHOT-sources.jar"/>
 	<classpathentry kind="var" path="TED_LIB_DIR/jsap-2.1.jar"/>
@@ -16,5 +13,8 @@
 	<classpathentry kind="var" path="TED_LIB_DIR/rome-1.0.0-javadoc.jar"/>
 	<classpathentry kind="var" path="TED_LIB_DIR/rome-1.0.0-sources.jar"/>
 	<classpathentry kind="var" path="TED_LIB_DIR/jdom-1.0.jar"/>
+	<classpathentry kind="var" path="TED_LIB_DIR/slf4j-api-1.6.1.jar"/>
+	<classpathentry kind="var" path="TED_LIB_DIR/logback-classic-0.9.26.jar"/>
+	<classpathentry kind="var" path="TED_LIB_DIR/logback-core-0.9.26.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>