From 884fd0d19330ecd8fa292d0bbfae3808bc34b97e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 05 Sep 2014 12:12:39 -0400
Subject: [PATCH] Merge branch 'ticket/163' into develop
---
gitblit.iml | 84 +++++++++++++++++++++---------------------
1 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/gitblit.iml b/gitblit.iml
index cd6e14a..4061daf 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -14,13 +14,13 @@
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
- <library name="dagger-1.2.1.jar">
+ <library name="guice-4.0-beta4.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/dagger-1.2.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/guice-4.0-beta4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/dagger-1.2.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/guice-4.0-beta4.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -36,35 +36,35 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="dagger-compiler-1.2.1.jar">
+ <library name="aopalliance-1.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/dagger-compiler-1.2.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/aopalliance-1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/dagger-compiler-1.2.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/aopalliance-1.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="javawriter-2.3.0.jar">
+ <library name="guava-17.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/javawriter-2.3.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/guava-17.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/javawriter-2.3.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/guava-17.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="guava-15.0.jar">
+ <library name="guice-servlet-4.0-gb1.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/guava-15.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/guice-servlet-4.0-gb1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/guava-15.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/guice-servlet-4.0-gb1.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -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>
@@ -179,79 +179,79 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-core-4.8.1.jar">
+ <library name="lucene-core-4.10.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-core-4.8.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-core-4.10.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-core-4.8.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-core-4.10.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-analyzers-common-4.8.1.jar">
+ <library name="lucene-analyzers-common-4.10.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-analyzers-common-4.8.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-analyzers-common-4.10.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-analyzers-common-4.8.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-analyzers-common-4.10.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-highlighter-4.8.1.jar">
+ <library name="lucene-highlighter-4.10.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-highlighter-4.8.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-highlighter-4.10.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-4.8.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-4.10.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-memory-4.8.1.jar">
+ <library name="lucene-memory-4.10.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-memory-4.8.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-memory-4.10.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-memory-4.8.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-memory-4.10.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-queries-4.8.1.jar">
+ <library name="lucene-queries-4.10.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-queries-4.8.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-queries-4.10.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-queries-4.8.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-queries-4.10.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-queryparser-4.8.1.jar">
+ <library name="lucene-queryparser-4.10.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-queryparser-4.8.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-queryparser-4.10.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-queryparser-4.8.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-queryparser-4.10.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-sandbox-4.8.1.jar">
+ <library name="lucene-sandbox-4.10.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-sandbox-4.8.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-sandbox-4.10.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-sandbox-4.8.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-sandbox-4.10.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -529,13 +529,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="sshd-core-0.11.1-atlassian-1.jar">
+ <library name="sshd-core-0.12.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/sshd-core-0.11.1-atlassian-1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/sshd-core-0.12.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/sshd-core-0.11.1-atlassian-1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/sshd-core-0.12.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -780,13 +780,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="pf4j-0.8.0.jar">
+ <library name="pf4j-0.9.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/pf4j-0.8.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/pf4j-0.9.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/pf4j-0.8.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/pf4j-0.9.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
--
Gitblit v1.9.1