From 6a71e7c8234867cfab7405a3e3af7e995c30adbb Mon Sep 17 00:00:00 2001 From: Joep Meindertsma Date: Sat, 27 Mar 2021 21:45:18 +0100 Subject: [PATCH] Upgrade various dependencies --- CHANGELOG.md | 3 +- Cargo.lock | 129 ++++++++++++++++++++++------------------------ README.md | 2 +- lib/Cargo.toml | 20 +++---- server/Cargo.toml | 6 +-- 5 files changed, 77 insertions(+), 83 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba7d0df21..532817824 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,8 @@ List of changes for this repo, including `atomic-cli`, - Moved `/path` logic to `atomic-lib` as endpoint #110 - `get_extended_resource` is now DB only #110 - Correct response codes (404) #105 -- Improved .html page (+PWA support and matomo tracking) +- Improved .html page (+PWA support and Matomo tracking) +- Upgraded various dependencies ## v0.22.4 diff --git a/Cargo.lock b/Cargo.lock index 399c5f22f..5fddd14d0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,7 +23,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78d1833b3838dbe990df0f1f87baf640cf6146e898166afe401839d1b001e570" dependencies = [ "bitflags", - "bytes 0.5.6", + "bytes", "futures-core", "futures-sink", "log", @@ -70,14 +70,14 @@ dependencies = [ [[package]] name = "actix-files" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d031468a7859f71674e5531bd05137e0ea5de05ec9a917314330b88c582e2e0a" +checksum = "c51e8a9146c12fce92a6e4c24b8c4d9b05268130bfd8d61bc587e822c32ce689" dependencies = [ "actix-service", "actix-web", "bitflags", - "bytes 0.5.6", + "bytes", "derive_more", "futures-core", "futures-util", @@ -104,7 +104,7 @@ dependencies = [ "base64 0.13.0", "bitflags", "brotli2", - "bytes 0.5.6", + "bytes", "cookie", "copyless", "derive_more", @@ -259,7 +259,7 @@ dependencies = [ "actix-rt", "actix-service", "bitflags", - "bytes 0.5.6", + "bytes", "either", "futures-channel", "futures-sink", @@ -288,7 +288,7 @@ dependencies = [ "actix-utils", "actix-web-codegen", "awc", - "bytes 0.5.6", + "bytes", "derive_more", "encoding_rs", "futures-channel", @@ -452,7 +452,7 @@ dependencies = [ "serde", "serde_json", "tera", - "tokio 0.3.6", + "tokio 1.4.0", "tray-item", "use", "uuid", @@ -468,7 +468,7 @@ dependencies = [ "dirs", "lazy_static", "ntest", - "rand 0.8.0", + "rand 0.8.3", "regex", "ring", "rio_api", @@ -509,7 +509,7 @@ dependencies = [ "actix-rt", "actix-service", "base64 0.13.0", - "bytes 0.5.6", + "bytes", "cfg-if 1.0.0", "derive_more", "futures-core", @@ -557,9 +557,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bincode" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d" +checksum = "d175dfa69e619905c4c3cdb7c3c203fa3bdd5d51184e3afdb2742c0280493772" dependencies = [ "byteorder", "serde", @@ -673,11 +673,11 @@ dependencies = [ [[package]] name = "buf-min" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881e704e61d0fb41d7c6c9ae2bd790eb8c13dc974ae102fb98c788b4fdea4349" +checksum = "fa17aa1cf56bdd6bb30518767d00e58019d326f3f05d8c3e0730b549d332ea83" dependencies = [ - "bytes 0.6.0", + "bytes", ] [[package]] @@ -704,19 +704,13 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" -[[package]] -name = "bytes" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0dcbc35f504eb6fc275a6d20e4ebcda18cf50d40ba6fabff8c711fa16cb3b16" - [[package]] name = "bytestring" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7c05fa5172da78a62d9949d662d2ac89d4cc7355d7b49adee5163f1fb3f363" dependencies = [ - "bytes 0.5.6", + "bytes", ] [[package]] @@ -854,9 +848,9 @@ dependencies = [ [[package]] name = "comrak" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcfb8008d04126b176c76cbfdecf9a2ccb4bacc70af87c8da6136d63d7b7292a" +checksum = "ac96caba4b5b55c21c9efd51d498225ce9448d06d9d5c17bbd357522c71bacfd" dependencies = [ "clap", "entities", @@ -1603,7 +1597,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" dependencies = [ - "bytes 0.5.6", + "bytes", "fnv", "futures-core", "futures-sink", @@ -1658,7 +1652,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84129d298a6d57d246960ff8eb831ca4af3f96d29e2e28848dae275408658e26" dependencies = [ - "bytes 0.5.6", + "bytes", "fnv", "itoa", ] @@ -1828,9 +1822,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.81" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" +checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7" [[package]] name = "libloading" @@ -2020,9 +2014,9 @@ dependencies = [ [[package]] name = "ntest" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3909e1f9c352eb0a816af6f0ff8b7ab86b146b558cebd369cee6e2848bb6c70" +checksum = "984caf6c8aa869418ef88062fc685d07d50c04308e63f7eaff6a395b1f5aff33" dependencies = [ "ntest_proc_macro_helper", "ntest_test_cases", @@ -2031,15 +2025,15 @@ dependencies = [ [[package]] name = "ntest_proc_macro_helper" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a971d3e5ef11ad60a45ce21691a4ceed08cdbb3c581bf8d5efda953b100e345" +checksum = "115562228962147ca51748d19446a4261535a7b6a7b5ff02681e527dcefc22f7" [[package]] name = "ntest_test_cases" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f95849341fe7f83e7f06f00226d01411bc7d77f173ad4fd484a72ba58b8303" +checksum = "c03e3201148714c580c5cf1ef68b1ed4039203068193197834a43503164b8237" dependencies = [ "proc-macro2", "quote", @@ -2048,9 +2042,9 @@ dependencies = [ [[package]] name = "ntest_timeout" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c4a32167a84767f6cdd8560a6d5b99a630505d9879c87d49e3eb1a409e3374" +checksum = "a870300c30d4224cb16022a4660fd8084d6cb4d29618563c3016b50cc757d1e7" dependencies = [ "ntest_proc_macro_helper", "proc-macro-crate", @@ -2489,9 +2483,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76330fb486679b4ace3670f117bbc9e16204005c4bde9c4bd372f45bed34f12" +checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" dependencies = [ "libc", "rand_chacha 0.3.0", @@ -2574,21 +2568,20 @@ dependencies = [ [[package]] name = "regex" -version = "1.4.2" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" +checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" dependencies = [ "aho-corasick", "memchr", "regex-syntax", - "thread_local", ] [[package]] name = "regex-syntax" -version = "0.6.21" +version = "0.6.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" +checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" [[package]] name = "remove_dir_all" @@ -2611,9 +2604,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.16.19" +version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "024a1e66fea74c66c66624ee5622a7ff0e4b73a13b4f5c326ddb50c708944226" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" dependencies = [ "cc", "libc", @@ -2626,15 +2619,15 @@ dependencies = [ [[package]] name = "rio_api" -version = "0.5.0" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f3057bb5d32a656ed84e7680b0ff792a0d0a9f528749930bfd8701625f7b387" +checksum = "3fc78f8e9a7f81c2ac5670a0740086e8d61ab9377d07d01ebf65f7ff13bab7e0" [[package]] name = "rio_turtle" -version = "0.5.0" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeb18a70b16b9497be10e5562b059dac70298aa8db061dcba2b4d6b6c5785c8" +checksum = "b86d09c32fdf8768cb5973be607eb88edabbd6cdfd6d09fd39431e426404b3dc" dependencies = [ "oxilangtag", "oxiri", @@ -2767,18 +2760,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.118" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" +checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.118" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" +checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" dependencies = [ "proc-macro2", "quote", @@ -2787,9 +2780,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.60" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779" +checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" dependencies = [ "itoa", "ryu", @@ -2980,9 +2973,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "syn" -version = "1.0.54" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44" +checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f" dependencies = [ "proc-macro2", "quote", @@ -3017,7 +3010,7 @@ dependencies = [ "percent-encoding", "pest", "pest_derive", - "rand 0.8.0", + "rand 0.8.3", "regex", "serde", "serde_json", @@ -3151,7 +3144,7 @@ version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48" dependencies = [ - "bytes 0.5.6", + "bytes", "futures-core", "iovec", "lazy_static", @@ -3167,9 +3160,9 @@ dependencies = [ [[package]] name = "tokio" -version = "0.3.6" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "720ba21c25078711bf456d607987d95bce90f7c3bea5abe1db587862e7a1e87c" +checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722" dependencies = [ "autocfg", "pin-project-lite 0.2.4", @@ -3193,7 +3186,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" dependencies = [ - "bytes 0.5.6", + "bytes", "futures-core", "futures-sink", "log", @@ -3467,9 +3460,9 @@ dependencies = [ [[package]] name = "url" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e" +checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" dependencies = [ "form_urlencoded", "idna", @@ -3500,9 +3493,9 @@ dependencies = [ [[package]] name = "v_escape" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccca9e73c678b882900cbaec16dae4d3662ace5a17774ac45af04e0f3988fafa" +checksum = "f3e0ab5fab1db278a9413d2ea794cb66f471f898c5b020c3c394f6447625d9d4" dependencies = [ "buf-min", "v_escape_derive", @@ -3522,9 +3515,9 @@ dependencies = [ [[package]] name = "v_htmlescape" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db00c903248abee8499af60bf20d242e7882335bbbffd2614915184cbb207402" +checksum = "1f9a8af610ad6f7fc9989c9d2590d9764bc61f294884e9ee93baa58795174572" dependencies = [ "cfg-if 1.0.0", "v_escape", diff --git a/README.md b/README.md index 3972d75a6..28cdd5e0c 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Powers both `atomic-cli` and `atomic-server`. I've been working with Linked Data for a couple of years, and I believe it has some incredible merits. URLs are great identifiers, and using them for keys makes sense as well. -It has the potential to help a more democratic and decentralized web, where people control their own data. +Linked data has the potential to help a more interoperable and decentralized web, where people control their own data. However, the RDF data model has [some characteristics](https://docs.atomicdata.dev/interoperability/rdf.html) that make it difficult for many developers, and I think that limits adoption. That's why I've been working on a new way to think about linked data: [Atomic Data](https://docs.atomicdata.dev/). Atomic Data is heavily inspired by RDF (and converts nicely into RDF, as it is a strict subset), but introduces some new concepts that aim to make it easier to use for developers. diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 889343b8c..c1a4f1d93 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -10,22 +10,22 @@ version = "0.22.3" [dependencies] base64 = "0.13.0" -bincode = {version = "1.3.1", optional = true} +bincode = {version = "1.3.2", optional = true} dirs = {version = "3.0.1", optional = true} -rand = {version = "0.8.0"} -regex = "1.4.2" -ring = "0.16.19" -rio_api = {version = "0.5.0", optional = true} -rio_turtle = {version = "0.5.0", optional = true} -serde = {version = "1.0.118", features = ["derive"]} -serde_json = "1.0.60" +rand = {version = "0.8.3"} +regex = "1.4.5" +ring = "0.16.20" +rio_api = {version = "0.5.3", optional = true} +rio_turtle = {version = "0.5.3", optional = true} +serde = {version = "1.0.125", features = ["derive"]} +serde_json = "1.0.64" sled = {version = "0.34.6", optional = true} toml = {version = "0.5.8", optional = true} ureq = "1.5.4" -url = "2.2.0" +url = "2.2.1" [dev-dependencies] -ntest = "0.7.2" +ntest = "0.7.3" lazy_static = "1.4.0" [features] diff --git a/server/Cargo.toml b/server/Cargo.toml index 022337c7b..8869c6db3 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -10,11 +10,11 @@ repository = "https://github.com/joepio/atomic-cli" [dependencies] atomic_lib = { version = "0.22.0", path = "../lib", features = ["config", "db", "rdf"] } acme-lib = "0.8.1" -actix-files = "0.4.1" +actix-files = "0.5.0" actix-rt = "1.1.1" actix-web = { version = "3.3.2", features = ["rustls"] } chrono = "0.4.19" -comrak = "0.9.0" +comrak = "0.10.0" dirs = "3.0.1" dotenv = "0.15.0" env_logger = "0.8.2" @@ -25,7 +25,7 @@ rustls = "0.18.1" serde = { version = "1.0.118", features = ["derive"] } serde_json = "1.0.60" tera = "1.6.0" -tokio = "0.3.6" +tokio = "1.4.0" use = "0.0.0" uuid = { version = "0.8.1", features = ["v4"] } tray-item = { version = "0.4.0-alpha", optional = true }