Merge tag '2.1.0' into develop

2.1.0
TheHive-Project · Sep 25, 2018 · 35b1a20 · 35b1a20
2 parents 099f6f4 + bb41372
commit 35b1a20
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Change Log
 
+## [Unreleased](https://github.com/TheHive-Project/Cortex/tree/HEAD)
+
+[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/2.1.0-RC1...HEAD)
+
+**Implemented enhancements:**
+
+- Show PAP value in the Org \> Analyzers screen [\#124](https://github.com/TheHive-Project/Cortex/issues/124)
+- Display cache configuration in analyzer admin page [\#123](https://github.com/TheHive-Project/Cortex/issues/123)
+
+**Fixed bugs:**
+
+- Temporary files are not removed at the end of job [\#129](https://github.com/TheHive-Project/Cortex/issues/129)
+- MISP fails to run analyzers [\#128](https://github.com/TheHive-Project/Cortex/issues/128)
+- MISP API fails [\#109](https://github.com/TheHive-Project/Cortex/issues/109)
+- File\_Info issue [\#53](https://github.com/TheHive-Project/Cortex/issues/53)
+
+**Merged pull requests:**
+
+- Update resolvers in build.sbt to contain Maven as a dependency [\#130](https://github.com/TheHive-Project/Cortex/pull/130) ([adl1995](https://github.com/adl1995))
+
 ## [2.1.0-RC1](https://github.com/TheHive-Project/Cortex/tree/2.1.0-RC1) (2018-07-31)
 [Full Changelog](https://github.com/TheHive-Project/Cortex/compare/2.0.4...2.1.0-RC1)
 
@@ -9,22 +29,22 @@
 
 **Fixed bugs:**
 
+- Analyzer Configuration Only Showing Global Configuration [\#104](https://github.com/TheHive-Project/Cortex/issues/104)
 - First analyze of a "file" always fail, must re-run the analyze a second time [\#117](https://github.com/TheHive-Project/Cortex/issues/117)
 - Analyzers filter in Jobs History view is limited to 25 analyzers [\#116](https://github.com/TheHive-Project/Cortex/issues/116)
 - Fix redirection from Migration page to login on 401 error [\#114](https://github.com/TheHive-Project/Cortex/issues/114)
-- Analyzer Configuration Only Showing Global Configuration [\#104](https://github.com/TheHive-Project/Cortex/issues/104)
 
 **Closed issues:**
 
 - Automatic observables extraction from analysis reports. [\#111](https://github.com/TheHive-Project/Cortex/issues/111)
-- Automated response via Cortex [\#110](https://github.com/TheHive-Project/Cortex/issues/110)
-- Consider providing checksums for the release files [\#105](https://github.com/TheHive-Project/Cortex/issues/105)
 - ImportError: No module named 'cortexutils' on V2.0.4 [\#102](https://github.com/TheHive-Project/Cortex/issues/102)
 - Error occur from thehive project request to cortex project [\#101](https://github.com/TheHive-Project/Cortex/issues/101)
 - Analyzers disappear after deactivation and can not get enabled [\#98](https://github.com/TheHive-Project/Cortex/issues/98)
-- PAP as an analyzer restriction [\#65](https://github.com/TheHive-Project/Cortex/issues/65)
 - Application.conf doesn't have Yeti config nor allows for API Auth [\#54](https://github.com/TheHive-Project/Cortex/issues/54)
 - endless loop of cortex analyser call [\#36](https://github.com/TheHive-Project/Cortex/issues/36)
+- Automated response via Cortex [\#110](https://github.com/TheHive-Project/Cortex/issues/110)
+- Consider providing checksums for the release files [\#105](https://github.com/TheHive-Project/Cortex/issues/105)
+- PAP as an analyzer restriction [\#65](https://github.com/TheHive-Project/Cortex/issues/65)
 
 **Merged pull requests:**
 

diff --git a/docker.sbt b/docker.sbt
@@ -30,6 +30,7 @@ dockerCommands ~= { dc =>
           "apt-get install -y --no-install-recommends python-pip python2.7-dev python3-pip python3-dev ssdeep libfuzzy-dev libfuzzy2 libimage-exiftool-perl libmagic1 build-essential git libssl-dev && " +
           "pip2 install -U pip setuptools && " +
           "pip3 install -U pip setuptools && " +
+          "hash -r && " +
           "cd /opt && " +
           "git clone https://github.com/TheHive-Project/Cortex-Analyzers.git && " +
           "for I in $(find Cortex-Analyzers -name 'requirements.txt'); do pip2 install -r $I; done && " +

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -17,6 +17,6 @@ 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.6.0"
+  val elastic4play = "org.thehive-project" %% "elastic4play" % "1.6.2"
 }
 
diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "2.1.0-RC1"
+version in ThisBuild := "2.1.0"
diff --git a/www/package.json b/www/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cortex",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "description": "A powerfull observable analysis engine",
   "license": "AGPL-v3",
   "homepage": "https://github.com/TheHive-Project/Cortex",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		version in ThisBuild := "2.1.0-RC1"
		version in ThisBuild := "2.1.0"