From ecc298bc65dbe75793e8956d89ac3d1a25dddd91 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 30 Sep 2014 10:58:43 -0400
Subject: [PATCH] Merge branch 'ticket/200' into develop
---
.classpath | 2 +-
build.moxie | 2 +-
gitblit.iml | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.classpath b/.classpath
index 21432ba..4a62e82 100644
--- a/.classpath
+++ b/.classpath
@@ -16,7 +16,7 @@
<classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.7.jar" sourcepath="ext/src/slf4j-log4j12-1.7.7.jar" />
<classpathentry kind="lib" path="ext/javax.mail-1.5.1.jar" sourcepath="ext/src/javax.mail-1.5.1.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.2.2.v20140723.jar" sourcepath="ext/src/jetty-all-9.2.2.v20140723.jar" />
+ <classpathentry kind="lib" path="ext/jetty-all-9.2.3.v20140905.jar" sourcepath="ext/src/jetty-all-9.2.3.v20140905.jar" />
<classpathentry kind="lib" path="ext/wicket-1.4.21.jar" sourcepath="ext/src/wicket-1.4.21.jar" />
<classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.21.jar" sourcepath="ext/src/wicket-auth-roles-1.4.21.jar" />
<classpathentry kind="lib" path="ext/wicket-extensions-1.4.21.jar" sourcepath="ext/src/wicket-extensions-1.4.21.jar" />
diff --git a/build.moxie b/build.moxie
index 965ecde..d028200 100644
--- a/build.moxie
+++ b/build.moxie
@@ -102,7 +102,7 @@
# Convenience properties for dependencies
properties: {
- jetty.version : 9.2.2.v20140723
+ jetty.version : 9.2.3.v20140905
wicket.version : 1.4.21
lucene.version : 4.10.0
jgit.version : 3.5.0.201409260305-r
diff --git a/gitblit.iml b/gitblit.iml
index cfe8b54..759bf03 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -135,13 +135,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="jetty-all-9.2.2.v20140723.jar">
+ <library name="jetty-all-9.2.3.v20140905.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/jetty-all-9.2.2.v20140723.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/jetty-all-9.2.3.v20140905.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/jetty-all-9.2.2.v20140723.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/jetty-all-9.2.3.v20140905.jar!/" />
</SOURCES>
</library>
</orderEntry>
--
Gitblit v1.9.1