From c4754963658d508435b4d677a2a00778b5a2ecd6 Mon Sep 17 00:00:00 2001
From: Petr Jasek <jasekpetr@gmail.com>
Date: Thu, 2 Feb 2023 12:57:04 +0100
Subject: [PATCH] update core to v2.6.1

---
 client/package-lock.json | 10 +++++-----
 client/package.json      |  2 +-
 server/requirements.in   |  2 +-
 server/requirements.txt  | 22 +++++++++++++---------
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index b12e10fa..d586f7e0 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1557,9 +1557,9 @@
             }
         },
         "caniuse-db": {
-            "version": "1.0.30001449",
-            "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001449.tgz",
-            "integrity": "sha512-K7XIAmo8tCt2W7LFSrTjbrXZqer/4af8cfediBT+iDk4b8eljuMo6gBzJlW7e4RTz5+wYEGKg8gXk1Vm+Jh+YA=="
+            "version": "1.0.30001450",
+            "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001450.tgz",
+            "integrity": "sha512-HqXvh7yrdHTNLVaXu9t/8lkG49xXe97jD6zWvbnT6aQBGPl1I5ukZbSAlOLjJ6/hV8BduRMl1eR6ggNi/O0hTA=="
         },
         "caseless": {
             "version": "0.12.0",
@@ -12007,8 +12007,8 @@
             }
         },
         "superdesk-core": {
-            "version": "github:superdesk/superdesk-client-core#3f867e21c2f7cbcb7adda66ee749e29df2806687",
-            "from": "github:superdesk/superdesk-client-core#v2.6.0",
+            "version": "github:superdesk/superdesk-client-core#2e037583bccc89e1b78dfbc2108e6728ddfc3ba4",
+            "from": "github:superdesk/superdesk-client-core#hotfix/2.6.1",
             "requires": {
                 "@metadata/exif": "github:superdesk/exif#431066d",
                 "@popperjs/core": "2.10.2",
diff --git a/client/package.json b/client/package.json
index accee259..faa51010 100644
--- a/client/package.json
+++ b/client/package.json
@@ -3,7 +3,7 @@
     "license": "GPL-3.0",
     "dependencies": {
         "superdesk-analytics": "github:superdesk/superdesk-analytics#v2.6.0-rc1",
-        "superdesk-core": "github:superdesk/superdesk-client-core#v2.6.0",
+        "superdesk-core": "github:superdesk/superdesk-client-core#hotfix/2.6.1",
         "superdesk-planning": "github:superdesk/superdesk-planning#v2.6.0"
     },
     "devDependencies": {
diff --git a/server/requirements.in b/server/requirements.in
index e9a494b5..3a126235 100644
--- a/server/requirements.in
+++ b/server/requirements.in
@@ -3,6 +3,6 @@ honcho
 gspread==3.1.0
 oauth2client==4.1.3
 
-git+https://github.com/superdesk/superdesk-core.git@v2.6.0#egg=Superdesk-Core
+git+https://github.com/superdesk/superdesk-core.git@hotfix/2.6.1#egg=Superdesk-Core
 git+https://github.com/superdesk/superdesk-analytics.git@v2.6.0-rc1#egg=superdesk-analytics
 git+https://github.com/superdesk/superdesk-planning.git@v2.6.0#egg=superdesk-planning
diff --git a/server/requirements.txt b/server/requirements.txt
index c965d467..4573f064 100644
--- a/server/requirements.txt
+++ b/server/requirements.txt
@@ -24,9 +24,9 @@ blinker==1.4
     #   flask-mail
     #   raven
     #   superdesk-core
-boto3==1.26.58
+boto3==1.26.62
     # via superdesk-core
-botocore==1.29.58
+botocore==1.29.62
     # via
     #   boto3
     #   s3transfer
@@ -61,19 +61,19 @@ cryptography==39.0.0
     # via
     #   authlib
     #   jwcrypto
-deepdiff==3.3.0
+deepdiff==6.2.3
     # via superdesk-planning
 deprecated==1.2.13
     # via jwcrypto
 draftjs-exporter[lxml]==2.1.7
     # via superdesk-core
-elastic-apm[flask]==6.7.2
+elastic-apm[flask]==6.14.0
     # via superdesk-core
 elasticsearch==7.13.4
     # via eve-elastic
 eve==1.1.2
     # via superdesk-core
-eve-elastic==7.3.0
+eve-elastic==7.3.1
     # via superdesk-core
 events==0.3
     # via eve
@@ -126,8 +126,6 @@ jmespath==1.0.1
     # via
     #   boto3
     #   botocore
-jsonpickle==3.0.1
-    # via deepdiff
 jwcrypto==1.4.2
     # via
     #   flask-oidc-ex
@@ -156,6 +154,10 @@ oauth2client==4.1.3
     #   flask-oidc-ex
 oauthlib==3.2.2
     # via requests-oauthlib
+ordered-set==4.1.0
+    # via deepdiff
+orjson==3.8.5
+    # via deepdiff
 pillow==9.2.0
     # via superdesk-core
 pyasn1==0.4.8
@@ -231,7 +233,7 @@ six==1.16.0
     #   python-dateutil
 superdesk-analytics @ git+https://github.com/superdesk/superdesk-analytics.git@v2.6.0-rc1
     # via -r requirements.in
-superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@v2.6.0
+superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@hotfix/2.6.1
     # via -r requirements.in
 superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@v2.6.0
     # via -r requirements.in
@@ -259,7 +261,9 @@ werkzeug==1.0.1
     #   flask
     #   superdesk-core
 wrapt==1.14.1
-    # via deprecated
+    # via
+    #   deprecated
+    #   elastic-apm
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools