From 301adb550d1d45bbbc6344252dd9cf1c628122d3 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 26 Sep 2012 17:10:31 -0400
Subject: [PATCH] Fix LDAP connection leak (issue 139)
---
src/com/gitblit/build/Build.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/com/gitblit/build/Build.java b/src/com/gitblit/build/Build.java
index ea7f2e5..2bb4336 100644
--- a/src/com/gitblit/build/Build.java
+++ b/src/com/gitblit/build/Build.java
@@ -143,6 +143,9 @@
downloadFromApache(MavenObject.LOG4J, BuildType.RUNTIME);
downloadFromApache(MavenObject.GSON, BuildType.RUNTIME);
downloadFromApache(MavenObject.JSCH, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.LUCENE, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.LUCENE_HIGHLIGHTER, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.LUCENE_MEMORY, BuildType.RUNTIME);
downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME);
}
@@ -357,6 +360,16 @@
}
for (String jar : jars) {
File targetFile = mo.getLocalFile("ext", jar);
+ if ("-sources".equals(jar)) {
+ File relocated = new File("ext/src", targetFile.getName());
+ if (targetFile.exists()) {
+ // move -sources jar to ext/src folder
+ targetFile.renameTo(relocated);
+ }
+ // -sources jars are located in ext/src
+ targetFile = relocated;
+ }
+
if (targetFile.exists()) {
downloads.add(targetFile);
continue;
@@ -461,20 +474,20 @@
private static class MavenObject {
public static final MavenObject JCOMMANDER = new MavenObject("jCommander", "com/beust",
- "jcommander", "1.27", 51000, 32000, 141000,
- "58c9cbf0f1fa296f93c712f2cf46de50471920f9",
- "fae697ac46477a5227a5ee14f8f3a1270a4627b0",
- "a3ffcf1c0792a8ab851e99f3973ad8aa7cb825a8");
+ "jcommander", "1.17", 34000, 32000, 141000,
+ "219a3540f3b27d7cc3b1d91d6ea046cd8723290e",
+ "0bb50eec177acf0e94d58e0cf07262fe5164331d",
+ "c7adc475ca40c288c93054e0f4fe58f3a98c0cb5");
public static final MavenObject JETTY = new MavenObject("Jetty",
- "org/eclipse/jetty/aggregate", "jetty-webapp", "7.4.3.v20110701", 1000000, 680000,
- 2720000, "bde072b178f9650e2308f0babe58a4baaa469e3c",
- "bc75f05dd4f7fa848720ac669b8b438ee4a6b146",
- "dcd42f672e734521d1a6ccc0c2f9ecded1a1a281");
+ "org/eclipse/jetty/aggregate", "jetty-webapp", "7.6.5.v20120716", 1000000, 680000,
+ 2720000, "e6a34a2d79cbb010d56741e53f8ebf6d9eeef135",
+ "c2dc95a9c0d0f85c2610cb71aa169c90b25dff83",
+ "");
public static final MavenObject JETTY_AJP = new MavenObject("Jetty-AJP",
- "org/eclipse/jetty", "jetty-ajp", "7.4.3.v20110701", 32000, 22000,
- 97000, "ddeb533bcf29e9b95555a9c0f34c1de3ab14c430", "bc4798286d705ea972643b3a0b31f46a0c53f605", "");
+ "org/eclipse/jetty", "jetty-ajp", "7.6.5.v20120716", 32000, 22000,
+ 97000, "74fb9aae97e2d189d1c4071da51101b293034e80", "ebb9a2f2f8960e5565e8a6bda950e0934772507f", "");
public static final MavenObject SERVLET = new MavenObject("Servlet 3.0", "javax/servlet",
"javax.servlet-api", "3.0.1", 84000, 211000, 0,
@@ -585,8 +598,8 @@
"5875e2729de83a4e46391f8f979ec8bd03810c10", null);
public static final MavenObject GROOVY = new MavenObject("groovy", "org/codehaus/groovy", "groovy-all",
- "1.8.5", 6143000, 2290000, 4608000, "3be3914c49ca7d8e8afb29a7772a74c30a1f1b28",
- "1435cc8c90e3a91e5fee7bb53e83aad96e93aeb7", "5a214b52286523f9e2a4b5fed526506c763fa6f1");
+ "1.8.6", 6143000, 2290000, 4608000, "96a26bfa6e5aea2e3c46df44a19de93a2acd2366",
+ "2ac423ad404db3e3d9053c626d4c15a84cd18b73", "3c55878578272093f6b545072d46e3e8ee9a6639");
public static final MavenObject LUCENE = new MavenObject("lucene", "org/apache/lucene", "lucene-core",
"3.6.0", 1470000, 1347000, 3608000, "8a0429de6b7c9918841fa2c441a6ef4cc07f2a18",
--
Gitblit v1.9.1