Release 3.1.2

TheHive-Project · Nov 5, 2021 · 294790a · 294790a
1 parent 30658e2
commit 294790a
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 46 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -104,12 +104,26 @@ steps:
     when:
       event: [tag]
 
+  # Publish docker image on Harbor
+  - name: harbor
+    image: plugins/docker
+    settings:
+      context: target/docker/stage
+      dockerfile: target/docker/stage/Dockerfile
+      registry: {from_secret: harbor_registry}
+      repo: {from_secret: harbor_repo}
+      username: {from_secret: harbor_username}
+      password: {from_secret: harbor_password}
+    when:
+      event: [tag]
+
   - name: update docker tags
     image: thehiveproject/drone-scala-node
-    commands: sed -i -e 's/,/-withdeps,/g; s/$/-withdeps/' .tags
+    commands:
+      - sed -i -e 's/,/-withdeps,/g; s/$/-withdeps/' .tags
 
   # Publish docker image on Docker Hub
-  - name: docker
+  - name: docker fat
     image: plugins/docker
     settings:
       context: target/docker-withdeps/target/docker/stage
@@ -121,11 +135,11 @@ steps:
       event: [tag]
 
   # Publish docker image on Harbor
-  - name: harbor
+  - name: harbor fat
     image: plugins/docker
     settings:
-      context: target/docker/stage
-      dockerfile: target/docker/stage/Dockerfile
+      context: target/docker-withdeps/target/docker/stage
+      dockerfile: target/docker-withdeps/target/docker/stage/Dockerfile
       registry: {from_secret: harbor_registry}
       repo: {from_secret: harbor_repo}
       username: {from_secret: harbor_username}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,16 +1,26 @@
 # Change Log
 
-## [3.1.1](https://github.com/TheHive-Project/Cortex/milestone/28) (2021-03-01)
+## [3.1.2](https://github.com/TheHive-Project/Cortex/milestone/30) (2021-11-05)
+
+**Closed issues:**
+
+- More settings on docker containers instantiated by Cortex [\#387](https://github.com/TheHive-Project/Cortex/issues/387)
 
 **Implemented enhancements:**
 
-- [Improvement] Create logfile after installation [\#341](https://github.com/TheHive-Project/Cortex/issues/341)
+- Create a docker image with all dependencies [\#388](https://github.com/TheHive-Project/Cortex/issues/388)
+
+## [3.1.1](https://github.com/TheHive-Project/Cortex/milestone/28) (2021-03-01)
 
 **Fixed bugs:**
 
 - [BUG] Certificate not taken into account when running neurons with process [\#317](https://github.com/TheHive-Project/Cortex/issues/317)
 - [Bug] Update doesn't work on Elasticsearch 7.11 [\#346](https://github.com/TheHive-Project/Cortex/issues/346)
 
+**Implemented enhancements:**
+
+- [Improvement] Create logfile after installation [\#341](https://github.com/TheHive-Project/Cortex/issues/341)
+
 ## [3.1.0](https://github.com/TheHive-Project/Cortex/milestone/27) (2020-10-30)
 
 **Implemented enhancements:**
@@ -25,14 +35,14 @@
 
 ## [3.1.0-RC1](https://github.com/TheHive-Project/Cortex/milestone/21) (2020-08-13)
 
-**Implemented enhancements:**
-
-- Support of ElasticSearch 7  [\#279](https://github.com/TheHive-Project/Cortex/issues/279)
-
 **Fixed bugs:**
 
 - OAuth2 SSO Login Broken [\#264](https://github.com/TheHive-Project/Cortex/issues/264)
 
+**Implemented enhancements:**
+
+- Support of ElasticSearch 7  [\#279](https://github.com/TheHive-Project/Cortex/issues/279)
+
 ## [3.0.1](https://github.com/TheHive-Project/Cortex/milestone/24) (2020-04-24)
 
 **Implemented enhancements:**
@@ -58,17 +68,17 @@
 
 ## [3.0.0-RC4](https://github.com/TheHive-Project/Cortex/milestone/22) (2019-07-11)
 
-**Closed issues:**
-
-- dockerhub sample uses the wrong port [\#203](https://github.com/TheHive-Project/Cortex/issues/203)
-- docker version of cortex prints a lot of errors for auth failures [\#205](https://github.com/TheHive-Project/Cortex/issues/205)
-
 **Fixed bugs:**
 
 - Login error after Cortex upgrade to 3 [\#199](https://github.com/TheHive-Project/Cortex/issues/199)
 - docker version of cortex breaks when you don't create a user immediately [\#204](https://github.com/TheHive-Project/Cortex/issues/204)
 - Responder run displayed as Analyzer run [\#207](https://github.com/TheHive-Project/Cortex/issues/207)
 
+**Closed issues:**
+
+- dockerhub sample uses the wrong port [\#203](https://github.com/TheHive-Project/Cortex/issues/203)
+- docker version of cortex prints a lot of errors for auth failures [\#205](https://github.com/TheHive-Project/Cortex/issues/205)
+
 ## [3.0.0-RC3](https://github.com/TheHive-Project/Cortex/milestone/20) (2019-06-28)
 
 **Implemented enhancements:**
@@ -108,11 +118,6 @@
 
 ## [2.1.3](https://github.com/TheHive-Project/Cortex/milestone/18) (2019-02-05)
 
-**Implemented enhancements:**
-
-- Add PAP property to jobs list [\#146](https://github.com/TheHive-Project/Cortex/issues/146)
-- Add configuration for drone continuous integration [\#156](https://github.com/TheHive-Project/Cortex/issues/156)
-
 **Closed issues:**
 
 - conf/logback.xml: Rotate logs [\#62](https://github.com/TheHive-Project/Cortex/issues/62)
@@ -126,6 +131,11 @@
 - Unable to disable invalid responders [\#157](https://github.com/TheHive-Project/Cortex/issues/157)
 - Wrong checks of role when an user is created [\#158](https://github.com/TheHive-Project/Cortex/issues/158)
 
+**Implemented enhancements:**
+
+- Add PAP property to jobs list [\#146](https://github.com/TheHive-Project/Cortex/issues/146)
+- Add configuration for drone continuous integration [\#156](https://github.com/TheHive-Project/Cortex/issues/156)
+
 ## [2.1.2](https://github.com/TheHive-Project/Cortex/milestone/17) (2018-10-12)
 
 **Fixed bugs:**
@@ -134,18 +144,18 @@
 
 ## [2.1.1](https://github.com/TheHive-Project/Cortex/milestone/16) (2018-10-12)
 
-**Implemented enhancements:**
-
-- Publish stable versions in beta package channels [\#138](https://github.com/TheHive-Project/Cortex/issues/138)
-- Allow Cortex to use a custom root context [\#140](https://github.com/TheHive-Project/Cortex/issues/140)
-- Change Debian dependencies [\#141](https://github.com/TheHive-Project/Cortex/issues/141)
-
 **Fixed bugs:**
 
 - Console output should not be logged in syslog [\#136](https://github.com/TheHive-Project/Cortex/issues/136)
 - RPM update replace configuration file [\#137](https://github.com/TheHive-Project/Cortex/issues/137)
 - Fix Cache column in analyzers admin page [\#139](https://github.com/TheHive-Project/Cortex/issues/139)
 
+**Implemented enhancements:**
+
+- Publish stable versions in beta package channels [\#138](https://github.com/TheHive-Project/Cortex/issues/138)
+- Allow Cortex to use a custom root context [\#140](https://github.com/TheHive-Project/Cortex/issues/140)
+- Change Debian dependencies [\#141](https://github.com/TheHive-Project/Cortex/issues/141)
+
 ## [2.1.0](https://github.com/TheHive-Project/Cortex/milestone/15) (2018-09-25)
 
 **Implemented enhancements:**
@@ -180,10 +190,6 @@
 
 ## [2.0.4](https://github.com/TheHive-Project/Cortex/milestone/13) (2018-04-13)
 
-**Implemented enhancements:**
-
-- Let a Read/Analyze User Display/Change their API Key [\#89](https://github.com/TheHive-Project/Cortex/issues/89)
-
 **Fixed bugs:**
 
 - Install python3 requirements for analyzers in public docker image [\#58](https://github.com/TheHive-Project/Cortex/issues/58)
@@ -194,8 +200,17 @@
 - Updating users by orgAdmin users fails silently [\#94](https://github.com/TheHive-Project/Cortex/issues/94)
 - Strictly filter the list of analyzers in the run dialog [\#95](https://github.com/TheHive-Project/Cortex/issues/95)
 
+**Implemented enhancements:**
+
+- Let a Read/Analyze User Display/Change their API Key [\#89](https://github.com/TheHive-Project/Cortex/issues/89)
+
 ## [2.0.3](https://github.com/TheHive-Project/Cortex/milestone/12) (2018-04-12)
 
+**Fixed bugs:**
+
+- Version Upgrade of Analyzer makes all Analyzers invisible for TheHive (Cortex2) [\#75](https://github.com/TheHive-Project/Cortex/issues/75)
+- Refresh Analyzers button not working [\#83](https://github.com/TheHive-Project/Cortex/issues/83)
+
 **Implemented enhancements:**
 
 - Allow configuring auto artifacts extraction per analyzer [\#80](https://github.com/TheHive-Project/Cortex/issues/80)
@@ -204,11 +219,6 @@
 - Allow specifying a cache period per analyzer [\#85](https://github.com/TheHive-Project/Cortex/issues/85)
 - Allow arbitrary parameters for a job [\#86](https://github.com/TheHive-Project/Cortex/issues/86)
 
-**Fixed bugs:**
-
-- Version Upgrade of Analyzer makes all Analyzers invisible for TheHive (Cortex2) [\#75](https://github.com/TheHive-Project/Cortex/issues/75)
-- Refresh Analyzers button not working [\#83](https://github.com/TheHive-Project/Cortex/issues/83)
-
 ## [2.0.2](https://github.com/TheHive-Project/Cortex/milestone/11) (2018-04-04)
 
 **Fixed bugs:**
@@ -263,17 +273,17 @@
 
 ## [1.1.2](https://github.com/TheHive-Project/Cortex/milestone/6) (2017-06-12)
 
-**Implemented enhancements:**
-
-- Initialize MISP modules at startup [\#28](https://github.com/TheHive-Project/Cortex/issues/28)
-- Add page loader [\#30](https://github.com/TheHive-Project/Cortex/issues/30)
-
 **Fixed bugs:**
 
 - Error 500 in TheHive when a job is submited to Cortex [\#27](https://github.com/TheHive-Project/Cortex/issues/27)
 - Cortex and MISP unclear and error-loop [\#29](https://github.com/TheHive-Project/Cortex/issues/29)
 - jobstatus from jobs within cortex are not updated when status changes [\#31](https://github.com/TheHive-Project/Cortex/issues/31)
 
+**Implemented enhancements:**
+
+- Initialize MISP modules at startup [\#28](https://github.com/TheHive-Project/Cortex/issues/28)
+- Add page loader [\#30](https://github.com/TheHive-Project/Cortex/issues/30)
+
 ## [1.1.1](https://github.com/TheHive-Project/Cortex/milestone/5) (2017-05-17)
 
 **Implemented enhancements:**

diff --git a/project/Common.scala b/project/Common.scala
@@ -24,11 +24,11 @@ object Common {
       "-Ywarn-nullary-override", // Warn when non-nullary overrides nullary, e.g. def foo() over def foo.
       "-Ywarn-numeric-widen"     // Warn when numerics are widened.
     ),
-    scalacOptions in Test ~= { options =>
+    Test / scalacOptions ~= { options =>
       options filterNot (_ == "-Ywarn-dead-code") // Allow dead code in tests (to support using mockito).
     },
-    parallelExecution in Test := false,
-    fork in Test := true,
+    Test / parallelExecution := false,
+    Test / fork := true,
     javaOptions += "-Xmx1G",
     // Redirect logs from ElasticSearch (which uses log4j2) to slf4j
     libraryDependencies += "org.apache.logging.log4j" % "log4j-to-slf4j" % "2.9.1",

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -18,7 +18,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.13.2"
+  val elastic4play     = "org.thehive-project" %% "elastic4play"       % "1.13.3"
   val dockerClient     = "com.spotify"          % "docker-client"      % "8.14.4"
   val akkaCluster      = "com.typesafe.akka"   %% "akka-cluster"       % play.core.PlayVersion.akkaVersion
   val akkaClusterTyped = "com.typesafe.akka"   %% "akka-cluster-typed" % play.core.PlayVersion.akkaVersion

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-ThisBuild / version := "3.1.1-1"
+ThisBuild / version := "3.1.2-1"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ThisBuild / version := "3.1.1-1"
		ThisBuild / version := "3.1.2-1"