From a5e762ba4ab82f0c6ef71d853c5103f19bbf8e22 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 11 Oct 2012 08:10:20 -0400
Subject: [PATCH] Tweak canFork description
---
src/com/gitblit/build/Build.java | 187 ++++++++++++++++++++++++++++++++--------------
1 files changed, 129 insertions(+), 58 deletions(-)
diff --git a/src/com/gitblit/build/Build.java b/src/com/gitblit/build/Build.java
index fcf52b9..d5abc24 100644
--- a/src/com/gitblit/build/Build.java
+++ b/src/com/gitblit/build/Build.java
@@ -20,6 +20,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileWriter;
+import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
import java.io.RandomAccessFile;
@@ -92,7 +93,10 @@
downloadFromApache(MavenObject.LUCENE, BuildType.RUNTIME);
downloadFromApache(MavenObject.LUCENE_HIGHLIGHTER, BuildType.RUNTIME);
downloadFromApache(MavenObject.LUCENE_MEMORY, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.LUCENE_QUERIES, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.JAKARTA_REGEXP, BuildType.RUNTIME);
downloadFromApache(MavenObject.UNBOUND_ID, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.IVY, BuildType.RUNTIME);
downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME);
downloadFromEclipse(MavenObject.JGIT_HTTP, BuildType.RUNTIME);
@@ -100,6 +104,7 @@
public static void compiletime() {
downloadFromApache(MavenObject.JUNIT, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.HAMCREST, BuildType.RUNTIME);
downloadFromApache(MavenObject.JCOMMANDER, BuildType.COMPILETIME);
downloadFromApache(MavenObject.JETTY, BuildType.COMPILETIME);
downloadFromApache(MavenObject.JETTY_AJP, BuildType.COMPILETIME);
@@ -123,7 +128,10 @@
downloadFromApache(MavenObject.LUCENE, BuildType.COMPILETIME);
downloadFromApache(MavenObject.LUCENE_HIGHLIGHTER, BuildType.COMPILETIME);
downloadFromApache(MavenObject.LUCENE_MEMORY, BuildType.COMPILETIME);
+ downloadFromApache(MavenObject.LUCENE_QUERIES, BuildType.COMPILETIME);
+ downloadFromApache(MavenObject.JAKARTA_REGEXP, BuildType.COMPILETIME);
downloadFromApache(MavenObject.UNBOUND_ID, BuildType.COMPILETIME);
+ downloadFromApache(MavenObject.IVY, BuildType.COMPILETIME);
downloadFromEclipse(MavenObject.JGIT, BuildType.COMPILETIME);
downloadFromEclipse(MavenObject.JGIT_HTTP, BuildType.COMPILETIME);
@@ -141,6 +149,11 @@
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);
+ downloadFromApache(MavenObject.LUCENE_QUERIES, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.JAKARTA_REGEXP, BuildType.RUNTIME);
downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME);
}
@@ -355,8 +368,19 @@
}
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);
+ removeObsoleteArtifacts(mo, type, targetFile.getParentFile());
continue;
}
String expectedSHA1 = mo.getSHA1(jar);
@@ -432,8 +456,40 @@
throw new RuntimeException("Error writing to file " + targetFile, e);
}
downloads.add(targetFile);
+
+ removeObsoleteArtifacts(mo, type, targetFile.getParentFile());
}
return downloads;
+ }
+
+ private static void removeObsoleteArtifacts(final MavenObject mo, final BuildType type, File folder) {
+ File [] removals = folder.listFiles(new FilenameFilter() {
+ @Override
+ public boolean accept(File dir, String name) {
+ String n = name.toLowerCase();
+ String dep = mo.artifact.toLowerCase();
+ if (n.startsWith(dep)) {
+ String suffix = "-" + mo.version;
+ if (type.equals(BuildType.COMPILETIME)) {
+ suffix += "-sources.jar";
+ } else {
+ suffix += ".jar";
+ }
+ if (!n.endsWith(suffix)) {
+ return true;
+ }
+ }
+ return false;
+ }
+ });
+
+ // delete any matches
+ if (removals != null) {
+ for (File file : removals) {
+ System.out.println("deleting " + file);
+ file.delete();
+ }
+ }
}
private static void updateDownload(float progress, File file) {
@@ -465,63 +521,66 @@
"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.7.v20120910", 1000000, 680000,
+ 2720000, "d621fa6419aaa37edbcab8e16a5e6b05c9527e62",
+ "b505f7b493c5aa262d371d90754bded8b392ffb0",
+ "");
public static final MavenObject JETTY_AJP = new MavenObject("Jetty-AJP",
- "org/eclipse/jetty", "jetty-ajp", "7.4.3.v20110701", 32000, 22000,
- 97000, "ddeb533bcf29e9b95555a9c0f34c1de3ab14c430", "bc4798286d705ea972643b3a0b31f46a0c53f605", "");
-
- public static final MavenObject SERVLET = new MavenObject("Servlet 3.0", "org/glassfish",
- "javax.servlet", "3.0.1", 84000, 211000, 0,
- "58f17c941cd0607bb5edcbcafc491d02265ac9a1",
- "63f2f8bcdd3f138020bbadd5c847e8f3847b77d2", null);
+ "org/eclipse/jetty", "jetty-ajp", "7.6.7.v20120910", 32000, 22000,
+ 97000, "578d502bc78ed7aa1c0b6afef4cd59477041ec37", "6cfed9a1354f720fcde12ec15d5e1ae9cf97000c", "");
+
+ public static final MavenObject SERVLET = new MavenObject("Servlet 3.0", "javax/servlet",
+ "javax.servlet-api", "3.0.1", 84000, 211000, 0,
+ "6bf0ebb7efd993e222fc1112377b5e92a13b38dd",
+ "01952f91d84016a39e31346c9d18bd8c9c4a128a", null);
public static final MavenObject SLF4JAPI = new MavenObject("SLF4J API", "org/slf4j",
- "slf4j-api", "1.6.1", 25500, 45000, 182000,
- "6f3b8a24bf970f17289b234284c94f43eb42f0e4",
- "46a386136c901748e6a3af67ebde6c22bc6b4524",
- "e223571d77769cdafde59040da235842f3326453");
+ "slf4j-api", "1.6.6", 25500, 45000, 182000,
+ "ce53b0a0e2cfbb27e8a59d38f79a18a5c6a8d2b0",
+ "bcd0e21b1572960cefd449f8a16efab5b6b8e644",
+ "4253b52aabf1c5a5f20c191a261e6ada0fcf621d");
public static final MavenObject SLF4LOG4J = new MavenObject("SLF4J LOG4J", "org/slf4j",
- "slf4j-log4j12", "1.6.1", 9800, 9500, 52400,
- "bd245d6746cdd4e6203e976e21d597a46f115802",
- "7a26b08b265f55622fa1fed3bda68bbd37a465ba",
- "6e4b16bce7994e3692e82002f322a0dd2f32741e");
+ "slf4j-log4j12", "1.6.6", 9800, 9500, 52400,
+ "5cd9b4fbc3ff6a97beaade3206137d76f65df805",
+ "497bfac9a678118e7ff75d1f3b8c3bcc06dc9c8c",
+ "69855e2a85d9249bb577df3c5076bc2cb34975d7");
public static final MavenObject LOG4J = new MavenObject("Apache LOG4J", "log4j", "log4j",
- "1.2.16", 481000, 471000, 1455000, "7999a63bfccbc7c247a9aea10d83d4272bd492c6",
- "bf945d1dc995be7fe64923625f842fbb6bf443be",
- "78aa1cbf0fa3b259abdc7d87f9f6788d785aac2a");
+ "1.2.17", 481000, 471000, 1455000, "5af35056b4d257e4b64b9e8069c0746e8b08629f",
+ "677abe279b68c5e7490d6d50c6951376238d7d3e",
+ "c10c20168206896442f3192d5417815df7fcbf9a");
public static final MavenObject WICKET = new MavenObject("Apache Wicket",
- "org/apache/wicket", "wicket", "1.4.20", 1960000, 1906000, 6818000,
- "bafe47d8ce8647cabeff691b5fc1ffd241ffee00",
- "7a6570df4ee7fbad71a38042c53780d46b5856db",
+ "org/apache/wicket", "wicket", "1.4.21", 1960000, 1906000, 6818000,
+ "cce9dfd3088e18a3cdcf9be33b5b76caa48dc4c6",
+ "e8c2bfe2c96a2da7a0eca947a2f60dc3242e7229",
"");
public static final MavenObject WICKET_EXT = new MavenObject("Apache Wicket Extensions",
- "org/apache/wicket", "wicket-extensions", "1.4.20", 1180000, 1118000, 1458000,
- "5dc6353c3c69e39e6d5a0aaeedbbaf7a53e539c4",
- "c30112665f4c4874489d7df9fc8f866c57f93cc8",
+ "org/apache/wicket", "wicket-extensions", "1.4.21", 1180000, 1118000, 1458000,
+ "fac510c7ee4399a29b927405ec3de40b67d105d8",
+ "ee3409ce9ed64ad8cc8d69abbd7d63f07e10851a",
"");
public static final MavenObject WICKET_AUTH_ROLES = new MavenObject(
- "Apache Wicket Auth Roles", "org/apache/wicket", "wicket-auth-roles", "1.4.20",
- 44000, 45000, 166000, "7e8f99b96bce03cc0a115e6a70d9eed7fbcf6a4b",
- "d7d0479ecca239bd020b247e82562fe047f53620",
+ "Apache Wicket Auth Roles", "org/apache/wicket", "wicket-auth-roles", "1.4.21",
+ 44000, 45000, 166000, "e78df70ca942e2e15287c393f236b32fbe6f9a30",
+ "47c301212cce43a70caa72f41a9a1aefcf26a533",
"");
public static final MavenObject WICKET_GOOGLE_CHARTS = new MavenObject(
- "Apache Wicket Google Charts Add-On", "org/wicketstuff", "googlecharts", "1.4.20",
- 34000, 18750, 161000, "a4bed7d4a3632f95f3e204017ee60332a95da7c6",
- "16bda0794345b113c8dd5c8775e1ce493541dc67",
+ "Apache Wicket Google Charts Add-On", "org/wicketstuff", "googlecharts", "1.4.21",
+ 34000, 18750, 161000, "73d7540267afc3a0e91ca6148d3073e050dba180",
+ "627b125cc6029d4d5c59c3a910c1bef347384d97",
"");
- public static final MavenObject JUNIT = new MavenObject("JUnit", "junit", "junit", "4.8.2",
- 237000, 0, 0, "c94f54227b08100974c36170dcb53329435fe5ad", "", "");
+ public static final MavenObject JUNIT = new MavenObject("JUnit", "junit", "junit", "4.10",
+ 253000, 141000, 0, "e4f1766ce7404a08f45d859fb9c226fc9e41a861", "6c98d6766e72d5575f96c9479d1c1d3b865c6e25", "");
+
+ public static final MavenObject HAMCREST = new MavenObject("Hamcrest Core", "org/hamcrest", "hamcrest-core", "1.1",
+ 77000, 0, 0, "860340562250678d1a344907ac75754e259cdb14", null, "");
public static final MavenObject MARKDOWNPAPERS = new MavenObject("MarkdownPapers",
"org/tautua/markdownpapers", "markdownpapers-core", "1.2.7", 87000, 58000, 268000,
@@ -542,15 +601,15 @@
"3b7c5f3938f202311bdca0bf7ed46bc0118af081");
public static final MavenObject JGIT = new MavenObject("JGit", "org/eclipse/jgit",
- "org.eclipse.jgit", "1.3.0.201202151440-r", 1532000, 1565000, 3460000,
- "a00dc524b1d1db1abbf95407aa3e6009c3d2c157",
- "68864beaa0856f539deafecf9e1fe105a7e996c3",
+ "org.eclipse.jgit", "2.1.0.201209190230-r", 1600000, 1565000, 3460000,
+ "5e7296d21645a479a1054fc96f3ec8469cede137",
+ "5f492aaeae1beda2a31d1efa182f5d34e76d7b77",
"");
public static final MavenObject JGIT_HTTP = new MavenObject("JGit", "org/eclipse/jgit",
- "org.eclipse.jgit.http.server", "1.3.0.201202151440-r", 68000, 62000, 110000,
- "099468bdd59d6f4919d54d5b66022d3ec8077b29",
- "721ef2b857a7e92989a8f1ee688e361510303bb1",
+ "org.eclipse.jgit.http.server", "2.1.0.201209190230-r", 68000, 62000, 110000,
+ "0bd9e5801c246d6f8ad9268d18c45ca9915f9a50",
+ "210c434c38ddcf2126af250018d5845ea41ff502",
"");
public static final MavenObject JSCH = new MavenObject("JSch", "com/jcraft", "jsch",
@@ -567,40 +626,52 @@
"226f851dc44fd94fe70b9c471881b71f88949cbf",
"8d7d867b97eeb3a9196c3926da550ad042941c1b");
- public static final MavenObject JDOM = new MavenObject("jdom", "org/jdom", "jdom", "1.1",
- 153000, 235000, 445000, "1d04c0f321ea337f3661cf7ede8f4c6f653a8fdd",
- "a7ed425c4c46605b8f2bf2ee118c1609682f4f2c",
- "f3df91edccba2f07a0fced70887c2f7b7836cb75");
+ public static final MavenObject JDOM = new MavenObject("jdom", "jdom", "jdom", "1.0",
+ 153000, 235000, 445000, "a2ac1cd690ab4c80defe7f9bce14d35934c35cec",
+ "662abe0196cf554d4d7374f5d6382034171b652c",
+ "");
public static final MavenObject GSON = new MavenObject("gson", "com/google/code/gson",
- "gson", "1.7.1", 174000, 142000, 247000,
- "0697e3a1fa094a983cd12f7f6f61abf9c6ea52e2",
- "51f6f78aec2d30d0c2bfb4a5f00d456a6f7a5e7e",
- "f0872fe17d484815328538b89909d5e46d85db74");
+ "gson", "1.7.2", 174000, 142000, 247000,
+ "112366d8158749e25532ebce162232c6e0fb20a5",
+ "a6fe3006df46174a9c1c56b3c51357b9bfde5874",
+ "537f729ac63b6132a795a3c1f2e13b327e872333");
public static final MavenObject MAIL = new MavenObject("javax.mail", "javax/mail", "mail",
"1.4.3", 462000, 642000, 0, "8154bf8d666e6db154c548dc31a8d512c273f5ee",
"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.8", 6143000, 2290000, 4608000, "98a489343d3c30da817d36cbea5de11ed07bef31",
+ "5f847ed18009f8a034bad3906e39f771c01728c1", "");
public static final MavenObject LUCENE = new MavenObject("lucene", "org/apache/lucene", "lucene-core",
- "3.5.0", 1470000, 1347000, 3608000, "90ff0731fafb05c01fee4f2247140d56e9c30a3b",
- "0757113199f9c8c18c678c96d61c2c4160b9baa6", "19f8e80e5e7f6ec88a41d4f63495994692e31bf1");
+ "3.6.1", 1540000, 1431000, 3608000, "6ae2c83c77a1ffa5840b9151a271ab3f451f6e0c",
+ "6925deb6b78e63bbcac382004f00b98133327057", "");
public static final MavenObject LUCENE_HIGHLIGHTER = new MavenObject("lucene highlighter", "org/apache/lucene", "lucene-highlighter",
- "3.5.0", 88000, 82334, 0, "9b38acfa185337dac65e350073a26fe2416f2b0e",
- "200a9b9857e589b9f5bc9f65ecf5daa37e19527d", "");
+ "3.6.1", 89200, 85000, 0, "2bd49695e9891697c5f290aa94c3412dfb95b096",
+ "20ae81816ce9c27186ef0f2e92a57812c9ee3b6c", "");
public static final MavenObject LUCENE_MEMORY = new MavenObject("lucene memory", "org/apache/lucene", "lucene-memory",
- "3.5.0", 30000, 23000, 0, "7908e954e8c1b4b2463aa712b34fa4a5612e241d",
- "69b19b38d78cc3b27ea5542a14f0ebbb1625ffdd", "");
+ "3.6.1", 30000, 23000, 0, "8c7ca5572edea50973dc0d26cf75c27047eebe7e",
+ "2e291e96d25132e002b1c8240e361d1272d113e1", "");
+
+ public static final MavenObject LUCENE_QUERIES = new MavenObject("lucene queries", "org/apache/lucene", "lucene-queries",
+ "3.6.1", 47400, 48600, 0, "4ed6022dd4aa80b932a1546e7e39e3b8bbe7acb7",
+ "dc425c75d988e4975d314772035a46b6a17dcc8d", "");
+
+ public static final MavenObject JAKARTA_REGEXP = new MavenObject("jakarta regexp", "jakarta-regexp", "jakarta-regexp",
+ "1.4", 28500, 0, 0, "0ea514a179ac1dd7e81c7e6594468b9b9910d298",
+ null, "");
public static final MavenObject UNBOUND_ID = new MavenObject("unbound id", "com/unboundid", "unboundid-ldapsdk",
"2.3.0", 1383417, 1439721, 0, "6fde8d9fb4ee3e7e3d7e764e3ea57195971e2eb2",
"5276d3d29630693dba99ab9f7ea54f4c471d3af1", "");
+
+ public static final MavenObject IVY = new MavenObject("ivy", "org/apache/ivy", "ivy",
+ "2.2.0", 948000, 744000, 0, "f9d1e83e82fc085093510f7d2e77d81d52bc2081",
+ "0312527950ad0e8fbab37228fbed3bf41a6fe0a1", "");
public final String name;
--
Gitblit v1.9.1