# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1645617261 -3600
# Node ID 4dae452af79fb90a76638006116203a92743c56a
# Parent  309fb4f027043f02e7861b9f44d2e7416d7e90e7
Orthanc-1.10.0

diff -r 309fb4f02704 -r 4dae452af79f CITATION.cff
--- a/CITATION.cff	Wed Feb 23 11:09:43 2022 +0100
+++ b/CITATION.cff	Wed Feb 23 12:54:21 2022 +0100
@@ -10,5 +10,5 @@
 doi: "10.1007/s10278-018-0082-y"
 license: "GPL-3.0-or-later"
 repository-code: "https://hg.orthanc-server.com/orthanc/"
-version: 1.9.7
-date-released: 2021-08-31
+version: 1.10.0
+date-released: 2022-02-23
diff -r 309fb4f02704 -r 4dae452af79f NEWS
--- a/NEWS	Wed Feb 23 11:09:43 2022 +0100
+++ b/NEWS	Wed Feb 23 12:54:21 2022 +0100
@@ -1,14 +1,13 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.10.0 (2022-02-23)
+===========================
+
 General
 -------
 
-* Removed the OpenSSL license exception, as binary versions of Orthanc are now
-  designed to use OpenSSL 3.x, that was re-licensed under Apache 2.0, making
-  it compatible with the GPL/AGPL licenses used by the Orthanc project:
-  https://en.wikipedia.org/wiki/OpenSSL#Licensing
-  https://people.gnome.org/~markmc/openssl-and-the-gpl.html
 * New configuration "DicomAlwaysAllowFindWorklist" to complement the existing
   "DicomAlwaysAllowFind" configuration.  "DicomAlwaysAllowFind" applies now 
   only to C-Find for Patients/Studies/Series/Instances while C-Find for worklists are
@@ -31,13 +30,13 @@
 * Support decoding of black-and-white images (with 1 bit per pixel), notably DICOM SEG
 * Added links to download attachments from the Orthanc Explorer
 * Fix XSS inside DICOM in Orthanc Explorer (as reported by Stuart Kurutac, NCC Group).  
-  XSS Issues were re-introduced in Orthanc 1.9.5.
+  XSS Issues were re-introduced in Orthanc 1.9.4.
 
 REST API
 --------
 
 * API version upgraded to 16
-* If an image can not be decoded, ../preview and ../rendered routes
+* If an image can not be decoded, "../preview" and "../rendered" routes
   are now returning "unsupported.png" only if the
   "?returnUnsupportedImage" option is specified; otherwise, it raises
   a 415 HTTP error code.
@@ -45,7 +44,7 @@
 * "/instances/{...}/frames/{...}/numpy": Download the frame as a Python numpy array
 * "/instances/{...}/numpy": Download the instance as a Python numpy array
 * "/series/{...}/numpy": Download the series as a Python numpy array
-* Added a ?full option to "/patients|studies|series|instances/{...}/attachments" route
+* Added a "?full" option to "/patients|studies|series|instances/{...}/attachments" route
   to show the mapping alias<->numerical id.
 * Added "/patients|studies|series|instances/{...}/attachments/{...}/info" route to retrieve
   the full information about an attachment (size, type, MD5 and UUID)
@@ -64,6 +63,11 @@
 Maintenance
 -----------
 
+* Removed the OpenSSL license exception, as binary versions of Orthanc are now
+  designed to use OpenSSL 3.x, that was re-licensed under Apache 2.0, making
+  it compatible with the GPL/AGPL licenses used by the Orthanc project:
+  https://en.wikipedia.org/wiki/OpenSSL#Licensing
+  https://people.gnome.org/~markmc/openssl-and-the-gpl.html
 * Fix handling of option "DeidentifyLogs", notably for tags (0010,0010) and (0010,0020)
 * New configuration options:
   - "DicomThreadsCount" to set the number of threads in the embedded DICOM server
diff -r 309fb4f02704 -r 4dae452af79f OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake
--- a/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Wed Feb 23 11:09:43 2022 +0100
+++ b/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Wed Feb 23 12:54:21 2022 +0100
@@ -24,7 +24,7 @@
 #####################################################################
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "mainline")
+set(ORTHANC_VERSION "1.10.0")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning