Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

maintenance: Unpin schemars version. #1135

Merged
merged 2 commits into from
May 24, 2022
Merged

maintenance: Unpin schemars version. #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd5d100
maintenance: Unpin schemars version.
o0Ignition0o May 24, 2022
fbc0c2b
Merge branch 'main' into igni/unpin_schemars
o0Ignition0o May 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions NEXT_CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ Description! And a link to a [reference](http://url)
Cancelling a request could put the router in an unresponsive state where the deduplication layer or cache would make subgraph requests hang.

## 🛠 Maintenance
### Unpin schemars version [#1074](https://github.com/apollographql/router/issues/1074)
The Schemars 0.8.9 caused compile errors due to it validating default types.
This change has however been rolled back upstream.
We can now safely depend on schemars 0.8.10.

## 📚 Documentation

Expand Down
4 changes: 2 additions & 2 deletions apollo-router-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ publish = false
failfast = []

[dependencies]
apollo-parser = {git="https://github.com/apollographql/apollo-rs.git", tag="hotfix_227"}
apollo-parser = { git = "https://github.com/apollographql/apollo-rs.git", tag = "hotfix_227" }
async-trait = "0.1.53"
atty = "0.2.14"
axum = { version = "0.5.4" }
Expand Down Expand Up @@ -43,7 +43,7 @@ opentelemetry-http = "0.6.0"
paste = "1.0.7"
regex = "1.5.6"
router-bridge = { git = "https://github.com/apollographql/federation-rs.git", rev = "46fdeb35aa3d3f3289ff0dbbccf63c1234da92a8" }
schemars = { version = "=0.8.8", features = ["url"] } # https://github.com/apollographql/router/issues/1074
schemars = { version = "0.8.10", features = ["url"] }
serde = { version = "1.0.137", features = ["derive", "rc"] }
serde_json = { version = "1.0.81", features = ["preserve_order"] }
serde_json_bytes = { version = "0.2.0", features = ["preserve_order"] }
Expand Down
15 changes: 11 additions & 4 deletions apollo-router/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,17 @@ atty = "0.2.14"
backtrace = "0.3.65"
buildstructor = "0.1.12"
bytes = "1.1.0"
clap = { version = "3.1.18", default-features = false, features = ["env", "derive", "std"] }
deadpool = { version = "0.9.4", features = ["rt_tokio_1"]}
clap = { version = "3.1.18", default-features = false, features = [
"env",
"derive",
"std",
] }
deadpool = { version = "0.9.4", features = ["rt_tokio_1"] }
derivative = "2.2.0"
derive_more = { version = "0.99.17", default-features = false, features = ["from", "display"] }
derive_more = { version = "0.99.17", default-features = false, features = [
"from",
"display",
] }
directories = "4.0.1"
displaydoc = "0.2"
envmnt = "0.9.1"
Expand Down Expand Up @@ -70,7 +77,7 @@ reqwest = { version = "0.11.10", default-features = false, features = [
"json",
"stream",
] }
schemars = { version = "=0.8.8", features = ["url"] } # https://github.com/apollographql/router/issues/1074
schemars = { version = "0.8.10", features = ["url"] }
serde = { version = "1.0.137", features = ["derive", "rc"] }
serde_json_bytes = { version = "0.2.0", features = ["preserve_order"] }
serde_json = { version = "1.0.81", features = ["preserve_order"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/async-auth/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ apollo-router = { path = "../../apollo-router" }
apollo-router-core = { path = "../../apollo-router-core" }
async-trait = "0.1.53"
http = "0.2.6"
schemars = { version = "=0.8.8", features = ["url"] } # https://github.com/apollographql/router/issues/1074
schemars = { version = "0.8.10", features = ["url"] }
serde = "1.0.136"
serde_json = "1.0.79"
serde_json_bytes = "0.2.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/hello-world/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ anyhow = "1.0.55"
apollo-router = { path = "../../apollo-router" }
apollo-router-core = { path = "../../apollo-router-core" }
async-trait = "0.1.52"
schemars = { version = "=0.8.8", features = ["url"] } # https://github.com/apollographql/router/issues/1074
schemars = { version = "0.8.10", features = ["url"] }
serde = "1.0.136"
serde_json = "1.0.79"
tokio = { version = "1.17.0", features = ["full"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/jwt-auth/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ async-trait = "0.1.53"
hex = "0.4.3"
http = "0.2.6"
jwt-simple = "0.10.8"
schemars = { version = "=0.8.8", features = ["url"] } # https://github.com/apollographql/router/issues/1074
schemars = { version = "0.8.10", features = ["url"] }
serde = "1.0.136"
serde_json = "1.0.79"
strum = { version = "0.24.0", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/status-code-propagation/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ apollo-router = { path = "../../apollo-router" }
apollo-router-core = { path = "../../apollo-router-core" }
async-trait = "0.1.53"
http = "0.2.6"
schemars = { version = "=0.8.8", features = ["url"] } # https://github.com/apollographql/router/issues/1074
schemars = { version = "0.8.10", features = ["url"] }
serde = "1.0.136"
serde_json = "1.0.79"
tokio = { version = "1.17.0", features = ["full"] }
Expand Down
60 changes: 30 additions & 30 deletions licenses.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11623,6 +11623,36 @@ <h4>Used by:</h4>
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
</pre>
</li>
<li class="license">
<h3 id="MIT">MIT License</h3>
<h4>Used by:</h4>
<ul class="license-used-by">
<li><a href=" https://github.com/GREsau/schemars ">schemars</a></li>
<li><a href=" https://github.com/GREsau/schemars ">schemars_derive</a></li>
</ul>
<pre class="license-text">MIT License

Copyright (c) 2019 Graham Esau

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the &quot;Software&quot;), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
Expand Down Expand Up @@ -11780,36 +11810,6 @@ <h4>Used by:</h4>
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
</pre>
</li>
<li class="license">
<h3 id="MIT">MIT License</h3>
<h4>Used by:</h4>
<ul class="license-used-by">
<li><a href=" https://github.com/GREsau/schemars ">schemars</a></li>
<li><a href=" https://github.com/GREsau/schemars ">schemars_derive</a></li>
</ul>
<pre class="license-text">MIT License

Copyright (c) 2019 Graham Esau

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the &quot;Software&quot;), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
</pre>
</li>
<li class="license">
Expand Down