Merge pull request #1422 from jwillemsen/jwi-betamicro

Use micro version instead of beta version

73 files changed, 144 insertions, 144 deletions

diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp
index 7a1b38b2bf0..c684ce76153 100644
--- a/ACE/ace/ACE.cpp
+++ b/ACE/ace/ACE.cpp
@@ -105,7 +105,7 @@ ACE::minor_version ()
 u_int
 ACE::beta_version ()
 {
-  return ACE_BETA_VERSION;
+  return ACE_MICRO_VERSION;
 }
 
 u_int
diff --git a/ACE/ace/ace.rc b/ACE/ace/ace.rc
index 54792491900..00a332dbe37 100644
--- a/ACE/ace/ace.rc
+++ b/ACE/ace/ace.rc
@@ -1,8 +1,8 @@
 #include "Version.h"
 
 1 VERSIONINFO
- FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_BETA_VERSION,0
- PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_BETA_VERSION,0
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/ACE/bin/generate_doxygen.pl b/ACE/bin/generate_doxygen.pl
index 679c6fcf85c..3827290f7d2 100755
--- a/ACE/bin/generate_doxygen.pl
+++ b/ACE/bin/generate_doxygen.pl
@@ -300,7 +300,7 @@ sub run_doxy {
 sub get_versions () {
   my $KIT = shift;
   my $VERSION_FILE = shift;
-  my ($major_version, $minor_version, $beta_version);
+  my ($major_version, $minor_version, $micro_version);
 
   open (VERSION, '<'.$VERSION_FILE)  ||
     die "$0: unable to open $VERSION_FILE\n";
@@ -309,23 +309,23 @@ sub get_versions () {
     if (/$KIT version (\d+)\.(\d+)\.(\d+)/) {
       $major_version = $1;
       $minor_version = $2;
-      $beta_version = $3;
+      $micro_version = $3;
       last;
     } elsif (/$KIT version (\d+)\.(\d+)[^\.]/) {
       #### Previous release was a minor.
       $major_version = $1;
       $minor_version = $2;
-      $beta_version  = '0';
+      $micro_version  = '0';
       last;
     } elsif (/$KIT version (\d+)[^\.]/) {
       #### Previous release was a major.
       $major_version = $1;
       $minor_version = '0';
-      $beta_version  = '0';
+      $micro_version  = '0';
       last;
     }
   }
   close VERSION;
 
-  return ($major_version, $minor_version, $beta_version);
+  return ($major_version, $minor_version, $micro_version);
 }
diff --git a/ACE/tests/CDR_Array_Test.cpp b/ACE/tests/CDR_Array_Test.cpp
index ed088cf2c29..d20d9b9123d 100644
--- a/ACE/tests/CDR_Array_Test.cpp
+++ b/ACE/tests/CDR_Array_Test.cpp
@@ -893,7 +893,7 @@ run_main (int argc, ACE_TCHAR *argv[])
               ACE_TEXT ("This is ACE Version %u.%u.%u\n\n"),
               ACE::major_version (),
               ACE::minor_version(),
-              ACE::beta_version()));
+              ACE::micro_version()));
 
   ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("d:f:q:w:h:c:t:n:"));
   int dtotal = 0;
diff --git a/ACE/tests/CDR_File_Test.cpp b/ACE/tests/CDR_File_Test.cpp
index c10f0c2323a..edc6c8d8fd8 100644
--- a/ACE/tests/CDR_File_Test.cpp
+++ b/ACE/tests/CDR_File_Test.cpp
@@ -338,7 +338,7 @@ run_main (int argc, ACE_TCHAR *argv[])
               ACE_TEXT ("This is ACE Version %u.%u.%u\n\n"),
               ACE::major_version (),
               ACE::minor_version (),
-              ACE::beta_version ()));
+              ACE::micro_version ()));
 
   ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("f:rw"));
   int opt;
diff --git a/ACE/tests/CDR_Test.cpp b/ACE/tests/CDR_Test.cpp
index 283f5a9e1ae..fa140dc5c65 100644
--- a/ACE/tests/CDR_Test.cpp
+++ b/ACE/tests/CDR_Test.cpp
@@ -852,7 +852,7 @@ run_main (int argc, ACE_TCHAR *argv[])
               ACE_TEXT ("This is ACE Version %u.%u.%u\n\n"),
               ACE::major_version (),
               ACE::minor_version(),
-              ACE::beta_version()));
+              ACE::micro_version()));
 
   ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("dn:l:"));
   int opt;
diff --git a/ACE/tests/Codecs_Test.cpp b/ACE/tests/Codecs_Test.cpp
index 0bbcb4ce81c..c851b26c08e 100644
--- a/ACE/tests/Codecs_Test.cpp
+++ b/ACE/tests/Codecs_Test.cpp
@@ -88,7 +88,7 @@ run_main (int argc, ACE_TCHAR *argv[])
               ACE_TEXT ("This is ACE Version %u.%u.%u\n\n"),
               ACE::major_version (),
               ACE::minor_version(),
-              ACE::beta_version()));
+              ACE::micro_version()));
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing ACE Base64 - normal stream\n\n")));
diff --git a/TAO/orbsvcs/orbsvcs/AV.rc b/TAO/orbsvcs/orbsvcs/AV.rc
index b413f84efb4..4cd437a13e7 100644
--- a/TAO/orbsvcs/orbsvcs/AV.rc
+++ b/TAO/orbsvcs/orbsvcs/AV.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.rc b/TAO/orbsvcs/orbsvcs/CosConcurrency.rc
index 6acef854715..509d3d0de48 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrency.rc
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.rc b/TAO/orbsvcs/orbsvcs/CosEvent.rc
index d6cc9b8e7eb..b075fbc59b6 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent.rc
+++ b/TAO/orbsvcs/orbsvcs/CosEvent.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent_Serv.rc b/TAO/orbsvcs/orbsvcs/CosEvent_Serv.rc
index 1f0c9f20bfd..776d4638667 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent_Serv.rc
+++ b/TAO/orbsvcs/orbsvcs/CosEvent_Serv.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent_Skel.rc b/TAO/orbsvcs/orbsvcs/CosEvent_Skel.rc
index 9b946c02901..9b8781b6ffc 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent_Skel.rc
+++ b/TAO/orbsvcs/orbsvcs/CosEvent_Skel.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.rc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.rc
index b473dd1fb42..e20feb2e11a 100644
--- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.rc
+++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.rc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.rc
index e74743f1da6..510da34f404 100644
--- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.rc
+++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.rc b/TAO/orbsvcs/orbsvcs/CosNaming.rc
index 14bb96966a1..8104786737f 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.rc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.rc b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.rc
index c220c974a61..69fd4730749 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.rc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.rc b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.rc
index 0dced68a41a..3d5a83e0bc8 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.rc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.rc b/TAO/orbsvcs/orbsvcs/CosNotification.rc
index b7262c7fa0f..84ebc3fd873 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.rc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification_Serv.rc b/TAO/orbsvcs/orbsvcs/CosNotification_Serv.rc
index 8971fba2147..8899b4cd9fd 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification_Serv.rc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification_Serv.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification_Skel.rc b/TAO/orbsvcs/orbsvcs/CosNotification_Skel.rc
index 2a3f233965d..b16bdda5928 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification_Skel.rc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification_Skel.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.rc b/TAO/orbsvcs/orbsvcs/CosProperty.rc
index 21632396cf2..0caf1788e63 100644
--- a/TAO/orbsvcs/orbsvcs/CosProperty.rc
+++ b/TAO/orbsvcs/orbsvcs/CosProperty.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.rc b/TAO/orbsvcs/orbsvcs/CosTime.rc
index 41976094fee..2ed33f85aa5 100644
--- a/TAO/orbsvcs/orbsvcs/CosTime.rc
+++ b/TAO/orbsvcs/orbsvcs/CosTime.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.rc b/TAO/orbsvcs/orbsvcs/CosTrading.rc
index 9423877548d..30ca54d7443 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.rc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading_Serv.rc b/TAO/orbsvcs/orbsvcs/CosTrading_Serv.rc
index 1aab60f77fc..de4b0ba9ade 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading_Serv.rc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading_Serv.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading_Skel.rc b/TAO/orbsvcs/orbsvcs/CosTrading_Skel.rc
index 5f88c354a8c..9250c377639 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading_Skel.rc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading_Skel.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.rc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.rc
index 6683761ad72..9a1c6d4fe9f 100644
--- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.rc
+++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.rc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.rc
index e767de71e2f..cd6af48ec0d 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.rc
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.rc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.rc
index 346113d6e32..6ef9f6acba0 100644
--- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.rc
+++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.rc b/TAO/orbsvcs/orbsvcs/FaultTolerance.rc
index 9ae406b172f..231d473a2e1 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance.rc
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/IFRService.rc b/TAO/orbsvcs/orbsvcs/IFRService.rc
index 859f6e1bce8..6c9ce5065f7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService.rc
+++ b/TAO/orbsvcs/orbsvcs/IFRService.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.rc b/TAO/orbsvcs/orbsvcs/PortableGroup.rc
index 0aff1ba619d..cb842d9f00e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.rc
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.rc b/TAO/orbsvcs/orbsvcs/RTEvent.rc
index b0fa5167fef..dc984a66293 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent.rc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.rc b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.rc
index c0d674c114f..fa540896754 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.rc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.rc b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.rc
index 3187dbc77d2..2036034e730 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.rc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/RTSched.rc b/TAO/orbsvcs/orbsvcs/RTSched.rc
index 3ecf9760760..c07034c264e 100644
--- a/TAO/orbsvcs/orbsvcs/RTSched.rc
+++ b/TAO/orbsvcs/orbsvcs/RTSched.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.rc b/TAO/orbsvcs/orbsvcs/RTSchedEvent.rc
index a8db023c435..c2948f5722f 100644
--- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.rc
+++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/RT_Notification.rc b/TAO/orbsvcs/orbsvcs/RT_Notification.rc
index b7262c7fa0f..84ebc3fd873 100644
--- a/TAO/orbsvcs/orbsvcs/RT_Notification.rc
+++ b/TAO/orbsvcs/orbsvcs/RT_Notification.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.rc b/TAO/orbsvcs/orbsvcs/SSLIOP.rc
index 8fb24d904f8..db14291f806 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP.rc
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/Security.rc b/TAO/orbsvcs/orbsvcs/Security.rc
index 380a55730be..0a5546279d6 100644
--- a/TAO/orbsvcs/orbsvcs/Security.rc
+++ b/TAO/orbsvcs/orbsvcs/Security.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.rc b/TAO/orbsvcs/orbsvcs/Svc_Utils.rc
index b49af73a65f..9c9fac8ae37 100644
--- a/TAO/orbsvcs/orbsvcs/Svc_Utils.rc
+++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.rc
@@ -1,8 +1,8 @@
 #include "../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/AnyTypeCode/TAO_AnyTypeCode.rc b/TAO/tao/AnyTypeCode/TAO_AnyTypeCode.rc
index f26f5172554..1e39dd41c37 100644
--- a/TAO/tao/AnyTypeCode/TAO_AnyTypeCode.rc
+++ b/TAO/tao/AnyTypeCode/TAO_AnyTypeCode.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/BiDir_GIOP/TAO_BiDir_GIOP.rc b/TAO/tao/BiDir_GIOP/TAO_BiDir_GIOP.rc
index 8b84d57f987..48bacac6356 100644
--- a/TAO/tao/BiDir_GIOP/TAO_BiDir_GIOP.rc
+++ b/TAO/tao/BiDir_GIOP/TAO_BiDir_GIOP.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/CodecFactory/TAO_CodecFactory.rc b/TAO/tao/CodecFactory/TAO_CodecFactory.rc
index c3c3a5fc1d0..babd1afde2d 100644
--- a/TAO/tao/CodecFactory/TAO_CodecFactory.rc
+++ b/TAO/tao/CodecFactory/TAO_CodecFactory.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/Codeset/TAO_Codeset.rc b/TAO/tao/Codeset/TAO_Codeset.rc
index 414dc0bcf01..c5fddd8e38a 100644
--- a/TAO/tao/Codeset/TAO_Codeset.rc
+++ b/TAO/tao/Codeset/TAO_Codeset.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/Compression/TAO_Compression.rc b/TAO/tao/Compression/TAO_Compression.rc
index 64faf0f88da..af05500977e 100644
--- a/TAO/tao/Compression/TAO_Compression.rc
+++ b/TAO/tao/Compression/TAO_Compression.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/Compression/bzip2/TAO_Bzip2Compressor.rc b/TAO/tao/Compression/bzip2/TAO_Bzip2Compressor.rc
index a33d29f96ad..30819d895b4 100644
--- a/TAO/tao/Compression/bzip2/TAO_Bzip2Compressor.rc
+++ b/TAO/tao/Compression/bzip2/TAO_Bzip2Compressor.rc
@@ -1,8 +1,8 @@
 #include "../../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/Compression/lzo/TAO_LzoCompressor.rc b/TAO/tao/Compression/lzo/TAO_LzoCompressor.rc
index a33d29f96ad..30819d895b4 100644
--- a/TAO/tao/Compression/lzo/TAO_LzoCompressor.rc
+++ b/TAO/tao/Compression/lzo/TAO_LzoCompressor.rc
@@ -1,8 +1,8 @@
 #include "../../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/Compression/rle/TAO_RLECompressor.rc b/TAO/tao/Compression/rle/TAO_RLECompressor.rc
index 25c1dda6d77..f8c22d1dc59 100644
--- a/TAO/tao/Compression/rle/TAO_RLECompressor.rc
+++ b/TAO/tao/Compression/rle/TAO_RLECompressor.rc
@@ -1,8 +1,8 @@
 #include "../../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/Compression/zlib/TAO_ZlibCompressor.rc b/TAO/tao/Compression/zlib/TAO_ZlibCompressor.rc
index 90fcc9d0526..85f5cf2d00c 100644
--- a/TAO/tao/Compression/zlib/TAO_ZlibCompressor.rc
+++ b/TAO/tao/Compression/zlib/TAO_ZlibCompressor.rc
@@ -1,8 +1,8 @@
 #include "../../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/DynamicAny/TAO_DynamicAny.rc b/TAO/tao/DynamicAny/TAO_DynamicAny.rc
index cbae2d05f08..ca5004522cf 100644
--- a/TAO/tao/DynamicAny/TAO_DynamicAny.rc
+++ b/TAO/tao/DynamicAny/TAO_DynamicAny.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/DynamicInterface/TAO_DynamicInterface.rc b/TAO/tao/DynamicInterface/TAO_DynamicInterface.rc
index b958cb64868..8673fd88035 100644
--- a/TAO/tao/DynamicInterface/TAO_DynamicInterface.rc
+++ b/TAO/tao/DynamicInterface/TAO_DynamicInterface.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/IFR_Client/TAO_IFR_Client.rc b/TAO/tao/IFR_Client/TAO_IFR_Client.rc
index 4cef05b72a6..fd4c3f48469 100644
--- a/TAO/tao/IFR_Client/TAO_IFR_Client.rc
+++ b/TAO/tao/IFR_Client/TAO_IFR_Client.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/IORInterceptor/TAO_IORInterceptor.rc b/TAO/tao/IORInterceptor/TAO_IORInterceptor.rc
index 2e3093c06a3..e5b12b40fd2 100644
--- a/TAO/tao/IORInterceptor/TAO_IORInterceptor.rc
+++ b/TAO/tao/IORInterceptor/TAO_IORInterceptor.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/IORManipulation/TAO_IORManip.rc b/TAO/tao/IORManipulation/TAO_IORManip.rc
index be205c8bb67..460bea41635 100644
--- a/TAO/tao/IORManipulation/TAO_IORManip.rc
+++ b/TAO/tao/IORManipulation/TAO_IORManip.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/IORTable/TAO_Async_IORTable.rc b/TAO/tao/IORTable/TAO_Async_IORTable.rc
index a60ace62dd1..52ba0342c9a 100644
--- a/TAO/tao/IORTable/TAO_Async_IORTable.rc
+++ b/TAO/tao/IORTable/TAO_Async_IORTable.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/IORTable/TAO_IORTable.rc b/TAO/tao/IORTable/TAO_IORTable.rc
index f80122bd7e4..3462b008227 100644
--- a/TAO/tao/IORTable/TAO_IORTable.rc
+++ b/TAO/tao/IORTable/TAO_IORTable.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/ImR_Client/TAO_IMR_Client.rc b/TAO/tao/ImR_Client/TAO_IMR_Client.rc
index 64932985c91..de61611ebc3 100644
--- a/TAO/tao/ImR_Client/TAO_IMR_Client.rc
+++ b/TAO/tao/ImR_Client/TAO_IMR_Client.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/Messaging/TAO_Messaging.rc b/TAO/tao/Messaging/TAO_Messaging.rc
index 27cf97078dd..f59165d77af 100644
--- a/TAO/tao/Messaging/TAO_Messaging.rc
+++ b/TAO/tao/Messaging/TAO_Messaging.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/ObjRefTemplate/TAO_ObjRefTemplate.rc b/TAO/tao/ObjRefTemplate/TAO_ObjRefTemplate.rc
index 6a3a75062d5..81821712a61 100644
--- a/TAO/tao/ObjRefTemplate/TAO_ObjRefTemplate.rc
+++ b/TAO/tao/ObjRefTemplate/TAO_ObjRefTemplate.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/PI/TAO_PI.rc b/TAO/tao/PI/TAO_PI.rc
index 3ab60738b02..75d3348da11 100644
--- a/TAO/tao/PI/TAO_PI.rc
+++ b/TAO/tao/PI/TAO_PI.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/PI_Server/TAO_PI_Server.rc b/TAO/tao/PI_Server/TAO_PI_Server.rc
index eeeb3f6328a..9fe45922552 100644
--- a/TAO/tao/PI_Server/TAO_PI_Server.rc
+++ b/TAO/tao/PI_Server/TAO_PI_Server.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/PortableServer/TAO_PortableServer.rc b/TAO/tao/PortableServer/TAO_PortableServer.rc
index 5ecad1717ea..a5a199a0bb4 100644
--- a/TAO/tao/PortableServer/TAO_PortableServer.rc
+++ b/TAO/tao/PortableServer/TAO_PortableServer.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/RTCORBA/TAO_RTCORBA.rc b/TAO/tao/RTCORBA/TAO_RTCORBA.rc
index 9ebc99bd6da..f6f8f3a0dd5 100644
--- a/TAO/tao/RTCORBA/TAO_RTCORBA.rc
+++ b/TAO/tao/RTCORBA/TAO_RTCORBA.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/RTPortableServer/TAO_RTPortableServer.rc b/TAO/tao/RTPortableServer/TAO_RTPortableServer.rc
index 4efa00f35ae..ea32284a59a 100644
--- a/TAO/tao/RTPortableServer/TAO_RTPortableServer.rc
+++ b/TAO/tao/RTPortableServer/TAO_RTPortableServer.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/RTScheduling/TAO_RTScheduler.rc b/TAO/tao/RTScheduling/TAO_RTScheduler.rc
index 27f592a9a47..d49235c9216 100644
--- a/TAO/tao/RTScheduling/TAO_RTScheduler.rc
+++ b/TAO/tao/RTScheduling/TAO_RTScheduler.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/SmartProxies/SmartProxies.rc b/TAO/tao/SmartProxies/SmartProxies.rc
index 0ede89159d9..e21122abf66 100644
--- a/TAO/tao/SmartProxies/SmartProxies.rc
+++ b/TAO/tao/SmartProxies/SmartProxies.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/Strategies/TAO_Strategies.rc b/TAO/tao/Strategies/TAO_Strategies.rc
index 2d4bc93ddfd..8e3c63d61e5 100644
--- a/TAO/tao/Strategies/TAO_Strategies.rc
+++ b/TAO/tao/Strategies/TAO_Strategies.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.rc b/TAO/tao/TypeCodeFactory/TypeCodeFactory.rc
index 24772624830..8269c45866f 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.rc
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/Utils/TAO_Utils.rc b/TAO/tao/Utils/TAO_Utils.rc
index 822fe015410..ee036b0e4cf 100644
--- a/TAO/tao/Utils/TAO_Utils.rc
+++ b/TAO/tao/Utils/TAO_Utils.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/Valuetype/TAO_Valuetype.rc b/TAO/tao/Valuetype/TAO_Valuetype.rc
index 0c0763fdbd6..57e5bcd4c1a 100644
--- a/TAO/tao/Valuetype/TAO_Valuetype.rc
+++ b/TAO/tao/Valuetype/TAO_Valuetype.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/ZIOP/TAO_ZIOP.rc b/TAO/tao/ZIOP/TAO_ZIOP.rc
index 2c3a29707bb..5a7060df1c8 100644
--- a/TAO/tao/ZIOP/TAO_ZIOP.rc
+++ b/TAO/tao/ZIOP/TAO_ZIOP.rc
@@ -1,8 +1,8 @@
 #include "../Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tao/tao.rc b/TAO/tao/tao.rc
index 998e9157f92..b827486689d 100644
--- a/TAO/tao/tao.rc
+++ b/TAO/tao/tao.rc
@@ -1,8 +1,8 @@
 #include "Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/TAO/tests/ZIOP/TestCompressor/TAO_TestCompressor.rc b/TAO/tests/ZIOP/TestCompressor/TAO_TestCompressor.rc
index 1c761d966a1..03516623445 100644
--- a/TAO/tests/ZIOP/TestCompressor/TAO_TestCompressor.rc
+++ b/TAO/tests/ZIOP/TestCompressor/TAO_TestCompressor.rc
@@ -1,8 +1,8 @@
 #include "../../../tao/Version.h"
 
 1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L