From 73f1adb2e84b8b9cd4045bcdd7d9afa72d3875b5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 27 Nov 2012 17:13:03 -0500
Subject: [PATCH] Added short commit id column to log and history tables (issue 168)
---
src/com/gitblit/build/Build.java | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/src/com/gitblit/build/Build.java b/src/com/gitblit/build/Build.java
index b594087..4c5fa19 100644
--- a/src/com/gitblit/build/Build.java
+++ b/src/com/gitblit/build/Build.java
@@ -69,6 +69,11 @@
runtime();
compiletime();
buildSettingKeys();
+ delete(
+ "bcmail-jdk16-1.46.jar",
+ "bcprov-jdk16-1.46.jar",
+ "src/bcmail-jdk16-1.46-sources.jar",
+ "src/bcprov-jdk16-1.46-sources.jar");
}
public static void runtime() {
@@ -86,6 +91,7 @@
downloadFromApache(MavenObject.MARKDOWNPAPERS, BuildType.RUNTIME);
downloadFromApache(MavenObject.BOUNCYCASTLE, BuildType.RUNTIME);
downloadFromApache(MavenObject.BOUNCYCASTLE_MAIL, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.BOUNCYCASTLE_PKIX, BuildType.RUNTIME);
downloadFromApache(MavenObject.JSCH, BuildType.RUNTIME);
downloadFromApache(MavenObject.ROME, BuildType.RUNTIME);
downloadFromApache(MavenObject.JDOM, BuildType.RUNTIME);
@@ -99,6 +105,7 @@
downloadFromApache(MavenObject.JAKARTA_REGEXP, BuildType.RUNTIME);
downloadFromApache(MavenObject.UNBOUND_ID, BuildType.RUNTIME);
downloadFromApache(MavenObject.IVY, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.JCALENDAR, BuildType.RUNTIME);
downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME);
downloadFromEclipse(MavenObject.JGIT_HTTP, BuildType.RUNTIME);
@@ -121,6 +128,7 @@
downloadFromApache(MavenObject.MARKDOWNPAPERS, BuildType.COMPILETIME);
downloadFromApache(MavenObject.BOUNCYCASTLE, BuildType.COMPILETIME);
downloadFromApache(MavenObject.BOUNCYCASTLE_MAIL, BuildType.COMPILETIME);
+ downloadFromApache(MavenObject.BOUNCYCASTLE_PKIX, BuildType.COMPILETIME);
downloadFromApache(MavenObject.JSCH, BuildType.COMPILETIME);
downloadFromApache(MavenObject.ROME, BuildType.COMPILETIME);
downloadFromApache(MavenObject.JDOM, BuildType.COMPILETIME);
@@ -134,12 +142,22 @@
downloadFromApache(MavenObject.JAKARTA_REGEXP, BuildType.COMPILETIME);
downloadFromApache(MavenObject.UNBOUND_ID, BuildType.COMPILETIME);
downloadFromApache(MavenObject.IVY, BuildType.COMPILETIME);
+ downloadFromApache(MavenObject.JCALENDAR, BuildType.COMPILETIME);
downloadFromEclipse(MavenObject.JGIT, BuildType.COMPILETIME);
downloadFromEclipse(MavenObject.JGIT_HTTP, BuildType.COMPILETIME);
// needed for site publishing
downloadFromApache(MavenObject.COMMONSNET, BuildType.RUNTIME);
+ }
+
+ private static void delete(String... files) {
+ for (String name : files) {
+ File file = new File("ext", name);
+ if (file.exists()) {
+ file.delete();
+ }
+ }
}
public static void federationClient() {
@@ -166,6 +184,22 @@
downloadFromApache(MavenObject.ROME, BuildType.RUNTIME);
downloadFromApache(MavenObject.JDOM, BuildType.RUNTIME);
downloadFromApache(MavenObject.JSCH, BuildType.RUNTIME);
+
+ downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME);
+ }
+
+ public static void authority(DownloadListener listener) {
+ downloadListener = listener;
+ downloadFromApache(MavenObject.JCOMMANDER, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.JSCH, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.SLF4JAPI, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.SLF4LOG4J, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.LOG4J, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.BOUNCYCASTLE, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.BOUNCYCASTLE_MAIL, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.BOUNCYCASTLE_PKIX, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.JCALENDAR, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.MAIL, BuildType.RUNTIME);
downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME);
}
@@ -616,18 +650,25 @@
"");
public static final MavenObject BOUNCYCASTLE = new MavenObject(
- "BouncyCastle", "org/bouncycastle", "bcprov-jdk16", "1.46",
+ "BouncyCastle", "org/bouncycastle", "bcprov-jdk15on", "1.47",
1900000, 1400000, 4670000,
- "ce091790943599535cbb4de8ede84535b0c1260c",
- "d2b70567594225923450d7e3f80cd022c852725e",
- "873a6fe765f33fc27df498a5d1f5bf077e503b2f");
+ "b6f5d9926b0afbde9f4dbe3db88c5247be7794bb",
+ "85e6e1ad449d5a3f09624bf4038fc8d2b02de81c",
+ "");
public static final MavenObject BOUNCYCASTLE_MAIL = new MavenObject(
- "BouncyCastle Mail", "org/bouncycastle", "bcmail-jdk16", "1.46",
+ "BouncyCastle Mail", "org/bouncycastle", "bcmail-jdk15on", "1.47",
502000, 420000, 482000,
- "08a9233bfd6ad38ea32df5e6ff91035b650584b9",
- "3ebd62bc56854767512dc5deec0a17795f2e671d",
- "3b7c5f3938f202311bdca0bf7ed46bc0118af081");
+ "a35ccec640177d0de5815568529021af5546d6a7",
+ "f742330cfe1e7365dbdf773c24b92382172164a7",
+ "");
+
+ public static final MavenObject BOUNCYCASTLE_PKIX = new MavenObject(
+ "BouncyCastle PKIX", "org/bouncycastle", "bcpkix-jdk15on", "1.47",
+ 502000, 420000, 482000,
+ "cd204e6f26d2bbf65ff3a30de8831d3a1344e851",
+ "80e774a73d0e6a6b40ddf35fff613f9f30fe2a98",
+ "");
public static final MavenObject JGIT = new MavenObject(
"JGit", "org/eclipse/jgit", "org.eclipse.jgit", "2.1.0.201209190230-r",
@@ -733,6 +774,11 @@
"f9d1e83e82fc085093510f7d2e77d81d52bc2081",
"0312527950ad0e8fbab37228fbed3bf41a6fe0a1", "");
+ public static final MavenObject JCALENDAR = new MavenObject(
+ "jcalendar", "com/toedter", "jcalendar", "1.3.2",
+ 127000, 0, 0,
+ "323a672aeacb5f5f4461be3b7f7d9d3e4bda80d4",
+ null, "");
public final String name;
public final String group;
--
Gitblit v1.9.1