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

Scott Cantor cantor.2 at osu.edu
Tue Feb 4 07:53:11 EST 2020 

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

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

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

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

commit c729e62a8393fccc752414a689c838b733faabdb
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 4 07:52:47 2020 -0500

    Bump version to 3.1.0
---
 Projects/vc15/shibsp/shibsp-lite.vcxproj |  8 ++++----
 Projects/vc15/shibsp/shibsp.vcxproj      |  8 ++++----
 configure.ac                             |  2 +-
 shibboleth.spec.in                       | 15 +++++++++------
 shibsp/Makefile.am                       |  2 +-
 util/resourceCommon.rci                  |  2 +-
 6 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/Projects/vc15/shibsp/shibsp-lite.vcxproj b/Projects/vc15/shibsp/shibsp-lite.vcxproj
index 3d3eb6b..38c01c8 100644
--- a/Projects/vc15/shibsp/shibsp-lite.vcxproj
+++ b/Projects/vc15/shibsp/shibsp-lite.vcxproj
@@ -91,10 +91,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/shibsp/shibsp.vcxproj b/Projects/vc15/shibsp/shibsp.vcxproj
index 03cd4d0..41cb134 100644
--- a/Projects/vc15/shibsp/shibsp.vcxproj
+++ b/Projects/vc15/shibsp/shibsp.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)'=='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/configure.ac b/configure.ac
index 6626005..953dd29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.50])
-AC_INIT([shibboleth],[3.1],[https://issues.shibboleth.net/],[shibboleth-sp])
+AC_INIT([shibboleth],[3.1.0],[https://issues.shibboleth.net/],[shibboleth-sp])
 AC_CONFIG_SRCDIR(shibsp)
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_MACRO_DIR(m4)
diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 4c59f0f..e6e9a41 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -11,9 +11,9 @@ BuildRoot:	%{_tmppath}/%{name}-sp-%{version}-root
 Obsoletes:	shibboleth-sp = 2.5.0
 Requires:	openssl
 %if 0%{?rhel} >= 6 || 0%{?amzn} >= 1
-PreReq:		xmltooling-schemas%{?_isa} >= 3.0.0, opensaml-schemas%{?_isa} >= 3.0.0
+PreReq:		xmltooling-schemas%{?_isa} >= 3.1.0, opensaml-schemas%{?_isa} >= 3.1.0
 %else
-PreReq:		xmltooling-schemas >= 3.0.0, opensaml-schemas >= 3.0.0
+PreReq:		xmltooling-schemas >= 3.1.0, opensaml-schemas >= 3.1.0
 %endif
 %if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
 PreReq:		%{insserv_prereq} %{fillup_prereq}
@@ -26,8 +26,8 @@ BuildRequires:  gdb
 %endif
 BuildRequires:  libxerces-c-devel >= 3.2
 BuildRequires:	libxml-security-c-devel >= 2.0.0
-BuildRequires:	libxmltooling-devel >= 3.0.0
-BuildRequires:	libsaml-devel >= 3.0.0
+BuildRequires:	libxmltooling-devel >= 3.1.0
+BuildRequires:	libsaml-devel >= 3.1.0
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 2}
 %if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} >= 1
@@ -90,8 +90,8 @@ Requires:	%{name} = %{version}-%{release}
 Obsoletes:	shibboleth-sp-devel = 2.5.0
 Requires:	libxerces-c-devel >= 3.2
 Requires: 	libxml-security-c-devel >= 2.0.0
-Requires: 	libxmltooling-devel >= 3.0.0
-Requires: 	libsaml-devel >= 3.0.0
+Requires: 	libxmltooling-devel >= 3.1.0
+Requires: 	libsaml-devel >= 3.1.0
 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:Requires: liblog4shib-devel >= 2}
 
@@ -476,6 +476,9 @@ exit 0
 %doc %{pkgdocdir}/api
 
 %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/shibsp/Makefile.am b/shibsp/Makefile.am
index a342b72..ccae58d 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -243,7 +243,7 @@ libshibsp_la_SOURCES = \
 
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
-libshibsp_la_LDFLAGS = -version-info 8:5:0
+libshibsp_la_LDFLAGS = -version-info 9:0:0
 libshibsp_la_CXXFLAGS = \
     $(AM_CXXFLAGS) \
     $(BOOST_CPPFLAGS) \
diff --git a/util/resourceCommon.rci b/util/resourceCommon.rci
index 959f8b7..2a5fb98 100644
--- a/util/resourceCommon.rci
+++ b/util/resourceCommon.rci
@@ -2,7 +2,7 @@
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Shibboleth Consortium\0"
             VALUE "FileVersion", "3,1,0,0\0"
-            VALUE "LegalCopyright", "Copyright 2019 Various\0"
+            VALUE "LegalCopyright", "Copyright 2020 Various\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Shibboleth 3.1.0\0"

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

More information about the commits mailing list