Skip to content

Commit 0aab9ed

Browse files
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
1 parent ec290d8 commit 0aab9ed

File tree

11 files changed

+879
-520
lines changed

11 files changed

+879
-520
lines changed

Cargo.lock

Lines changed: 839 additions & 480 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,34 @@ opt-level = 3
1818
codegen-units = 1
1919

2020
[workspace.dependencies]
21-
base64 = "0.21.7"
21+
base64 = "0.22.1"
2222
defer = "0.2.1"
23-
env_logger = "0.11.3"
24-
futures = "0.3.30"
25-
gix = { version = "0.63.0", default-features = false }
23+
env_logger = "0.11.5"
24+
futures = "0.3.31"
25+
gix = { version = "0.68.0", default-features = false }
2626
hyper-reverse-proxy = "0.5.1"
27-
lazy_static = "1.4.0"
28-
libc = "0.2.155"
29-
regex = "1.10.4"
27+
lazy_static = "1.5.0"
28+
libc = "0.2.167"
29+
regex = "1.11.1"
3030
rs_tracing = { version = "1.1.0", features = ["rs_tracing"] }
31-
serde = { version = "1.0.203", features = ["std", "derive"] }
32-
serde_json = "1.0.117"
33-
serde_yaml = "0.9.33"
34-
toml = "0.8.13"
35-
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
36-
tempfile = "3.10.1"
31+
serde = { version = "1.0.215", features = ["std", "derive"] }
32+
serde_json = "1.0.133"
33+
serde_yaml = "0.9.34"
34+
toml = "0.8.19"
35+
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
36+
tempfile = "3.14.0"
3737

3838
[workspace.dependencies.git2]
3939
default-features = false
4040
version = "0.19"
4141

4242
[workspace.dependencies.juniper]
43-
version = "0.15.11"
43+
version = "0.15.12"
4444
default-features = false
4545
features = ["expose-test-schema"]
4646

4747
[workspace.dependencies.tokio]
48-
version = "1.38.0"
48+
version = "1.41.1"
4949
features = [
5050
"fs",
5151
"rt-multi-thread",
@@ -58,19 +58,19 @@ features = [
5858
]
5959

6060
[workspace.dependencies.tokio-util]
61-
version = "0.7.11"
61+
version = "0.7.12"
6262
features = ["compat"]
6363

6464
[workspace.dependencies.reqwest]
65-
version = "0.11.26"
65+
version = "0.12.9"
6666
default-features = false
6767
features = ["blocking", "json"]
6868

6969
[workspace.dependencies.tracing]
70-
version = "0.1.40"
70+
version = "0.1.41"
7171
features = ["max_level_trace", "release_max_level_trace"]
7272

7373
[workspace.dependencies.clap]
74-
version = "4.5.4"
74+
version = "4.5.21"
7575
features = ["derive", "help", "std", "usage"]
7676
default-features = false

hyper_cgi/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ readme = "README.md"
1212
futures = { workspace = true }
1313
tokio = { workspace = true }
1414
tokio-util = { workspace = true }
15-
hyper = { version = "0.14.28", features = ["stream", "tcp", "server", "http1"] }
15+
hyper = { version = "0.14.31", features = ["stream", "tcp", "server", "http1"] }
1616

1717
clap = { workspace = true, optional = true }
1818
base64 = { workspace = true, optional = true }
1919
rand = { version = "0.8.5", optional = true, features = ["std"] }
20-
lazy_static = { version = "1.4.0", optional = true }
20+
lazy_static = { version = "1.5.0", optional = true }
2121
hyper-reverse-proxy = { workspace = true }
2222

2323
[lib]

josh-core/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ readme = "README.md"
1010
edition = "2021"
1111

1212
[dependencies]
13-
backtrace = "0.3.72"
13+
backtrace = "0.3.74"
1414
bitvec = "1.0.1"
15-
bstr = "1.9.0"
15+
bstr = "1.11.0"
1616
git-version = "0.3.9"
1717
git2 = { workspace = true }
18-
gix-object = "0.42.2"
18+
gix-object = "0.46.0"
1919
glob = "0.3.1"
2020
hex = "0.4.3"
2121
indoc = "2.0.5"
2222
itertools = "0.13.0"
2323
lazy_static = { workspace = true }
24-
log = "0.4.21"
24+
log = "0.4.22"
2525
percent-encoding = "2.3.1"
26-
pest = "2.7.10"
27-
pest_derive = "2.7.10"
26+
pest = "2.7.14"
27+
pest_derive = "2.7.14"
2828
rayon = "1.10.0"
2929
regex = { workspace = true }
3030
rs_tracing = { workspace = true }

josh-graphql/src/graphql.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ impl Document {
798798
})
799799
}
800800

801-
fn id() -> String {
801+
fn id(&self) -> String {
802802
self.id.to_string()
803803
}
804804
}

josh-proxy/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ version = "22.4.15"
1313
base64 = { workspace = true }
1414
clap = { workspace = true }
1515
futures = { workspace = true }
16-
hyper = { version = "0.14.28", features = ["stream"] }
16+
hyper = { version = "0.14.31", features = ["stream"] }
1717
hyper-reverse-proxy = { workspace = true }
18-
hyper-staticfile = "0.9.5"
18+
hyper-staticfile = "0.9.6"
1919
hyper-tls = "0.5.0"
2020
hyper_cgi = { path = "../hyper_cgi" }
2121
indoc = "2.0.5"
@@ -25,7 +25,7 @@ josh-graphql = { path = "../josh-graphql" }
2525
lazy_static = { workspace = true }
2626
opentelemetry = "0.23.0"
2727
opentelemetry-jaeger = "0.22.0"
28-
percent-encoding = "2.3.0"
28+
percent-encoding = "2.3.1"
2929
regex = { workspace = true }
3030
reqwest = { workspace = true }
3131
serde = { workspace = true }
@@ -38,8 +38,8 @@ tracing-futures = "0.2.5"
3838
tracing-opentelemetry = "0.24.0"
3939
tracing-subscriber = { workspace = true }
4040
unindent = "0.2.3"
41-
url = "2.5.0"
42-
uuid = { version = "1.8.0", features = ["v4"] }
41+
url = "2.5.4"
42+
uuid = { version = "1.11.0", features = ["v4"] }
4343
josh-rpc = { path = "../josh-rpc" }
4444
tokio-util = { workspace = true }
4545
tempfile = { workspace = true }

josh-proxy/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -571,10 +571,10 @@ fn create_repo_base(path: &PathBuf) -> josh::JoshResult<josh::shell::Shell> {
571571
values
572572
.iter()
573573
.cloned()
574-
.try_for_each(|(key, value)| -> JoshResult<()> {
575-
use gix::config::parse::section::Key;
574+
.try_for_each(|(name, value)| -> JoshResult<()> {
575+
use gix::config::parse::section::ValueName;
576576

577-
let key = Key::try_from(key)
577+
let key = ValueName::try_from(name)
578578
.map_err(|_| josh_error("unable to create config section"))?;
579579
let value = Some(value.into());
580580

josh-ssh-shell/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ serde_json = { workspace = true }
1313
tracing = { workspace = true }
1414
tracing-subscriber = { workspace = true }
1515
tokio-util = { workspace = true }
16-
thiserror = "1.0.57"
16+
thiserror = "2.0.3"
1717
tempfile = { workspace = true }
1818
reqwest = { workspace = true }

josh-templates/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ josh = { path = "../josh-core" }
99
josh-graphql = { path = "../josh-graphql" }
1010
juniper = { workspace = true }
1111
serde_json = { workspace = true }
12-
handlebars = "5.1.2"
12+
handlebars = "6.2.0"
1313
form_urlencoded = "1.2.1"

josh-ui/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55

66
[build-dependencies]
77
npm_rs = "1.0.0"
8-
dircpy = "0.3.15"
8+
dircpy = "0.3.19"
99

1010
[lib]
1111
path = 'lib.rs'

0 commit comments

Comments
 (0)