update slf4j to 1.7.12

wocommunity · Aug 5, 2015 · 5f6110b · 5f6110b
1 parent 2711540
commit 5f6110b
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 6 deletions.
diff --git a/Build/build/build.xml b/Build/build/build.xml
@@ -34,8 +34,8 @@
     <property name="framework.erjars.junit" value="junit-4.10.jar" />
     <property name="framework.erjars.log4j" value="log4j-1.2.17.jar" />
     <property name="framework.erjars.ognl" value="ognl-2.6.7.jar" />
-    <property name="framework.erjars.slf4j.api" value="slf4j-api-1.7.10.jar" />
-    <property name="framework.erjars.slf4j.log4j12" value="slf4j-log4j12-1.7.10.jar" />
+    <property name="framework.erjars.slf4j.api" value="slf4j-api-1.7.12.jar" />
+    <property name="framework.erjars.slf4j.log4j12" value="slf4j-log4j12-1.7.12.jar" />
 
     <target name="ERJars.all">
         <fail message="Please check versions of jar files included in ERJars project. See properties in Build/build//build.xml.">

diff --git a/Frameworks/Core/ERJars/.classpath b/Frameworks/Core/ERJars/.classpath
@@ -58,7 +58,15 @@
 			<attribute name="javadoc_location" value="jar:platform:/resource/ERJars/LibraryJavadocs/httpmime-4.3.6-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="Libraries/slf4j-api-1.7.10.jar" sourcepath="LibrarySources/slf4j-api-1.7.10-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="Libraries/slf4j-log4j12-1.7.10.jar" sourcepath="LibrarySources/slf4j-log4j12-1.7.10-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="Libraries/slf4j-log4j12-1.7.12.jar" sourcepath="LibrarySources/slf4j-log4j12-1.7.12-sources.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="jar:platform:/resource/ERJars/LibraryJavadocs/slf4j-log4j12-1.7.12-javadoc.jar!/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="Libraries/slf4j-api-1.7.12.jar" sourcepath="LibrarySources/slf4j-api-1.7.12-sources.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="jar:platform:/resource/ERJars/LibraryJavadocs/slf4j-api-1.7.12-javadoc.jar!/"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Frameworks/Core/ERJars/Libraries/slf4j-api-1.7.10.jar b/Frameworks/Core/ERJars/Libraries/slf4j-api-1.7.10.jar
diff --git a/Frameworks/Core/ERJars/Libraries/slf4j-api-1.7.12.jar b/Frameworks/Core/ERJars/Libraries/slf4j-api-1.7.12.jar
diff --git a/Frameworks/Core/ERJars/Libraries/slf4j-log4j12-1.7.10.jar b/Frameworks/Core/ERJars/Libraries/slf4j-log4j12-1.7.10.jar
diff --git a/Frameworks/Core/ERJars/Libraries/slf4j-log4j12-1.7.12.jar b/Frameworks/Core/ERJars/Libraries/slf4j-log4j12-1.7.12.jar
diff --git a/Frameworks/Core/ERJars/LibraryJavadocs/slf4j-api-1.7.12-javadoc.jar b/Frameworks/Core/ERJars/LibraryJavadocs/slf4j-api-1.7.12-javadoc.jar
diff --git a/Frameworks/Core/ERJars/LibraryJavadocs/slf4j-log4j12-1.7.12-javadoc.jar b/Frameworks/Core/ERJars/LibraryJavadocs/slf4j-log4j12-1.7.12-javadoc.jar
diff --git a/Frameworks/Core/ERJars/LibrarySources/slf4j-api-1.7.10-sources.jar b/Frameworks/Core/ERJars/LibrarySources/slf4j-api-1.7.10-sources.jar
diff --git a/Frameworks/Core/ERJars/LibrarySources/slf4j-api-1.7.12-sources.jar b/Frameworks/Core/ERJars/LibrarySources/slf4j-api-1.7.12-sources.jar
diff --git a/Frameworks/Core/ERJars/LibrarySources/slf4j-log4j12-1.7.10-sources.jar b/Frameworks/Core/ERJars/LibrarySources/slf4j-log4j12-1.7.10-sources.jar
diff --git a/Frameworks/Core/ERJars/LibrarySources/slf4j-log4j12-1.7.12-sources.jar b/Frameworks/Core/ERJars/LibrarySources/slf4j-log4j12-1.7.12-sources.jar
diff --git a/pom.xml b/pom.xml
@@ -386,12 +386,12 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.7.10</version>
+                <version>1.7.12</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-log4j12</artifactId>
-                <version>1.7.10</version>
+                <version>1.7.12</version>
             </dependency>
             <dependency>
                 <groupId>ognl</groupId>