From d1231c63669f4bc3643985b9032de7f998612e08 Mon Sep 17 00:00:00 2001 From: Jason Pyeron <jpyeron@pdinc.us> Date: Sun, 19 Aug 2012 21:35:52 -0400 Subject: [PATCH] fixed build to allow builds where a proxy is needed for access to outside resources see: http://ant.apache.org/manual/proxy.html --- src/com/gitblit/Launcher.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/com/gitblit/Launcher.java b/src/com/gitblit/Launcher.java index abd4098..a43331b 100644 --- a/src/com/gitblit/Launcher.java +++ b/src/com/gitblit/Launcher.java @@ -25,6 +25,7 @@ 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 @@ 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) { -- Gitblit v1.9.1