summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2020-04-20 17:20:25 +0200
committerJose <jose@zeroc.com>2020-04-20 17:20:25 +0200
commit84e61ebe2820e1ef81d54bfae1f5af9d7768f928 (patch)
treed4e942efcad398ebafba68dca01c1ad5d8a5806c /java
parentFix bug in C# ice_ids - Close #641 (diff)
downloadice-84e61ebe2820e1ef81d54bfae1f5af9d7768f928.tar.bz2
ice-84e61ebe2820e1ef81d54bfae1f5af9d7768f928.tar.xz
ice-84e61ebe2820e1ef81d54bfae1f5af9d7768f928.zip
Update version to 3.7.4
Diffstat (limited to 'java')
-rw-r--r--java/README.md28
-rw-r--r--java/gradle.properties2
-rw-r--r--java/src/Ice/src/main/java/com/zeroc/Ice/Util.java4
-rw-r--r--java/test/android/controller/gradle.properties2
4 files changed, 18 insertions, 18 deletions
diff --git a/java/README.md b/java/README.md
index e6eaadaff85..31847f7f18b 100644
--- a/java/README.md
+++ b/java/README.md
@@ -126,7 +126,7 @@ export ICE_HOME=/usr
On Windows with an MSI installation:
```
set ICE_BIN_DIST=cpp
-set ICE_HOME=C:\Program Files\ZeroC\Ice-3.7.3
+set ICE_HOME=C:\Program Files\ZeroC\Ice-3.7.4
```
If you are using Ice for C++ from a source build on Windows, you must set
@@ -168,17 +168,17 @@ gradlew install
The following JAR files will be installed to `<prefix>/lib`.
```
-glacier2-3.7.3.jar
-ice-3.7.3.jar
-icebox-3.7.3.jar
-icebt-3.7.3.jar
-icediscovery-3.7.3.jar
-icegrid-3.7.3.jar
+glacier2-3.7.4.jar
+ice-3.7.4.jar
+icebox-3.7.4.jar
+icebt-3.7.4.jar
+icediscovery-3.7.4.jar
+icegrid-3.7.4.jar
icegridgui.jar
-icelocatordiscovery-3.7.3.jar
-icepatch2-3.7.3.jar
-icessl-3.7.3.jar
-icestorm-3.7.3.jar
+icelocatordiscovery-3.7.4.jar
+icepatch2-3.7.4.jar
+icessl-3.7.4.jar
+icestorm-3.7.4.jar
```
POM files are also installed for ease of deployment to a Maven-based
@@ -191,13 +191,13 @@ C++ distribution. If you have not built Ice for C++ in this source distribution
then you must set the `ICE_HOME` environment variable with the path name of your
Ice installation. On Unix:
```
-export ICE_HOME=/opt/Ice-3.7.3 (For local build)
+export ICE_HOME=/opt/Ice-3.7.4 (For local build)
export ICE_HOME=/usr (For RPM installation)
```
On Windows:
```
-set ICE_HOME=C:\Program Files\ZeroC\Ice-3.7.3
+set ICE_HOME=C:\Program Files\ZeroC\Ice-3.7.4
```
Python is required to run the test suite. To run the tests, open a command
@@ -305,7 +305,7 @@ can start the IceGrid GUI tool by double-clicking the IceGrid GUI icon in
Finder.
[1]: https://zeroc.com/downloads/ice
-[2]: https://doc.zeroc.com/ice/3.7/release-notes/supported-platforms-for-ice-3-7-3
+[2]: https://doc.zeroc.com/ice/3.7/release-notes/supported-platforms-for-ice-3-7-4
[3]: https://gradle.org
[4]: http://proguard.sourceforge.net
[5]: https://commons.apache.org/proper/commons-compress/
diff --git a/java/gradle.properties b/java/gradle.properties
index 56ef44b441d..fe77ef0b95e 100644
--- a/java/gradle.properties
+++ b/java/gradle.properties
@@ -5,7 +5,7 @@
//
// Version used in JAR files
//
-iceVersion = 3.7.3
+iceVersion = 3.7.4
//
// Select an installation base directory. The directory will be created
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java b/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java
index 87923196f2a..2cd491de8fe 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java
@@ -529,7 +529,7 @@ public final class Util
**/
public static String stringVersion()
{
- return "3.7.3"; // "A.B.C", with A=major, B=minor, C=patch
+ return "3.7.4"; // "A.B.C", with A=major, B=minor, C=patch
}
/**
@@ -541,7 +541,7 @@ public final class Util
**/
public static int intVersion()
{
- return 30703; // AABBCC, with AA=major, BB=minor, CC=patch
+ return 30704; // AABBCC, with AA=major, BB=minor, CC=patch
}
/**
diff --git a/java/test/android/controller/gradle.properties b/java/test/android/controller/gradle.properties
index d8c1c6b10d0..e72c1682a3f 100644
--- a/java/test/android/controller/gradle.properties
+++ b/java/test/android/controller/gradle.properties
@@ -5,7 +5,7 @@
//
// Version used in JAR files
//
-iceVersion = 3.7.3
+iceVersion = 3.7.4
//
// Set iceHome to location of Ice installation if Ice was installed in a