Browse Source
Merge branch 'pr-1214' into master
Fix conflict from earlier JGit update to 4.5 Add updated Eclipse and IntelliJ files.pull/1277/merge
Florian Zschocke
1 year ago
3 changed files with 13 additions and 13 deletions
+ 3
- 3
.classpath
View File
| @@ -58,14 +58,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-4.5.7.201904151645-r.jar" sourcepath="ext/src/org.eclipse.jgit-4.5.7.201904151645-r.jar" /> | |||
| <classpathentry kind="lib" path="ext/org.eclipse.jgit-4.6.1.201703071140-r.jar" sourcepath="ext/src/org.eclipse.jgit-4.6.1.201703071140-r.jar" /> | |||
| <classpathentry kind="lib" path="ext/jsch-0.1.53.jar" sourcepath="ext/src/jsch-0.1.53.jar" /> | |||
| <classpathentry kind="lib" path="ext/JavaEWAH-0.7.9.jar" sourcepath="ext/src/JavaEWAH-0.7.9.jar" /> | |||
| <classpathentry kind="lib" path="ext/JavaEWAH-1.1.6.jar" sourcepath="ext/src/JavaEWAH-1.1.6.jar" /> | |||
| <classpathentry kind="lib" path="ext/httpclient-4.3.6.jar" sourcepath="ext/src/httpclient-4.3.6.jar" /> | |||
| <classpathentry kind="lib" path="ext/httpcore-4.3.3.jar" sourcepath="ext/src/httpcore-4.3.3.jar" /> | |||
| <classpathentry kind="lib" path="ext/commons-logging-1.1.3.jar" sourcepath="ext/src/commons-logging-1.1.3.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-4.5.7.201904151645-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-4.5.7.201904151645-r.jar" /> | |||
| <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-4.6.1.201703071140-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-4.6.1.201703071140-r.jar" /> | |||
| <classpathentry kind="lib" path="ext/bcprov-jdk15on-1.69.jar" sourcepath="ext/src/bcprov-jdk15on-1.69.jar" /> | |||
| <classpathentry kind="lib" path="ext/bcmail-jdk15on-1.69.jar" sourcepath="ext/src/bcmail-jdk15on-1.69.jar" /> | |||
| <classpathentry kind="lib" path="ext/bcutil-jdk15on-1.69.jar" sourcepath="ext/src/bcutil-jdk15on-1.69.jar" /> | |||
+ 1
- 1
build.moxie
View File
| @@ -109,7 +109,7 @@ properties: { | |||
| slf4j.version : 1.7.29 | |||
| wicket.version : 1.4.22 | |||
| lucene.version : 5.5.2 | |||
| jgit.version : 4.5.7.201904151645-r | |||
| jgit.version : 4.6.1.201703071140-r | |||
| groovy.version : 2.4.4 | |||
| bouncycastle.version : 1.69 | |||
| selenium.version : 2.28.0 | |||
+ 9
- 9
gitblit.iml
View File
| @@ -583,13 +583,13 @@ | |||
| </library> | |||
| </orderEntry> | |||
| <orderEntry type="module-library"> | |||
| <library name="org.eclipse.jgit-4.5.7.201904151645-r.jar"> | |||
| <library name="org.eclipse.jgit-4.6.1.201703071140-r.jar"> | |||
| <CLASSES> | |||
| <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-4.5.7.201904151645-r.jar!/" /> | |||
| <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-4.6.1.201703071140-r.jar!/" /> | |||
| </CLASSES> | |||
| <JAVADOC /> | |||
| <SOURCES> | |||
| <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-4.5.7.201904151645-r.jar!/" /> | |||
| <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-4.6.1.201703071140-r.jar!/" /> | |||
| </SOURCES> | |||
| </library> | |||
| </orderEntry> | |||
| @@ -605,13 +605,13 @@ | |||
| </library> | |||
| </orderEntry> | |||
| <orderEntry type="module-library"> | |||
| <library name="JavaEWAH-0.7.9.jar"> | |||
| <library name="JavaEWAH-1.1.6.jar"> | |||
| <CLASSES> | |||
| <root url="jar://$MODULE_DIR$/ext/JavaEWAH-0.7.9.jar!/" /> | |||
| <root url="jar://$MODULE_DIR$/ext/JavaEWAH-1.1.6.jar!/" /> | |||
| </CLASSES> | |||
| <JAVADOC /> | |||
| <SOURCES> | |||
| <root url="jar://$MODULE_DIR$/ext/src/JavaEWAH-0.7.9.jar!/" /> | |||
| <root url="jar://$MODULE_DIR$/ext/src/JavaEWAH-1.1.6.jar!/" /> | |||
| </SOURCES> | |||
| </library> | |||
| </orderEntry> | |||
| @@ -660,13 +660,13 @@ | |||
| </library> | |||
| </orderEntry> | |||
| <orderEntry type="module-library"> | |||
| <library name="org.eclipse.jgit.http.server-4.5.7.201904151645-r.jar"> | |||
| <library name="org.eclipse.jgit.http.server-4.6.1.201703071140-r.jar"> | |||
| <CLASSES> | |||
| <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-4.5.7.201904151645-r.jar!/" /> | |||
| <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-4.6.1.201703071140-r.jar!/" /> | |||
| </CLASSES> | |||
| <JAVADOC /> | |||
| <SOURCES> | |||
| <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-4.5.7.201904151645-r.jar!/" /> | |||
| <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-4.6.1.201703071140-r.jar!/" /> | |||
| </SOURCES> | |||
| </library> | |||
| </orderEntry> | |||
Loading…