From ffe1c344b4d674f7656b0bdec481eadd78d981f4 Mon Sep 17 00:00:00 2001
From: To-om <toom@thehive-project.org>
Date: Thu, 7 Feb 2019 11:07:15 +0100
Subject: [PATCH 1/2] #867 Fix deb package dependency

---
 debian.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian.sbt b/debian.sbt
index 702bd13815..2f08116b02 100644
--- a/debian.sbt
+++ b/debian.sbt
@@ -10,7 +10,7 @@ version in Debian := {
   }
 }
 debianPackageRecommends := Seq("elasticsearch")
-debianPackageDependencies += "java-runtime (>= 8) | java-runtime-headless (>= 8)"
+debianPackageDependencies += "java8-runtime-headless"
 maintainerScripts in Debian := maintainerScriptsFromDirectory(
   baseDirectory.value / "package" / "debian",
   Seq(DebianConstants.Postinst, DebianConstants.Prerm, DebianConstants.Postrm)

From e0a327ae474d1be45ba81b3d5c347d2a15f73c89 Mon Sep 17 00:00:00 2001
From: To-om <toom@thehive-project.org>
Date: Thu, 7 Feb 2019 11:16:37 +0100
Subject: [PATCH 2/2] Update version and changelog

---
 CHANGELOG.md    | 13 ++++++++++---
 ui/bower.json   |  2 +-
 ui/package.json |  2 +-
 version.sbt     |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 966969a116..cf414d99e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,24 @@
 # Change Log
 
-## [3.3.0-RC1](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC1) (2019-02-05)
+## [3.3.0-RC2](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC2) (2019-02-07)
 
+[Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.3.0-RC1...3.3.0-RC2)
+
+**Fixed bugs:**
+
+- Java dependency of DEB package is broken [\#867](https://github.com/TheHive-Project/TheHive/issues/867)
+
+## [3.3.0-RC1](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC1) (2019-02-06)
 [Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.2.1...3.3.0-RC1)
 
 **Implemented enhancements:**
 
+- \[BUG\] Session cookie received with API token  [\#864](https://github.com/TheHive-Project/TheHive/issues/864)
 - Add support to Java versions, higher than 8 [\#861](https://github.com/TheHive-Project/TheHive/issues/861)
 - MISP - Add an Event Tag instead of/additionnally to Attribute Tag [\#836](https://github.com/TheHive-Project/TheHive/issues/836)
 - sorting in alerts [\#824](https://github.com/TheHive-Project/TheHive/issues/824)
 - Improve case template selection for case creation [\#769](https://github.com/TheHive-Project/TheHive/issues/769)
 - Bulk Merge Alerts into Case [\#271](https://github.com/TheHive-Project/TheHive/issues/271)
-- \[BUG\] Session cookie received with API token  [\#864](https://github.com/TheHive-Project/TheHive/issues/864)
 - Merge alerts directly to a case [\#826](https://github.com/TheHive-Project/TheHive/issues/826)
 - Tag normalization [\#657](https://github.com/TheHive-Project/TheHive/pull/657) ([Viltaria](https://github.com/Viltaria))
 
@@ -771,4 +778,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\ No newline at end of file
diff --git a/ui/bower.json b/ui/bower.json
index 02944d5f43..3b6695f030 100644
--- a/ui/bower.json
+++ b/ui/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "thehive",
-  "version": "3.2.1",
+  "version": "3.3.0-RC2",
   "license": "AGPL-3.0",
   "dependencies": {
     "angular": "1.5.8",
diff --git a/ui/package.json b/ui/package.json
index 99bcfd2c70..d566ad6bad 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "thehive",
-    "version": "3.2.1",
+    "version": "3.3.0-RC2",
     "license": "AGPL-3.0",
     "repository": {
         "type": "git",
diff --git a/version.sbt b/version.sbt
index 8f9c88ff2a..d7d3ca675d 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "3.3.0-RC1"
+version in ThisBuild := "3.3.0-RC2"