# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1531809491 -7200
# Node ID 4c3f767ead030184d70d904a9f3b19274cd47791
# Parent  f729a4b6f37a0bc250b9a8c9f5403b1904a4d5d8
set version

diff -r f729a4b6f37a -r 4c3f767ead03 MySQL/CMakeLists.txt
--- a/MySQL/CMakeLists.txt	Tue Jul 17 08:28:13 2018 +0200
+++ b/MySQL/CMakeLists.txt	Tue Jul 17 08:38:11 2018 +0200
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8)
 project(OrthancMySQL)
 
-set(ORTHANC_PLUGIN_VERSION "mainline")
+set(ORTHANC_PLUGIN_VERSION "1.0")
 
 if (ORTHANC_PLUGIN_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_VERSION "mainline")
diff -r f729a4b6f37a -r 4c3f767ead03 MySQL/NEWS
--- a/MySQL/NEWS	Tue Jul 17 08:28:13 2018 +0200
+++ b/MySQL/NEWS	Tue Jul 17 08:38:11 2018 +0200
@@ -1,4 +1,9 @@
 Pending changes in the mainline
 ===============================
 
+
+
+Release 1.0 (2018-07-17)
+========================
+
 * Initial release
diff -r f729a4b6f37a -r 4c3f767ead03 MySQL/Plugins/IndexPlugin.cpp
--- a/MySQL/Plugins/IndexPlugin.cpp	Tue Jul 17 08:28:13 2018 +0200
+++ b/MySQL/Plugins/IndexPlugin.cpp	Tue Jul 17 08:38:11 2018 +0200
@@ -25,6 +25,7 @@
 
 #include <Core/HttpClient.h>
 #include <Core/Logging.h>
+#include <Core/Toolbox.h>
 
 static std::auto_ptr<OrthancDatabases::MySQLIndex> backend_;
 
@@ -38,6 +39,7 @@
       return -1;
     }
 
+    Orthanc::Toolbox::InitializeOpenSsl();
     Orthanc::HttpClient::GlobalInitialize();
 
     OrthancPlugins::OrthancConfiguration configuration(context);
@@ -92,6 +94,7 @@
     backend_.reset(NULL);
     OrthancDatabases::MySQLDatabase::GlobalFinalization();
     Orthanc::HttpClient::GlobalFinalize();
+    Orthanc::Toolbox::FinalizeOpenSsl();
   }
 
 
diff -r f729a4b6f37a -r 4c3f767ead03 MySQL/Plugins/StoragePlugin.cpp
--- a/MySQL/Plugins/StoragePlugin.cpp	Tue Jul 17 08:28:13 2018 +0200
+++ b/MySQL/Plugins/StoragePlugin.cpp	Tue Jul 17 08:38:11 2018 +0200
@@ -25,6 +25,7 @@
 
 #include <Core/HttpClient.h>
 #include <Core/Logging.h>
+#include <Core/Toolbox.h>
 
 
 extern "C"
@@ -36,6 +37,7 @@
       return -1;
     }
 
+    Orthanc::Toolbox::InitializeOpenSsl();
     Orthanc::HttpClient::GlobalInitialize();
 
     OrthancPlugins::OrthancConfiguration configuration(context);
@@ -86,6 +88,7 @@
     OrthancDatabases::StorageBackend::Finalize();
     OrthancDatabases::MySQLDatabase::GlobalFinalization();
     Orthanc::HttpClient::GlobalFinalize();
+    Orthanc::Toolbox::FinalizeOpenSsl();
   }
 
 
diff -r f729a4b6f37a -r 4c3f767ead03 MySQL/UnitTests/UnitTestsMain.cpp
--- a/MySQL/UnitTests/UnitTestsMain.cpp	Tue Jul 17 08:28:13 2018 +0200
+++ b/MySQL/UnitTests/UnitTestsMain.cpp	Tue Jul 17 08:38:11 2018 +0200
@@ -33,6 +33,7 @@
 
 #include <Core/HttpClient.h>
 #include <Core/Logging.h>
+#include <Core/Toolbox.h>
 
 #include <gtest/gtest.h>
 
@@ -216,6 +217,7 @@
   Orthanc::Logging::Initialize();
   Orthanc::Logging::EnableInfoLevel(true);
   Orthanc::Logging::EnableTraceLevel(true);
+  Orthanc::Toolbox::InitializeOpenSsl();
   Orthanc::HttpClient::GlobalInitialize();
   
   if (args.size() == 4)
@@ -249,9 +251,9 @@
   int result = RUN_ALL_TESTS();
 
   Orthanc::HttpClient::GlobalFinalize();
+  Orthanc::Toolbox::FinalizeOpenSsl();
+  OrthancDatabases::MySQLDatabase::GlobalFinalization();
   Orthanc::Logging::Finalize();
 
-  OrthancDatabases::MySQLDatabase::GlobalFinalization();
-
   return result;
 }
diff -r f729a4b6f37a -r 4c3f767ead03 PostgreSQL/NEWS
--- a/PostgreSQL/NEWS	Tue Jul 17 08:28:13 2018 +0200
+++ b/PostgreSQL/NEWS	Tue Jul 17 08:38:11 2018 +0200
@@ -2,7 +2,7 @@
 ===============================
 
 
-Release 2.2 (2018-16-16)
+Release 2.2 (2018-07-16)
 ========================
 
 !! Important remark when upgrading from an older version of the plugin: