diff options
| -rw-r--r-- | .classpath | 20 | ||||
| -rw-r--r-- | docs/00_index.mkd | 3 | ||||
| -rw-r--r-- | docs/01_setup.mkd | 4 | ||||
| -rw-r--r-- | docs/04_releases.mkd | 1 | ||||
| -rw-r--r-- | src/com/gitblit/Constants.java | 2 | ||||
| -rw-r--r-- | src/com/gitblit/Launcher.java | 5 | ||||
| -rw-r--r-- | src/com/gitblit/build/Build.java | 16 |
7 files changed, 29 insertions, 22 deletions
@@ -51,16 +51,6 @@ </attributes>
</classpathentry>
<classpathentry kind="lib" path="ext/junit-4.8.2.jar" sourcepath="C:/Users/James Moger/.m2/repository/junit/junit/4.8.2/junit-4.8.2-sources.jar"/>
- <classpathentry kind="lib" path="ext/org.eclipse.jgit-1.0.0.201106090707-r.jar" sourcepath="ext/org.eclipse.jgit-1.0.0.201106090707-r-sources.jar">
- <attributes>
- <attribute name="javadoc_location" value="jar:platform:/resource/gitblit/ext/org.eclipse.jgit-1.0.0.201106090707-r-javadoc.jar!/"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-1.0.0.201106090707-r.jar" sourcepath="ext/org.eclipse.jgit.http.server-1.0.0.201106090707-r-sources.jar">
- <attributes>
- <attribute name="javadoc_location" value="jar:platform:/resource/gitblit/ext/org.eclipse.jgit.http.server-1.0.0.201106090707-r-javadoc.jar!/"/>
- </attributes>
- </classpathentry>
<classpathentry kind="lib" path="ext/jetty-webapp-7.4.3.v20110701.jar" sourcepath="ext/jetty-webapp-7.4.3.v20110701-sources.jar">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/gitblit/ext/jetty-webapp-7.4.3.v20110701-javadoc.jar!/"/>
@@ -97,5 +87,15 @@ <attribute name="javadoc_location" value="jar:platform:/resource/gitblit/ext/wicket-extensions-1.4.18-javadoc.jar!/"/>
</attributes>
</classpathentry>
+ <classpathentry kind="lib" path="ext/org.eclipse.jgit-1.1.0.201109151100-r.jar" sourcepath="ext/org.eclipse.jgit-1.1.0.201109151100-r-sources.jar">
+ <attributes>
+ <attribute name="javadoc_location" value="jar:platform:/resource/gitblit/ext/org.eclipse.jgit-1.1.0.201109151100-r-javadoc.jar!/"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-1.1.0.201109151100-r.jar" sourcepath="ext/org.eclipse.jgit.http.server-1.1.0.201109151100-r-sources.jar">
+ <attributes>
+ <attribute name="javadoc_location" value="jar:platform:/resource/gitblit/ext/org.eclipse.jgit-1.1.0.201109151100-r-javadoc.jar!/"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/docs/00_index.mkd b/docs/00_index.mkd index 2f24298c..e499abe7 100644 --- a/docs/00_index.mkd +++ b/docs/00_index.mkd @@ -18,7 +18,7 @@ Gitblit is available in two variations: ### Java Runtime Requirement
Gitblit requires a Java 6 Runtime Environment (JRE) or a Java 6 Development Kit (JDK).
-
+
### Current Release
**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)) based on [%JGIT%][jgit] *released %BUILDDATE%*
@@ -37,6 +37,7 @@ This is something like svn-sync for gitblit. - added: javamail dependency
- updated: MarkdownPapers 1.1.1
- updated: Wicket 1.4.18
+- updated: JGit 1.1.0
issues, binaries, and sources @ [Google Code][googlecode]<br/>
sources @ [Github][gitbltsrc]
diff --git a/docs/01_setup.mkd b/docs/01_setup.mkd index 37605c9a..1c8db122 100644 --- a/docs/01_setup.mkd +++ b/docs/01_setup.mkd @@ -32,7 +32,7 @@ Open `gitblit.properties` in your favorite text editor and make sure to review a ### Creating your own Self-Signed Certificate
Gitblit GO automatically generates an ssl certificate for you that is bound to *localhost*.
-Remote Eclipse/EGit/JGit clients (<= 1.0.0) will fail to communicate using this certificate because JGit always verifies the hostname of the certificate, regardless of the *http.sslVerify=false* client-side setting.
+Remote Eclipse/EGit/JGit clients (<= 1.1.0) will fail to communicate using this certificate because JGit always verifies the hostname of the certificate, regardless of the *http.sslVerify=false* client-side setting.
The EGit failure message is something like:
@@ -307,7 +307,7 @@ You must tell Git/JGit not to verify the self-signed certificate in order to per **NOTE:**<br/>
The default self-signed certificate generated by Gitlbit GO is bound to *localhost*.<br/>
If you are using Eclipse/EGit/JGit clients, you will have to generate your own certificate that specifies the exact hostname used in your clone/push url.<br/>
-You must do this because Eclipse/EGit/JGit (<= 1.0.0) always verifies certificate hostnames, regardless of the *http.sslVerify=false* client-side setting.
+You must do this because Eclipse/EGit/JGit (<= 1.1.0) always verifies certificate hostnames, regardless of the *http.sslVerify=false* client-side setting.
- Eclipse/EGit/JGit
1. Window->Preferences->Team->Git->Configuration
diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd index 6eff75f1..ead799a7 100644 --- a/docs/04_releases.mkd +++ b/docs/04_releases.mkd @@ -17,6 +17,7 @@ This is something like svn-sync for gitblit. - added: javamail dependency
- updated: MarkdownPapers 1.1.1
- updated: Wicket 1.4.18
+- updated: JGit 1.1.0
### Older Releases
diff --git a/src/com/gitblit/Constants.java b/src/com/gitblit/Constants.java index 0446f2d7..1fc549a6 100644 --- a/src/com/gitblit/Constants.java +++ b/src/com/gitblit/Constants.java @@ -37,7 +37,7 @@ public class Constants { // The build script extracts this exact line so be careful editing it
// and only use A-Z a-z 0-9 .-_ in the string.
- public static final String JGIT_VERSION = "JGit 1.0.0 (201106090707-r)";
+ public static final String JGIT_VERSION = "JGit 1.1.0 (201109151100-r)";
public static final String ADMIN_ROLE = "#admin";
diff --git a/src/com/gitblit/Launcher.java b/src/com/gitblit/Launcher.java index abd4098e..a43331b7 100644 --- a/src/com/gitblit/Launcher.java +++ b/src/com/gitblit/Launcher.java @@ -25,6 +25,7 @@ import java.security.ProtectionDomain; import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import com.gitblit.build.Build;
@@ -74,6 +75,10 @@ public class Launcher { List<File> found = findJars(libFolder.getAbsoluteFile());
jars.addAll(found);
}
+ // sort the jars by name and then reverse the order so the newer version
+ // of the library gets loaded in the event that this is an upgrade
+ Collections.sort(jars);
+ Collections.reverse(jars);
if (jars.size() == 0) {
for (String folder : folders) {
diff --git a/src/com/gitblit/build/Build.java b/src/com/gitblit/build/Build.java index 3fa542b8..40342269 100644 --- a/src/com/gitblit/build/Build.java +++ b/src/com/gitblit/build/Build.java @@ -416,16 +416,16 @@ public class Build { "3b7c5f3938f202311bdca0bf7ed46bc0118af081");
public static final MavenObject JGIT = new MavenObject("JGit", "org/eclipse/jgit",
- "org.eclipse.jgit", "1.0.0.201106090707-r", 1318000, 1354000, 2993000,
- "34e70691382d67ee5c84ef207fb8d3784594ba2c",
- "78dbd385cf40cb266f4fb2de8651b288a72f4e2d",
- "dab55685bb6eee8d07cc87faf0cedaa3f9d04a0d");
+ "org.eclipse.jgit", "1.1.0.201109151100-r", 1318000, 1354000, 3300000,
+ "bacc988346c839f79513d7bc7f5c88b22ea6e7a5",
+ "90abf988d98ce0d4b162f94f63fc99c435eba6b4",
+ "a46540a2857a0fdbf43debf3383295a897946c79");
public static final MavenObject JGIT_HTTP = new MavenObject("JGit", "org/eclipse/jgit",
- "org.eclipse.jgit.http.server", "1.0.0.201106090707-r", 68000, 62000, 99000,
- "35e22f7000af95d0c90caaf2012071ef3734ff59",
- "4a2368beb1e9db4a6a0d609b7b869f218bf8e7a9",
- "3100ce7c40d6968481a12377c59c708cda2d17b5");
+ "org.eclipse.jgit.http.server", "1.1.0.201109151100-r", 68000, 62000, 110000,
+ "3070161a89756aac2dfc2e26d89faf31fe894ab4",
+ "9cecb8e4351e616688cafbcca906f542d9b1f525",
+ "20aaab759acd8eb6cb6acbb1b2934a689fb3774d");
public static final MavenObject JSCH = new MavenObject("JSch", "com/jcraft", "jsch",
"0.1.44-1", 214000, 211000, 413000, "2e9ae08de5a71bd0e0d3ba2558598181bfa71d4e",
|