From aa8708a66f854f206f0bddd174887728a888b630 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 08 Sep 2014 14:38:25 -0400
Subject: [PATCH] Merge branch 'ticket/169' into develop
---
gitblit.iml | 88 +++++++++++++++++++++++++++----------------
1 files changed, 55 insertions(+), 33 deletions(-)
diff --git a/gitblit.iml b/gitblit.iml
index 9a689da..e49bc80 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -47,13 +47,24 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="guava-16.0.1.jar">
+ <library name="guava-17.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/guava-16.0.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/guava-17.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/guava-16.0.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/guava-17.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="guice-servlet-4.0-gb1.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/guice-servlet-4.0-gb1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/guice-servlet-4.0-gb1.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -124,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>
@@ -168,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>
@@ -518,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>
@@ -769,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>
@@ -790,6 +801,17 @@
</SOURCES>
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library name="jsoup-1.7.3.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/jsoup-1.7.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/jsoup-1.7.3.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="junit-4.11.jar">
<CLASSES>
--
Gitblit v1.9.1