Bump version.

diff --git a/adfs/adfs.rc b/adfs/adfs.rc
index 7db3d05..9e46d04 100644 (file)
--- a/adfs/adfs.rc
+++ b/adfs/adfs.rc
@@ -54,8 +54,8 @@ END
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,2,1,0\r
- PRODUCTVERSION 2,2,1,0\r
+ FILEVERSION 2,3,0,0\r
+ PRODUCTVERSION 2,3,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -73,7 +73,7 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Internet2\0"\r
             VALUE "FileDescription", "Shibboleth ADFSv1 Plugin\0"\r
-            VALUE "FileVersion", "2, 2, 1, 0\0"\r
+            VALUE "FileVersion", "2, 3, 0, 0\0"\r
 #ifdef SHIBSP_LITE\r
             VALUE "InternalName", "adfs-lite\0"\r
 #else\r
@@ -87,8 +87,8 @@ BEGIN
             VALUE "OriginalFilename", "adfs.so\0"\r
 #endif\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.2.1\0"\r
-            VALUE "ProductVersion", "2, 2, 1, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.3\0"\r
+            VALUE "ProductVersion", "2, 3, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/apache/mod_shib_13.rc b/apache/mod_shib_13.rc
index 503cf30..1ef85b6 100644 (file)
--- a/apache/mod_shib_13.rc
+++ b/apache/mod_shib_13.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,1,0
- PRODUCTVERSION 2,2,1,0
+ FILEVERSION 2,3,0,0
+ PRODUCTVERSION 2,3,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth Apache 1.3 Module\0"
-            VALUE "FileVersion", "2, 2, 1, 0\0"
+            VALUE "FileVersion", "2, 3, 0, 0\0"
             VALUE "InternalName", "mod_shib_13\0"
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "mod_shib_13.so\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.2.1\0"
-            VALUE "ProductVersion", "2, 2, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.3\0"
+            VALUE "ProductVersion", "2, 3, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/apache/mod_shib_20.rc b/apache/mod_shib_20.rc
index d3e619e..79dd05e 100644 (file)
--- a/apache/mod_shib_20.rc
+++ b/apache/mod_shib_20.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,1,0
- PRODUCTVERSION 2,2,1,0
+ FILEVERSION 2,3,0,0
+ PRODUCTVERSION 2,3,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth Apache 2.0 Module\0"
-            VALUE "FileVersion", "2, 2, 1, 0\0"
+            VALUE "FileVersion", "2, 3, 0, 0\0"
             VALUE "InternalName", "mod_shib_20\0"
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "mod_shib_20.so\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.2.1\0"
-            VALUE "ProductVersion", "2, 2, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.3\0"
+            VALUE "ProductVersion", "2, 3, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/apache/mod_shib_22.rc b/apache/mod_shib_22.rc
index 5f92326..24182bd 100644 (file)
--- a/apache/mod_shib_22.rc
+++ b/apache/mod_shib_22.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,1,0
- PRODUCTVERSION 2,2,1,0
+ FILEVERSION 2,3,0,0
+ PRODUCTVERSION 2,3,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth Apache 2.2 Module\0"
-            VALUE "FileVersion", "2, 2, 1, 0\0"
+            VALUE "FileVersion", "2, 3, 0, 0\0"
             VALUE "InternalName", "mod_shib_22\0"
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "mod_shib_22.so\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.2.1\0"
-            VALUE "ProductVersion", "2, 2, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.3\0"
+            VALUE "ProductVersion", "2, 3, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/config_win32.h b/config_win32.h
index 04b4dd2..9778d65 100644 (file)
--- a/config_win32.h
+++ b/config_win32.h
@@ -117,13 +117,13 @@
 #define PACKAGE_NAME "shibboleth"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "shibboleth 2.2.1"
+#define PACKAGE_STRING "shibboleth 2.3"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "shibboleth"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.2.1"
+#define PACKAGE_VERSION "2.3"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -136,7 +136,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "2.2.1"
+#define VERSION "2.3"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

diff --git a/configure.ac b/configure.ac
index fd07125..9a99c3b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.50])
-AC_INIT([shibboleth], [2.2.1], [shibboleth-users@internet2.edu], [shibboleth])
+AC_INIT([shibboleth], [2.3], [shibboleth-users@internet2.edu], [shibboleth])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([shibboleth],[2.2.1])
+AM_INIT_AUTOMAKE([shibboleth],[2.3])
 
 sinclude(doxygen.m4)
 sinclude(acx_pthread.m4)

diff --git a/fastcgi/shibauthorizer.rc b/fastcgi/shibauthorizer.rc
index c9b4c1d..37258c9 100644 (file)
--- a/fastcgi/shibauthorizer.rc
+++ b/fastcgi/shibauthorizer.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,2,1,0\r
- PRODUCTVERSION 2,2,1,0\r
+ FILEVERSION 2,3,0,0\r
+ PRODUCTVERSION 2,3,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Internet2\0"\r
             VALUE "FileDescription", "Shibboleth FastCGI Authorizer\0"\r
-            VALUE "FileVersion", "2, 2, 1, 0\0"\r
+            VALUE "FileVersion", "2, 3, 0, 0\0"\r
             VALUE "InternalName", "shibauthorizer\0"\r
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "shibauthorizer.exe\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.2.1\0"\r
-            VALUE "ProductVersion", "2, 2, 1, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.3\0"\r
+            VALUE "ProductVersion", "2, 3, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/fastcgi/shibresponder.rc b/fastcgi/shibresponder.rc
index 4bccb0f..f95c347 100644 (file)
--- a/fastcgi/shibresponder.rc
+++ b/fastcgi/shibresponder.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,2,1,0\r
- PRODUCTVERSION 2,2,1,0\r
+ FILEVERSION 2,3,0,0\r
+ PRODUCTVERSION 2,3,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Internet2\0"\r
             VALUE "FileDescription", "Shibboleth FastCGI Responder\0"\r
-            VALUE "FileVersion", "2, 2, 1, 0\0"\r
+            VALUE "FileVersion", "2, 3, 0, 0\0"\r
             VALUE "InternalName", "shibresponder\0"\r
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "shibresponder.exe\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.2.1\0"\r
-            VALUE "ProductVersion", "2, 2, 1, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.3\0"\r
+            VALUE "ProductVersion", "2, 3, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/isapi_shib/isapi_shib.rc b/isapi_shib/isapi_shib.rc
index 4a6f709..116438f 100644 (file)
--- a/isapi_shib/isapi_shib.rc
+++ b/isapi_shib/isapi_shib.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,1,0
- PRODUCTVERSION 2,2,1,0
+ FILEVERSION 2,3,0,0
+ PRODUCTVERSION 2,3,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth ISAPI Filter / Extension\0"
-            VALUE "FileVersion", "2, 2, 1, 0\0"
+            VALUE "FileVersion", "2, 3, 0, 0\0"
             VALUE "InternalName", "isapi_shib\0"
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "isapi_shib.dll\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.2.1\0"
-            VALUE "ProductVersion", "2, 2, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.3\0"
+            VALUE "ProductVersion", "2, 3, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/memcache-store/memcache-store.rc b/memcache-store/memcache-store.rc
index ffd78ff..5edb5b1 100644 (file)
--- a/memcache-store/memcache-store.rc
+++ b/memcache-store/memcache-store.rc
@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,1,0
- PRODUCTVERSION 2,2,1,0
+ FILEVERSION 2,3,0,0
+ PRODUCTVERSION 2,3,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -71,12 +71,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth Memcache Storage Service Plugin\0"
-            VALUE "FileVersion", "2, 2, 1, 0\0"
+            VALUE "FileVersion", "2, 3, 0, 0\0"
             VALUE "InternalName", "memcache-store\0"
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
             VALUE "OriginalFilename", "memcache-store.so\0"
-            VALUE "ProductName", "Shibboleth 2.2.1\0"
-            VALUE "ProductVersion", "2, 2, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.3\0"
+            VALUE "ProductVersion", "2, 3, 0, 0\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/nsapi_shib/nsapi_shib.rc b/nsapi_shib/nsapi_shib.rc
index ba31800..a551403 100644 (file)
--- a/nsapi_shib/nsapi_shib.rc
+++ b/nsapi_shib/nsapi_shib.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,1,0
- PRODUCTVERSION 2,2,1,0
+ FILEVERSION 2,3,0,0
+ PRODUCTVERSION 2,3,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth NSAPI Extension\0"
-            VALUE "FileVersion", "2, 2, 1, 0\0"
+            VALUE "FileVersion", "2, 3, 0, 0\0"
             VALUE "InternalName", "nsapi_shib\0"
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "nsapi_shib.dll\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.2.1\0"
-            VALUE "ProductVersion", "2, 2, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.3\0"
+            VALUE "ProductVersion", "2, 3, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/odbc-store/odbc-store.rc b/odbc-store/odbc-store.rc
index 1a9eb39..0190222 100644 (file)
--- a/odbc-store/odbc-store.rc
+++ b/odbc-store/odbc-store.rc
@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,1,0
- PRODUCTVERSION 2,2,1,0
+ FILEVERSION 2,3,0,0
+ PRODUCTVERSION 2,3,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -71,12 +71,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth ODBC Storage Service Plugin\0"
-            VALUE "FileVersion", "2, 2, 1, 0\0"
+            VALUE "FileVersion", "2, 3, 0, 0\0"
             VALUE "InternalName", "odbc-store\0"
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
             VALUE "OriginalFilename", "odbc-store.so\0"
-            VALUE "ProductName", "Shibboleth 2.2.1\0"
-            VALUE "ProductVersion", "2, 2, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.3\0"
+            VALUE "ProductVersion", "2, 3, 0, 0\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/shibd/shibd.rc b/shibd/shibd.rc
index 4f11667..264fc0c 100644 (file)
--- a/shibd/shibd.rc
+++ b/shibd/shibd.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,2,1,0\r
- PRODUCTVERSION 2,2,1,0\r
+ FILEVERSION 2,3,0,0\r
+ PRODUCTVERSION 2,3,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Internet2\0"\r
             VALUE "FileDescription", "Shibboleth Daemon Service\0"\r
-            VALUE "FileVersion", "2, 2, 1, 0\0"\r
+            VALUE "FileVersion", "2, 3, 0, 0\0"\r
             VALUE "InternalName", "shibd\0"\r
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "shibd.exe\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.2.1\0"\r
-            VALUE "ProductVersion", "2, 2, 1, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.3\0"\r
+            VALUE "ProductVersion", "2, 3, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 811d4ed..baa88ad 100644 (file)
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -200,8 +200,8 @@ libshibsp_la_SOURCES = \
 
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
-libshibsp_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 3:1:0
-libshibsp_lite_la_LDFLAGS = $(LITE_LIBS) -version-info 3:1:0
+libshibsp_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 4:0:0
+libshibsp_lite_la_LDFLAGS = $(LITE_LIBS) -version-info 4:0:0
 libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
 
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@

diff --git a/shibsp/shibsp-lite.vcproj b/shibsp/shibsp-lite.vcproj
index e465154..beccaa1 100644 (file)
--- a/shibsp/shibsp-lite.vcproj
+++ b/shibsp/shibsp-lite.vcproj
@@ -67,7 +67,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="log4shib1D.lib xerces-c_3D.lib xmltooling-lite1D.lib wsock32.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)1_2D.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)1_3D.dll"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(ConfigurationName)"\r
                                GenerateDebugInformation="true"\r
@@ -148,7 +148,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="log4shib1D.lib xerces-c_3D.lib xmltooling-lite1D.lib wsock32.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)1_2D.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)1_3D.dll"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"\r
                                GenerateDebugInformation="true"\r
@@ -225,7 +225,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="log4shib1.lib xerces-c_3.lib xmltooling-lite1.lib wsock32.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)1_2.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)1_3.dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(ConfigurationName)"\r
                                SubSystem="2"\r
@@ -304,7 +304,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="log4shib1.lib xerces-c_3.lib xmltooling-lite1.lib wsock32.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)1_2.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)1_3.dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"\r
                                GenerateDebugInformation="true"\r

diff --git a/shibsp/shibsp.rc b/shibsp/shibsp.rc
index b39d484..d69080c 100644 (file)
--- a/shibsp/shibsp.rc
+++ b/shibsp/shibsp.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,2,1,0\r
- PRODUCTVERSION 2,2,1,0\r
+ FILEVERSION 1,3,0,0\r
+ PRODUCTVERSION 2,3,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -51,38 +51,38 @@ BEGIN
 #else\r
             VALUE "FileDescription", "Shibboleth SP Library\0"\r
 #endif\r
-            VALUE "FileVersion", "1, 2, 1, 0\0"\r
+            VALUE "FileVersion", "1, 3, 0, 0\0"\r
 #ifdef SHIBSP_LITE\r
 #ifdef _DEBUG\r
-            VALUE "InternalName", "shibsp-lite1_2D\0"\r
+            VALUE "InternalName", "shibsp-lite1_3D\0"\r
 #else\r
-            VALUE "InternalName", "shibsp-lite1_2\0"\r
+            VALUE "InternalName", "shibsp-lite1_3\0"\r
 #endif\r
 #else\r
 #ifdef _DEBUG\r
-            VALUE "InternalName", "shibsp1_2D\0"\r
+            VALUE "InternalName", "shibsp1_3D\0"\r
 #else\r
-            VALUE "InternalName", "shibsp1_2\0"\r
+            VALUE "InternalName", "shibsp1_3\0"\r
 #endif\r
 #endif\r
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"\r
             VALUE "LegalTrademarks", "\0"\r
 #ifdef SHIBSP_LITE\r
 #ifdef _DEBUG\r
-            VALUE "OriginalFilename", "shibsp-lite1_2D.dll\0"\r
+            VALUE "OriginalFilename", "shibsp-lite1_3D.dll\0"\r
 #else\r
-            VALUE "OriginalFilename", "shibsp-lite1_2.dll\0"\r
+            VALUE "OriginalFilename", "shibsp-lite1_3.dll\0"\r
 #endif\r
 #else\r
 #ifdef _DEBUG\r
-            VALUE "OriginalFilename", "shibsp1_2D.dll\0"\r
+            VALUE "OriginalFilename", "shibsp1_3D.dll\0"\r
 #else\r
-            VALUE "OriginalFilename", "shibsp1_2.dll\0"\r
+            VALUE "OriginalFilename", "shibsp1_3.dll\0"\r
 #endif\r
 #endif\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.2.1\0"\r
-            VALUE "ProductVersion", "2, 2, 1, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.3\0"\r
+            VALUE "ProductVersion", "2, 3, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/shibsp/shibsp.vcproj b/shibsp/shibsp.vcproj
index cbd630d..df32894 100644 (file)
--- a/shibsp/shibsp.vcproj
+++ b/shibsp/shibsp.vcproj
@@ -67,7 +67,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="log4shib1D.lib xerces-c_3D.lib xsec_1D.lib saml2D.lib xmltooling1D.lib wsock32.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)1_2D.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)1_3D.dll"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"\r
                                GenerateDebugInformation="true"\r
@@ -148,7 +148,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="log4shib1D.lib xerces-c_3D.lib xsec_1D.lib saml2D.lib xmltooling1D.lib wsock32.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)1_2D.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)1_3D.dll"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(PlatformName)\$(ConfigurationName);..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"\r
                                GenerateDebugInformation="true"\r
@@ -224,7 +224,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="log4shib1.lib xerces-c_3.lib xsec_1.lib saml2.lib xmltooling1.lib wsock32.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)1_2.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)1_3.dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"\r
                                SubSystem="2"\r
@@ -302,7 +302,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="log4shib1.lib xerces-c_3.lib xsec_1.lib saml2.lib xmltooling1.lib wsock32.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)1_2.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)1_3.dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(PlatformName)\$(ConfigurationName);..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"\r
                                GenerateDebugInformation="true"\r

diff --git a/shibsp/version.h b/shibsp/version.h
index b08f76d..e8707e4 100644 (file)
--- a/shibsp/version.h
+++ b/shibsp/version.h
@@ -38,8 +38,8 @@
  */
 
 #define SHIBSP_VERSION_MAJOR 1
-#define SHIBSP_VERSION_MINOR 2
-#define SHIBSP_VERSION_REVISION 1
+#define SHIBSP_VERSION_MINOR 3
+#define SHIBSP_VERSION_REVISION 0
 
 /** DO NOT MODIFY BELOW THIS LINE */