diff --git a/CHANGELOG.md b/CHANGELOG.md index d1fc3fb1e..e6a31a21b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,17 @@ # Change Log -## [1.1.2](https://github.com/CERT-BDF/Cortex/tree/1.1.2) +## [1.1.3](https://github.com/CERT-BDF/Cortex/tree/1.1.3) -[Full Changelog](https://github.com/CERT-BDF/Cortex/compare/rpm/1.1.1-2...1.1.2) +[Full Changelog](https://github.com/CERT-BDF/Cortex/compare/debian/1.1.2...1.1.3) + +**Fixed bugs:** + +- Problem Start Cortex on Ubuntu 16.04 [\#35](https://github.com/CERT-BDF/Cortex/issues/35) +- Error when parsing analyzer failure report [\#33](https://github.com/CERT-BDF/Cortex/issues/33) + + +## [1.1.2](https://github.com/CERT-BDF/Cortex/tree/1.1.2) (2017-05-24) +[Full Changelog](https://github.com/CERT-BDF/Cortex/compare/debian/1.1.1...1.1.2) **Implemented enhancements:** @@ -15,22 +24,13 @@ - Cortex and MISP unclear and error-loop [\#29](https://github.com/CERT-BDF/Cortex/issues/29) - Error 500 in TheHive when a job is submited to Cortex [\#27](https://github.com/CERT-BDF/Cortex/issues/27) -## [rpm/1.1.1-2](https://github.com/CERT-BDF/Cortex/tree/rpm/1.1.1-2) (2017-05-19) -[Full Changelog](https://github.com/CERT-BDF/Cortex/compare/debian/1.1.1-2...rpm/1.1.1-2) - -## [debian/1.1.1-2](https://github.com/CERT-BDF/Cortex/tree/debian/1.1.1-2) (2017-05-19) -[Full Changelog](https://github.com/CERT-BDF/Cortex/compare/1.1.1...debian/1.1.1-2) - -**Fixed bugs:** - -- After Upgrade from Cortex 1.0.2 to 1.1.1 system does not come up [\#26](https://github.com/CERT-BDF/Cortex/issues/26) - ## [1.1.1](https://github.com/CERT-BDF/Cortex/tree/1.1.1) (2017-05-17) [Full Changelog](https://github.com/CERT-BDF/Cortex/compare/1.1.0...1.1.1) **Fixed bugs:** - Missing logos and favicons [\#25](https://github.com/CERT-BDF/Cortex/issues/25) +- After Upgrade from Cortex 1.0.2 to 1.1.1 system does not come up [\#26](https://github.com/CERT-BDF/Cortex/issues/26) **Closed issues:** diff --git a/app/models/JsonFormat.scala b/app/models/JsonFormat.scala index 561544d3b..7d5f33b76 100644 --- a/app/models/JsonFormat.scala +++ b/app/models/JsonFormat.scala @@ -52,7 +52,7 @@ object JsonFormat { } yield SuccessReport(artifacts, full, summary)) .getOrElse(FailureReport(s"Invalid analyzer output format : $json")) else - FailureReport((json \ "error").asOpt[String].getOrElse(json.toString)) + FailureReport((json \ "errorMessage").asOpt[String].getOrElse(json.toString)) } } diff --git a/build.sbt b/build.sbt index 5bc4022a2..dcfab9ed5 100644 --- a/build.sbt +++ b/build.sbt @@ -84,8 +84,8 @@ packageBin := { (packageBin in Universal).value } // DEB // -version in Debian := version.value + "-2" -debianPackageDependencies += "java8-runtime-headless | java8-runtime" +version in Debian := version.value + "-1" +debianPackageDependencies += "openjdk-8-jre-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 index 0b83f6d20..91e854ef7 100644 --- a/ui/bower.json +++ b/ui/bower.json @@ -1,6 +1,6 @@ { "name": "cortex", - "version": "1.1.2", + "version": "1.1.3", "dependencies": { "angular": "1.5.10", "angular-sanitize": "1.5.10", diff --git a/ui/package.json b/ui/package.json index 6508d4822..3eca868ac 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "cortex", - "version": "1.1.2", + "version": "1.1.3", "license": "AGPL-3.0", "repository": { "type": "git", diff --git a/version.sbt b/version.sbt index 1990c4dd4..a1014cee4 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "1.1.2" +version in ThisBuild := "1.1.3"