From d00a0ca46fcde3e3e580afea6a548b9c12aeac25 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 Jul 2012 17:18:02 -0400
Subject: [PATCH] Update to slf4j 1.6.6 and log4j 1.2.17
---
src/com/gitblit/build/Build.java | 58 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/src/com/gitblit/build/Build.java b/src/com/gitblit/build/Build.java
index fcf52b9..e600a4f 100644
--- a/src/com/gitblit/build/Build.java
+++ b/src/com/gitblit/build/Build.java
@@ -93,6 +93,7 @@
downloadFromApache(MavenObject.LUCENE_HIGHLIGHTER, BuildType.RUNTIME);
downloadFromApache(MavenObject.LUCENE_MEMORY, BuildType.RUNTIME);
downloadFromApache(MavenObject.UNBOUND_ID, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.IVY, BuildType.RUNTIME);
downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME);
downloadFromEclipse(MavenObject.JGIT_HTTP, BuildType.RUNTIME);
@@ -124,6 +125,7 @@
downloadFromApache(MavenObject.LUCENE_HIGHLIGHTER, BuildType.COMPILETIME);
downloadFromApache(MavenObject.LUCENE_MEMORY, BuildType.COMPILETIME);
downloadFromApache(MavenObject.UNBOUND_ID, BuildType.COMPILETIME);
+ downloadFromApache(MavenObject.IVY, BuildType.COMPILETIME);
downloadFromEclipse(MavenObject.JGIT, BuildType.COMPILETIME);
downloadFromEclipse(MavenObject.JGIT_HTTP, BuildType.COMPILETIME);
@@ -473,28 +475,28 @@
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);
+
+ 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,
@@ -542,15 +544,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.0.0.201206130900-r", 1600000, 1565000, 3460000,
+ "c8934e903ef26ec9aa1d0d3b604979c77eda4137",
+ "7e2c1486bf13e7bbdf39b68554e9010abe385c32",
"");
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.0.0.201206130900-r", 68000, 62000, 110000,
+ "d42535d996ccfc487092a8850e6e78d368de72d6",
+ "85d5ba16db13144815634aeff31ad6c7d92107e6",
"");
public static final MavenObject JSCH = new MavenObject("JSch", "com/jcraft", "jsch",
@@ -567,10 +569,10 @@
"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,
@@ -601,6 +603,10 @@
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