# HG changeset patch # User Sebastien Jodogne # Date 1607959265 -3600 # Node ID 5e604adfd41fa8e2de750782e4d643d77d6773ce # Parent 48aa43c14bb3689ff87f67fc0aec11c81cb35e95# Parent 9b500ad566c0d1beb7b1f4725032fb4603ad08ee back to mainline diff -r 48aa43c14bb3 -r 5e604adfd41f MySQL/CMakeLists.txt --- a/MySQL/CMakeLists.txt Sun Dec 13 12:37:30 2020 +0100 +++ b/MySQL/CMakeLists.txt Mon Dec 14 16:21:05 2020 +0100 @@ -11,7 +11,7 @@ set(ORTHANC_FRAMEWORK_VERSION "mainline") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") else() - set(ORTHANC_FRAMEWORK_VERSION "${ORTHANC_OPTIMAL_VERSION_MAJOR}.${ORTHANC_OPTIMAL_VERSION_MINOR}.${ORTHANC_OPTIMAL_VERSION_REVISION}") + set(ORTHANC_FRAMEWORK_VERSION "1.8.1") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") endif() diff -r 48aa43c14bb3 -r 5e604adfd41f PostgreSQL/CMakeLists.txt --- a/PostgreSQL/CMakeLists.txt Sun Dec 13 12:37:30 2020 +0100 +++ b/PostgreSQL/CMakeLists.txt Mon Dec 14 16:21:05 2020 +0100 @@ -11,7 +11,7 @@ set(ORTHANC_FRAMEWORK_VERSION "mainline") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") else() - set(ORTHANC_FRAMEWORK_VERSION "${ORTHANC_OPTIMAL_VERSION_MAJOR}.${ORTHANC_OPTIMAL_VERSION_MINOR}.${ORTHANC_OPTIMAL_VERSION_REVISION}") + set(ORTHANC_FRAMEWORK_VERSION "1.8.1") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") endif() diff -r 48aa43c14bb3 -r 5e604adfd41f PostgreSQL/NEWS --- a/PostgreSQL/NEWS Sun Dec 13 12:37:30 2020 +0100 +++ b/PostgreSQL/NEWS Mon Dec 14 16:21:05 2020 +0100 @@ -1,6 +1,10 @@ Pending changes in the mainline =============================== + +Release 3.3 (2020-12-14) +======================== + * Added an advisory lock to avoid race conditions during database setup * Added "MaximumConnectionRetries" & "ConnectionRetryInterval" to configure the retries when connecting to the DB at startup diff -r 48aa43c14bb3 -r 5e604adfd41f SQLite/CMakeLists.txt --- a/SQLite/CMakeLists.txt Sun Dec 13 12:37:30 2020 +0100 +++ b/SQLite/CMakeLists.txt Mon Dec 14 16:21:05 2020 +0100 @@ -11,8 +11,8 @@ set(ORTHANC_FRAMEWORK_VERSION "mainline") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") else() - set(ORTHANC_FRAMEWORK_VERSION "1.7.2") - set(ORTHANC_FRAMEWORK_VERSION "${ORTHANC_OPTIMAL_VERSION_MAJOR}.${ORTHANC_OPTIMAL_VERSION_MINOR}.${ORTHANC_OPTIMAL_VERSION_REVISION}") + set(ORTHANC_FRAMEWORK_VERSION "1.8.1") + set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") endif() include(${CMAKE_SOURCE_DIR}/../Resources/CMake/DatabasesPluginParameters.cmake)