Selaa lähdekoodia

Merge branch 'ticket/198' into develop

tags/v1.7.0
James Moger 9 vuotta sitten
vanhempi
commit
136fbddd52
3 muutettua tiedostoa jossa 9 lisäystä ja 9 poistoa
  1. 2
    2
      .classpath
  2. 1
    1
      build.moxie
  3. 6
    6
      gitblit.iml

+ 2
- 2
.classpath Näytä tiedosto

@@ -41,14 +41,14 @@
<classpathentry kind="lib" path="ext/tracwiki-core-1.4.jar" sourcepath="ext/src/tracwiki-core-1.4.jar" />
<classpathentry kind="lib" path="ext/mediawiki-core-1.4.jar" sourcepath="ext/src/mediawiki-core-1.4.jar" />
<classpathentry kind="lib" path="ext/confluence-core-1.4.jar" sourcepath="ext/src/confluence-core-1.4.jar" />
<classpathentry kind="lib" path="ext/org.eclipse.jgit-3.4.1.201406201815-r.jar" sourcepath="ext/src/org.eclipse.jgit-3.4.1.201406201815-r.jar" />
<classpathentry kind="lib" path="ext/org.eclipse.jgit-3.5.0.201409260305-r.jar" sourcepath="ext/src/org.eclipse.jgit-3.5.0.201409260305-r.jar" />
<classpathentry kind="lib" path="ext/jsch-0.1.50.jar" sourcepath="ext/src/jsch-0.1.50.jar" />
<classpathentry kind="lib" path="ext/JavaEWAH-0.7.9.jar" sourcepath="ext/src/JavaEWAH-0.7.9.jar" />
<classpathentry kind="lib" path="ext/httpclient-4.1.3.jar" sourcepath="ext/src/httpclient-4.1.3.jar" />
<classpathentry kind="lib" path="ext/httpcore-4.1.4.jar" sourcepath="ext/src/httpcore-4.1.4.jar" />
<classpathentry kind="lib" path="ext/commons-logging-1.1.1.jar" sourcepath="ext/src/commons-logging-1.1.1.jar" />
<classpathentry kind="lib" path="ext/commons-codec-1.7.jar" sourcepath="ext/src/commons-codec-1.7.jar" />
<classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-3.4.1.201406201815-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-3.4.1.201406201815-r.jar" />
<classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-3.5.0.201409260305-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-3.5.0.201409260305-r.jar" />
<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" />

+ 1
- 1
build.moxie Näytä tiedosto

@@ -105,7 +105,7 @@ properties: {
jetty.version : 9.2.2.v20140723
wicket.version : 1.4.21
lucene.version : 4.10.0
jgit.version : 3.4.1.201406201815-r
jgit.version : 3.5.0.201409260305-r
groovy.version : 2.3.3
bouncycastle.version : 1.49
selenium.version : 2.28.0

+ 6
- 6
gitblit.iml Näytä tiedosto

@@ -408,13 +408,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="org.eclipse.jgit-3.4.1.201406201815-r.jar">
<library name="org.eclipse.jgit-3.5.0.201409260305-r.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-3.4.1.201406201815-r.jar!/" />
<root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-3.5.0.201409260305-r.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-3.4.1.201406201815-r.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-3.5.0.201409260305-r.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -485,13 +485,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="org.eclipse.jgit.http.server-3.4.1.201406201815-r.jar">
<library name="org.eclipse.jgit.http.server-3.5.0.201409260305-r.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.4.1.201406201815-r.jar!/" />
<root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.5.0.201409260305-r.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-3.4.1.201406201815-r.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-3.5.0.201409260305-r.jar!/" />
</SOURCES>
</library>
</orderEntry>

Loading…
Peruuta
Tallenna