From 9e1aa2eab5a72be52ebee633557a5aafc8132eb6 Mon Sep 17 00:00:00 2001 From: James Moger Date: Fri, 30 Nov 2012 16:26:38 -0500 Subject: [PATCH] Added Commons-Compress and XZ for Java (issue-174) --- .classpath | 2 ++ NOTICE | 18 +++++++++++++++++- docs/04_design.mkd | 2 ++ docs/04_releases.mkd | 3 ++- src/com/gitblit/build/Build.java | 20 ++++++++++++++++++-- 5 files changed, 41 insertions(+), 4 deletions(-) diff --git a/.classpath b/.classpath index 772d0e62..55018bfb 100644 --- a/.classpath +++ b/.classpath @@ -34,6 +34,8 @@ + + diff --git a/NOTICE b/NOTICE index 6c2e2531..4daa1202 100644 --- a/NOTICE +++ b/NOTICE @@ -238,4 +238,20 @@ JCalendar 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 c2a73592..622e4a23 100644 --- a/docs/04_design.mkd +++ b/docs/04_design.mkd @@ -43,6 +43,8 @@ The following dependencies are automatically downloaded by Gitblit GO (or alread - [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 9704de0f..70a853fc 100644 --- a/docs/04_releases.mkd +++ b/docs/04_releases.mkd @@ -90,7 +90,8 @@ If *realm.ldap.maintainTeams==true* **AND** *realm.ldap.admins* is not empty, th - 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
### Older Releases diff --git a/src/com/gitblit/build/Build.java b/src/com/gitblit/build/Build.java index 4c5fa195..e8e6b45d 100644 --- a/src/com/gitblit/build/Build.java +++ b/src/com/gitblit/build/Build.java @@ -106,6 +106,8 @@ public class Build { 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 @@ public class Build { 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 @@ public class Build { 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; -- 2.39.5