From 9e1aa2eab5a72be52ebee633557a5aafc8132eb6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 30 Nov 2012 16:26:38 -0500
Subject: [PATCH] Added Commons-Compress and XZ for Java (issue-174)
---
NOTICE | 18 +++++++++++++++++-
.classpath | 2 ++
docs/04_releases.mkd | 3 ++-
docs/04_design.mkd | 2 ++
src/com/gitblit/build/Build.java | 20 ++++++++++++++++++--
5 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/.classpath b/.classpath
index 772d0e6..55018bf 100644
--- a/.classpath
+++ b/.classpath
@@ -34,6 +34,8 @@
<classpathentry kind="lib" path="ext/unboundid-ldapsdk-2.3.0.jar" sourcepath="ext/src/unboundid-ldapsdk-2.3.0-sources.jar" />
<classpathentry kind="lib" path="ext/ivy-2.2.0.jar" sourcepath="ext/src/ivy-2.2.0-sources.jar" />
<classpathentry kind="lib" path="ext/jcalendar-1.3.2.jar" />
+ <classpathentry kind="lib" path="ext/commons-compress-1.4.1.jar" sourcepath="ext/src/commons-compress-1.4.1-sources.jar" />
+ <classpathentry kind="lib" path="ext/xz-1.0.jar" sourcepath="ext/src/xz-1.0-sources.jar" />
<classpathentry kind="lib" path="ext/junit-4.10.jar" sourcepath="ext/src/junit-4.10-sources.jar" />
<classpathentry kind="lib" path="ext/hamcrest-core-1.1.jar" />
<classpathentry kind="output" path="bin/classes" />
diff --git a/NOTICE b/NOTICE
index 6c2e253..4daa120 100644
--- a/NOTICE
+++ b/NOTICE
@@ -238,4 +238,20 @@
GNU LESSER GENERAL PUBLIC LICENSE. (http://www.unboundid.com/products/ldap-sdk/docs/LICENSE-LGPLv2.1.txt)
http://www.toedter.com/en/jcalendar
-
\ No newline at end of file
+
+---------------------------------------------------------------------------
+Commons-Compress
+---------------------------------------------------------------------------
+ Commons-Compress, released under the
+ Apache Software License, Version 2.0.
+
+ http://commons.apache.org/compress
+
+---------------------------------------------------------------------------
+XZ for Java
+---------------------------------------------------------------------------
+ XZ for Java, released under the
+ Public Domain
+
+ http://tukaani.org/xz/java.html
+
diff --git a/docs/04_design.mkd b/docs/04_design.mkd
index c2a7359..622e4a2 100644
--- a/docs/04_design.mkd
+++ b/docs/04_design.mkd
@@ -43,6 +43,8 @@
- [UnboundID](http://www.unboundid.com) (LGPL 2.1)
- [Ivy](http://ant.apache.org/ivy) (Apache 2.0)
- [JCalendar](http://www.toedter.com/en/jcalendar) (LGPL 2.1)
+- [Commons-Compress](http://commons.apache.org/compress) (Apache 2.0)
+- [XZ for Java](http://tukaani.org/xz/java.html) (Public Domain)
### Other Build Dependencies
- [Fancybox image viewer](http://fancybox.net) (MIT and GPL dual-licensed)
diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index 9704de0..70a853f 100644
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -90,7 +90,8 @@
- updated to Lucene 3.6.1
- updated to BouncyCastle 1.47
- added JCalendar 1.3.2
-
+- added Commons-Compress 1.4.1
+- added XZ for Java 1.0
<hr/>
### Older Releases
diff --git a/src/com/gitblit/build/Build.java b/src/com/gitblit/build/Build.java
index 4c5fa19..e8e6b45 100644
--- a/src/com/gitblit/build/Build.java
+++ b/src/com/gitblit/build/Build.java
@@ -106,6 +106,8 @@
downloadFromApache(MavenObject.UNBOUND_ID, BuildType.RUNTIME);
downloadFromApache(MavenObject.IVY, BuildType.RUNTIME);
downloadFromApache(MavenObject.JCALENDAR, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.COMMONS_COMPRESS, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.XZ, BuildType.RUNTIME);
downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME);
downloadFromEclipse(MavenObject.JGIT_HTTP, BuildType.RUNTIME);
@@ -143,7 +145,9 @@
downloadFromApache(MavenObject.UNBOUND_ID, BuildType.COMPILETIME);
downloadFromApache(MavenObject.IVY, BuildType.COMPILETIME);
downloadFromApache(MavenObject.JCALENDAR, BuildType.COMPILETIME);
-
+ downloadFromApache(MavenObject.COMMONS_COMPRESS, BuildType.COMPILETIME);
+ downloadFromApache(MavenObject.XZ, BuildType.COMPILETIME);
+
downloadFromEclipse(MavenObject.JGIT, BuildType.COMPILETIME);
downloadFromEclipse(MavenObject.JGIT_HTTP, BuildType.COMPILETIME);
@@ -779,7 +783,19 @@
127000, 0, 0,
"323a672aeacb5f5f4461be3b7f7d9d3e4bda80d4",
null, "");
-
+
+ public static final MavenObject COMMONS_COMPRESS = new MavenObject(
+ "commons-compress", "org/apache/commons", "commons-compress", "1.4.1",
+ 242000, 265000, 0,
+ "b02e84a993d88568417536240e970c4b809126fd",
+ "277d39267403965a7a192474794a29bac6760a25", "");
+
+ public static final MavenObject XZ = new MavenObject(
+ "xz", "org/tukaani", "xz", "1.0",
+ 95000, 120000, 0,
+ "ecff5cb8b1189514c9d1d8d68eb77ac372e000c9",
+ "f95e32a5d2dd8da643c4419814415b9704312993", "");
+
public final String name;
public final String group;
public final String artifact;
--
Gitblit v1.9.1