From a928a17cbe25925c90201f594ed658cbee3bb269 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <borisk@apache.org>
Date: Tue, 27 Oct 2009 12:59:02 +0000
Subject: [PATCH] Change version to 3.1.0.

git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@830158 13f79535-47bb-0310-9956-ffa450edef68
---
 configure.ac                                  |  2 +-
 doc/style/dtd/entities.ent                    | 14 +++---
 .../CreateDOMDocument/CreateDOMDocument.dsp   |  6 +--
 .../CreateDOMDocument/CreateDOMDocument.mak   |  4 +-
 .../VC6/xerces-all/RangeTest/RangeTest.dsp    |  6 +--
 .../VC6/xerces-all/RangeTest/RangeTest.mak    |  4 +-
 .../VC6/xerces-all/StdInParse/StdInParse.dsp  |  6 +--
 .../VC6/xerces-all/StdInParse/StdInParse.mak  |  4 +-
 .../VC6/xerces-all/XercesLib/XercesLib.dsp    |  8 ++--
 .../VC6/xerces-all/XercesLib/XercesLib.mak    | 46 +++++++++---------
 .../xerces-all/XercesLib/XercesLib.vcproj     | 24 +++++-----
 .../VC8/xerces-all/XercesLib/XercesLib.vcproj | 48 +++++++++----------
 .../VC9/xerces-all/XercesLib/XercesLib.vcproj | 48 +++++++++----------
 .../util/MsgLoaders/ICU/ICUMsgLoader.cpp      |  4 +-
 src/xercesc/util/MsgLoaders/Win32/Version.rc  | 16 +++----
 src/xercesc/util/XercesVersion.hpp            |  2 +-
 version.incl                                  |  6 +--
 xerces-c.spec                                 |  2 +-
 18 files changed, 125 insertions(+), 125 deletions(-)

diff --git a/configure.ac b/configure.ac
index a6792ac9e..157e97456 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@
 #
 
 AC_PREREQ(2.60)
-AC_INIT([xerces-c],[3.0.0])
+AC_INIT([xerces-c],[3.1.0])
 AC_CONFIG_SRCDIR([src/Makefile.am])
 AC_CONFIG_LIBOBJ_DIR([src])
 AC_CONFIG_AUX_DIR([config])
diff --git a/doc/style/dtd/entities.ent b/doc/style/dtd/entities.ent
index d61fe91c4..98b10db2d 100644
--- a/doc/style/dtd/entities.ent
+++ b/doc/style/dtd/entities.ent
@@ -5,16 +5,16 @@
 <!ENTITY XercesCName             "Xerces-C++">                   <!-- productname -->
 
 <!ENTITY XercesC3Series          "3">                            <!-- release series -->
-<!ENTITY XercesC3Version         "3.0.0">                        <!-- 3-series version number -->
-<!ENTITY XercesC3InstallDir      "xerces-c-3.0.0">               <!-- installdirname -->
-<!ENTITY XercesC3SrcInstallDir   "xerces-c-3.0.0">               <!-- sourcedirectory -->
-<!ENTITY XercesC3ToolsInstallDir "xerces-c-tools-3.0.0">         <!-- sourcedirectory -->
+<!ENTITY XercesC3Version         "3.1.0">                        <!-- 3-series version number -->
+<!ENTITY XercesC3InstallDir      "xerces-c-3.1.0">               <!-- installdirname -->
+<!ENTITY XercesC3SrcInstallDir   "xerces-c-3.1.0">               <!-- sourcedirectory -->
+<!ENTITY XercesC3ToolsInstallDir "xerces-c-tools-3.1.0">         <!-- sourcedirectory -->
 <!ENTITY XercesC3WindowsLib      "xerces-c_3">                   <!-- windowslibname -->
-<!ENTITY XercesC3WindowsDLL      "xerces-c_3_0">                 <!-- windowsDLLname -->
-<!ENTITY XercesC3UnixSoVersion   "3.0">                          <!-- unixlibversion -->
+<!ENTITY XercesC3WindowsDLL      "xerces-c_3_1">                 <!-- windowsDLLname -->
+<!ENTITY XercesC3UnixSoVersion   "3.1">                          <!-- unixlibversion -->
 <!ENTITY XercesC3UnixLib         "libxerces-c">                  <!-- unixlibname -->
 <!ENTITY XercesC3Namespace       "xercesc">                      <!-- C++ namespace name -->
-<!ENTITY XercesC3NSVersion       "xercesc_3_0">                  <!-- C++ namespace name with Version -->
+<!ENTITY XercesC3NSVersion       "xercesc_3_1">                  <!-- C++ namespace name with Version -->
 
 
 <!ENTITY HelpURI "http://xerces.apache.org/xerces-c/feedback.html"> <!-- help and feedback -->
diff --git a/projects/Win32/VC6/xerces-all/CreateDOMDocument/CreateDOMDocument.dsp b/projects/Win32/VC6/xerces-all/CreateDOMDocument/CreateDOMDocument.dsp
index 2c75576db..ab8743b2a 100644
--- a/projects/Win32/VC6/xerces-all/CreateDOMDocument/CreateDOMDocument.dsp
+++ b/projects/Win32/VC6/xerces-all/CreateDOMDocument/CreateDOMDocument.dsp
@@ -73,7 +73,7 @@ LINK32=link.exe
 BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib xerces-c_3D.lib /version:3.0 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+# ADD LINK32 kernel32.lib user32.lib xerces-c_3D.lib /version:3.1 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
 
 !ELSEIF  "$(CFG)" == "CreateDOMDocument - Win64 Debug"
 
@@ -96,8 +96,8 @@ LINK32=link.exe
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
-# ADD LINK32 kernel32.lib user32.lib xerces-c_3D.lib /version:3.0 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+# ADD BASE LINK32 kernel32.lib user32.lib xerces-c_2D.lib /version:3.1 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+# ADD LINK32 kernel32.lib user32.lib xerces-c_3D.lib /version:3.1 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "CreateDOMDocument - Win64 Release"
diff --git a/projects/Win32/VC6/xerces-all/CreateDOMDocument/CreateDOMDocument.mak b/projects/Win32/VC6/xerces-all/CreateDOMDocument/CreateDOMDocument.mak
index aee3be301..4cd6cd7b0 100644
--- a/projects/Win32/VC6/xerces-all/CreateDOMDocument/CreateDOMDocument.mak
+++ b/projects/Win32/VC6/xerces-all/CreateDOMDocument/CreateDOMDocument.mak
@@ -122,7 +122,7 @@ BSC32_FLAGS=/o"$(OUTDIR)\CreateDOMDocument.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\CreateDOMDocument.pdb" /debug /machine:I386 /out:"$(OUTDIR)\CreateDOMDocument.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:3.1 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\CreateDOMDocument.pdb" /debug /machine:I386 /out:"$(OUTDIR)\CreateDOMDocument.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\CreateDOMDocument.obj" \
 	"$(OUTDIR)\xerces-c_3D.lib"
@@ -174,7 +174,7 @@ BSC32_FLAGS=/o"$(OUTDIR)\CreateDOMDocument.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\CreateDOMDocument.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\CreateDOMDocument.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:3.1 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\CreateDOMDocument.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\CreateDOMDocument.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\CreateDOMDocument.obj" \
 	"$(OUTDIR)\xerces-c_3D.lib"
diff --git a/projects/Win32/VC6/xerces-all/RangeTest/RangeTest.dsp b/projects/Win32/VC6/xerces-all/RangeTest/RangeTest.dsp
index e5a98f371..fee9a1ddc 100644
--- a/projects/Win32/VC6/xerces-all/RangeTest/RangeTest.dsp
+++ b/projects/Win32/VC6/xerces-all/RangeTest/RangeTest.dsp
@@ -74,7 +74,7 @@ LINK32=link.exe
 BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib xerces-c_3D.lib /version:3.0 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+# ADD LINK32 kernel32.lib user32.lib xerces-c_3D.lib /version:3.1 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
 
 !ELSEIF  "$(CFG)" == "RangeTest - Win64 Debug"
 
@@ -97,8 +97,8 @@ LINK32=link.exe
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
-# ADD LINK32 kernel32.lib user32.lib xerces-c_3D.lib /version:3.0 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+# ADD BASE LINK32 kernel32.lib user32.lib xerces-c_2D.lib /version:3.1 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+# ADD LINK32 kernel32.lib user32.lib xerces-c_3D.lib /version:3.1 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "RangeTest - Win64 Release"
diff --git a/projects/Win32/VC6/xerces-all/RangeTest/RangeTest.mak b/projects/Win32/VC6/xerces-all/RangeTest/RangeTest.mak
index 4784e7b9d..d63dc73e3 100644
--- a/projects/Win32/VC6/xerces-all/RangeTest/RangeTest.mak
+++ b/projects/Win32/VC6/xerces-all/RangeTest/RangeTest.mak
@@ -122,7 +122,7 @@ BSC32_FLAGS=/o"$(OUTDIR)\RangeTest.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\RangeTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\RangeTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:3.1 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\RangeTest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\RangeTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\RangeTest.obj" \
 	"$(OUTDIR)\xerces-c_3D.lib"
@@ -174,7 +174,7 @@ BSC32_FLAGS=/o"$(OUTDIR)\RangeTest.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\RangeTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\RangeTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:3.1 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\RangeTest.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\RangeTest.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\RangeTest.obj" \
 	"$(OUTDIR)\xerces-c_3D.lib"
diff --git a/projects/Win32/VC6/xerces-all/StdInParse/StdInParse.dsp b/projects/Win32/VC6/xerces-all/StdInParse/StdInParse.dsp
index 4028c9548..54233da44 100644
--- a/projects/Win32/VC6/xerces-all/StdInParse/StdInParse.dsp
+++ b/projects/Win32/VC6/xerces-all/StdInParse/StdInParse.dsp
@@ -74,7 +74,7 @@ LINK32=link.exe
 BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib xerces-c_3D.lib /version:3.0 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+# ADD LINK32 kernel32.lib user32.lib xerces-c_3D.lib /version:3.1 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
 
 !ELSEIF  "$(CFG)" == "StdInParse - Win64 Debug"
 
@@ -97,8 +97,8 @@ LINK32=link.exe
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
-# ADD LINK32 kernel32.lib user32.lib xerces-c_3D.lib /version:3.0 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+# ADD BASE LINK32 kernel32.lib user32.lib xerces-c_2D.lib /version:3.1 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+# ADD LINK32 kernel32.lib user32.lib xerces-c_3D.lib /version:3.1 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "StdInParse - Win64 Release"
diff --git a/projects/Win32/VC6/xerces-all/StdInParse/StdInParse.mak b/projects/Win32/VC6/xerces-all/StdInParse/StdInParse.mak
index 1c4eb7a62..cd1aea9b9 100644
--- a/projects/Win32/VC6/xerces-all/StdInParse/StdInParse.mak
+++ b/projects/Win32/VC6/xerces-all/StdInParse/StdInParse.mak
@@ -125,7 +125,7 @@ BSC32_FLAGS=/o"$(OUTDIR)\StdInParse.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\StdInParse.pdb" /debug /machine:I386 /out:"$(OUTDIR)\StdInParse.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:3.1 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\StdInParse.pdb" /debug /machine:I386 /out:"$(OUTDIR)\StdInParse.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
 LINK32_OBJS= \
 	"$(INTDIR)\StdInParse.obj" \
 	"$(INTDIR)\StdInParseHandlers.obj" \
@@ -179,7 +179,7 @@ BSC32_FLAGS=/o"$(OUTDIR)\StdInParse.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:3.0 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\StdInParse.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\StdInParse.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_3D.lib /version:3.1 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\StdInParse.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\StdInParse.exe" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\StdInParse.obj" \
 	"$(INTDIR)\StdInParseHandlers.obj" \
diff --git a/projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp b/projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
index 1667ed9fe..ae732d962 100644
--- a/projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
+++ b/projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
@@ -54,7 +54,7 @@ RSC=rc.exe
 BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /base:"0x12000000" /version:3.0 /subsystem:windows /dll /map /machine:I386 /out:"..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_3_0.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Release/xerces-c_3.lib"
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /base:"0x12000000" /version:3.1 /subsystem:windows /dll /map /machine:I386 /out:"..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_3_1.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Release/xerces-c_3.lib"
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win32 Debug"
@@ -80,7 +80,7 @@ LINK32=link.exe
 BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /base:"0x12000000" /version:3.0 /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-c_3_0D.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-c_3D.lib" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /base:"0x12000000" /version:3.1 /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-c_3_1D.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-c_3D.lib" /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win64 Debug"
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /debug /machine:IX86 /out:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2_4_0D.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept /version:2.4.0
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /base:"0x12000000" /version:3.0 /subsystem:windows /dll /debug /machine:IX86 /out:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_3_0D.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_3D.lib" /pdbtype:sept /machine:IA64
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /base:"0x12000000" /version:3.1 /subsystem:windows /dll /debug /machine:IX86 /out:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_3_1D.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_3D.lib" /pdbtype:sept /machine:IA64
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win64 Release"
@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /map /machine:IX86 /out:"..\..\..\..\..\Build\Win64\VC6\Release\xerces-c_2_4_0.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Release/xerces-c_2.lib" /version:2.4.0
 # SUBTRACT BASE LINK32 /pdb:none /incremental:yes
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /base:"0x12000000" /version:3.0 /subsystem:windows /dll /incremental:yes /map /machine:IX86 /out:"..\..\..\..\..\Build\Win64\VC6\Release\xerces-c_3_0.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Release/xerces-c_3.lib" /machine:IA64
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /base:"0x12000000" /version:3.1 /subsystem:windows /dll /incremental:yes /map /machine:IX86 /out:"..\..\..\..\..\Build\Win64\VC6\Release\xerces-c_3_1.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Release/xerces-c_3.lib" /machine:IA64
 # SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
diff --git a/projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak b/projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak
index 258a8874b..c612e847d 100644
--- a/projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak
+++ b/projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak
@@ -39,7 +39,7 @@ INTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release\obj
 OutDir=.\..\..\..\..\..\Build\Win32\VC6\Release
 # End Custom Macros
 
-ALL : "..\..\..\..\..\src\xercesc\util\Xerces_autoconf_config.hpp" "$(OUTDIR)\xerces-c_3_0.dll"
+ALL : "..\..\..\..\..\src\xercesc\util\Xerces_autoconf_config.hpp" "$(OUTDIR)\xerces-c_3_1.dll"
 
 
 CLEAN :
@@ -343,10 +343,10 @@ CLEAN :
 	-@erase "$(INTDIR)\XUtil.obj"
 	-@erase "$(INTDIR)\YearDatatypeValidator.obj"
 	-@erase "$(INTDIR)\YearMonthDatatypeValidator.obj"
-	-@erase "$(OUTDIR)\obj\xerces-c_3_0.map"
+	-@erase "$(OUTDIR)\obj\xerces-c_3_1.map"
 	-@erase "$(OUTDIR)\xerces-c_3.exp"
 	-@erase "$(OUTDIR)\xerces-c_3.lib"
-	-@erase "$(OUTDIR)\xerces-c_3_0.dll"
+	-@erase "$(OUTDIR)\xerces-c_3_1.dll"
 	-@erase "..\..\..\..\..\src\xercesc\util\Xerces_autoconf_config.hpp"
 
 "$(OUTDIR)" :
@@ -363,7 +363,7 @@ BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /base:"0x12000000" /version:3.0 /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xerces-c_3_0.pdb" /map:"$(INTDIR)\xerces-c_3_0.map" /machine:I386 /out:"$(OUTDIR)\xerces-c_3_0.dll" /implib:"$(OUTDIR)\xerces-c_3.lib" 
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /base:"0x12000000" /version:3.1 /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xerces-c_3_1.pdb" /map:"$(INTDIR)\xerces-c_3_1.map" /machine:I386 /out:"$(OUTDIR)\xerces-c_3_1.dll" /implib:"$(OUTDIR)\xerces-c_3.lib" 
 LINK32_OBJS= \
 	"$(INTDIR)\Win32MsgLoader.obj" \
 	"$(INTDIR)\Win32TransService.obj" \
@@ -665,7 +665,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\XIncludeLocation.obj" \
 	"$(INTDIR)\XIncludeUtils.obj"
 
-"$(OUTDIR)\xerces-c_3_0.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-c_3_1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
@@ -678,7 +678,7 @@ INTDIR=.\..\..\..\..\..\Build\Win32\VC6\Debug\obj
 OutDir=.\..\..\..\..\..\Build\Win32\VC6\Debug
 # End Custom Macros
 
-ALL : "$(OUTDIR)\xerces-c_3_0D.dll"
+ALL : "$(OUTDIR)\xerces-c_3_1D.dll"
 
 
 CLEAN :
@@ -983,9 +983,9 @@ CLEAN :
 	-@erase "$(INTDIR)\XUtil.obj"
 	-@erase "$(INTDIR)\YearDatatypeValidator.obj"
 	-@erase "$(INTDIR)\YearMonthDatatypeValidator.obj"
-	-@erase "$(OUTDIR)\xerces-c_3_0D.dll"
-	-@erase "$(OUTDIR)\xerces-c_3_0D.ilk"
-	-@erase "$(OUTDIR)\xerces-c_3_0D.pdb"
+	-@erase "$(OUTDIR)\xerces-c_3_1D.dll"
+	-@erase "$(OUTDIR)\xerces-c_3_1D.ilk"
+	-@erase "$(OUTDIR)\xerces-c_3_1D.pdb"
 	-@erase "$(OUTDIR)\xerces-c_3D.exp"
 	-@erase "$(OUTDIR)\xerces-c_3D.lib"
 
@@ -1003,7 +1003,7 @@ BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /base:"0x12000000" /version:3.0 /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_3_0D.pdb" /debug /machine:I386 /out:"$(OUTDIR)\xerces-c_3_0D.dll" /implib:"$(OUTDIR)\xerces-c_3D.lib" /pdbtype:sept 
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /base:"0x12000000" /version:3.1 /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_3_1D.pdb" /debug /machine:I386 /out:"$(OUTDIR)\xerces-c_3_1D.dll" /implib:"$(OUTDIR)\xerces-c_3D.lib" /pdbtype:sept 
 LINK32_OBJS= \
 	"$(INTDIR)\Win32MsgLoader.obj" \
 	"$(INTDIR)\Win32TransService.obj" \
@@ -1305,7 +1305,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\XIncludeLocation.obj" \
 	"$(INTDIR)\XIncludeUtils.obj"
 
-"$(OUTDIR)\xerces-c_3_0D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-c_3_1D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
@@ -1318,7 +1318,7 @@ INTDIR=.\..\..\..\..\..\Build\Win64\VC6\Debug\obj
 OutDir=.\..\..\..\..\..\Build\Win64\VC6\Debug
 # End Custom Macros
 
-ALL : "..\..\..\..\..\src\xercesc\util\Xerces_autoconf_config.hpp" "$(OUTDIR)\xerces-c_3_0D.dll"
+ALL : "..\..\..\..\..\src\xercesc\util\Xerces_autoconf_config.hpp" "$(OUTDIR)\xerces-c_3_1D.dll"
 
 
 CLEAN :
@@ -1623,9 +1623,9 @@ CLEAN :
 	-@erase "$(INTDIR)\XUtil.obj"
 	-@erase "$(INTDIR)\YearDatatypeValidator.obj"
 	-@erase "$(INTDIR)\YearMonthDatatypeValidator.obj"
-	-@erase "$(OUTDIR)\xerces-c_3_0D.dll"
-	-@erase "$(OUTDIR)\xerces-c_3_0D.ilk"
-	-@erase "$(OUTDIR)\xerces-c_3_0D.pdb"
+	-@erase "$(OUTDIR)\xerces-c_3_1D.dll"
+	-@erase "$(OUTDIR)\xerces-c_3_1D.ilk"
+	-@erase "$(OUTDIR)\xerces-c_3_1D.pdb"
 	-@erase "$(OUTDIR)\xerces-c_3D.exp"
 	-@erase "$(OUTDIR)\xerces-c_3D.lib"
 	-@erase "..\..\..\..\..\src\xercesc\util\Xerces_autoconf_config.hpp"
@@ -1644,7 +1644,7 @@ BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /base:"0x12000000" /version:3.0 /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_3_0D.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\xerces-c_3_0D.dll" /implib:"$(OUTDIR)\xerces-c_3D.lib" /pdbtype:sept /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /base:"0x12000000" /version:3.1 /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_3_1D.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\xerces-c_3_1D.dll" /implib:"$(OUTDIR)\xerces-c_3D.lib" /pdbtype:sept /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\Win32MsgLoader.obj" \
 	"$(INTDIR)\Win32TransService.obj" \
@@ -1946,7 +1946,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\XIncludeLocation.obj" \
 	"$(INTDIR)\XIncludeUtils.obj"
 
-"$(OUTDIR)\xerces-c_3_0D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-c_3_1D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
@@ -1959,7 +1959,7 @@ INTDIR=.\..\..\..\..\..\Build\Win64\VC6\Release\obj
 OutDir=.\..\..\..\..\..\Build\Win64\VC6\Release
 # End Custom Macros
 
-ALL : "..\..\..\..\..\src\xercesc\util\Xerces_autoconf_config.hpp" "$(OUTDIR)\xerces-c_3_0.dll"
+ALL : "..\..\..\..\..\src\xercesc\util\Xerces_autoconf_config.hpp" "$(OUTDIR)\xerces-c_3_1.dll"
 
 
 CLEAN :
@@ -2263,11 +2263,11 @@ CLEAN :
 	-@erase "$(INTDIR)\XUtil.obj"
 	-@erase "$(INTDIR)\YearDatatypeValidator.obj"
 	-@erase "$(INTDIR)\YearMonthDatatypeValidator.obj"
-	-@erase "$(OUTDIR)\obj\xerces-c_3_0.map"
+	-@erase "$(OUTDIR)\obj\xerces-c_3_1.map"
 	-@erase "$(OUTDIR)\xerces-c_3.exp"
 	-@erase "$(OUTDIR)\xerces-c_3.lib"
-	-@erase "$(OUTDIR)\xerces-c_3_0.dll"
-	-@erase "$(OUTDIR)\xerces-c_3_0.ilk"
+	-@erase "$(OUTDIR)\xerces-c_3_1.dll"
+	-@erase "$(OUTDIR)\xerces-c_3_1.ilk"
 	-@erase "..\..\..\..\..\src\xercesc\util\Xerces_autoconf_config.hpp"
 
 "$(OUTDIR)" :
@@ -2284,7 +2284,7 @@ BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /base:"0x12000000" /version:3.0 /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_3_0.pdb" /map:"$(INTDIR)\xerces-c_3_0.map" /machine:IX86 /out:"$(OUTDIR)\xerces-c_3_0.dll" /implib:"$(OUTDIR)\xerces-c_3.lib" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /base:"0x12000000" /version:3.1 /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_3_1.pdb" /map:"$(INTDIR)\xerces-c_3_1.map" /machine:IX86 /out:"$(OUTDIR)\xerces-c_3_1.dll" /implib:"$(OUTDIR)\xerces-c_3.lib" /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\Win32MsgLoader.obj" \
 	"$(INTDIR)\Win32TransService.obj" \
@@ -2586,7 +2586,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\XIncludeLocation.obj" \
 	"$(INTDIR)\XIncludeUtils.obj"
 
-"$(OUTDIR)\xerces-c_3_0.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-c_3_1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
diff --git a/projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj b/projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
index a89c447ad..fdf29ede9 100644
--- a/projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
+++ b/projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
@@ -44,14 +44,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="ws2_32.lib advapi32.lib "
-				OutputFile="$(OutDir)\xerces-c_3_0.dll"
+				OutputFile="$(OutDir)\xerces-c_3_1.dll"
 				LinkIncremental="0"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0.fullpdb"
-				StripPrivateSymbols="$(OutDir)\xerces-c_3_0.pdb"
+				ProgramDatabaseFile="$(OutDir)\xerces-c_3_1.fullpdb"
+				StripPrivateSymbols="$(OutDir)\xerces-c_3_1.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName="$(IntDir)\xerces-c_3_0.map"
+				MapFileName="$(IntDir)\xerces-c_3_1.map"
 				SubSystem="2"
 				OptimizeReferences="2"
 				SetChecksum="TRUE"
@@ -113,11 +113,11 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="ws2_32.lib advapi32.lib "
-				OutputFile="$(OutDir)\xerces-c_3_0D.dll"
+				OutputFile="$(OutDir)\xerces-c_3_1D.dll"
 				LinkIncremental="0"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0D.pdb"
+				ProgramDatabaseFile="$(OutDir)\xerces-c_3_1D.pdb"
 				SubSystem="2"
 				SetChecksum="TRUE"
 				BaseAddress="0x12000000"
@@ -284,11 +284,11 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="ws2_32.lib advapi32.lib icuuc.lib"
-				OutputFile="$(OutDir)\xerces-c_3_0D.dll"
+				OutputFile="$(OutDir)\xerces-c_3_1D.dll"
 				LinkIncremental="0"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0D.pdb"
+				ProgramDatabaseFile="$(OutDir)\xerces-c_3_1D.pdb"
 				SubSystem="2"
 				SetChecksum="TRUE"
 				BaseAddress="0x12000000"
@@ -352,14 +352,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="ws2_32.lib advapi32.lib icuuc.lib"
-				OutputFile="$(OutDir)\xerces-c_3_0.dll"
+				OutputFile="$(OutDir)\xerces-c_3_1.dll"
 				LinkIncremental="0"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0.fullpdb"
-				StripPrivateSymbols="$(OutDir)\xerces-c_3_0.pdb"
+				ProgramDatabaseFile="$(OutDir)\xerces-c_3_1.fullpdb"
+				StripPrivateSymbols="$(OutDir)\xerces-c_3_1.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName="$(IntDir)\xerces-c_3_0.map"
+				MapFileName="$(IntDir)\xerces-c_3_1.map"
 				SubSystem="2"
 				OptimizeReferences="2"
 				SetChecksum="TRUE"
diff --git a/projects/Win32/VC8/xerces-all/XercesLib/XercesLib.vcproj b/projects/Win32/VC8/xerces-all/XercesLib/XercesLib.vcproj
index da39cb5ad..d451699c9 100644
--- a/projects/Win32/VC8/xerces-all/XercesLib/XercesLib.vcproj
+++ b/projects/Win32/VC8/xerces-all/XercesLib/XercesLib.vcproj
@@ -79,14 +79,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="ws2_32.lib advapi32.lib"
-				OutputFile="$(OutDir)\xerces-c_3_0.dll"
+				OutputFile="$(OutDir)\xerces-c_3_1.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0.fullpdb"
-				StripPrivateSymbols="$(OutDir)\xerces-c_3_0.pdb"
+				ProgramDatabaseFile="$(OutDir)\xerces-c_3_1.fullpdb"
+				StripPrivateSymbols="$(OutDir)\xerces-c_3_1.pdb"
 				GenerateMapFile="true"
-				MapFileName="$(IntDir)\xerces-c_3_0.map"
+				MapFileName="$(IntDir)\xerces-c_3_1.map"
 				SubSystem="2"
 				OptimizeReferences="2"
 				SetChecksum="true"
@@ -178,14 +178,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib advapi32.lib"
-				OutputFile="$(OutDir)\xerces-c_3_0.dll"
+				OutputFile="$(OutDir)\xerces-c_3_1.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0.fullpdb"
-				StripPrivateSymbols="$(OutDir)\xerces-c_3_0.pdb"
+				ProgramDatabaseFile="$(OutDir)\xerces-c_3_1.fullpdb"
+				StripPrivateSymbols="$(OutDir)\xerces-c_3_1.pdb"
 				GenerateMapFile="true"
-				MapFileName="$(IntDir)\xerces-c_3_0.map"
+				MapFileName="$(IntDir)\xerces-c_3_1.map"
 				SubSystem="2"
 				OptimizeReferences="2"
 				SetChecksum="true"
@@ -277,11 +277,11 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="ws2_32.lib advapi32.lib"
-				OutputFile="$(OutDir)\xerces-c_3_0D.dll"
+				OutputFile="$(OutDir)\xerces-c_3_1D.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0D.pdb"
+				ProgramDatabaseFile="$(OutDir)\xerces-c_3_1D.pdb"
 				SubSystem="2"
 				SetChecksum="false"
 				BaseAddress="0x12000000"
@@ -369,11 +369,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib advapi32.lib"
-				OutputFile="$(OutDir)\xerces-c_3_0D.dll"
+				OutputFile="$(OutDir)\xerces-c_3_1D.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0D.pdb"
+				ProgramDatabaseFile="$(OutDir)\xerces-c_3_1D.pdb"
 				SubSystem="2"
 				SetChecksum="false"
 				BaseAddress="0x12000000"
@@ -760,11 +760,11 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="ws2_32.lib advapi32.lib icuuc.lib"
-				OutputFile="$(OutDir)\xerces-c_3_0D.dll"
+				OutputFile="$(OutDir)\xerces-c_3_1D.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0D.pdb"
+				ProgramDatabaseFile="$(OutDir)\xerces-c_3_1D.pdb"
 				SubSystem="2"
 				SetChecksum="false"
 				BaseAddress="0x12000000"
@@ -852,11 +852,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib advapi32.lib"
-				OutputFile="$(OutDir)\xerces-c_3_0D.dll"
+				OutputFile="$(OutDir)\xerces-c_3_1D.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0D.pdb"
+				ProgramDatabaseFile="$(OutDir)\xerces-c_3_1D.pdb"
 				SubSystem="2"
 				SetChecksum="false"
 				BaseAddress="0x12000000"
@@ -950,14 +950,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="ws2_32.lib advapi32.lib icuuc.lib"
-				OutputFile="$(OutDir)\xerces-c_3_0.dll"
+				OutputFile="$(OutDir)\xerces-c_3_1.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0.fullpdb"
-				StripPrivateSymbols="$(OutDir)\xerces-c_3_0.pdb"
+				ProgramDatabaseFile="$(OutDir)\xerces-c_3_1.fullpdb"
+				StripPrivateSymbols="$(OutDir)\xerces-c_3_1.pdb"
 				GenerateMapFile="true"
-				MapFileName="$(IntDir)\xerces-c_3_0.map"
+				MapFileName="$(IntDir)\xerces-c_3_1.map"
 				SubSystem="2"
 				OptimizeReferences="2"
 				SetChecksum="true"
@@ -1049,14 +1049,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib advapi32.lib"
-				OutputFile="$(OutDir)\xerces-c_3_0.dll"
+				OutputFile="$(OutDir)\xerces-c_3_1.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0.fullpdb"
-				StripPrivateSymbols="$(OutDir)\xerces-c_3_0.pdb"
+				ProgramDatabaseFile="$(OutDir)\xerces-c_3_1.fullpdb"
+				StripPrivateSymbols="$(OutDir)\xerces-c_3_1.pdb"
 				GenerateMapFile="true"
-				MapFileName="$(IntDir)\xerces-c_3_0.map"
+				MapFileName="$(IntDir)\xerces-c_3_1.map"
 				SubSystem="2"
 				OptimizeReferences="2"
 				SetChecksum="true"
diff --git a/projects/Win32/VC9/xerces-all/XercesLib/XercesLib.vcproj b/projects/Win32/VC9/xerces-all/XercesLib/XercesLib.vcproj
index 24cdbd42c..c20aaf5a5 100644
--- a/projects/Win32/VC9/xerces-all/XercesLib/XercesLib.vcproj
+++ b/projects/Win32/VC9/xerces-all/XercesLib/XercesLib.vcproj
@@ -81,14 +81,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="ws2_32.lib advapi32.lib"
-				OutputFile="$(OutDir)\xerces-c_3_0.dll"
+				OutputFile="$(OutDir)\xerces-c_3_1.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0.fullpdb"
-				StripPrivateSymbols="$(OutDir)\xerces-c_3_0.pdb"
+				ProgramDatabaseFile="$(OutDir)\xerces-c_3_1.fullpdb"
+				StripPrivateSymbols="$(OutDir)\xerces-c_3_1.pdb"
 				GenerateMapFile="true"
-				MapFileName="$(IntDir)\xerces-c_3_0.map"
+				MapFileName="$(IntDir)\xerces-c_3_1.map"
 				SubSystem="2"
 				OptimizeReferences="2"
 				SetChecksum="true"
@@ -179,14 +179,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib advapi32.lib"
-				OutputFile="$(OutDir)\xerces-c_3_0.dll"
+				OutputFile="$(OutDir)\xerces-c_3_1.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0.fullpdb"
-				StripPrivateSymbols="$(OutDir)\xerces-c_3_0.pdb"
+				ProgramDatabaseFile="$(OutDir)\xerces-c_3_1.fullpdb"
+				StripPrivateSymbols="$(OutDir)\xerces-c_3_1.pdb"
 				GenerateMapFile="true"
-				MapFileName="$(IntDir)\xerces-c_3_0.map"
+				MapFileName="$(IntDir)\xerces-c_3_1.map"
 				SubSystem="2"
 				OptimizeReferences="2"
 				SetChecksum="true"
@@ -278,11 +278,11 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="ws2_32.lib advapi32.lib"
-				OutputFile="$(OutDir)\xerces-c_3_0D.dll"
+				OutputFile="$(OutDir)\xerces-c_3_1D.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0D.pdb"
+				ProgramDatabaseFile="$(OutDir)\xerces-c_3_1D.pdb"
 				SubSystem="2"
 				SetChecksum="false"
 				BaseAddress="0x12000000"
@@ -369,11 +369,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib advapi32.lib"
-				OutputFile="$(OutDir)\xerces-c_3_0D.dll"
+				OutputFile="$(OutDir)\xerces-c_3_1D.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0D.pdb"
+				ProgramDatabaseFile="$(OutDir)\xerces-c_3_1D.pdb"
 				SubSystem="2"
 				SetChecksum="false"
 				BaseAddress="0x12000000"
@@ -762,11 +762,11 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="ws2_32.lib advapi32.lib icuuc.lib"
-				OutputFile="$(OutDir)\xerces-c_3_0D.dll"
+				OutputFile="$(OutDir)\xerces-c_3_1D.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0D.pdb"
+				ProgramDatabaseFile="$(OutDir)\xerces-c_3_1D.pdb"
 				SubSystem="2"
 				SetChecksum="false"
 				BaseAddress="0x12000000"
@@ -853,11 +853,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib advapi32.lib"
-				OutputFile="$(OutDir)\xerces-c_3_0D.dll"
+				OutputFile="$(OutDir)\xerces-c_3_1D.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0D.pdb"
+				ProgramDatabaseFile="$(OutDir)\xerces-c_3_1D.pdb"
 				SubSystem="2"
 				SetChecksum="false"
 				BaseAddress="0x12000000"
@@ -951,14 +951,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="ws2_32.lib advapi32.lib icuuc.lib"
-				OutputFile="$(OutDir)\xerces-c_3_0.dll"
+				OutputFile="$(OutDir)\xerces-c_3_1.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0.fullpdb"
-				StripPrivateSymbols="$(OutDir)\xerces-c_3_0.pdb"
+				ProgramDatabaseFile="$(OutDir)\xerces-c_3_1.fullpdb"
+				StripPrivateSymbols="$(OutDir)\xerces-c_3_1.pdb"
 				GenerateMapFile="true"
-				MapFileName="$(IntDir)\xerces-c_3_0.map"
+				MapFileName="$(IntDir)\xerces-c_3_1.map"
 				SubSystem="2"
 				OptimizeReferences="2"
 				SetChecksum="true"
@@ -1049,14 +1049,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib advapi32.lib"
-				OutputFile="$(OutDir)\xerces-c_3_0.dll"
+				OutputFile="$(OutDir)\xerces-c_3_1.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0.fullpdb"
-				StripPrivateSymbols="$(OutDir)\xerces-c_3_0.pdb"
+				ProgramDatabaseFile="$(OutDir)\xerces-c_3_1.fullpdb"
+				StripPrivateSymbols="$(OutDir)\xerces-c_3_1.pdb"
 				GenerateMapFile="true"
-				MapFileName="$(IntDir)\xerces-c_3_0.map"
+				MapFileName="$(IntDir)\xerces-c_3_1.map"
 				SubSystem="2"
 				OptimizeReferences="2"
 				SetChecksum="true"
diff --git a/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp b/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp
index 648adcf24..0484f6986 100644
--- a/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp
+++ b/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp
@@ -51,8 +51,8 @@ XERCES_CPP_NAMESPACE_BEGIN
  *  The application (this *.cpp) references that symbol here, and will pass the data address to ICU, which
  *  will then  be able to fetch resources from the data.
  */
-#define ENTRY_POINT xercesc_messages_3_0_dat
-#define BUNDLE_NAME "xercesc_messages_3_0"
+#define ENTRY_POINT xercesc_messages_3_1_dat
+#define BUNDLE_NAME "xercesc_messages_3_1"
 
 extern "C" void U_IMPORT *ENTRY_POINT;
 
diff --git a/src/xercesc/util/MsgLoaders/Win32/Version.rc b/src/xercesc/util/MsgLoaders/Win32/Version.rc
index 65c5a4528..3b306bf31 100644
--- a/src/xercesc/util/MsgLoaders/Win32/Version.rc
+++ b/src/xercesc/util/MsgLoaders/Win32/Version.rc
@@ -30,8 +30,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,0,0,0
- PRODUCTVERSION 3,0,0,0
+ FILEVERSION 3,1,0,0
+ PRODUCTVERSION 3,1,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -48,15 +48,15 @@ BEGIN
         BEGIN
             VALUE "Comments", "Dynamic linked library for Xerces-C++\0"
             VALUE "CompanyName", "Apache Software Foundation\0"
-            VALUE "FileDescription", "Shared Library for Xerces-C++ Version 3.0.0\0"
-            VALUE "FileVersion", "3, 0, 0\0"
-            VALUE "InternalName", "xerces-c_3_0.dll\0"
+            VALUE "FileDescription", "Shared Library for Xerces-C++ Version 3.1.0\0"
+            VALUE "FileVersion", "3, 1, 0\0"
+            VALUE "InternalName", "xerces-c_3_1.dll\0"
             VALUE "LegalCopyright", "Copyright © Apache Software Foundation 2008 subject to licensing terms\0"
             VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "xerces-c_3_0.dll\0"
+            VALUE "OriginalFilename", "xerces-c_3_1.dll\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Xerces-C++ Version 3.0.0\0"
-            VALUE "ProductVersion", "3, 0, 0\0"
+            VALUE "ProductName", "Xerces-C++ Version 3.1.0\0"
+            VALUE "ProductVersion", "3, 1, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/src/xercesc/util/XercesVersion.hpp b/src/xercesc/util/XercesVersion.hpp
index a853fb795..74839df15 100644
--- a/src/xercesc/util/XercesVersion.hpp
+++ b/src/xercesc/util/XercesVersion.hpp
@@ -127,7 +127,7 @@
  */
 
 #define XERCES_VERSION_MAJOR 3
-#define XERCES_VERSION_MINOR 0
+#define XERCES_VERSION_MINOR 1
 #define XERCES_VERSION_REVISION 0
 
 /***
diff --git a/version.incl b/version.incl
index bed500292..d04dd2dbd 100644
--- a/version.incl
+++ b/version.incl
@@ -17,6 +17,6 @@
 #
 # $Id$
 #
-VER=3_0_0
-INTERFACE_VER_D=3.0
-INTERFACE_VER_U=3_0
+VER=3_1_0
+INTERFACE_VER_D=3.1
+INTERFACE_VER_U=3_1
diff --git a/xerces-c.spec b/xerces-c.spec
index 92f041f68..75bf3abdf 100644
--- a/xerces-c.spec
+++ b/xerces-c.spec
@@ -1,6 +1,6 @@
 Summary:	Xerces-C++ validating XML parser
 Name:		xerces-c
-Version:	3.0.0
+Version:	3.1.0
 Release:	1
 URL:		http://xerces.apache.org/xerces-c/
 Source0:	%{name}-%{version}.tar.gz
-- 
GitLab