From 5e7973b4302a54b1a0223772f6b1f9c657a9dd61 Mon Sep 17 00:00:00 2001
From: Hannes de Jager <hdejager@bol.com>
Date: Thu, 28 Oct 2021 22:09:47 +0200
Subject: [PATCH] Upgrade dependencies and RUST version for images

---
 Cargo.lock | 38 ++++++++++++--------------------------
 Cargo.toml | 10 +++++-----
 Makefile   |  2 +-
 3 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2cb6f3f..056c46c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -636,9 +636,9 @@ checksum = "05842d0d43232b23ccb7060ecb0f0626922c21f30012e97b767b30afd4a5d4b9"
 
 [[package]]
 name = "hyper"
-version = "0.14.13"
+version = "0.14.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15d1cfb9e4f68655fa04c01f59edb405b6074a0f7118ea881e5026e4a1cd8593"
+checksum = "436ec0091e4f20e655156a30a0df3770fe2900aa301e548e08446ec794b6953c"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -784,7 +784,7 @@ dependencies = [
  "lazy_static",
  "md-5",
  "moka",
- "prometheus 0.13.0",
+ "prometheus",
  "proxy-protocol",
  "rustls 0.20.1",
  "rustls-pemfile",
@@ -1143,9 +1143,9 @@ checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
 
 [[package]]
 name = "pretty_assertions"
-version = "0.7.2"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cab0e7c02cf376875e9335e0ba1da535775beb5450d21e1dffca068818ed98b"
+checksum = "ec0cfe1b2403f172ba0f234e500906ee0a3e493fb81092dac23ebefe129301cc"
 dependencies = [
  "ansi_term 0.12.1",
  "ctor",
@@ -1176,9 +1176,9 @@ dependencies = [
 
 [[package]]
 name = "procfs"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab8809e0c18450a2db0f236d2a44ec0b4c1412d0eb936233579f0990faa5d5cd"
+checksum = "95e344cafeaeefe487300c361654bcfc85db3ac53619eeccced29f5ea18c4c70"
 dependencies = [
  "bitflags",
  "byteorder",
@@ -1190,9 +1190,9 @@ dependencies = [
 
 [[package]]
 name = "prometheus"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5986aa8d62380092d2f50f8b1cdba9cb9b6731ffd4b25b51fd126b6c3e05b99c"
+checksum = "b7f64969ffd5dd8f39bd57a68ac53c163a095ed9d0fb707146da1b27025a3504"
 dependencies = [
  "cfg-if 1.0.0",
  "fnv",
@@ -1205,20 +1205,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "prometheus"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7f64969ffd5dd8f39bd57a68ac53c163a095ed9d0fb707146da1b27025a3504"
-dependencies = [
- "cfg-if 1.0.0",
- "fnv",
- "lazy_static",
- "memchr",
- "parking_lot",
- "thiserror",
-]
-
 [[package]]
 name = "protobuf"
 version = "2.23.0"
@@ -1631,9 +1617,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.68"
+version = "1.0.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8"
+checksum = "063bf466a64011ac24040a49009724ee60a57da1b437617ceb32e53ad61bfb19"
 dependencies = [
  "itoa",
  "ryu",
@@ -2052,7 +2038,7 @@ dependencies = [
  "lazy_static",
  "libunftp",
  "pretty_assertions",
- "prometheus 0.12.0",
+ "prometheus",
  "serde",
  "serde_json",
  "slog",
diff --git a/Cargo.toml b/Cargo.toml
index d64e07d..a8d969f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,18 +33,18 @@ bitflags = "1.3.2"
 clap = "2.33.3"
 futures = "0.3.17"
 http = "0.2.5"
-hyper = { version = "0.14.13", features = ["server", "http1"] }
+hyper = { version = "0.14.15", features = ["server", "http1"] }
 hyper-rustls = "^0.22"
 lazy_static = "1.4.0"
 libunftp = "0.18.2"
-prometheus = { version = "0.12.0", features = ["process"] }
+prometheus = { version = "0.13.0", features = ["process"] }
 serde = { version = "1.0.130", features = ["derive"] }
-serde_json = { version = "1.0.68" }
+serde_json = { version = "1.0.71" }
 slog = { version = "2.7.0", features = ["max_level_trace", "release_max_level_info"] }
 slog-async = "2.7.0"
 slog-term = "2.8.0"
 thiserror = "1.0.30"
-tokio = { version = "1.12.0", features = ["full"] }
+tokio = { version = "1.14.0", features = ["full"] }
 unftp-sbe-fs = "0.2.0"
 unftp-sbe-gcs = { version = "0.2.0", optional = true }
 unftp-auth-rest = { version = "0.2.0", optional = true }
@@ -76,7 +76,7 @@ musl = ["rest_auth", "cloud_storage", "jsonfile_auth"]
 docker = ["musl"]
 
 [dev-dependencies]
-pretty_assertions = "0.7.1"
+pretty_assertions = "1.0.0"
 
 [build-dependencies]
 built = "0.3"
diff --git a/Makefile b/Makefile
index 086b35b..ece16fe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-RUST_VERSION=1.55.0
+RUST_VERSION=1.56.1
 DOCKER_TAG=$(shell git describe --tags)
 DOCKER_TEMPLATES:=$(wildcard *.Dockerfile.template)
 DOCKER_FILES=$(DOCKER_TEMPLATES:%.template=%)