summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2015-07-31 11:57:38 -0230
committerDwayne Boone <dwayne@zeroc.com>2015-07-31 11:57:38 -0230
commit20eb6c6acc2d234750aa697f266f064f484308f5 (patch)
tree050d47a3a5385dcc1e098c450349b27d192dd3ef /java
parentFixed ICE-6625: warning when shutting IceDiscovery hello server (diff)
downloadice-20eb6c6acc2d234750aa697f266f064f484308f5.tar.bz2
ice-20eb6c6acc2d234750aa697f266f064f484308f5.tar.xz
ice-20eb6c6acc2d234750aa697f266f064f484308f5.zip
Updated version to 3.6.1
Diffstat (limited to 'java')
-rw-r--r--java/gradle.properties2
-rw-r--r--java/src/Ice/src/main/java/Ice/Util.java4
-rw-r--r--java/test/ejb/README.md2
3 files changed, 4 insertions, 4 deletions
diff --git a/java/gradle.properties b/java/gradle.properties
index 6fb302a2c9a..7d1501203c1 100644
--- a/java/gradle.properties
+++ b/java/gradle.properties
@@ -7,7 +7,7 @@
//
// **********************************************************************
-iceVersion = 3.6.0
+iceVersion = 3.6.1
//
// The directory that contains Oracle Berkeley DB's db.jar file. When not
diff --git a/java/src/Ice/src/main/java/Ice/Util.java b/java/src/Ice/src/main/java/Ice/Util.java
index 720a99a72eb..54c7596b34c 100644
--- a/java/src/Ice/src/main/java/Ice/Util.java
+++ b/java/src/Ice/src/main/java/Ice/Util.java
@@ -575,7 +575,7 @@ public final class Util
public static String
stringVersion()
{
- return "3.6.0"; // "A.B.C", with A=major, B=minor, C=patch
+ return "3.6.1"; // "A.B.C", with A=major, B=minor, C=patch
}
/**
@@ -588,7 +588,7 @@ public final class Util
public static int
intVersion()
{
- return 30600; // AABBCC, with AA=major, BB=minor, CC=patch
+ return 30601; // AABBCC, with AA=major, BB=minor, CC=patch
}
/**
diff --git a/java/test/ejb/README.md b/java/test/ejb/README.md
index 82c87eaed30..e3d80f85fe6 100644
--- a/java/test/ejb/README.md
+++ b/java/test/ejb/README.md
@@ -42,7 +42,7 @@ directory, for example:
$ export JBOSS_HOME=$HOME/EnterprisePlatform-5.1.2/jboss-eap-5.1/jboss-as/
If Ice isn't installed in the default location set the ICE_HOME
-environment variable to your Ice 3.6.0 installation directory.
+environment variable to your Ice 3.6.1 installation directory.
Run ant to build and deploy the application: