summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2014-09-04 23:07:05 +0200
committerDavid Ostrovsky <david@ostrovsky.org>2014-09-04 23:07:05 +0200
commitb331474798271adecc60eee2eb0dc1bd6412c90c (patch)
tree91f89ece67a36e45ee03c646689f0bc7da2bf26f
parent248b7172cd23ac5853747c7c77e07ea8afded899 (diff)
downloadgitblit-b331474798271adecc60eee2eb0dc1bd6412c90c.tar.gz
gitblit-b331474798271adecc60eee2eb0dc1bd6412c90c.zip
Update SSHD version to 0.12
Also switch back to Maven Central repository.
-rw-r--r--.classpath4
-rw-r--r--build.moxie5
-rw-r--r--gitblit.iml8
3 files changed, 7 insertions, 10 deletions
diff --git a/.classpath b/.classpath
index 9873ddb4..4ea2a16a 100644
--- a/.classpath
+++ b/.classpath
@@ -52,7 +52,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.1-atlassian-1.jar" sourcepath="ext/src/sshd-core-0.11.1-atlassian-1.jar" />
+ <classpathentry kind="lib" path="ext/sshd-core-0.12.0.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" />
@@ -88,7 +88,7 @@
<classpathentry kind="lib" path="ext/selenium-api-2.28.0.jar" sourcepath="ext/src/selenium-api-2.28.0.jar" />
<classpathentry kind="lib" path="ext/commons-exec-1.1.jar" sourcepath="ext/src/commons-exec-1.1.jar" />
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
- <classpathentry kind="src" path="src/main/gen">
+ <classpathentry kind="src" path="src/main/dagger">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
diff --git a/build.moxie b/build.moxie
index 3f18bf5e..cf9037a0 100644
--- a/build.moxie
+++ b/build.moxie
@@ -95,11 +95,10 @@ dependencyDirectory: ext
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' }
- { id: gitblit, url: 'http://gitblit.github.io/gitblit-maven' }
# Source all dependencies from the following repositories in the specified order
-repositories: central, eclipse-snapshots, eclipse, atlassian-contrib, gitblit
+repositories: central, eclipse-snapshots, eclipse, gitblit
# Convenience properties for dependencies
properties: {
@@ -111,7 +110,7 @@ properties: {
bouncycastle.version : 1.49
selenium.version : 2.28.0
wikitext.version : 1.4
- sshd.version: 0.11.1-atlassian-1
+ sshd.version: 0.12.0
mina.version: 2.0.7
guice.version : 4.0-beta4
# Gitblit maintains a fork of guice-servlet
diff --git a/gitblit.iml b/gitblit.iml
index 878fdc3c..02095d97 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -529,14 +529,12 @@
</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!/" />
- </SOURCES>
+ <SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">