From 4e54686d9346dc33a1cffd4a06c5c4ff9945f25e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 05 Oct 2015 08:12:43 -0400
Subject: [PATCH] Merge branch 'topic/pr-934' into develop
---
gitblit.iml | 85 ++++++++++++++++++++++--------------------
1 files changed, 45 insertions(+), 40 deletions(-)
diff --git a/gitblit.iml b/gitblit.iml
index 89ea8e6..62b1e45 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -14,13 +14,13 @@
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
- <library name="guice-4.0-beta5.jar">
+ <library name="guice-4.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/guice-4.0-beta5.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/guice-4.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/guice-4.0-beta5.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/guice-4.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -58,13 +58,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="guice-servlet-4.0-gb1.jar">
+ <library name="guice-servlet-4.0-gb2.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/guice-servlet-4.0-gb1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/guice-servlet-4.0-gb2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/guice-servlet-4.0-gb1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/guice-servlet-4.0-gb2.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -135,13 +135,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="jetty-all-9.2.10.v20150310.jar">
+ <library name="jetty-all-9.2.13.v20150730.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/jetty-all-9.2.10.v20150310.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/jetty-all-9.2.13.v20150730.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/jetty-all-9.2.10.v20150310.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/jetty-all-9.2.13.v20150730.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -179,79 +179,79 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-core-4.10.0.jar">
+ <library name="lucene-core-4.10.4.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-core-4.10.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-core-4.10.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-core-4.10.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-core-4.10.4.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-analyzers-common-4.10.0.jar">
+ <library name="lucene-analyzers-common-4.10.4.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-analyzers-common-4.10.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-analyzers-common-4.10.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-analyzers-common-4.10.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-analyzers-common-4.10.4.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-highlighter-4.10.0.jar">
+ <library name="lucene-highlighter-4.10.4.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-highlighter-4.10.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-highlighter-4.10.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-4.10.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-4.10.4.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-memory-4.10.0.jar">
+ <library name="lucene-memory-4.10.4.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-memory-4.10.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-memory-4.10.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-memory-4.10.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-memory-4.10.4.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-queries-4.10.0.jar">
+ <library name="lucene-queries-4.10.4.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-queries-4.10.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-queries-4.10.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-queries-4.10.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-queries-4.10.4.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-queryparser-4.10.0.jar">
+ <library name="lucene-queryparser-4.10.4.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-queryparser-4.10.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-queryparser-4.10.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-queryparser-4.10.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-queryparser-4.10.4.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-sandbox-4.10.0.jar">
+ <library name="lucene-sandbox-4.10.4.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-sandbox-4.10.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-sandbox-4.10.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-sandbox-4.10.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-sandbox-4.10.4.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -408,14 +408,12 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="org.eclipse.jgit-4.0.2.201509141540-r.jar">
+ <library name="org.eclipse.jgit-4.1.0.201509280440-r.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-4.0.2.201509141540-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-4.1.0.201509280440-r.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-4.0.2.201509141540-r.jar!/" />
- </SOURCES>
+ <SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
@@ -485,14 +483,21 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="org.eclipse.jgit.http.server-4.0.2.201509141540-r.jar">
+ <library name="org.eclipse.jdt.annotation-1.1.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-4.0.2.201509141540-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/org.eclipse.jdt.annotation-1.1.0.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-4.0.2.201509141540-r.jar!/" />
- </SOURCES>
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="org.eclipse.jgit.http.server-4.1.0.201509280440-r.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-4.1.0.201509280440-r.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
--
Gitblit v1.9.1