Changed version to 3.3

10 files changed, 17 insertions, 17 deletions

diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index b855cde8dab..a6acb197ad8 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -113,9 +113,9 @@ KERBEROS_HOME           ?= /usr/kerberos
 
 SHELL			= /bin/sh
 VERSION_MAJOR           = 3
-VERSION_MINOR           = 2
-VERSION			= 3.2.0
-SOVERSION		= 32
+VERSION_MINOR           = 3
+VERSION			= 3.3.0
+SOVERSION		= 33
 
 bindir			= $(top_srcdir)/bin
 libdir			= $(top_srcdir)/lib
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak
index e4be229751e..77396126067 100644
--- a/cpp/config/Make.rules.mak
+++ b/cpp/config/Make.rules.mak
@@ -84,8 +84,8 @@ MT = "$(PDK_HOME)\bin\mt.exe"
 # ----------------------------------------------------------------------
 
 SHELL			= /bin/sh
-VERSION			= 3.2.0
-SOVERSION		= 32
+VERSION			= 3.3.0
+SOVERSION		= 33
 bindir			= $(top_srcdir)\bin
 libdir			= $(top_srcdir)\lib
 includedir		= $(top_srcdir)\include
diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml
index 39c2be728fd..2fec560a307 100644
--- a/cpp/config/templates.xml
+++ b/cpp/config/templates.xml
@@ -64,7 +64,7 @@
       <parameter name="publish-endpoints" default="default"/>
       <parameter name="flush-timeout" default="1000"/>
 
-      <service name="IceStorm${index}" entry="IceStormService,32:createIceStorm">
+      <service name="IceStorm${index}" entry="IceStormService,33:createIceStorm">
 
         <dbenv name="${service}"/>
 
diff --git a/cpp/demo/IceStorm/clock/config.icebox b/cpp/demo/IceStorm/clock/config.icebox
index 07fb2e3cb6c..455571cacdf 100644
--- a/cpp/demo/IceStorm/clock/config.icebox
+++ b/cpp/demo/IceStorm/clock/config.icebox
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,32:createIceStorm --Ice.Config=config.service
+IceBox.Service.IceStorm=IceStormService,33:createIceStorm --Ice.Config=config.service
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/IceStorm/counter/config.icebox b/cpp/demo/IceStorm/counter/config.icebox
index 07fb2e3cb6c..455571cacdf 100644
--- a/cpp/demo/IceStorm/counter/config.icebox
+++ b/cpp/demo/IceStorm/counter/config.icebox
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,32:createIceStorm --Ice.Config=config.service
+IceBox.Service.IceStorm=IceStormService,33:createIceStorm --Ice.Config=config.service
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/IceStorm/replicated/application.xml b/cpp/demo/IceStorm/replicated/application.xml
index 73cb00976e9..65f10019719 100644
--- a/cpp/demo/IceStorm/replicated/application.xml
+++ b/cpp/demo/IceStorm/replicated/application.xml
@@ -9,7 +9,7 @@
 
        <icebox id="DemoIceStorm-${index}" exe="icebox" activation="on-demand">
 
-         <service name="IceStorm" entry="IceStormService,32:createIceStorm">
+         <service name="IceStorm" entry="IceStormService,33:createIceStorm">
 
            <dbenv name="${service}"/>
 
diff --git a/cpp/doc/swish/swish.conf b/cpp/doc/swish/swish.conf
index e8cbefc4f36..4a1c7381fa4 100644
--- a/cpp/doc/swish/swish.conf
+++ b/cpp/doc/swish/swish.conf
@@ -1,6 +1,6 @@
 Replacerules remove /var/www/html/
-IndexDir /var/www/html/doc/Ice-3.2.0/reference
-IndexDir /var/www/html/doc/Ice-3.2.0/manual
+IndexDir /var/www/html/doc/Ice-3.3.0/reference
+IndexDir /var/www/html/doc/Ice-3.3.0/manual
 IndexOnly .html
 FileRules filename is _sindex\.html
 DefaultContents HTML*
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index 682d20ff568..c92a9c164bb 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -207,7 +207,7 @@ typedef long long Int64;
 //
 // The Ice version.
 //
-#define ICE_STRING_VERSION "3.2.0" // "A.B.C", with A=major, B=minor, C=patch
-#define ICE_INT_VERSION 30200      // AABBCC, with AA=major, BB=minor, CC=patch
+#define ICE_STRING_VERSION "3.3.0" // "A.B.C", with A=major, B=minor, C=patch
+#define ICE_INT_VERSION 30300      // AABBCC, with AA=major, BB=minor, CC=patch
 
 #endif
diff --git a/cpp/install/rpm/ice.spec b/cpp/install/rpm/ice.spec
index 0d9bdd0a8be..63c08bf8bd5 100644
--- a/cpp/install/rpm/ice.spec
+++ b/cpp/install/rpm/ice.spec
@@ -7,7 +7,7 @@
 %define core_arches %{ix86} x86_64
 Summary: The Ice base runtime and services
 Name: ice
-Version: 3.2.1
+Version: 3.3.0
 Release: 1%{?dist}
 License: GPL
 Group:System Environment/Libraries
@@ -26,8 +26,8 @@ Source7:IceRuby-%{version}.tar.gz
 
 BuildRoot: /var/tmp/Ice-%{version}-1-buildroot
 
-%define soversion 32
-%define dotnetversion 3.2.1
+%define soversion 33
+%define dotnetversion 3.3.0
 %define dotnetmainversion 3.2
 
 %ifarch x86_64
diff --git a/cpp/src/ca/iceca b/cpp/src/ca/iceca
index fb843cba17b..937349cea8d 100755..100644
--- a/cpp/src/ca/iceca
+++ b/cpp/src/ca/iceca
@@ -74,7 +74,7 @@ if sys.argv[script] == "import":
     # development. "/usr/bin" handles RPM installs and "/opt/..."
     # handles standard tarball installs.
     #
-    checkLocations = [os.path.dirname(sys.argv[0]), ".", "/usr/bin", "/opt/Ice-3.2.0/bin"]
+    checkLocations = [os.path.dirname(sys.argv[0]), ".", "/usr/bin", "/opt/Ice-3.3.0/bin"]
     if os.getenv("ICE_HOME"):
         checkLocations.append(os.path.join(os.getenv("ICE_HOME"), "bin"))
     for bindir in checkLocations: