From 997b81ca1f6926d628e41c405ef219e81000e1df Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kj@orbekk.com>
Date: Fri, 23 Dec 2022 07:44:11 -0500
Subject: Update remaining server dependencies

---
 Cargo.lock            | 45 ++++++---------------------------------------
 protocol/Cargo.toml   |  2 +-
 server-old/Cargo.toml |  2 +-
 server/Cargo.toml     |  2 +-
 server/src/error.rs   |  2 +-
 webapp/Cargo.toml     |  2 +-
 6 files changed, 11 insertions(+), 44 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c00808c..1748d04 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -92,17 +92,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -470,19 +459,6 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
-[[package]]
-name = "env_logger"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
-]
-
 [[package]]
 name = "env_logger"
 version = "0.10.0"
@@ -856,15 +832,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.2.6"
@@ -1078,7 +1045,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
 dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi",
  "io-lifetimes",
  "rustix",
  "windows-sys 0.42.0",
@@ -1316,7 +1283,7 @@ version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
 dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi",
  "libc",
 ]
 
@@ -1574,7 +1541,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "dotenv",
- "env_logger 0.8.4",
+ "env_logger",
  "lazy_static",
  "log",
  "rand",
@@ -1936,7 +1903,7 @@ dependencies = [
  "chrono",
  "cookie",
  "dotenv",
- "env_logger 0.10.0",
+ "env_logger",
  "lru",
  "openidconnect",
  "protocol",
@@ -1946,7 +1913,7 @@ dependencies = [
  "serde_json",
  "sqlx",
  "thiserror",
- "time 0.1.45",
+ "time 0.3.17",
  "tokio",
  "tower",
  "tower-cookies",
@@ -2740,7 +2707,7 @@ dependencies = [
  "anyhow",
  "console_error_panic_hook",
  "dotenv",
- "env_logger 0.8.4",
+ "env_logger",
  "getrandom",
  "gloo-net",
  "lazy_static",
diff --git a/protocol/Cargo.toml b/protocol/Cargo.toml
index 6c0c583..9d25188 100644
--- a/protocol/Cargo.toml
+++ b/protocol/Cargo.toml
@@ -19,6 +19,6 @@ lazy_static = "1.4"
 async-trait = "0.1.58"
 
 [dev-dependencies]
-env_logger = "0.8.4"
+env_logger = "0.10.0"
 dotenv = "0.15"
 tokio = { version = "1.21.2", features = ["full"] }
diff --git a/server-old/Cargo.toml b/server-old/Cargo.toml
index 7d7011b..d821ce2 100644
--- a/server-old/Cargo.toml
+++ b/server-old/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 anyhow = "1.0.65"
 dotenv = "0.15.0"
 log = "0.4.17"
-env_logger = "0.8.4"
+env_logger = "0.10.0"
 openidconnect = "2.3.2"
 rocket = { version = "0.5.0-rc.2", features = ["secrets", "json"] }
 jwt-simple = "0.11.0"
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 7e2772f..2d7e866 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -27,7 +27,7 @@ chrono = { version = "0.4.22", features = ["serde"] }
 thiserror = "1.0.37"
 reqwest = "0.11.12"
 cookie = "0.16.1"
-time = "0.1.44"
+time = "0.3"
 async-trait = "0.1.57"
 rand =  "0.8.4"
 env_logger = "0.10.0"
diff --git a/server/src/error.rs b/server/src/error.rs
index a636ceb..b6a7c4d 100644
--- a/server/src/error.rs
+++ b/server/src/error.rs
@@ -54,7 +54,7 @@ pub enum BridgeError {
     Internal(String),
 
     #[error("Duration out of range")]
-    DurationOutOfRange(#[from] time::OutOfRangeError),
+    DurationOutOfRange(#[from] chrono::OutOfRangeError),
 
     #[error("Not found: {0}")]
     NotFound(String),
diff --git a/webapp/Cargo.toml b/webapp/Cargo.toml
index 255dd45..f90e981 100644
--- a/webapp/Cargo.toml
+++ b/webapp/Cargo.toml
@@ -23,5 +23,5 @@ rand =  "0.8.4"
 serde = "1.0.147"
 
 [dev-dependencies]
-env_logger = "0.8.4"
+env_logger = "0.10.0"
 dotenv = "0.15"
-- 
cgit v1.2.3