apollographql · o0Ignition0o · Dec 13, 2022 · Nov 7, 2022 · Nov 7, 2022 · Nov 7, 2022
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 # Generated by Cargo
 # will have compiled files and executables
-/target/
+**/target/
 
 # These are backup files generated by rustfmt
 **/*.rs.bk

diff --git a/NEXT_CHANGELOG.md b/NEXT_CHANGELOG.md
@@ -200,6 +200,12 @@ Rust MSRV incremented to 1.65.
 
 By [@bryncooke](https://github.com/bryncooke) in https://github.com/apollographql/router/pull/2221 and https://github.com/apollographql/router/pull/2240
 
+### Use Elastic-2.0 license spdx ([PR #2055](https://github.com/apollographql/router/issues/2055))
+
+Now that the Elastic-2.0 spdx is a valid identifier in the rust ecosystem, we can update the router references.
+
+By [@o0Ignition0o](https://github.com/o0Ignition0o) in https://github.com/apollographql/router/pull/2054
+
 ## 📚 Documentation
 ### Create yaml config design guidance ([Issue #2158](https://github.com/apollographql/router/pull/2158))
 

diff --git a/about.toml b/about.toml
@@ -5,8 +5,8 @@ accepted = [
     "BSD-3-Clause",
     "CC0-1.0",
     "ISC",
-    "LicenseRef-ELv2",
-    "LicenseRef-webpki",
+    "Elastic-2.0",
+    "LicenseRef-ring",
     "MIT",
     "MPL-2.0",
     "Unicode-DFS-2016"
@@ -25,35 +25,6 @@ workarounds = [
 [ring]
 accepted = ["OpenSSL"]
 
-# apollographql licenses
-[xtask.clarify]
-license = "LicenseRef-ELv2"
-[[xtask.clarify.files]]
-path = 'LICENSE'
-license = 'LicenseRef-ELv2'
-checksum = '6330b076d84694d0e8905c12d7a506e4ed8e5f4a7b0ddf41a3137483ff80be50'
-
-[apollo-router.clarify]
-license = "LicenseRef-ELv2"
-[[apollo-router.clarify.files]]
-path = 'LICENSE'
-license = 'LicenseRef-ELv2'
-checksum = '6330b076d84694d0e8905c12d7a506e4ed8e5f4a7b0ddf41a3137483ff80be50'
-
-[router-bridge.clarify]
-license = "LicenseRef-ELv2"
-[[router-bridge.clarify.files]]
-path = 'LICENSE'
-license = 'LicenseRef-ELv2'
-checksum = 'f527cb71b36ad7d828d0d1198ee0ab60db4170521a405661c0893f31b9962a6c'
-
-[apollo-spaceport.clarify]
-license = "LicenseRef-ELv2"
-[[apollo-spaceport.clarify.files]]
-path = 'LICENSE'
-license = 'LicenseRef-ELv2'
-checksum = '6330b076d84694d0e8905c12d7a506e4ed8e5f4a7b0ddf41a3137483ff80be50'
-
 [webpki.clarify]
 license = "ISC"
 [[webpki.clarify.files]]

@@ -3,7 +3,7 @@ name = "apollo-router-benchmarks"
 version = "1.5.0"
 authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
 edition = "2021"
-license = "LicenseRef-ELv2"
+license = "Elastic-2.0"
 publish = false
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/apollo-router-scaffold/Cargo.toml b/apollo-router-scaffold/Cargo.toml
@@ -3,7 +3,7 @@ name = "apollo-router-scaffold"
 version = "1.5.0"
 authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
 edition = "2021"
-license = "LicenseRef-ELv2"
+license = "Elastic-2.0"
 publish = false
 
 [dependencies]

diff --git a/apollo-router-scaffold/templates/base/Cargo.toml b/apollo-router-scaffold/templates/base/Cargo.toml
@@ -22,7 +22,7 @@ apollo-router = { path ="{{integration_test}}apollo-router" }
 apollo-router = { git="https://github.com/apollographql/router.git", branch="{{branch}}" }
 {{else}}
 # Note if you update these dependencies then also update xtask/Cargo.toml
-apollo-router = "1.4.0"
+apollo-router = "1.5.0"
 {{/if}}
 {{/if}}
 async-trait = "0.1.52"

diff --git a/apollo-router-scaffold/templates/base/xtask/Cargo.toml b/apollo-router-scaffold/templates/base/xtask/Cargo.toml
@@ -13,7 +13,7 @@ apollo-router-scaffold = { path ="{{integration_test}}apollo-router-scaffold" }
 {{#if branch}}
 apollo-router-scaffold = { git="https://github.com/apollographql/router.git", branch="{{branch}}" }
 {{else}}
-apollo-router-scaffold = { git="https://github.com/apollographql/router.git", tag="v1.4.0"}
+apollo-router-scaffold = { git="https://github.com/apollographql/router.git", tag="v1.5.0"}
 {{/if}}
 {{/if}}
 anyhow = "1.0.58"

@@ -5,7 +5,7 @@ authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
 repository = "https://github.com/apollographql/router/"
 documentation = "https://www.apollographql.com/docs/router/"
 description = "A configurable, high-performance routing runtime for Apollo Federation 🚀"
-license = "LicenseRef-ELv2"
+license = "Elastic-2.0"
 
 # renovate-automation: rustc version
 rust-version = "1.65.0"

diff --git a/deny.toml b/deny.toml
@@ -44,7 +44,7 @@ allow = [
     "LicenseRef-ring",
     "MIT",
     "MPL-2.0",
-    "LicenseRef-ELv2",
+    "Elastic-2.0",
     "Unicode-DFS-2016"
 ]
 copyleft = "warn"

diff --git a/licenses.html b/licenses.html
@@ -51,6 +51,7 @@ <h2>Overview of licenses:</h2>
             <li><a href="#MPL-2.0">Mozilla Public License 2.0</a> (2)</li>
             <li><a href="#BSD-2-Clause">BSD 2-Clause &quot;Simplified&quot; License</a> (1)</li>
             <li><a href="#CC0-1.0">Creative Commons Zero v1.0 Universal</a> (1)</li>
+            <li><a href="#Elastic-2.0">Elastic License 2.0</a> (1)</li>
             <li><a href="#OpenSSL">OpenSSL License</a> (1)</li>
             <li><a href="#Unicode-DFS-2016">Unicode License Agreement - Data Files and Software (2016)</a> (1)</li>
         </ul>
@@ -10011,7 +10012,7 @@ <h4>Used by:</h4>
                 <ul class="license-used-by">
                     <li><a href=" https://github.com/abumni/inflector ">str_inflector</a></li>
                 </ul>
-                <pre class="license-text">Copyright (c) &lt;year&gt; &lt;owner&gt; All rights reserved.
+                <pre class="license-text">Copyright (c) &lt;year&gt; &lt;owner&gt; 
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
@@ -10160,7 +10161,7 @@ <h4>Used by:</h4>
                 <ul class="license-used-by">
                     <li><a href=" https://github.com/dropbox/rust-alloc-no-stdlib ">alloc-stdlib</a></li>
                 </ul>
-                <pre class="license-text">Copyright (c) &lt;year&gt; &lt;owner&gt;. All rights reserved.
+                <pre class="license-text">Copyright (c) &lt;year&gt; &lt;owner&gt;. 
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
@@ -10335,6 +10336,108 @@ <h4>Used by:</h4>
  d. Affirmer understands and acknowledges that Creative Commons is not a
     party to this document and has no duty or obligation with respect to
     this CC0 or use of the Work.
+</pre>
+            </li>
+            <li class="license">
+                <h3 id="Elastic-2.0">Elastic License 2.0</h3>
+                <h4>Used by:</h4>
+                <ul class="license-used-by">
+                    <li><a href=" https://github.com/apollographql/router/ ">apollo-router</a></li>
+                    <li><a href=" https://github.com/apollographql/federation/ ">router-bridge</a></li>
+                </ul>
+                <pre class="license-text">Elastic License 2.0
+
+URL: https://www.elastic.co/licensing/elastic-license
+
+## Acceptance
+
+By using the software, you agree to all of the terms and conditions below.
+
+## Copyright License
+
+The licensor grants you a non-exclusive, royalty-free, worldwide,
+non-sublicensable, non-transferable license to use, copy, distribute, make
+available, and prepare derivative works of the software, in each case subject to
+the limitations and conditions below.
+
+## Limitations
+
+You may not provide the software to third parties as a hosted or managed
+service, where the service provides users with access to any substantial set of
+the features or functionality of the software.
+
+You may not move, change, disable, or circumvent the license key functionality
+in the software, and you may not remove or obscure any functionality in the
+software that is protected by the license key.
+
+You may not alter, remove, or obscure any licensing, copyright, or other notices
+of the licensor in the software. Any use of the licensor’s trademarks is subject
+to applicable law.
+
+## Patents
+
+The licensor grants you a license, under any patent claims the licensor can
+license, or becomes able to license, to make, have made, use, sell, offer for
+sale, import and have imported the software, in each case subject to the
+limitations and conditions in this license. This license does not cover any
+patent claims that you cause to be infringed by modifications or additions to
+the software. If you or your company make any written claim that the software
+infringes or contributes to infringement of any patent, your patent license for
+the software granted under these terms ends immediately. If your company makes
+such a claim, your patent license ends immediately for work on behalf of your
+company.
+
+## Notices
+
+You must ensure that anyone who gets a copy of any part of the software from you
+also gets a copy of these terms.
+
+If you modify the software, you must include in any modified copies of the
+software prominent notices stating that you have modified the software.
+
+## No Other Rights
+
+These terms do not imply any licenses other than those expressly granted in
+these terms.
+
+## Termination
+
+If you use the software in violation of these terms, such use is not licensed,
+and your licenses will automatically terminate. If the licensor provides you
+with a notice of your violation, and you cease all violation of this license no
+later than 30 days after you receive that notice, your licenses will be
+reinstated retroactively. However, if you violate these terms after such
+reinstatement, any additional violation of these terms will cause your licenses
+to terminate automatically and permanently.
+
+## No Liability
+
+*As far as the law allows, the software comes as is, without any warranty or
+condition, and the licensor will not be liable to you for any damages arising
+out of these terms or the use or nature of the software, under any kind of
+legal claim.*
+
+## Definitions
+
+The **licensor** is the entity offering these terms, and the **software** is the
+software the licensor makes available under these terms, including any portion
+of it.
+
+**you** refers to the individual or entity agreeing to these terms.
+
+**your company** is any legal entity, sole proprietorship, or other kind of
+organization that you work for, plus all organizations that have control over,
+are under the control of, or are under common control with that
+organization. **control** means ownership of substantially all the assets of an
+entity, or the power to direct its management and policies by vote, contract, or
+otherwise. Control can be direct or indirect.
+
+**your licenses** are all the licenses granted to you for the software under
+these terms.
+
+**use** means anything you do with the software requiring one of your licenses.
+
+**trademark** means trademarks, service marks, and similar rights.
 </pre>
             </li>
             <li class="license">