# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1703084741 -3600
# Node ID 02168cb5069930b5102b7c68b24cdad1c3d3c990
# Parent  c5fe4d3cc56fee6310e66d347dab2bf2d93c636a# Parent  f35c3281e62f86b22a107f3a03b92e238c91c1d5
back to mainline

diff -r c5fe4d3cc56f -r 02168cb50699 Aws/CMakeLists.txt
--- a/Aws/CMakeLists.txt	Wed Dec 13 09:13:49 2023 +0100
+++ b/Aws/CMakeLists.txt	Wed Dec 20 16:05:41 2023 +0100
@@ -25,8 +25,8 @@
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")  # TODO: update to web - 1.12.2 when available
-  set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.2")
+  set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
 set(STATIC_BUILD OFF CACHE BOOL "Static build of the third-party libraries (necessary for Windows)")
diff -r c5fe4d3cc56f -r 02168cb50699 Azure/CMakeLists.txt
--- a/Azure/CMakeLists.txt	Wed Dec 13 09:13:49 2023 +0100
+++ b/Azure/CMakeLists.txt	Wed Dec 20 16:05:41 2023 +0100
@@ -25,8 +25,8 @@
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")  # TODO: update to web - 1.12.2 when available
-  set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.2")
+  set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
 set(ORTHANC_FRAMEWORK_SOURCE "${ORTHANC_FRAMEWORK_DEFAULT_SOURCE}" CACHE STRING "Source of the Orthanc framework (can be \"system\", \"hg\", \"archive\", \"web\" or \"path\")")
diff -r c5fe4d3cc56f -r 02168cb50699 Google/CMakeLists.txt
--- a/Google/CMakeLists.txt	Wed Dec 13 09:13:49 2023 +0100
+++ b/Google/CMakeLists.txt	Wed Dec 20 16:05:41 2023 +0100
@@ -25,8 +25,8 @@
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")  # TODO: update to web - 1.12.2 when available
-  set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.2")
+  set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
 set(ORTHANC_FRAMEWORK_SOURCE "${ORTHANC_FRAMEWORK_DEFAULT_SOURCE}" CACHE STRING "Source of the Orthanc framework (can be \"system\", \"hg\", \"archive\", \"web\" or \"path\")")
diff -r c5fe4d3cc56f -r 02168cb50699 NEWS
--- a/NEWS	Wed Dec 13 09:13:49 2023 +0100
+++ b/NEWS	Wed Dec 20 16:05:41 2023 +0100
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+2023-12-20 - v 2.3.1
+====================
+
 * AWS plugin:
   * New configuration "EnableAwsSdkLogs" to include AWS SDK logs in Orthanc logs.
 * Now displaying size, duration and transfer speed for each read/write operation.