diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 4665da0..e4dafc6 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -40,7 +40,7 @@ To make review of PRs easier, please: * Keep PRs small and cohesive - if you have multiple independent contributions, please submit them as independent PRs. * Minimise "spurious" changes (e.g. whitespace shenanigans). * Ensure all updated files include your copyright information at the top. - * Ensure all new files include a header comment block containing the [Apache 2.0 license header and your copyright information](https://infra.apache.org/apply-license.html). + * Ensure all new files include a header comment block containing the [MPL 2.0 license header and your copyright information](https://www.mozilla.org/en-US/MPL/headers/). ## Commit and PR Messages diff --git a/.gitignore b/.gitignore index 6663fa3..d71c171 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,3 @@ attic resources/logback-test.xml .clj-kondo/.cache .lein-failures -greplace-test-*.txt diff --git a/deps.edn b/deps.edn index 9f63af4..17631a8 100644 --- a/deps.edn +++ b/deps.edn @@ -1,19 +1,11 @@ ; ; Copyright © 2021 Peter Monks ; -; Licensed under the Apache License, Version 2.0 (the "License"); -; you may not use this file except in compliance with the License. -; You may obtain a copy of the License at +; This Source Code Form is subject to the terms of the Mozilla Public +; License, v. 2.0. If a copy of the MPL was not distributed with this +; file, You can obtain one at https://mozilla.org/MPL/2.0/. ; -; http://www.apache.org/licenses/LICENSE-2.0 -; -; Unless required by applicable law or agreed to in writing, software -; distributed under the License is distributed on an "AS IS" BASIS, -; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -; See the License for the specific language governing permissions and -; limitations under the License. -; -; SPDX-License-Identifier: Apache-2.0 +; SPDX-License-Identifier: MPL-2.0 ; {:deps diff --git a/pbr.clj b/pbr.clj index f144d0c..9e9d89a 100644 --- a/pbr.clj +++ b/pbr.clj @@ -1,19 +1,11 @@ ; ; Copyright © 2021 Peter Monks ; -; Licensed under the Apache License, Version 2.0 (the "License"); -; you may not use this file except in compliance with the License. -; You may obtain a copy of the License at +; This Source Code Form is subject to the terms of the Mozilla Public +; License, v. 2.0. If a copy of the MPL was not distributed with this +; file, You can obtain one at https://mozilla.org/MPL/2.0/. ; -; http://www.apache.org/licenses/LICENSE-2.0 -; -; Unless required by applicable law or agreed to in writing, software -; distributed under the License is distributed on an "AS IS" BASIS, -; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -; See the License for the specific language governing permissions and -; limitations under the License. -; -; SPDX-License-Identifier: Apache-2.0 +; SPDX-License-Identifier: MPL-2.0 ; #_{:clj-kondo/ignore [:unresolved-namespace]} @@ -27,7 +19,7 @@ :validate-pom true :pom {:description "This library implements \"URL unfurling\" approximately according to how Slack does it." :url "https://github.com/pmonks/unfurl" - :licenses [:license {:name "Apache-2.0" :url "http://www.apache.org/licenses/LICENSE-2.0.html"}] + :licenses [:license {:name "MPL-2.0" :url "https://www.mozilla.org/en-US/MPL/2.0/"}] :developers [:developer {:id "pmonks" :name "Peter Monks" :email "pmonks+unfurl@gmail.com"}] :scm {:url "https://github.com/pmonks/unfurl" :connection "scm:git:git://github.com/pmonks/unfurl.git" :developer-connection "scm:git:ssh://git@github.com/pmonks/unfurl.git"} :issue-management {:system "github" :url "https://github.com/pmonks/unfurl/issues"}} diff --git a/test/unfurl/api_test.clj b/test/unfurl/api_test.clj index 22b723c..1c44c65 100644 --- a/test/unfurl/api_test.clj +++ b/test/unfurl/api_test.clj @@ -1,19 +1,11 @@ ; ; Copyright © 2016 Peter Monks ; -; Licensed under the Apache License, Version 2.0 (the "License"); -; you may not use this file except in compliance with the License. -; You may obtain a copy of the License at +; This Source Code Form is subject to the terms of the Mozilla Public +; License, v. 2.0. If a copy of the MPL was not distributed with this +; file, You can obtain one at https://mozilla.org/MPL/2.0/. ; -; http://www.apache.org/licenses/LICENSE-2.0 -; -; Unless required by applicable law or agreed to in writing, software -; distributed under the License is distributed on an "AS IS" BASIS, -; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -; See the License for the specific language governing permissions and -; limitations under the License. -; -; SPDX-License-Identifier: Apache-2.0 +; SPDX-License-Identifier: MPL-2.0 ; (ns unfurl.api-test