From 06eb51f13d9dcd4e4e5d9d7bb0db4cf18a67b23e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 05 Mar 2014 11:42:34 -0500
Subject: [PATCH] Allow integration (mergeTo) branch to be changed in edit ticket
---
gitblit.iml | 185 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 149 insertions(+), 36 deletions(-)
diff --git a/gitblit.iml b/gitblit.iml
index 67638df..7ebe2e8 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -6,10 +6,68 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/bugtraq" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/dagger" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/bugtraq" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library name="dagger-1.1.0.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/dagger-1.1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/dagger-1.1.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="javax.inject-1.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/javax.inject-1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/javax.inject-1.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="dagger-compiler-1.1.0.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/dagger-compiler-1.1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/dagger-compiler-1.1.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="javawriter-2.1.1.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/javawriter-2.1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/javawriter-2.1.1.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="annotations-12.0.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/annotations-12.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/annotations-12.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
<orderEntry type="module-library">
<library name="jcommander-1.17.jar">
<CLASSES>
@@ -143,46 +201,79 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-core-3.6.1.jar">
+ <library name="lucene-core-4.6.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-core-3.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-core-4.6.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-core-3.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-core-4.6.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-highlighter-3.6.1.jar">
+ <library name="lucene-analyzers-common-4.6.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-highlighter-3.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-analyzers-common-4.6.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-3.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-analyzers-common-4.6.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-memory-3.6.1.jar">
+ <library name="lucene-highlighter-4.6.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-memory-3.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-highlighter-4.6.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-memory-3.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-4.6.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-queries-3.6.1.jar">
+ <library name="lucene-memory-4.6.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-queries-3.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-memory-4.6.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-queries-3.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-memory-4.6.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="lucene-queries-4.6.0.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/lucene-queries-4.6.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-queries-4.6.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="lucene-queryparser-4.6.0.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/lucene-queryparser-4.6.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-queryparser-4.6.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="lucene-sandbox-4.6.0.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/lucene-sandbox-4.6.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-sandbox-4.6.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -196,35 +287,35 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="pegdown-1.4.1.jar">
+ <library name="pegdown-1.4.2.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/pegdown-1.4.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/pegdown-1.4.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/pegdown-1.4.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/pegdown-1.4.2.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="parboiled-java-1.1.5.jar">
+ <library name="parboiled-java-1.1.6.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/parboiled-java-1.1.5.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/parboiled-java-1.1.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/parboiled-java-1.1.5.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/parboiled-java-1.1.6.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="parboiled-core-1.1.5.jar">
+ <library name="parboiled-core-1.1.6.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/parboiled-core-1.1.5.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/parboiled-core-1.1.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/parboiled-core-1.1.5.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/parboiled-core-1.1.6.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -339,13 +430,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="org.eclipse.jgit-3.1.0.201310021548-r.jar">
+ <library name="org.eclipse.jgit-3.2.0.201312181205-r.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-3.1.0.201310021548-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-3.2.0.201312181205-r.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-3.1.0.201310021548-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-3.2.0.201312181205-r.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -372,46 +463,46 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="org.eclipse.jgit.http.server-3.1.0.201310021548-r.jar">
+ <library name="org.eclipse.jgit.http.server-3.2.0.201312181205-r.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.1.0.201310021548-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.2.0.201312181205-r.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-3.1.0.201310021548-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-3.2.0.201312181205-r.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="bcprov-jdk15on-1.47.jar">
+ <library name="bcprov-jdk15on-1.49.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/bcprov-jdk15on-1.47.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/bcprov-jdk15on-1.49.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/bcprov-jdk15on-1.47.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/bcprov-jdk15on-1.49.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="bcmail-jdk15on-1.47.jar">
+ <library name="bcmail-jdk15on-1.49.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/bcmail-jdk15on-1.47.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/bcmail-jdk15on-1.49.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/bcmail-jdk15on-1.47.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/bcmail-jdk15on-1.49.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="bcpkix-jdk15on-1.47.jar">
+ <library name="bcpkix-jdk15on-1.49.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/bcpkix-jdk15on-1.47.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/bcpkix-jdk15on-1.49.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/bcpkix-jdk15on-1.47.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/bcpkix-jdk15on-1.49.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -633,6 +724,28 @@
</SOURCES>
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library name="jedis-2.3.1.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/jedis-2.3.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/jedis-2.3.1.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="commons-pool2-2.0.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/commons-pool2-2.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/commons-pool2-2.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="junit-4.11.jar">
<CLASSES>
--
Gitblit v1.9.1