From fbf0a46d29809761467e722ae44ecfa53b8e49a3 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 21 Feb 2014 15:32:53 -0500
Subject: [PATCH] Merge commit 'refs/tickets/12/12/1' of https://dev.gitblit.com/git/gitblit
---
gitblit.iml | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/gitblit.iml b/gitblit.iml
index 8c95ac6..1900366 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -6,8 +6,10 @@
<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" />
@@ -52,6 +54,17 @@
<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>
@@ -274,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>
@@ -417,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>
@@ -450,13 +463,13 @@
</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>
--
Gitblit v1.9.1