Update dependencies (#1408)

* tracing dependencies can't be updated because of deprecated
`opentelemetry-jaeger`; jaeger supports native opentelemetry ingesting
now, so ideally we should remove jaeger support completely

Cargo.toml

@@ -18,34 +18,34 @@ opt-level = 3
 codegen-units = 1
 
 [workspace.dependencies]
-base64 = "0.21.7"
+base64 = "0.22.1"
 defer = "0.2.1"
-env_logger = "0.11.3"
-futures = "0.3.30"
-gix = { version = "0.63.0", default-features = false }
+env_logger = "0.11.5"
+futures = "0.3.31"
+gix = { version = "0.68.0", default-features = false }
 hyper-reverse-proxy = "0.5.1"
-lazy_static = "1.4.0"
-libc = "0.2.155"
-regex = "1.10.4"
+lazy_static = "1.5.0"
+libc = "0.2.167"
+regex = "1.11.1"
 rs_tracing = { version = "1.1.0", features = ["rs_tracing"] }
-serde = { version = "1.0.203", features = ["std", "derive"] }
-serde_json = "1.0.117"
-serde_yaml = "0.9.33"
-toml = "0.8.13"
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
-tempfile = "3.10.1"
+serde = { version = "1.0.215", features = ["std", "derive"] }
+serde_json = "1.0.133"
+serde_yaml = "0.9.34"
+toml = "0.8.19"
+tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
+tempfile = "3.14.0"
 
 [workspace.dependencies.git2]
 default-features = false
 version = "0.19"
 
 [workspace.dependencies.juniper]
-version = "0.15.11"
+version = "0.15.12"
 default-features = false
 features = ["expose-test-schema"]
 
 [workspace.dependencies.tokio]
-version = "1.38.0"
+version = "1.41.1"
 features = [
     "fs",
     "rt-multi-thread",
@@ -58,19 +58,19 @@ features = [
 ]
 
 [workspace.dependencies.tokio-util]
-version = "0.7.11"
+version = "0.7.12"
 features = ["compat"]
 
 [workspace.dependencies.reqwest]
-version = "0.11.26"
+version = "0.12.9"
 default-features = false
 features = ["blocking", "json"]
 
 [workspace.dependencies.tracing]
-version = "0.1.40"
+version = "0.1.41"
 features = ["max_level_trace", "release_max_level_trace"]
 
 [workspace.dependencies.clap]
-version = "4.5.4"
+version = "4.5.21"
 features = ["derive", "help", "std", "usage"]
 default-features = false

hyper_cgi/Cargo.toml

@@ -12,12 +12,12 @@ readme = "README.md"
 futures = { workspace = true }
 tokio = { workspace = true }
 tokio-util = { workspace = true }
-hyper = { version = "0.14.28", features = ["stream", "tcp", "server", "http1"] }
+hyper = { version = "0.14.31", features = ["stream", "tcp", "server", "http1"] }
 
 clap = { workspace = true, optional = true }
 base64 = { workspace = true, optional = true }
 rand = { version = "0.8.5", optional = true, features = ["std"] }
-lazy_static = { version = "1.4.0", optional = true }
+lazy_static = { version = "1.5.0", optional = true }
 hyper-reverse-proxy = { workspace = true }
 
 [lib]

josh-core/Cargo.toml

@@ -10,21 +10,21 @@ readme = "README.md"
 edition = "2021"
 
 [dependencies]
-backtrace = "0.3.72"
+backtrace = "0.3.74"
 bitvec = "1.0.1"
-bstr = "1.9.0"
+bstr = "1.11.0"
 git-version = "0.3.9"
 git2 = { workspace = true }
-gix-object = "0.42.2"
+gix-object = "0.46.0"
 glob = "0.3.1"
 hex = "0.4.3"
 indoc = "2.0.5"
 itertools = "0.13.0"
 lazy_static = { workspace = true }
-log = "0.4.21"
+log = "0.4.22"
 percent-encoding = "2.3.1"
-pest = "2.7.10"
-pest_derive = "2.7.10"
+pest = "2.7.14"
+pest_derive = "2.7.14"
 rayon = "1.10.0"
 regex = { workspace = true }
 rs_tracing = { workspace = true }

josh-graphql/src/graphql.rs

@@ -798,7 +798,7 @@ impl Document {
         })
     }
 
-    fn id() -> String {
+    fn id(&self) -> String {
         self.id.to_string()
     }
 }

josh-proxy/Cargo.toml

@@ -13,9 +13,9 @@ version = "22.4.15"
 base64 = { workspace = true }
 clap = { workspace = true }
 futures = { workspace = true }
-hyper = { version = "0.14.28", features = ["stream"] }
+hyper = { version = "0.14.31", features = ["stream"] }
 hyper-reverse-proxy = { workspace = true }
-hyper-staticfile = "0.9.5"
+hyper-staticfile = "0.9.6"
 hyper-tls = "0.5.0"
 hyper_cgi = { path = "../hyper_cgi" }
 indoc = "2.0.5"
@@ -25,7 +25,7 @@ josh-graphql = { path = "../josh-graphql" }
 lazy_static = { workspace = true }
 opentelemetry = "0.23.0"
 opentelemetry-jaeger = "0.22.0"
-percent-encoding = "2.3.0"
+percent-encoding = "2.3.1"
 regex = { workspace = true }
 reqwest = { workspace = true }
 serde = { workspace = true }
@@ -38,8 +38,8 @@ tracing-futures = "0.2.5"
 tracing-opentelemetry = "0.24.0"
 tracing-subscriber = { workspace = true }
 unindent = "0.2.3"
-url = "2.5.0"
-uuid = { version = "1.8.0", features = ["v4"] }
+url = "2.5.4"
+uuid = { version = "1.11.0", features = ["v4"] }
 josh-rpc = { path = "../josh-rpc" }
 tokio-util = { workspace = true }
 tempfile = { workspace = true }

josh-proxy/src/lib.rs

@@ -571,10 +571,10 @@ fn create_repo_base(path: &PathBuf) -> josh::JoshResult<josh::shell::Shell> {
             values
                 .iter()
                 .cloned()
-                .try_for_each(|(key, value)| -> JoshResult<()> {
-                    use gix::config::parse::section::Key;
+                .try_for_each(|(name, value)| -> JoshResult<()> {
+                    use gix::config::parse::section::ValueName;
 
-                    let key = Key::try_from(key)
+                    let key = ValueName::try_from(name)
                         .map_err(|_| josh_error("unable to create config section"))?;
                     let value = Some(value.into());
 

josh-ssh-shell/Cargo.toml

@@ -13,6 +13,6 @@ serde_json = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 tokio-util = { workspace = true }
-thiserror = "1.0.57"
+thiserror = "2.0.3"
 tempfile = { workspace = true }
 reqwest = { workspace = true }

josh-templates/Cargo.toml

@@ -9,5 +9,5 @@ josh = { path = "../josh-core" }
 josh-graphql = { path = "../josh-graphql" }
 juniper = { workspace = true }
 serde_json = { workspace = true }
-handlebars = "5.1.2"
+handlebars = "6.2.0"
 form_urlencoded = "1.2.1"

josh-ui/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [build-dependencies]
 npm_rs = "1.0.0"
-dircpy = "0.3.15"
+dircpy = "0.3.19"
 
 [lib]
 path = 'lib.rs'

tests/proxy/join_subtree.t

@@ -127,7 +127,7 @@ Make sure all temporary namespace got removed
   "real_repo.git" = [
       ":/sub1",
       "::sub1/",
-      ":join(\"/real/repo2.git@refs/heads/master\":/sub1)",
+      ':join("/real/repo2.git@refs/heads/master":/sub1)',
       ":join(d8388f5880393d255b371f1ed9b801d35620017e:/sub1)",
   ]
   .