yogsototh/leiningen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2404 from yegortimoshenko/20180220.210231/gplv2-or-later

Browse source 
Use GPL-2.0-or-later as secondary license
This commit is contained in:
Phil Hagelberg 2018-03-01 16:21:00 -08:00 committed by GitHub
commit ecd3853158
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
resources/leiningen/new/app/README.md
View file

@ -38,6 +38,7 @@ http://www.eclipse.org/legal/epl-2.0.
This Source Code may also be made available under the following Secondary This Source Code may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse Licenses when the conditions for such availability set forth in the Eclipse
Public License, v. 2.0 are satisfied: GNU General Public License, version 2 Public License, v. 2.0 are satisfied: GNU General Public License as published by
with the GNU Classpath Exception which is the Free Software Foundation, either version 2 of the License, or (at your
available at https://www.gnu.org/software/classpath/license.html. option) any later version, with the GNU Classpath Exception which is available
at https://www.gnu.org/software/classpath/license.html.

2
resources/leiningen/new/app/project.clj
View file

@ -1,7 +1,7 @@
(defproject {{raw-name}} "0.1.0-SNAPSHOT" (defproject {{raw-name}} "0.1.0-SNAPSHOT"
:description "FIXME: write description" :description "FIXME: write description"
:url "http://example.com/FIXME" :url "http://example.com/FIXME"
:license {:name "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0" :license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0"
:url "https://www.eclipse.org/legal/epl-2.0/"} :url "https://www.eclipse.org/legal/epl-2.0/"}
:dependencies [[org.clojure/clojure "1.9.0"]] :dependencies [[org.clojure/clojure "1.9.0"]]
:main ^:skip-aot {{namespace}} :main ^:skip-aot {{namespace}}

7
resources/leiningen/new/default/README.md
View file

@ -16,6 +16,7 @@ http://www.eclipse.org/legal/epl-2.0.
This Source Code may also be made available under the following Secondary This Source Code may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse Licenses when the conditions for such availability set forth in the Eclipse
Public License, v. 2.0 are satisfied: GNU General Public License, version 2 Public License, v. 2.0 are satisfied: GNU General Public License as published by
with the GNU Classpath Exception which is the Free Software Foundation, either version 2 of the License, or (at your
available at https://www.gnu.org/software/classpath/license.html. option) any later version, with the GNU Classpath Exception which is available
at https://www.gnu.org/software/classpath/license.html.

2
resources/leiningen/new/default/project.clj
View file

@ -1,7 +1,7 @@
(defproject {{raw-name}} "0.1.0-SNAPSHOT" (defproject {{raw-name}} "0.1.0-SNAPSHOT"
:description "FIXME: write description" :description "FIXME: write description"
:url "http://example.com/FIXME" :url "http://example.com/FIXME"
:license {:name "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0" :license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0"
:url "https://www.eclipse.org/legal/epl-2.0/"} :url "https://www.eclipse.org/legal/epl-2.0/"}
:dependencies [[org.clojure/clojure "1.9.0"]] :dependencies [[org.clojure/clojure "1.9.0"]]
:repl-options {:init-ns {{namespace}}}) :repl-options {:init-ns {{namespace}}})

7
resources/leiningen/new/plugin/README.md
View file

@ -27,6 +27,7 @@ http://www.eclipse.org/legal/epl-2.0.
This Source Code may also be made available under the following Secondary This Source Code may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse Licenses when the conditions for such availability set forth in the Eclipse
Public License, v. 2.0 are satisfied: GNU General Public License, version 2 Public License, v. 2.0 are satisfied: GNU General Public License as published by
with the GNU Classpath Exception which is the Free Software Foundation, either version 2 of the License, or (at your
available at https://www.gnu.org/software/classpath/license.html. option) any later version, with the GNU Classpath Exception which is available
at https://www.gnu.org/software/classpath/license.html.

2
resources/leiningen/new/plugin/project.clj
View file

@ -1,6 +1,6 @@
(defproject {{name}} "0.1.0-SNAPSHOT" (defproject {{name}} "0.1.0-SNAPSHOT"
:description "FIXME: write description" :description "FIXME: write description"
:url "http://example.com/FIXME" :url "http://example.com/FIXME"
:license {:name "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0" :license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0"
:url "https://www.eclipse.org/legal/epl-2.0/"} :url "https://www.eclipse.org/legal/epl-2.0/"}
:eval-in-leiningen true) :eval-in-leiningen true)

12
resources/leiningen/new/template/README.md
View file

@ -10,5 +10,13 @@ FIXME
Copyright © {{year}} FIXME Copyright © {{year}} FIXME
Distributed under the Eclipse Public License either version 1.0 or (at This program and the accompanying materials are made available under the
your option) any later version. terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0.
This Source Code may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse
Public License, v. 2.0 are satisfied: GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or (at your
option) any later version, with the GNU Classpath Exception which is available
at https://www.gnu.org/software/classpath/license.html.

2
resources/leiningen/new/template/project.clj
View file

@ -1,6 +1,6 @@
(defproject {{name}}/lein-template "0.1.0-SNAPSHOT" (defproject {{name}}/lein-template "0.1.0-SNAPSHOT"
:description "FIXME: write description" :description "FIXME: write description"
:url "http://example.com/FIXME" :url "http://example.com/FIXME"
:license {:name "EPL-2.0" :license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0"
:url "https://www.eclipse.org/legal/epl-2.0/"} :url "https://www.eclipse.org/legal/epl-2.0/"}
:eval-in-leiningen true) :eval-in-leiningen true)