changeset 180:5e604adfd41f

back to mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 14 Dec 2020 16:21:05 +0100
parents 48aa43c14bb3 (current diff) 9b500ad566c0 (diff)
children e01322c61094
files MySQL/CMakeLists.txt PostgreSQL/CMakeLists.txt SQLite/CMakeLists.txt
diffstat 4 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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()
 
--- 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()
 
--- 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
--- 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)