diff options
| -rw-r--r-- | CHANGELOG-3.7.md | 5 | ||||
| -rw-r--r-- | java-compat/BuildInstructions.md | 13 | ||||
| -rw-r--r-- | java-compat/build.gradle | 4 | ||||
| -rw-r--r-- | java-compat/src/Ice/src/main/java/IceInternal/BZip2.java | 4 | ||||
| -rw-r--r-- | java-compat/test/build.gradle | 2 | ||||
| -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 |
9 files changed, 24 insertions, 27 deletions
diff --git a/CHANGELOG-3.7.md b/CHANGELOG-3.7.md index f2670e3537f..d834df618a2 100644 --- a/CHANGELOG-3.7.md +++ b/CHANGELOG-3.7.md @@ -438,7 +438,7 @@ These are the changes since the Ice 3.6 release or snapshot described in - Fixed a bug where unmarshaling Ice objects was very slow when using compact type IDs. -- (Jaava) Added the proxy method `ice_executor`, which returns an instance of +- (Java) Added the proxy method `ice_executor`, which returns an instance of `java.util.concurrent.Executor` that you can pass to `CompletableFuture` methods such as `whenCompleteAsync` in order to force an action to be executed by an Ice thread pool thread. @@ -446,6 +446,9 @@ These are the changes since the Ice 3.6 release or snapshot described in - (Java Compat) Added new interface/class metadata `java:tie`. Use this metadata to generate a tie class for a given interface or class. +- Protocol compression now uses Bzip2 implementation from Apache Commons Compress, + previous versions use Bizp2 implementation from Apache Ant. + ## JavaScript Changes - Improved the `Ice.Long` class to allow creating `Ice.Long` instance from diff --git a/java-compat/BuildInstructions.md b/java-compat/BuildInstructions.md index a69a496e111..8d0904dc0f7 100644 --- a/java-compat/BuildInstructions.md +++ b/java-compat/BuildInstructions.md @@ -41,16 +41,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][4]. -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.* @@ -145,3 +145,4 @@ failure, the tests abort with `failed`. [1]: https://zeroc.com/distributions/ice [2]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.0 [3]: https://gradle.org +[4]: https://commons.apache.org/proper/commons-compress/
\ No newline at end of file diff --git a/java-compat/build.gradle b/java-compat/build.gradle index ea206e8070d..18d80b46a4e 100644 --- a/java-compat/build.gradle +++ b/java-compat/build.gradle @@ -41,10 +41,6 @@ subprojects { } mavenCentral() - - maven { - url 'https://repo.zeroc.com/nexus/content/repositories/thirdparty' - } } jar { diff --git a/java-compat/src/Ice/src/main/java/IceInternal/BZip2.java b/java-compat/src/Ice/src/main/java/IceInternal/BZip2.java index ae12752a233..7cb4ccee92f 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/BZip2.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/BZip2.java @@ -200,13 +200,13 @@ public class BZip2 { Class<?> cls; Class<?>[] types = new Class<?>[1]; - cls = IceInternal.Util.findClass("org.apache.tools.bzip2.CBZip2InputStream", null); + cls = IceInternal.Util.findClass("org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream", null); if(cls != null) { types[0] = java.io.InputStream.class; _bzInputStreamCtor = cls.getDeclaredConstructor(types); } - cls = IceInternal.Util.findClass("org.apache.tools.bzip2.CBZip2OutputStream", null); + cls = IceInternal.Util.findClass("org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream", null); if(cls != null) { types = new Class[2]; diff --git a/java-compat/test/build.gradle b/java-compat/test/build.gradle index a2e31400029..1992b38b90f 100644 --- a/java-compat/test/build.gradle +++ b/java-compat/test/build.gradle @@ -37,7 +37,7 @@ dependencies { if(!gradle.startParameter.isOffline()) { dependencies { - runtime "org.apache.tools:bzip2:1.0" + runtime "org.apache.commons:commons-compress:1.14" } } 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" } } |