diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/BuildInstructions.md | 13 | ||||
| -rw-r--r-- | java/build.gradle | 4 | ||||
| -rw-r--r-- | java/src/Ice/src/main/java/com/zeroc/IceInternal/BZip2.java | 4 | ||||
| -rw-r--r-- | java/test/build.gradle | 2 |
4 files changed, 10 insertions, 13 deletions
diff --git a/java/BuildInstructions.md b/java/BuildInstructions.md index b66000911ad..17259697946 100644 --- a/java/BuildInstructions.md +++ b/java/BuildInstructions.md @@ -48,16 +48,16 @@ packages automatically from ZeroC's Maven repository located at ### Bzip2 Compression Ice for Java supports protocol compression using the bzip2 classes included -with Apache Ant or available separately from [kohsuke.org](). +with [Apache Commons Compres][5]. -The Maven package id for the bzip2 JAR file is as follows: +The Maven package id for the commons-compress JAR file is as follows: - groupId=org.apache.tools, version=1.0, artifactId=bzip2 + groupId=org.apache.commons, version=1.14, artifactId=commons-compress The demos and tests are automatically setup to enable protocol compression by -adding the bzip2 JAR to the manifest class path. For your own applications you -must add the bzip2 JAR to the application CLASSPATH to enable protocol -compression. +adding the commons-compress JAR to the manifest class path. For your own +applications you must add the commons-compress JAR to the application CLASSPATH +to enable protocol compression. > *These classes are a pure Java implementation of the bzip2 algorithm and therefore add significant latency to Ice requests.* @@ -199,3 +199,4 @@ You can start the IceGrid GUI tool by double-clicking the IceGrid GUI icon in Fi [2]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.0 [3]: https://gradle.org [4]: http://proguard.sourceforge.net +[5]: https://commons.apache.org/proper/commons-compress/ diff --git a/java/build.gradle b/java/build.gradle index 711c45cf499..339250d460d 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -38,10 +38,6 @@ subprojects { } mavenCentral() - - maven { - url 'https://repo.zeroc.com/nexus/content/repositories/thirdparty' - } } jar { diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/BZip2.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/BZip2.java index de39bf371bc..bb1b0b41f85 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/BZip2.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/BZip2.java @@ -200,13 +200,13 @@ public class BZip2 { Class<?> cls; Class<?>[] types = new Class<?>[1]; - cls = Util.findClass("org.apache.tools.bzip2.CBZip2InputStream", null); + cls = Util.findClass("org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream", null); if(cls != null) { types[0] = java.io.InputStream.class; _bzInputStreamCtor = cls.getDeclaredConstructor(types); } - cls = Util.findClass("org.apache.tools.bzip2.CBZip2OutputStream", null); + cls = Util.findClass("org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream", null); if(cls != null) { types = new Class<?>[2]; diff --git a/java/test/build.gradle b/java/test/build.gradle index 3ce9f10b524..9e2ba76371d 100644 --- a/java/test/build.gradle +++ b/java/test/build.gradle @@ -32,7 +32,7 @@ dependencies { if(!gradle.startParameter.isOffline()) { dependencies { - runtime "org.apache.tools:bzip2:1.0" + runtime "org.apache.commons:commons-compress:1.14" } } |