diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a2f869586..bc0dce8ae9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,14 @@ # Change Log -## [3.3.0-RC6](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC6) (2019-02-07) +## [3.3.0](https://github.com/TheHive-Project/TheHive/tree/3.3.0) (2019-03-19) +[Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.3.0-RC6...3.3.0) + +**Fixed bugs:** + +- Merge case by CaseID Broken [\#930](https://github.com/TheHive-Project/TheHive/issues/930) + +## [3.3.0-RC6](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC6) (2019-03-07) [Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.3.0-RC5...3.3.0-RC6) **Implemented enhancements:** @@ -849,4 +856,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/project/Dependencies.scala b/project/Dependencies.scala index 31aac9bee6..bb22b979d0 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -20,7 +20,7 @@ object Dependencies { val reflections = "org.reflections" % "reflections" % "0.9.11" val zip4j = "net.lingala.zip4j" % "zip4j" % "1.3.2" - val elastic4play = "org.thehive-project" %% "elastic4play" % "1.9.0" + val elastic4play = "org.thehive-project" %% "elastic4play" % "1.10.0" val akkaCluster = "com.typesafe.akka" %% "akka-cluster" % "2.5.19" val akkaClusterTools = "com.typesafe.akka" %% "akka-cluster-tools" % "2.5.19" } diff --git a/thehive-cortex/app/connectors/cortex/services/ActionOperation.scala b/thehive-cortex/app/connectors/cortex/services/ActionOperation.scala index dad270cbbd..dff91957d8 100644 --- a/thehive-cortex/app/connectors/cortex/services/ActionOperation.scala +++ b/thehive-cortex/app/connectors/cortex/services/ActionOperation.scala @@ -90,8 +90,8 @@ object ActionOperation { content ← (json \ "content").validate[String] owner ← (json \ "owner").validateOpt[String] } yield AddLogToTask(content, owner) - case "AddTagToAlert" => (json \ "tag").validate[String].map(tag ⇒ AddTagToAlert(tag)) - case other ⇒ JsError(s"Unknown operation $other") + case "AddTagToAlert" ⇒ (json \ "tag").validate[String].map(tag ⇒ AddTagToAlert(tag)) + case other ⇒ JsError(s"Unknown operation $other") }) implicit val actionOperationWrites: Writes[ActionOperation] = Writes[ActionOperation] { case a: AddTagToCase ⇒ addTagToCaseWrites.writes(a) @@ -205,7 +205,7 @@ class ActionOperationSrv @Inject() ( task ← findTaskEntity(entity) _ ← logSrv.create(task, Fields.empty.set("message", content).set("owner", owner.map(JsString))) } yield operation.updateStatus(ActionOperationStatus.Success, "") - case AddTagToAlert(tag, _, _) => + case AddTagToAlert(tag, _, _) ⇒ entity match { case initialAlert: Alert ⇒ for { diff --git a/ui/bower.json b/ui/bower.json index 038e96e3dd..bc7d1b9bb3 100644 --- a/ui/bower.json +++ b/ui/bower.json @@ -1,6 +1,6 @@ { "name": "thehive", - "version": "3.3.0-RC6", + "version": "3.3.0", "license": "AGPL-3.0", "dependencies": { "angular": "1.5.8", diff --git a/ui/package.json b/ui/package.json index 8fd047fe20..ba8f5b8e8e 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "thehive", - "version": "3.3.0-RC6", + "version": "3.3.0", "license": "AGPL-3.0", "repository": { "type": "git", diff --git a/version.sbt b/version.sbt index ccfbebfa1b..9e1a15392a 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "3.3.0-RC6" +version in ThisBuild := "3.3.0-1"