From 6561f63e577706869337662663a52ba78c0d4072 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 04 Sep 2014 17:38:05 -0400
Subject: [PATCH] Merged #156 "Update stable 1.6.x SSHD to 0.11.1-atlassian-1"
---
.classpath | 2 +-
build.moxie | 5 +++--
gitblit.iml | 6 +++---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/.classpath b/.classpath
index 519aa51..f6e655e 100644
--- a/.classpath
+++ b/.classpath
@@ -51,7 +51,7 @@
<classpathentry kind="lib" path="ext/bcprov-jdk15on-1.49.jar" sourcepath="ext/src/bcprov-jdk15on-1.49.jar" />
<classpathentry kind="lib" path="ext/bcmail-jdk15on-1.49.jar" sourcepath="ext/src/bcmail-jdk15on-1.49.jar" />
<classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.49.jar" sourcepath="ext/src/bcpkix-jdk15on-1.49.jar" />
- <classpathentry kind="lib" path="ext/sshd-core-0.11.0.jar" sourcepath="ext/src/sshd-core-0.11.0.jar" />
+ <classpathentry kind="lib" path="ext/sshd-core-0.11.1-atlassian-1.jar" sourcepath="ext/src/sshd-core-0.11.1-atlassian-1.jar" />
<classpathentry kind="lib" path="ext/mina-core-2.0.7.jar" sourcepath="ext/src/mina-core-2.0.7.jar" />
<classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9.jar" />
<classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0.jar" />
diff --git a/build.moxie b/build.moxie
index 8eeb887..0801644 100644
--- a/build.moxie
+++ b/build.moxie
@@ -95,9 +95,10 @@
registeredRepositories:
- { id: eclipse, url: 'http://repo.eclipse.org/content/groups/releases' }
- { id: eclipse-snapshots, url: 'http://repo.eclipse.org/content/groups/snapshots' }
+- { id: atlassian-contrib, url: 'https://maven.atlassian.com/content/repositories/atlassian-3rdparty' }
# Source all dependencies from the following repositories in the specified order
-repositories: central, eclipse-snapshots, eclipse
+repositories: central, eclipse-snapshots, eclipse, atlassian-contrib
# Convenience properties for dependencies
properties: {
@@ -109,7 +110,7 @@
bouncycastle.version : 1.49
selenium.version : 2.28.0
wikitext.version : 1.4
- sshd.version: 0.11.0
+ sshd.version: 0.11.1-atlassian-1
mina.version: 2.0.7
}
diff --git a/gitblit.iml b/gitblit.iml
index 78828b6..03e2896 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -518,13 +518,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="sshd-core-0.11.0.jar">
+ <library name="sshd-core-0.11.1-atlassian-1.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/sshd-core-0.11.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/sshd-core-0.11.1-atlassian-1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/sshd-core-0.11.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/sshd-core-0.11.1-atlassian-1.jar!/" />
</SOURCES>
</library>
</orderEntry>
--
Gitblit v1.9.1