diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-10-23 15:03:49 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-10-23 15:03:49 -0400 |
| commit | ef571f80c545d30a5a2330b2d835f9c6441616a1 (patch) | |
| tree | fce9620a538899c44d8471a0e798c4ff134dead8 /java | |
| parent | Java/C# factory fix (diff) | |
| download | ice-ef571f80c545d30a5a2330b2d835f9c6441616a1.tar.bz2 ice-ef571f80c545d30a5a2330b2d835f9c6441616a1.tar.xz ice-ef571f80c545d30a5a2330b2d835f9c6441616a1.zip | |
Fixed ICE-4884:
Updated version to 3.5b
Some fixes to distribution/bin/fixVersion.py
Diffstat (limited to 'java')
| -rw-r--r-- | java/config/build.properties | 2 | ||||
| -rw-r--r-- | java/demo/IceStorm/clock/config.icebox | 2 | ||||
| -rw-r--r-- | java/src/Ice/Util.java | 4 | ||||
| -rw-r--r-- | java/src/IceUtil/Version.java | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/java/config/build.properties b/java/config/build.properties index b0c720f982b..0de3e3dd3a8 100644 --- a/java/config/build.properties +++ b/java/config/build.properties @@ -7,7 +7,7 @@ # # ********************************************************************** -ice.version = 3.4.2 +ice.version = 3.5b # # Oracle Berkeley DB version, only needed if you want to build diff --git a/java/demo/IceStorm/clock/config.icebox b/java/demo/IceStorm/clock/config.icebox index 7f866a8021f..1ef67c260be 100644 --- a/java/demo/IceStorm/clock/config.icebox +++ b/java/demo/IceStorm/clock/config.icebox @@ -11,7 +11,7 @@ IceBox.ServiceManager.Endpoints=tcp -h localhost -p 9998 # The IceStorm service. The service is configured using a separate # configuration file (see config.service). # -IceBox.Service.IceStorm=IceStormService,34:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,35b:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java index 193c747508c..822e8559efc 100644 --- a/java/src/Ice/Util.java +++ b/java/src/Ice/Util.java @@ -500,7 +500,7 @@ public final class Util public static String stringVersion() { - return "3.4.2"; // "A.B.C", with A=major, B=minor, C=patch + return "3.5b"; // "A.B.C", with A=major, B=minor, C=patch } /** @@ -513,7 +513,7 @@ public final class Util public static int intVersion() { - return 30402; // AABBCC, with AA=major, BB=minor, CC=patch + return 30551; // AABBCC, with AA=major, BB=minor, CC=patch } /** diff --git a/java/src/IceUtil/Version.java b/java/src/IceUtil/Version.java index 11acebb0c3c..a1b1f5e82e1 100644 --- a/java/src/IceUtil/Version.java +++ b/java/src/IceUtil/Version.java @@ -18,6 +18,6 @@ public final class Version // // The Ice version. // - public final static String ICE_STRING_VERSION = "3.4.2"; // "A.B.C", with A=major, B=minor, C=patch - public final static int ICE_INT_VERSION = 30402; // AABBCC, with AA=major, BB=minor, CC=patch + public final static String ICE_STRING_VERSION = "3.5b"; // "A.B.C", with A=major, B=minor, C=patch + public final static int ICE_INT_VERSION = 30551; // AABBCC, with AA=major, BB=minor, CC=patch } |