diff --git a/CHANGELOG b/CHANGELOG index cf7325842b..c94031ccbb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,12 @@ This is the changelog file for the POCO C++ Libraries. +Release 1.12.1 (2022-07-18) +=========================== + +- GH #3677 PocoFoundationConfig.cmake should now check for PCRE2 +- GH #3686 SIGSEGV in OSSL_PROVIDER_unload with static OpenSSL3 + + Release 1.12.0 (2022-07-08) =========================== diff --git a/DLLVersion.rc b/DLLVersion.rc index 779c4db1b2..ffca82f267 100644 --- a/DLLVersion.rc +++ b/DLLVersion.rc @@ -4,8 +4,8 @@ #include "winres.h" -#define POCO_VERSION 1,12,0,0 -#define POCO_VERSION_STR "1.12.0" +#define POCO_VERSION 1,12,1,0 +#define POCO_VERSION_STR "1.12.1" VS_VERSION_INFO VERSIONINFO FILEVERSION POCO_VERSION diff --git a/Foundation/cmake/PocoFoundationConfig.cmake b/Foundation/cmake/PocoFoundationConfig.cmake index 46c2d3fc00..82c5788940 100644 --- a/Foundation/cmake/PocoFoundationConfig.cmake +++ b/Foundation/cmake/PocoFoundationConfig.cmake @@ -2,7 +2,7 @@ if(@POCO_UNBUNDLED@) include(CMakeFindDependencyMacro) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") find_dependency(ZLIB REQUIRED) - find_dependency(PCRE REQUIRED) + find_dependency(PCRE2 REQUIRED) endif() include("${CMAKE_CURRENT_LIST_DIR}/PocoFoundationTargets.cmake") diff --git a/Foundation/include/Poco/Version.h b/Foundation/include/Poco/Version.h index cb014e9853..d881ed1238 100644 --- a/Foundation/include/Poco/Version.h +++ b/Foundation/include/Poco/Version.h @@ -36,6 +36,6 @@ // Bx: beta releases // -#define POCO_VERSION 0x010C0000 +#define POCO_VERSION 0x010C0100 #endif // Foundation_Version_INCLUDED diff --git a/VERSION b/VERSION index 0eed1a29ef..f8f4f03b3d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.12.0 +1.12.1 diff --git a/doc/99100-ReleaseNotes.page b/doc/99100-ReleaseNotes.page index 601b3a6d8c..2f630cf1a7 100644 --- a/doc/99100-ReleaseNotes.page +++ b/doc/99100-ReleaseNotes.page @@ -2,6 +2,14 @@ POCO C++ Libraries Release Notes AAAIntroduction +!!!Release 1.12.1 + +!!Summary of Changes + + - GH #3677 PocoFoundationConfig.cmake should now check for PCRE2 + - GH #3686 SIGSEGV in OSSL_PROVIDER_unload with static OpenSSL3 + + !!!Release 1.12.0 !!Summary of Changes diff --git a/libversion b/libversion index d61f00d8ca..7fe4e495fe 100644 --- a/libversion +++ b/libversion @@ -1 +1 @@ -90 +91