From 9c7a3604527ea467266ae1fbd427ea2c6f83af3d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 09 Feb 2012 19:56:58 -0500
Subject: [PATCH] Documented overriding default log4j configuration (issue 53)
---
src/com/gitblit/build/Build.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/com/gitblit/build/Build.java b/src/com/gitblit/build/Build.java
index 8ca52c3..4e8190a 100644
--- a/src/com/gitblit/build/Build.java
+++ b/src/com/gitblit/build/Build.java
@@ -73,6 +73,7 @@
public static void runtime() {
downloadFromApache(MavenObject.JCOMMANDER, BuildType.RUNTIME);
downloadFromApache(MavenObject.JETTY, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.JETTY_AJP, BuildType.RUNTIME);
downloadFromApache(MavenObject.SERVLET, BuildType.RUNTIME);
downloadFromApache(MavenObject.SLF4JAPI, BuildType.RUNTIME);
downloadFromApache(MavenObject.SLF4LOG4J, BuildType.RUNTIME);
@@ -99,6 +100,7 @@
downloadFromApache(MavenObject.JUNIT, BuildType.RUNTIME);
downloadFromApache(MavenObject.JCOMMANDER, BuildType.COMPILETIME);
downloadFromApache(MavenObject.JETTY, BuildType.COMPILETIME);
+ downloadFromApache(MavenObject.JETTY_AJP, BuildType.COMPILETIME);
downloadFromApache(MavenObject.SERVLET, BuildType.COMPILETIME);
downloadFromApache(MavenObject.SLF4JAPI, BuildType.COMPILETIME);
downloadFromApache(MavenObject.SLF4LOG4J, BuildType.COMPILETIME);
@@ -270,7 +272,7 @@
if (BuildType.RUNTIME.equals(type)) {
jars = new String[] { "" };
} else if (BuildType.COMPILETIME.equals(type)) {
- jars = new String[] { "-sources", "-javadoc" };
+ jars = new String[] { "-sources" };
}
for (String jar : jars) {
File targetFile = mo.getLocalFile("ext", jar);
@@ -389,6 +391,10 @@
"bc75f05dd4f7fa848720ac669b8b438ee4a6b146",
"dcd42f672e734521d1a6ccc0c2f9ecded1a1a281");
+ 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",
@@ -457,16 +463,16 @@
"3b7c5f3938f202311bdca0bf7ed46bc0118af081");
public static final MavenObject JGIT = new MavenObject("JGit", "org/eclipse/jgit",
- "org.eclipse.jgit", "1.1.0.201109151100-r", 1318000, 1354000, 3300000,
- "bacc988346c839f79513d7bc7f5c88b22ea6e7a5",
- "90abf988d98ce0d4b162f94f63fc99c435eba6b4",
- "a46540a2857a0fdbf43debf3383295a897946c79");
+ "org.eclipse.jgit", "1.2.0.201112221803-r", 1318000, 1354000, 3300000,
+ "f3bbea50b64c2c8e20176f412d2f063bd132878f",
+ "f6c616413540e226a6b72bc573a40410412e234f",
+ "a77e5ee65ba284d12ae444ac42e12948a9314c20");
public static final MavenObject JGIT_HTTP = new MavenObject("JGit", "org/eclipse/jgit",
- "org.eclipse.jgit.http.server", "1.1.0.201109151100-r", 68000, 62000, 110000,
- "3070161a89756aac2dfc2e26d89faf31fe894ab4",
- "9cecb8e4351e616688cafbcca906f542d9b1f525",
- "20aaab759acd8eb6cb6acbb1b2934a689fb3774d");
+ "org.eclipse.jgit.http.server", "1.2.0.201112221803-r", 68000, 62000, 110000,
+ "0d0004423b71bf7c29cd4ad85010c293c4fab95f",
+ "89be774b6db17bbc47b4757ae9e5178750064880",
+ "4cde29a085200ccf46ac677aeb1abb39352a3a6a");
public static final MavenObject JSCH = new MavenObject("JSch", "com/jcraft", "jsch",
"0.1.44-1", 214000, 211000, 413000, "2e9ae08de5a71bd0e0d3ba2558598181bfa71d4e",
@@ -498,8 +504,8 @@
"5875e2729de83a4e46391f8f979ec8bd03810c10", null);
public static final MavenObject GROOVY = new MavenObject("groovy", "org/codehaus/groovy", "groovy-all",
- "1.8.4", 6143000, 2290000, 4608000, "b5e7c2a5e6af43ccccf643ad656d6fe4b773be2b",
- "a527e83e5c715540108d8f2b86ca19a3c9c78ac1", "8e5da5584fff57b14adbb4ee25cca09f5a00b013");
+ "1.8.5", 6143000, 2290000, 4608000, "3be3914c49ca7d8e8afb29a7772a74c30a1f1b28",
+ "1435cc8c90e3a91e5fee7bb53e83aad96e93aeb7", "5a214b52286523f9e2a4b5fed526506c763fa6f1");
public final String name;
public final String group;
--
Gitblit v1.9.1