From 426f5c1729554d318989041457554f2abfa79d3e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 04 Sep 2014 20:04:36 -0400
Subject: [PATCH] Merged #158 "Update Jetty version to 9.2.2"
---
.classpath | 4 ++--
build.moxie | 2 +-
gitblit.iml | 10 ++++++----
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/.classpath b/.classpath
index 9364ea0..3e6b8a9 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.1.v20140609.jar" sourcepath="ext/src/jetty-all-9.2.1.v20140609.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/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" />
@@ -52,7 +52,7 @@
<classpathentry kind="lib" path="ext/bcprov-jdk15on-1.49.jar" sourcepath="ext/src/bcprov-jdk15on-1.49.jar" />
<classpathentry kind="lib" path="ext/bcmail-jdk15on-1.49.jar" sourcepath="ext/src/bcmail-jdk15on-1.49.jar" />
<classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.49.jar" sourcepath="ext/src/bcpkix-jdk15on-1.49.jar" />
- <classpathentry kind="lib" path="ext/sshd-core-0.12.0.jar" />
+ <classpathentry kind="lib" path="ext/sshd-core-0.12.0.jar" sourcepath="ext/src/sshd-core-0.12.0.jar" />
<classpathentry kind="lib" path="ext/mina-core-2.0.7.jar" sourcepath="ext/src/mina-core-2.0.7.jar" />
<classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9.jar" />
<classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0.jar" />
diff --git a/build.moxie b/build.moxie
index ae22066..b265115 100644
--- a/build.moxie
+++ b/build.moxie
@@ -102,7 +102,7 @@
# Convenience properties for dependencies
properties: {
- jetty.version : 9.2.1.v20140609
+ jetty.version : 9.2.2.v20140723
wicket.version : 1.4.21
lucene.version : 4.10.0
jgit.version : 3.4.1.201406201815-r
diff --git a/gitblit.iml b/gitblit.iml
index e432f02..d36f321 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -135,13 +135,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="jetty-all-9.2.1.v20140609.jar">
+ <library name="jetty-all-9.2.2.v20140723.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/jetty-all-9.2.1.v20140609.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/jetty-all-9.2.2.v20140723.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/jetty-all-9.2.1.v20140609.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/jetty-all-9.2.2.v20140723.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -534,7 +534,9 @@
<root url="jar://$MODULE_DIR$/ext/sshd-core-0.12.0.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/sshd-core-0.12.0.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
--
Gitblit v1.9.1