From a4f7cc8758e9eb2d564acdcf2f671b358aac972c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 15 Apr 2014 09:17:15 -0400
Subject: [PATCH] Update to SLF4J 1.7.5
---
.classpath | 4 ++--
releases.moxie | 1 +
build.moxie | 4 ++--
gitblit.iml | 16 ++++++----------
4 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/.classpath b/.classpath
index a66d934..f61ebd2 100644
--- a/.classpath
+++ b/.classpath
@@ -11,8 +11,8 @@
<classpathentry kind="lib" path="ext/javawriter-2.1.1.jar" sourcepath="ext/src/javawriter-2.1.1.jar" />
<classpathentry kind="lib" path="ext/annotations-12.0.jar" sourcepath="ext/src/annotations-12.0.jar" />
<classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar" />
- <classpathentry kind="lib" path="ext/slf4j-api-1.6.6.jar" sourcepath="ext/src/slf4j-api-1.6.6.jar" />
- <classpathentry kind="lib" path="ext/slf4j-log4j12-1.6.6.jar" sourcepath="ext/src/slf4j-log4j12-1.6.6.jar" />
+ <classpathentry kind="lib" path="ext/slf4j-api-1.7.5.jar" />
+ <classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.5.jar" />
<classpathentry kind="lib" path="ext/mail-1.4.3.jar" sourcepath="ext/src/mail-1.4.3.jar" />
<classpathentry kind="lib" path="ext/javax.servlet-api-3.1.0.jar" sourcepath="ext/src/javax.servlet-api-3.1.0.jar" />
<classpathentry kind="lib" path="ext/jetty-all-9.1.4.v20140401.jar" sourcepath="ext/src/jetty-all-9.1.4.v20140401.jar" />
diff --git a/build.moxie b/build.moxie
index 37592ba..7b5aa21 100644
--- a/build.moxie
+++ b/build.moxie
@@ -131,8 +131,8 @@
# Standard dependencies
- compile 'com.intellij:annotations:12.0' :war
- compile 'log4j:log4j:1.2.17' :war :fedclient :authority
-- compile 'org.slf4j:slf4j-api:1.6.6' :war :fedclient :authority
-- compile 'org.slf4j:slf4j-log4j12:1.6.6' :war :fedclient :authority
+- compile 'org.slf4j:slf4j-api:1.7.5' :war :fedclient :authority
+- compile 'org.slf4j:slf4j-log4j12:1.7.5' :war :fedclient :authority
- compile 'javax.mail:mail:1.4.3' :war :authority
- compile 'javax.servlet:javax.servlet-api:3.1.0' :fedclient
- compile 'org.eclipse.jetty.aggregate:jetty-all:${jetty.version}' @jar
diff --git a/gitblit.iml b/gitblit.iml
index 4712798..48a1c22 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -80,25 +80,21 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="slf4j-api-1.6.6.jar">
+ <library name="slf4j-api-1.7.5.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/slf4j-api-1.6.6.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/slf4j-api-1.7.5.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/slf4j-api-1.6.6.jar!/" />
- </SOURCES>
+ <SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="slf4j-log4j12-1.6.6.jar">
+ <library name="slf4j-log4j12-1.7.5.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/slf4j-log4j12-1.6.6.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/slf4j-log4j12-1.7.5.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/slf4j-log4j12-1.6.6.jar!/" />
- </SOURCES>
+ <SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
diff --git a/releases.moxie b/releases.moxie
index ac3346c..4749cce 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -50,6 +50,7 @@
- JGit 3.3.1
- Mina SSHD 0.10.1
- pf4j 0.8.0
+ - SLF4J 1.7.5
contributors:
- James Moger
- David Ostrovsky
--
Gitblit v1.9.1