Skip to content

Commit

Permalink
⚖️ Switch to MPL-2.0 license
Browse files Browse the repository at this point in the history
  • Loading branch information
pmonks committed Nov 12, 2024
1 parent 415a5ff commit 8cf9370
Show file tree
Hide file tree
Showing 31 changed files with 484 additions and 519 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ attic
resources/logback-test.xml
.clj-kondo/.cache
.nvd
.DS_Store
574 changes: 373 additions & 201 deletions LICENSE

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion LICENSE.spdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Creator: Peter Monks
PackageName: com.github.pmonks/lice-comb
PackageOriginator: Peter Monks
PackageHomePage: https://github.com/pmonks/lice-comb
PackageLicenseDeclared: Apache-2.0
PackageLicenseDeclared: MPL-2.0
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ $ deps-try com.github.pmonks/lice-comb
;; License extraction from tools.deps dependency maps
(require '[lice-comb.deps :as lcd])

(lcd/dep->expressions ['org.clojure/clojure {:deps/manifest :mvn :mvn/version "1.12.0-alpha5"}])
(lcd/dep->expressions ['org.clojure/clojure {:deps/manifest :mvn :mvn/version "1.12.0"}])
;=> #{"EPL-1.0"}


Expand Down Expand Up @@ -205,8 +205,8 @@ Please note that the `deploy` task is restricted to the core development team (a

Copyright © 2021 Peter Monks

Distributed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0).
Distributed under the [Mozilla Public License, version 2.0](https://www.mozilla.org/en-US/MPL/2.0/).

SPDX-License-Identifier: [Apache-2.0](https://spdx.org/licenses/Apache-2.0)
SPDX-License-Identifier: [`MPL-2.0`](https://spdx.org/licenses/MPL-2.0)

The OSI "Keyhole Logo" is used as per the [Open Source Initiative's](https://opensource.org/) [trademark](https://opensource.org/trademark-guidelines) and [logo usage](https://opensource.org/logo-usage-guidelines) policies.
16 changes: 4 additions & 12 deletions deps.edn
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
;

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/clj-spdx 1.0.176 is outdated. Latest version is 1.0.197. https://github.com/pmonks/clj-spdx/compare/1.0.176...1.0.197

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/rencg 1.0.51 is outdated. Latest version is 1.0.64. https://github.com/pmonks/rencg/compare/1.0.51...1.0.64

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/clj-spdx 1.0.176 is outdated. Latest version is 1.0.197. https://github.com/pmonks/clj-spdx/compare/1.0.176...1.0.197

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/rencg 1.0.51 is outdated. Latest version is 1.0.64. https://github.com/pmonks/rencg/compare/1.0.51...1.0.64

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/clj-spdx 1.0.176 is outdated. Latest version is 1.0.205. https://github.com/pmonks/clj-spdx/compare/1.0.176...1.0.205

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/rencg 1.0.51 is outdated. Latest version is 1.0.64. https://github.com/pmonks/rencg/compare/1.0.51...1.0.64

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/clj-spdx 1.0.176 is outdated. Latest version is 1.0.205. https://github.com/pmonks/clj-spdx/compare/1.0.176...1.0.205

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/rencg 1.0.51 is outdated. Latest version is 1.0.64. https://github.com/pmonks/rencg/compare/1.0.51...1.0.64

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/clj-spdx 1.0.176 is outdated. Latest version is 1.0.214. https://github.com/pmonks/clj-spdx/compare/1.0.176...1.0.214

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/rencg 1.0.51 is outdated. Latest version is 1.0.64. https://github.com/pmonks/rencg/compare/1.0.51...1.0.64

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/clj-spdx 1.0.176 is outdated. Latest version is 1.0.220. https://github.com/pmonks/clj-spdx/compare/1.0.176...1.0.220

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/rencg 1.0.51 is outdated. Latest version is 1.0.64. https://github.com/pmonks/rencg/compare/1.0.51...1.0.64

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/clj-spdx 1.0.176 is outdated. Latest version is 1.0.220. https://github.com/pmonks/clj-spdx/compare/1.0.176...1.0.220

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/rencg 1.0.51 is outdated. Latest version is 1.0.64. https://github.com/pmonks/rencg/compare/1.0.51...1.0.64

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/clj-spdx 1.0.176 is outdated. Latest version is 1.0.220. https://github.com/pmonks/clj-spdx/compare/1.0.176...1.0.220

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/rencg 1.0.51 is outdated. Latest version is 1.0.64. https://github.com/pmonks/rencg/compare/1.0.51...1.0.64

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/clj-spdx 1.0.176 is outdated. Latest version is 1.0.220. https://github.com/pmonks/clj-spdx/compare/1.0.176...1.0.220

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/rencg 1.0.51 is outdated. Latest version is 1.0.64. https://github.com/pmonks/rencg/compare/1.0.51...1.0.64

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/clj-spdx 1.0.176 is outdated. Latest version is 1.0.220. https://github.com/pmonks/clj-spdx/compare/1.0.176...1.0.220

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/rencg 1.0.51 is outdated. Latest version is 1.0.64. https://github.com/pmonks/rencg/compare/1.0.51...1.0.64

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/clj-spdx 1.0.176 is outdated. Latest version is 1.0.220. https://github.com/pmonks/clj-spdx/compare/1.0.176...1.0.220

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/rencg 1.0.51 is outdated. Latest version is 1.0.64. https://github.com/pmonks/rencg/compare/1.0.51...1.0.64

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/clj-spdx 1.0.176 is outdated. Latest version is 1.0.220. https://github.com/pmonks/clj-spdx/compare/1.0.176...1.0.220

Check failure on line 1 in deps.edn

View workflow job for this annotation

GitHub Actions / antq

com.github.pmonks/rencg 1.0.51 is outdated. Latest version is 1.0.64. https://github.com/pmonks/rencg/compare/1.0.51...1.0.64
; 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
;

{:paths ["src" "resources"]
Expand Down
18 changes: 5 additions & 13 deletions pbr.clj
Original file line number Diff line number Diff line change
@@ -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]}
Expand All @@ -27,7 +19,7 @@
:validate-pom true
:pom {:description "A Clojure library for software license detection."
:url "https://github.com/pmonks/lice-comb"
: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 "[email protected]"}]
:scm {:url "https://github.com/pmonks/lice-comb" :connection "scm:git:git://github.com/pmonks/lice-comb.git" :developer-connection "scm:git:ssh://[email protected]/pmonks/lice-comb.git"}
:issue-management {:system "github" :url "https://github.com/pmonks/lice-comb/issues"}}
Expand Down
16 changes: 4 additions & 12 deletions src/lice_comb/deps.clj
Original file line number Diff line number Diff line change
@@ -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
;

(ns lice-comb.deps
Expand Down
16 changes: 4 additions & 12 deletions src/lice_comb/files.clj
Original file line number Diff line number Diff line change
@@ -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
;

(ns lice-comb.files
Expand Down
16 changes: 4 additions & 12 deletions src/lice_comb/impl/data.clj
Original file line number Diff line number Diff line change
@@ -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
;

(ns lice-comb.impl.data
Expand Down
16 changes: 4 additions & 12 deletions src/lice_comb/impl/expressions_info.clj
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
;
; Copyright © 2023 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 lice-comb.impl.expressions-info
Expand Down
16 changes: 4 additions & 12 deletions src/lice_comb/impl/http.clj
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
;
; Copyright © 2023 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 lice-comb.impl.http
Expand Down
16 changes: 4 additions & 12 deletions src/lice_comb/impl/id_detection.clj
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
;
; Copyright © 2023 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 lice-comb.impl.id-detection
Expand Down
16 changes: 4 additions & 12 deletions src/lice_comb/impl/parsing.clj
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
;
; Copyright © 2023 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 lice-comb.impl.parsing
Expand Down
16 changes: 4 additions & 12 deletions src/lice_comb/impl/spdx.clj
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
;
; Copyright © 2023 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 lice-comb.impl.spdx
Expand Down
16 changes: 4 additions & 12 deletions src/lice_comb/impl/splitting.clj
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
;
; Copyright © 2024 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 lice-comb.impl.splitting
Expand Down
16 changes: 4 additions & 12 deletions src/lice_comb/impl/utils.clj
Original file line number Diff line number Diff line change
@@ -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
;

(ns lice-comb.impl.utils
Expand Down
16 changes: 4 additions & 12 deletions src/lice_comb/lein.clj
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
;
; Copyright © 2023 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 lice-comb.lein
Expand Down
16 changes: 4 additions & 12 deletions src/lice_comb/matching.clj
Original file line number Diff line number Diff line change
@@ -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
;

(ns lice-comb.matching
Expand Down
Loading

0 comments on commit 8cf9370

Please sign in to comment.