James Moger
2014-04-23 646133f591e7d3a43def675ac30ec4caea1f909a
Update to Apache MINA/SSHD 0.11.0
5 files modified
36 ■■■■■ changed files
.classpath 6 ●●●● patch | view | raw | blame | history
build.moxie 4 ●●●● patch | view | raw | blame | history
gitblit.iml 14 ●●●●● patch | view | raw | blame | history
releases.moxie 7 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/transport/ssh/DisabledFilesystemFactory.java 5 ●●●●● patch | view | raw | blame | history
.classpath
@@ -11,8 +11,8 @@
    <classpathentry kind="lib" path="ext/javawriter-2.1.1.jar" sourcepath="ext/src/javawriter-2.1.1.jar" />
    <classpathentry kind="lib" path="ext/annotations-12.0.jar" sourcepath="ext/src/annotations-12.0.jar" />
    <classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar" />
    <classpathentry kind="lib" path="ext/slf4j-api-1.7.5.jar" />
    <classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.5.jar" />
    <classpathentry kind="lib" path="ext/slf4j-api-1.7.5.jar" sourcepath="ext/src/slf4j-api-1.7.5.jar" />
    <classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.5.jar" sourcepath="ext/src/slf4j-log4j12-1.7.5.jar" />
    <classpathentry kind="lib" path="ext/mail-1.4.3.jar" sourcepath="ext/src/mail-1.4.3.jar" />
    <classpathentry kind="lib" path="ext/javax.servlet-api-3.1.0.jar" sourcepath="ext/src/javax.servlet-api-3.1.0.jar" />
    <classpathentry kind="lib" path="ext/jetty-all-9.1.4.v20140401.jar" sourcepath="ext/src/jetty-all-9.1.4.v20140401.jar" />
@@ -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.10.1.jar" sourcepath="ext/src/sshd-core-0.10.1.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/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" />
build.moxie
@@ -10,7 +10,7 @@
description: pure Java Git solution
groupId: com.gitblit
artifactId: gitblit
version: 1.5.1-SNAPSHOT
version: 1.6.0-SNAPSHOT
inceptionYear: 2011
# Current stable release
@@ -109,7 +109,7 @@
  bouncycastle.version : 1.49
  selenium.version : 2.28.0
  wikitext.version : 1.4
  sshd.version: 0.10.1
  sshd.version: 0.11.0
  mina.version: 2.0.7
  }
gitblit.iml
@@ -85,7 +85,9 @@
          <root url="jar://$MODULE_DIR$/ext/slf4j-api-1.7.5.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/slf4j-api-1.7.5.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
@@ -94,7 +96,9 @@
          <root url="jar://$MODULE_DIR$/ext/slf4j-log4j12-1.7.5.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/slf4j-log4j12-1.7.5.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
@@ -514,13 +518,13 @@
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="sshd-core-0.10.1.jar">
      <library name="sshd-core-0.11.0.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/sshd-core-0.10.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/sshd-core-0.11.0.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/sshd-core-0.10.1.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/sshd-core-0.11.0.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
releases.moxie
@@ -12,8 +12,11 @@
    fixes: ~
    changes: ~
    additions: ~
    dependencyChanges: ~
    contributors: ~
    dependencyChanges:
    - update to Apache MINA/SSHD 0.11.0 (issue-410)
    contributors:
    - James Moger
    - Ralph Hoffman
}
#
src/main/java/com/gitblit/transport/ssh/DisabledFilesystemFactory.java
@@ -36,6 +36,11 @@
            public SshFile getFile(String file) {
                return null;
            }
            @Override
            public FileSystemView getNormalizedView() {
                return null;
            }
        };
    }
}