From d74535a5a51433bf35bd4c4f11ff6441989f4fef Mon Sep 17 00:00:00 2001 From: Alexis Sellier Date: Sun, 23 Apr 2023 15:20:35 +0200 Subject: [PATCH] Update license for `radicle-cob` Now that we've obtained permission from the original author, we're able to update the license to MIT/Apache. --- radicle-cob/Cargo.toml | 2 +- radicle-cob/src/backend.rs | 3 --- radicle-cob/src/backend/git.rs | 3 --- radicle-cob/src/backend/git/change.rs | 3 --- radicle-cob/src/change.rs | 3 --- radicle-cob/src/change/store.rs | 3 --- radicle-cob/src/change_graph.rs | 3 --- radicle-cob/src/change_graph/evaluation.rs | 3 --- radicle-cob/src/history.rs | 3 --- radicle-cob/src/history/entry.rs | 4 +--- radicle-cob/src/lib.rs | 3 --- radicle-cob/src/object.rs | 3 --- radicle-cob/src/object/collaboration.rs | 3 --- radicle-cob/src/object/collaboration/create.rs | 3 --- radicle-cob/src/object/collaboration/error.rs | 3 --- radicle-cob/src/object/collaboration/get.rs | 3 --- radicle-cob/src/object/collaboration/info.rs | 3 --- radicle-cob/src/object/collaboration/list.rs | 3 --- radicle-cob/src/object/collaboration/remove.rs | 3 --- radicle-cob/src/object/collaboration/update.rs | 3 --- radicle-cob/src/object/storage.rs | 3 --- radicle-cob/src/pruning_fold.rs | 3 --- radicle-cob/src/sign.rs | 3 --- radicle-cob/src/signatures.rs | 3 --- radicle-cob/src/signatures/error.rs | 3 --- radicle-cob/src/trailers.rs | 3 --- radicle-cob/src/type_name.rs | 3 --- 27 files changed, 2 insertions(+), 79 deletions(-) diff --git a/radicle-cob/Cargo.toml b/radicle-cob/Cargo.toml index eee39c78..b038c03e 100644 --- a/radicle-cob/Cargo.toml +++ b/radicle-cob/Cargo.toml @@ -6,7 +6,7 @@ authors = [ "Fintan Halpenny ", ] edition = "2021" -license = "GPL-3.0-or-later" +license = "MIT OR Apache-2.0" description = "Library for implementing Radicle Collaborative Objects" keywords = ["radicle", "collaborative objects", "cob", "cobs"] diff --git a/radicle-cob/src/backend.rs b/radicle-cob/src/backend.rs index 3c5c0ce5..8baeba42 100644 --- a/radicle-cob/src/backend.rs +++ b/radicle-cob/src/backend.rs @@ -1,6 +1,3 @@ // Copyright © 2022 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. pub mod git; diff --git a/radicle-cob/src/backend/git.rs b/radicle-cob/src/backend/git.rs index 131f4057..78179c38 100644 --- a/radicle-cob/src/backend/git.rs +++ b/radicle-cob/src/backend/git.rs @@ -1,7 +1,4 @@ // Copyright © 2022 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. pub mod change; diff --git a/radicle-cob/src/backend/git/change.rs b/radicle-cob/src/backend/git/change.rs index 109028d4..9d4c6a8b 100644 --- a/radicle-cob/src/backend/git/change.rs +++ b/radicle-cob/src/backend/git/change.rs @@ -1,7 +1,4 @@ // Copyright © 2022 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. use std::collections::BTreeMap; use std::convert::TryFrom; diff --git a/radicle-cob/src/change.rs b/radicle-cob/src/change.rs index e3e59234..1a9a0fb6 100644 --- a/radicle-cob/src/change.rs +++ b/radicle-cob/src/change.rs @@ -1,7 +1,4 @@ // Copyright © 2021 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. use git_ext::Oid; diff --git a/radicle-cob/src/change/store.rs b/radicle-cob/src/change/store.rs index 934c4fb4..b8306252 100644 --- a/radicle-cob/src/change/store.rs +++ b/radicle-cob/src/change/store.rs @@ -1,7 +1,4 @@ // Copyright © 2022 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. use std::{error::Error, fmt}; diff --git a/radicle-cob/src/change_graph.rs b/radicle-cob/src/change_graph.rs index db1b6e37..c98a90b4 100644 --- a/radicle-cob/src/change_graph.rs +++ b/radicle-cob/src/change_graph.rs @@ -1,7 +1,4 @@ // Copyright © 2021 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. use std::{collections::BTreeSet, convert::TryInto}; diff --git a/radicle-cob/src/change_graph/evaluation.rs b/radicle-cob/src/change_graph/evaluation.rs index 67b4aa36..358561de 100644 --- a/radicle-cob/src/change_graph/evaluation.rs +++ b/radicle-cob/src/change_graph/evaluation.rs @@ -1,7 +1,4 @@ // Copyright © 2021 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. use std::{collections::HashMap, ops::ControlFlow}; diff --git a/radicle-cob/src/history.rs b/radicle-cob/src/history.rs index 455c6dad..d6c300c8 100644 --- a/radicle-cob/src/history.rs +++ b/radicle-cob/src/history.rs @@ -1,7 +1,4 @@ // Copyright © 2021 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. use std::{ collections::{BTreeSet, HashMap}, diff --git a/radicle-cob/src/history/entry.rs b/radicle-cob/src/history/entry.rs index f1679065..c4a2633e 100644 --- a/radicle-cob/src/history/entry.rs +++ b/radicle-cob/src/history/entry.rs @@ -1,7 +1,5 @@ // Copyright © 2021 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. + use std::fmt; use std::ops::Deref; use std::str::FromStr; diff --git a/radicle-cob/src/lib.rs b/radicle-cob/src/lib.rs index b4508f30..03c8e8d6 100644 --- a/radicle-cob/src/lib.rs +++ b/radicle-cob/src/lib.rs @@ -1,7 +1,4 @@ // Copyright © 2021 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. //! # Collaborative Objects //! diff --git a/radicle-cob/src/object.rs b/radicle-cob/src/object.rs index d0d6b7ed..25382f8e 100644 --- a/radicle-cob/src/object.rs +++ b/radicle-cob/src/object.rs @@ -1,7 +1,4 @@ // Copyright © 2022 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. use std::{convert::TryFrom as _, fmt, ops::Deref, str::FromStr}; diff --git a/radicle-cob/src/object/collaboration.rs b/radicle-cob/src/object/collaboration.rs index e8f2c075..149aded3 100644 --- a/radicle-cob/src/object/collaboration.rs +++ b/radicle-cob/src/object/collaboration.rs @@ -1,7 +1,4 @@ // Copyright © 2022 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. use std::collections::BTreeSet; diff --git a/radicle-cob/src/object/collaboration/create.rs b/radicle-cob/src/object/collaboration/create.rs index c86f5e7a..10d130b4 100644 --- a/radicle-cob/src/object/collaboration/create.rs +++ b/radicle-cob/src/object/collaboration/create.rs @@ -1,7 +1,4 @@ // Copyright © 2022 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. use nonempty::NonEmpty; diff --git a/radicle-cob/src/object/collaboration/error.rs b/radicle-cob/src/object/collaboration/error.rs index 0b1d45af..829e1001 100644 --- a/radicle-cob/src/object/collaboration/error.rs +++ b/radicle-cob/src/object/collaboration/error.rs @@ -1,7 +1,4 @@ // Copyright © 2022 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. use thiserror::Error; diff --git a/radicle-cob/src/object/collaboration/get.rs b/radicle-cob/src/object/collaboration/get.rs index 433978af..28cb6712 100644 --- a/radicle-cob/src/object/collaboration/get.rs +++ b/radicle-cob/src/object/collaboration/get.rs @@ -1,7 +1,4 @@ // Copyright © 2022 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. use crate::{change_graph::ChangeGraph, CollaborativeObject, ObjectId, Store, TypeName}; diff --git a/radicle-cob/src/object/collaboration/info.rs b/radicle-cob/src/object/collaboration/info.rs index e3fb34bd..211196a3 100644 --- a/radicle-cob/src/object/collaboration/info.rs +++ b/radicle-cob/src/object/collaboration/info.rs @@ -1,7 +1,4 @@ // Copyright © 2022 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. //! [`ChangeGraphInfo`] provides a useful debugging structure for //! representing a single [`crate::CollaborativeObject`]'s underlying diff --git a/radicle-cob/src/object/collaboration/list.rs b/radicle-cob/src/object/collaboration/list.rs index dd84f3cf..1780b6d1 100644 --- a/radicle-cob/src/object/collaboration/list.rs +++ b/radicle-cob/src/object/collaboration/list.rs @@ -1,7 +1,4 @@ // Copyright © 2022 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. use crate::{change_graph::ChangeGraph, CollaborativeObject, Store, TypeName}; diff --git a/radicle-cob/src/object/collaboration/remove.rs b/radicle-cob/src/object/collaboration/remove.rs index 503ab028..4969ccc5 100644 --- a/radicle-cob/src/object/collaboration/remove.rs +++ b/radicle-cob/src/object/collaboration/remove.rs @@ -1,7 +1,4 @@ // Copyright © 2022 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. use crate::{ObjectId, Store, TypeName}; diff --git a/radicle-cob/src/object/collaboration/update.rs b/radicle-cob/src/object/collaboration/update.rs index 0739d46e..d13e5cde 100644 --- a/radicle-cob/src/object/collaboration/update.rs +++ b/radicle-cob/src/object/collaboration/update.rs @@ -1,7 +1,4 @@ // Copyright © 2022 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. use git_ext::Oid; use nonempty::NonEmpty; diff --git a/radicle-cob/src/object/storage.rs b/radicle-cob/src/object/storage.rs index d0ce3382..6b44375b 100644 --- a/radicle-cob/src/object/storage.rs +++ b/radicle-cob/src/object/storage.rs @@ -1,7 +1,4 @@ // Copyright © 2021 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. use std::{collections::HashMap, error::Error}; diff --git a/radicle-cob/src/pruning_fold.rs b/radicle-cob/src/pruning_fold.rs index 73561c5a..32f717aa 100644 --- a/radicle-cob/src/pruning_fold.rs +++ b/radicle-cob/src/pruning_fold.rs @@ -1,7 +1,4 @@ // Copyright © 2021 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. use std::{ borrow::Borrow, diff --git a/radicle-cob/src/sign.rs b/radicle-cob/src/sign.rs index 1cf94bab..c8d7aea4 100644 --- a/radicle-cob/src/sign.rs +++ b/radicle-cob/src/sign.rs @@ -1,7 +1,4 @@ // Copyright © 2022 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. pub mod signatures; pub use signatures::{Signature, Signatures}; diff --git a/radicle-cob/src/signatures.rs b/radicle-cob/src/signatures.rs index 4d04a89d..12cb77a1 100644 --- a/radicle-cob/src/signatures.rs +++ b/radicle-cob/src/signatures.rs @@ -1,7 +1,4 @@ // Copyright © 2019-2020 The Radicle Foundation -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. use std::{ collections::BTreeMap, diff --git a/radicle-cob/src/signatures/error.rs b/radicle-cob/src/signatures/error.rs index 2804c132..45e5cacc 100644 --- a/radicle-cob/src/signatures/error.rs +++ b/radicle-cob/src/signatures/error.rs @@ -1,7 +1,4 @@ // Copyright © 2019-2020 The Radicle Foundation -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. use radicle_crypto::ssh::ExtendedSignatureError; use thiserror::Error; diff --git a/radicle-cob/src/trailers.rs b/radicle-cob/src/trailers.rs index aa47ca2c..215da098 100644 --- a/radicle-cob/src/trailers.rs +++ b/radicle-cob/src/trailers.rs @@ -1,7 +1,4 @@ // Copyright © 2019-2020 The Radicle Foundation -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. use git_trailers::{OwnedTrailer, Token, Trailer}; use radicle_git_ext as ext; diff --git a/radicle-cob/src/type_name.rs b/radicle-cob/src/type_name.rs index c3460032..b6d9f3ec 100644 --- a/radicle-cob/src/type_name.rs +++ b/radicle-cob/src/type_name.rs @@ -1,7 +1,4 @@ // Copyright © 2022 The Radicle Link Contributors -// -// This file is part of radicle-link, distributed under the GPLv3 with Radicle -// Linking Exception. For full terms see the included LICENSE file. use std::{fmt, str::FromStr};