From 86b4d0fbb6f351661ac1fd83ae44532d02d8cb20 Mon Sep 17 00:00:00 2001 From: o0Ignition0o Date: Mon, 7 Nov 2022 15:46:48 +0100 Subject: [PATCH 1/7] Use Elastic-2.0 in lieu of LicenseRef-ELv2 --- about.toml | 22 +--------------------- apollo-router-benchmarks/Cargo.toml | 2 +- apollo-router-scaffold/Cargo.toml | 2 +- apollo-router/Cargo.toml | 2 +- deny.toml | 2 +- 5 files changed, 5 insertions(+), 25 deletions(-) diff --git a/about.toml b/about.toml index b2418efc4c..71fc632171 100644 --- a/about.toml +++ b/about.toml @@ -5,6 +5,7 @@ accepted = [ "BSD-3-Clause", "CC0-1.0", "ISC", + "Elastic-2.0", "LicenseRef-ELv2", "LicenseRef-ring", "MIT", @@ -18,20 +19,6 @@ private = { ignore = true } ignore-dev-dependencies = true # 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]] @@ -45,10 +32,3 @@ license = "LicenseRef-ring" path = "LICENSE" license = "LicenseRef-ring" checksum = '76b39f9b371688eac9d8323f96ee80b3aef5ecbc2217f25377bd4e4a615296a9' - -[apollo-spaceport.clarify] -license = "LicenseRef-ELv2" -[[apollo-spaceport.clarify.files]] -path = 'LICENSE' -license = 'LicenseRef-ELv2' -checksum = '6330b076d84694d0e8905c12d7a506e4ed8e5f4a7b0ddf41a3137483ff80be50' diff --git a/apollo-router-benchmarks/Cargo.toml b/apollo-router-benchmarks/Cargo.toml index e07f04f346..c9c9e7f804 100644 --- a/apollo-router-benchmarks/Cargo.toml +++ b/apollo-router-benchmarks/Cargo.toml @@ -3,7 +3,7 @@ name = "apollo-router-benchmarks" version = "1.2.1" authors = ["Apollo Graph, Inc. "] 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 index b06f2420e2..6e899f2df2 100644 --- a/apollo-router-scaffold/Cargo.toml +++ b/apollo-router-scaffold/Cargo.toml @@ -3,7 +3,7 @@ name = "apollo-router-scaffold" version = "1.2.1" authors = ["Apollo Graph, Inc. "] edition = "2021" -license = "LicenseRef-ELv2" +license = "Elastic-2.0" publish = false [dependencies] diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml index 46f9dfbd8c..6790b1cead 100644 --- a/apollo-router/Cargo.toml +++ b/apollo-router/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Apollo Graph, Inc. "] 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.63.0" diff --git a/deny.toml b/deny.toml index 03c8787c83..8b68376f36 100644 --- 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" From 1e0499ce60c0fd56af65526d813896e36a6ed5db Mon Sep 17 00:00:00 2001 From: o0Ignition0o Date: Mon, 7 Nov 2022 21:02:11 +0100 Subject: [PATCH 2/7] wip: remove LicenseRef-ELv2 from the project --- Cargo.lock | 3 +-- about.toml | 9 --------- apollo-router/Cargo.toml | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a5a9604bfb..c1561a5877 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4018,8 +4018,7 @@ dependencies = [ [[package]] name = "router-bridge" version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d2434deb0c39a41b7b68f968c78517c59b1032894c2e013244ba18d9fb49b4" +source = "git+https://github.com/apollographql/federation-rs?branch=igni/license_elv2#1297da6ccf9455d2f6b683a2d051ec696c073e4a" dependencies = [ "anyhow", "async-channel", diff --git a/about.toml b/about.toml index 71fc632171..22b8389745 100644 --- a/about.toml +++ b/about.toml @@ -6,7 +6,6 @@ accepted = [ "CC0-1.0", "ISC", "Elastic-2.0", - "LicenseRef-ELv2", "LicenseRef-ring", "MIT", "MPL-2.0", @@ -18,14 +17,6 @@ private = { ignore = true } # Ignore dependencies used in tests only, test-log for example ignore-dev-dependencies = true -# apollographql licenses -[router-bridge.clarify] -license = "LicenseRef-ELv2" -[[router-bridge.clarify.files]] -path = 'LICENSE' -license = 'LicenseRef-ELv2' -checksum = 'f527cb71b36ad7d828d0d1198ee0ab60db4170521a405661c0893f31b9962a6c' - [ring.clarify] license = "LicenseRef-ring" [[ring.clarify.files]] diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml index 6790b1cead..a453172316 100644 --- a/apollo-router/Cargo.toml +++ b/apollo-router/Cargo.toml @@ -146,7 +146,7 @@ reqwest = { version = "0.11.12", default-features = false, features = [ "json", "stream", ] } -router-bridge = "0.1.11" +router-bridge = { git = "https://github.com/apollographql/federation-rs", branch = "igni/license_elv2"} # "0.1.11" schemars = { version = "0.8.10", features = ["url"] } shellexpand = "2.1.2" sha2 = "0.10.6" From 52411206952099597916d94a9183d371c2764af1 Mon Sep 17 00:00:00 2001 From: o0Ignition0o Date: Mon, 7 Nov 2022 21:45:19 +0100 Subject: [PATCH 3/7] make sure it works against a custom built cargo-about --- licenses.html | 127 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 111 insertions(+), 16 deletions(-) diff --git a/licenses.html b/licenses.html index a77f255df5..4698a7e161 100644 --- a/licenses.html +++ b/licenses.html @@ -45,12 +45,13 @@

Third Party Licenses

Overview of licenses:

All license text:

@@ -3350,7 +3351,6 @@

Used by:

Apache License 2.0

Used by:

@@ -6192,7 +6192,6 @@

Used by:

  • text-size
  • thiserror
  • thiserror-impl
    • -
  • thousands
  • thread_local
  • threadpool
  • toml
    • @@ -8945,17 +8944,6 @@

    Used by:

    limitations under the License. -
  • -

    Apache License 2.0

    -

    Used by:

    - - 
    ../../LICENSE-APACHE
    -

  • Apache License 2.0

    Used by:

    @@ -9391,6 +9379,10 @@

    Used by:

    Apache License 2.0

    Used by:

      +
    • apollo-compiler
      • +
    • apollo-encoder
      • +
    • apollo-parser
      • +
    • apollo-smith
    • askama_shared
    • deadpool-runtime
    • ecdsa
      • @@ -9804,7 +9796,7 @@

      Used by:

      - 
      Copyright (c) <year> <owner> All rights reserved.
+                
      Copyright (c) <year> <owner> 
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
@@ -9988,7 +9980,7 @@ 
      Used by:
      
                 
-                
      Copyright (c) <year> <owner>. All rights reserved.
+                
      Copyright (c) <year> <owner>. 
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
@@ -10162,6 +10154,108 @@ 
      Used by:
      
  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.
+
      
+            
+            
    • 
+                
      Elastic License 2.0
      
+                
      Used by:
      
+                
+                
      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.
 
      
             
      • 
             
    • 
@@ -12379,6 +12473,7 @@ 
      Used by:
      
                 

From 0bf2de06cd94208d4bf5bed5675238b6cd7773ee Mon Sep 17 00:00:00 2001
From: o0Ignition0o 
Date: Tue, 13 Dec 2022 11:04:52 +0100
Subject: [PATCH 4/7] update 1.4 versions that were forgotten during the last
 release

---
 apollo-router-scaffold/templates/base/Cargo.toml       | 2 +-
 apollo-router-scaffold/templates/base/xtask/Cargo.toml | 2 +-
 xtask/Cargo.toml                                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apollo-router-scaffold/templates/base/Cargo.toml b/apollo-router-scaffold/templates/base/Cargo.toml
index a822b0ccf7..75e69d4aeb 100644
--- 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
index 137ca77f00..20e2c2a4c5 100644
--- 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"
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 99f9b966c7..a1038384a5 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -2,7 +2,7 @@
 
 [package]
 name = "xtask"
-version = "1.4.0"
+version = "1.5.0"
 authors = ["Apollo Graph, Inc. "]
 edition = "2021"
 license = "LicenseRef-ELv2"

From bc82a5e8c5d28d4821bd56ed7b06a41bd5380ef1 Mon Sep 17 00:00:00 2001
From: o0Ignition0o 
Date: Tue, 13 Dec 2022 11:08:46 +0100
Subject: [PATCH 5/7] add **/target to gitignore to prevent us from
 accidentally checkin xtask/target

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 080c3ce480..ad362c28b0 100644
--- 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

From 1ee467e39e91e3e7fa188b3f6392c5dac6f15b67 Mon Sep 17 00:00:00 2001
From: o0Ignition0o 
Date: Tue, 13 Dec 2022 11:11:04 +0100
Subject: [PATCH 6/7] update xtask cargo lock

---
 xtask/Cargo.lock | 62 ++++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/xtask/Cargo.lock b/xtask/Cargo.lock
index b447975e44..7044c87d9a 100644
--- a/xtask/Cargo.lock
+++ b/xtask/Cargo.lock
@@ -254,9 +254,9 @@ dependencies = [
 
 [[package]]
 name = "cxx"
-version = "1.0.82"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453"
+checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -266,9 +266,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.82"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0"
+checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -281,15 +281,15 @@ dependencies = [
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.82"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71"
+checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.82"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470"
+checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -338,9 +338,9 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3"
+checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"
 dependencies = [
  "cfg-if",
  "libc",
@@ -602,9 +602,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.23.1"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59df7c4e19c950e6e0e868dcc0a300b09a9b88e9ec55bd879ca819087a77355d"
+checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
 dependencies = [
  "http",
  "hyper",
@@ -698,9 +698,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.5.1"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745"
+checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e"
 
 [[package]]
 name = "itertools"
@@ -728,9 +728,9 @@ dependencies = [
 
 [[package]]
 name = "jsonwebtoken"
-version = "8.1.1"
+version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aa4b4af834c6cfd35d8763d359661b90f2e45d8f750a0849156c7f4671af09c"
+checksum = "09f4f04699947111ec1733e71778d763555737579e44b85844cae8e1940a1828"
 dependencies = [
  "base64",
  "pem",
@@ -754,9 +754,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.137"
+version = "0.2.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
 
 [[package]]
 name = "link-cplusplus"
@@ -932,9 +932,9 @@ checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
 
 [[package]]
 name = "openssl"
-version = "0.10.43"
+version = "0.10.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020433887e44c27ff16365eaa2d380547a94544ad509aff6eb5b6e3e0b27b376"
+checksum = "29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -964,9 +964,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.78"
+version = "0.9.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07d5c8cb6e57b3a3612064d7b18b117912b4ce70955c2504d4b741c9e244b132"
+checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4"
 dependencies = [
  "autocfg",
  "cc",
@@ -1446,18 +1446,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.148"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc"
+checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.148"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c"
+checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1900,9 +1900,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 
 [[package]]
 name = "typenum"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
 [[package]]
 name = "unicase"
@@ -2109,9 +2109,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.22.5"
+version = "0.22.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
 dependencies = [
  "webpki",
 ]
@@ -2278,7 +2278,7 @@ dependencies = [
 
 [[package]]
 name = "xtask"
-version = "1.4.0"
+version = "1.5.0"
 dependencies = [
  "ansi_term",
  "anyhow",

From 73801472c21530baf565def7892fd08d64ac3d03 Mon Sep 17 00:00:00 2001
From: o0Ignition0o 
Date: Tue, 13 Dec 2022 11:13:20 +0100
Subject: [PATCH 7/7] changelog

---
 NEXT_CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/NEXT_CHANGELOG.md b/NEXT_CHANGELOG.md
index 3f0c3375cd..87356e3867 100644
--- 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))