Merge branch 'hotfix/4.1.21'

To-om · To-om · commit 7b31a9afd16e · 2022-06-22T10:08:08.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## [4.1.21](https://github.com/TheHive-Project/TheHive/milestone/91) (2022-06-22)
+
+**Fixed bugs:**
+
+- [Bug] S3 storage fails with old version of Minio [\#2388](https://github.com/TheHive-Project/TheHive/issues/2388)
+- [Bug ] Authentication Bypass Vulnerability [\#2391](https://github.com/TheHive-Project/TheHive/issues/2391)
+
 ## [4.1.20](https://github.com/TheHive-Project/TheHive/milestone/90) (2022-05-16)
 
 **Implemented enhancements:**
diff --git a/ScalliGraph b/ScalliGraph
@@ -1 +1 @@
-Subproject commit bdf6b0beb75643fa4300b2d1391aa8d7b3da85b8
+Subproject commit 2c2a7a461dcfc6aa3e6fcdd23f7fd079c1d5d4c7
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ import Dependencies._
 import com.typesafe.sbt.packager.Keys.bashScriptDefines
 import org.thp.ghcl.Milestone
 
-val thehiveVersion         = "4.1.20-1"
+val thehiveVersion         = "4.1.21-1"
 val scala212               = "2.12.13"
 val scala213               = "2.13.1"
 val supportedScalaVersions = List(scala212, scala213)
diff --git a/frontend/bower.json b/frontend/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "thehive",
-  "version": "4.1.20-1",
+  "version": "4.1.21-1",
   "license": "AGPL-3.0",
   "dependencies": {
     "jquery": "^3.4.1",
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
     "name": "thehive",
-    "version": "4.1.20-1",
+    "version": "4.1.21-1",
     "license": "AGPL-3.0",
     "repository": {
         "type": "git",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "thehive",`
`3`		`- "version": "4.1.20-1",`
	`3`	`+ "version": "4.1.21-1",`
`4`	`4`	`"license": "AGPL-3.0",`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"jquery": "^3.4.1",`