[cpp-xmltooling] branch master updated: Bump version to 3.1.0

Scott Cantor cantor.2 at osu.edu
Tue Feb 4 07:49:01 EST 2020


This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-xmltooling.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-xmltooling.git;a=commit;h=3b9e85cf4aa415431570c374e51dd9ab2b3f1c2f

The following commit(s) were added to refs/heads/master by this push:
       new  3b9e85c   Bump version to 3.1.0
3b9e85c is described below

commit 3b9e85cf4aa415431570c374e51dd9ab2b3f1c2f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 4 07:48:51 2020 -0500

    Bump version to 3.1.0
---
 Projects/vc15/xmltooling/xmltooling-lite.vcxproj |  8 +++----
 Projects/vc15/xmltooling/xmltooling.vcxproj      |  8 +++----
 config_win32.h                                   |  6 ++---
 configure.ac                                     |  2 +-
 xmltooling.spec.in                               | 13 ++++++-----
 xmltooling/Makefile.am                           |  2 +-
 xmltooling/version.h                             |  4 ++--
 xmltooling/xmltooling.rc                         | 28 ++++++++++++------------
 8 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/Projects/vc15/xmltooling/xmltooling-lite.vcxproj b/Projects/vc15/xmltooling/xmltooling-lite.vcxproj
index 4683761..cf80b6d 100644
--- a/Projects/vc15/xmltooling/xmltooling-lite.vcxproj
+++ b/Projects/vc15/xmltooling/xmltooling-lite.vcxproj
@@ -89,10 +89,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)3_0</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)3_0</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)3_0D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)3_0D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)3_1</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)3_1</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)3_1D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)3_1D</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/Projects/vc15/xmltooling/xmltooling.vcxproj b/Projects/vc15/xmltooling/xmltooling.vcxproj
index 3103479..81aaea5 100644
--- a/Projects/vc15/xmltooling/xmltooling.vcxproj
+++ b/Projects/vc15/xmltooling/xmltooling.vcxproj
@@ -87,10 +87,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)3_0D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)3_0D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)3_0</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)3_0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)3_1D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)3_1D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)3_1</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)3_1</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <IntDir>$(SolutionDir)..\..\Build\VC15\$(projectName)\$(Platform)\$(Configuration)\</IntDir>
diff --git a/config_win32.h b/config_win32.h
index 95bdbc4..b58ae55 100644
--- a/config_win32.h
+++ b/config_win32.h
@@ -106,13 +106,13 @@
 #define PACKAGE_NAME "xmltooling"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xmltooling 3.0.5"
+#define PACKAGE_STRING "xmltooling 3.1.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "xmltooling"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.0.5"
+#define PACKAGE_VERSION "3.1.0"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -125,7 +125,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "3.0.5"
+#define VERSION "3.1.0"
 
 /* Define if you wish to disable XML-Security-dependent features. */
 /* #undef XMLTOOLING_NO_XMLSEC */
diff --git a/configure.ac b/configure.ac
index 3de8767..ca34d84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoreconf
 AC_PREREQ([2.50])
-AC_INIT([xmltooling],[3.0.5],[https://issues.shibboleth.net/],[xmltooling])
+AC_INIT([xmltooling],[3.1.0],[https://issues.shibboleth.net/],[xmltooling])
 AC_CONFIG_SRCDIR(xmltooling)
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_MACRO_DIR(m4)
diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index 620e39d..1b7ab1b 100644
--- a/xmltooling.spec.in
+++ b/xmltooling.spec.in
@@ -56,7 +56,7 @@ Obsoletes:  @PACKAGE_NAME@ < %{version}-%{release}
 Requires: libcurl-openssl >= 7.21.7
 %endif
 
-%description -n lib at PACKAGE_NAME@8
+%description -n lib at PACKAGE_NAME@9
 The XMLTooling library contains generic XML parsing and processing
 classes based on the Xerces-C DOM. It adds more powerful facilities
 for declaring element- and type-specific API and implementation
@@ -68,7 +68,7 @@ This package contains just the shared library.
 %package -n lib at PACKAGE_NAME@-devel
 Summary:	XMLTooling development Headers
 Group:		Development/Libraries/C and C++
-Requires:	lib at PACKAGE_NAME@8 = %{version}-%{release}
+Requires:	lib at PACKAGE_NAME@9 = %{version}-%{release}
 Provides:	@PACKAGE_NAME at -devel = %{version}-%{release}
 Obsoletes:	@PACKAGE_NAME at -devel < %{version}-%{release}
 Requires:  libxerces-c-devel >= 3.2
@@ -126,11 +126,11 @@ This package includes XML schemas and related files.
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
-%post -n lib at PACKAGE_NAME@8 -p /sbin/ldconfig
+%post -n lib at PACKAGE_NAME@9 -p /sbin/ldconfig
 
-%postun -n lib at PACKAGE_NAME@8 -p /sbin/ldconfig
+%postun -n lib at PACKAGE_NAME@9 -p /sbin/ldconfig
 
-%files -n lib at PACKAGE_NAME@8
+%files -n lib at PACKAGE_NAME@9
 %defattr(-,root,root,-)
 %{_libdir}/*.so.*
 %exclude %{_libdir}/*.la
@@ -149,6 +149,9 @@ This package includes XML schemas and related files.
 %doc %{pkgdocdir}
 
 %changelog
+* Mon Feb 3 2020 Scott Cantor <cantor.2 at osu.edu> - 3.1.0-1
+- Version and lib bump
+
 * Mon Sep 30 2019 Scott Cantor <cantor.2 at osu.edu> - 3.0.4-1
 - CentOS 8 cleanup
 
diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index 8cca99c..0b172fb 100644
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -229,7 +229,7 @@ common_LIBADD = \
 	$(PTHREAD_LIBS) \
 	$(dlopen_LIBS)
 
-AM_LDFLAGS = -version-info 8:5:0
+AM_LDFLAGS = -version-info 9:0:0
 
 libxmltooling_lite_la_SOURCES = \
 	${common_sources}
diff --git a/xmltooling/version.h b/xmltooling/version.h
index 2744e51..726b20d 100644
--- a/xmltooling/version.h
+++ b/xmltooling/version.h
@@ -43,8 +43,8 @@
  */
 
 #define XMLTOOLING_VERSION_MAJOR 3
-#define XMLTOOLING_VERSION_MINOR 0
-#define XMLTOOLING_VERSION_REVISION 5
+#define XMLTOOLING_VERSION_MINOR 1
+#define XMLTOOLING_VERSION_REVISION 0
 
 /** DO NOT MODIFY BELOW THIS LINE */
 
diff --git a/xmltooling/xmltooling.rc b/xmltooling/xmltooling.rc
index c40c30b..81f652a 100644
--- a/xmltooling/xmltooling.rc
+++ b/xmltooling/xmltooling.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,0,5,0
- PRODUCTVERSION 3,0,1,0
+ FILEVERSION 3,1,0,0
+ PRODUCTVERSION 3,1,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -51,38 +51,38 @@ BEGIN
 #else
             VALUE "FileDescription", "OpenSAML XMLTooling Library\0"
 #endif
-            VALUE "FileVersion", "3, 0, 5, 0\0"
+            VALUE "FileVersion", "3, 1, 0, 0\0"
 #ifdef XMLTOOLING_LITE
 #ifdef _DEBUG
-            VALUE "InternalName", "xmltooling-lite3_0D\0"
+            VALUE "InternalName", "xmltooling-lite3_1D\0"
 #else
-            VALUE "InternalName", "xmltooling-lite3_0\0"
+            VALUE "InternalName", "xmltooling-lite3_1\0"
 #endif
 #else
 #ifdef _DEBUG
-            VALUE "InternalName", "xmltooling3_0D\0"
+            VALUE "InternalName", "xmltooling3_1D\0"
 #else
-            VALUE "InternalName", "xmltooling3_0\0"
+            VALUE "InternalName", "xmltooling3_1\0"
 #endif
 #endif
-            VALUE "LegalCopyright", "Copyright 2019 UCAID\0"
+            VALUE "LegalCopyright", "Copyright 2020 Various\0"
             VALUE "LegalTrademarks", "\0"
 #ifdef XMLTOOLING_LITE
 #ifdef _DEBUG
-            VALUE "OriginalFilename", "xmltooling-lite3_0D.dll\0"
+            VALUE "OriginalFilename", "xmltooling-lite3_1D.dll\0"
 #else
-            VALUE "OriginalFilename", "xmltooling-lite3_0.dll\0"
+            VALUE "OriginalFilename", "xmltooling-lite3_1.dll\0"
 #endif
 #else
 #ifdef _DEBUG
-            VALUE "OriginalFilename", "xmltooling3_0.dll\0"
+            VALUE "OriginalFilename", "xmltooling3_1.dll\0"
 #else
-            VALUE "OriginalFilename", "xmltooling3_0.dll\0"
+            VALUE "OriginalFilename", "xmltooling3_1.dll\0"
 #endif
 #endif
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "OpenSAML 3.0.1\0"
-            VALUE "ProductVersion", "3, 0, 1, 0\0"
+            VALUE "ProductName", "OpenSAML 3.1.0\0"
+            VALUE "ProductVersion", "3, 1, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list