Merge branch 'hotfix/3.3.0-RC2'

TheHive-Project · Feb 7, 2019 · 695478a · 695478a
2 parents 4880439 + e0a327a
commit 695478a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git 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)*
diff --git 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)

diff --git 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
@@ -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
@@ -1 +1 @@
-version in ThisBuild := "3.3.0-RC1"
+version in ThisBuild := "3.3.0-RC2"