Added Commons-Compress and XZ for Java (issue-174)

diff --git a/.classpath b/.classpath
index 772d0e628df8f6e5014e31f99e5ad759d70d5ca8..55018bfb1d71c22986cf40b7dd0304d448e33ac5 100644 (file)
--- 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 6c2e253158eeeb6a9a51240bdaf9d24926aef0c8..4daa1202d15f7f73c8cf971f0e61c803202a6797 100644 (file)
--- 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)\r
 \r
    http://www.toedter.com/en/jcalendar\r
-   
\ No newline at end of file
+   \r
+---------------------------------------------------------------------------\r
+Commons-Compress\r
+---------------------------------------------------------------------------\r
+   Commons-Compress, released under the\r
+   Apache Software License, Version 2.0.\r
+\r
+   http://commons.apache.org/compress\r
+\r
+---------------------------------------------------------------------------\r
+XZ for Java\r
+---------------------------------------------------------------------------\r
+   XZ for Java, released under the\r
+   Public Domain\r
+\r
+   http://tukaani.org/xz/java.html\r
+\r

diff --git a/docs/04_design.mkd b/docs/04_design.mkd
index c2a735929be7d31dc6609ef9577cc32ea3ca49c5..622e4a230c3ecdef262b50e945737c0d0176e3d5 100644 (file)
--- 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)\r
 - [Ivy](http://ant.apache.org/ivy) (Apache 2.0)\r
 - [JCalendar](http://www.toedter.com/en/jcalendar) (LGPL 2.1)\r
+- [Commons-Compress](http://commons.apache.org/compress) (Apache 2.0)\r
+- [XZ for Java](http://tukaani.org/xz/java.html) (Public Domain)\r
 \r
 ### Other Build Dependencies\r
 - [Fancybox image viewer](http://fancybox.net) (MIT and GPL dual-licensed)\r

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index 9704de0f7998d37f30a867c784687a7c3a6a9cec..70a853fcf91b851cef4f543a975052d2380758a3 100644 (file)
--- 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\r
 - updated to BouncyCastle 1.47\r
 - added JCalendar 1.3.2\r
-\r
+- added Commons-Compress 1.4.1\r
+- added XZ for Java 1.0\r
 <hr/>\r
 \r
 ### Older Releases\r

diff --git a/src/com/gitblit/build/Build.java b/src/com/gitblit/build/Build.java
index 4c5fa195d98542af79390a91a80918d859e32640..e8e6b45d02f371e357d34940d1e8b04644d1d5e4 100644 (file)
--- 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);\r
                downloadFromApache(MavenObject.IVY, BuildType.RUNTIME);\r
                downloadFromApache(MavenObject.JCALENDAR, BuildType.RUNTIME);\r
+               downloadFromApache(MavenObject.COMMONS_COMPRESS, BuildType.RUNTIME);\r
+               downloadFromApache(MavenObject.XZ, BuildType.RUNTIME);\r
 \r
                downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME);\r
                downloadFromEclipse(MavenObject.JGIT_HTTP, BuildType.RUNTIME);\r
@@ -143,7 +145,9 @@ public class Build {
                downloadFromApache(MavenObject.UNBOUND_ID, BuildType.COMPILETIME);\r
                downloadFromApache(MavenObject.IVY, BuildType.COMPILETIME);\r
                downloadFromApache(MavenObject.JCALENDAR, BuildType.COMPILETIME);\r
-               \r
+               downloadFromApache(MavenObject.COMMONS_COMPRESS, BuildType.COMPILETIME);\r
+               downloadFromApache(MavenObject.XZ, BuildType.COMPILETIME);\r
+\r
                downloadFromEclipse(MavenObject.JGIT, BuildType.COMPILETIME);\r
                downloadFromEclipse(MavenObject.JGIT_HTTP, BuildType.COMPILETIME);\r
 \r
@@ -779,7 +783,19 @@ public class Build {
                 127000, 0, 0,\r
                 "323a672aeacb5f5f4461be3b7f7d9d3e4bda80d4",\r
                                null, "");\r
-               \r
+\r
+               public static final MavenObject COMMONS_COMPRESS = new MavenObject(\r
+                "commons-compress", "org/apache/commons", "commons-compress", "1.4.1",\r
+                242000, 265000, 0,\r
+                "b02e84a993d88568417536240e970c4b809126fd",\r
+                               "277d39267403965a7a192474794a29bac6760a25", "");\r
+\r
+               public static final MavenObject XZ = new MavenObject(\r
+                "xz", "org/tukaani", "xz", "1.0",\r
+                95000, 120000, 0,\r
+                "ecff5cb8b1189514c9d1d8d68eb77ac372e000c9",\r
+                               "f95e32a5d2dd8da643c4419814415b9704312993", "");\r
+\r
                public final String name;\r
                public final String group;\r
                public final String artifact;\r