Skip to content

Commit bd72898

Browse files
ctruedenctrueden
committed
Update license to BSD-2, like the rest of SciJava
See: https://forum.image.sc/t/cant-release-project-script-editor/63240/24
1 parent 3a003b8 commit bd72898

17 files changed

Lines changed: 227 additions & 808 deletions

‎LICENSE.txt‎

Lines changed: 24 additions & 674 deletions
Large diffs are not rendered by default.

‎pom.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<version>0.1.0-SNAPSHOT</version>
1414

1515
<name>Jython Script Editor plugin</name>
16-
<description>Jython language support for SciJava Script Editor</description>
16+
<description>Jython language support for SciJava Script Editor.</description>
1717
<url>https://github.com/scijava/script-editor-jython</url>
1818
<inceptionYear>2020</inceptionYear>
1919
<organization>
@@ -22,8 +22,7 @@
2222
</organization>
2323
<licenses>
2424
<license>
25-
<name>GNU General Public License v3+</name>
26-
<url>https://www.gnu.org/licenses/gpl.html</url>
25+
<name>Simplified BSD License</name>
2726
<distribution>repo</distribution>
2827
</license>
2928
</licenses>
@@ -105,7 +104,7 @@
105104

106105
<properties>
107106
<package-name>org.scijava.jython.autocompletion</package-name>
108-
<license.licenseName>gpl_v3</license.licenseName>
107+
<license.licenseName>bsd_2</license.licenseName>
109108
<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
110109

111110
<!-- NB: Deploy releases to the SciJava Maven repository. -->

‎src/main/java/org/scijava/plugins/scripteditor/jython/ClassDotAutocompletions.java‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
11
/*-
22
* #%L
3-
* Autocompletion for the jython language in the Script Editor
3+
* Jython language support for SciJava Script Editor.
44
* %%
55
* Copyright (C) 2020 - 2022 SciJava developers.
66
* %%
7-
* This program is free software: you can redistribute it and/or modify
8-
* it under the terms of the GNU General Public License as
9-
* published by the Free Software Foundation, either version 3 of the
10-
* License, or (at your option) any later version.
7+
* Redistribution and use in source and binary forms, with or without
8+
* modification, are permitted provided that the following conditions are met:
119
*
12-
* This program is distributed in the hope that it will be useful,
13-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
* GNU General Public License for more details.
10+
* 1. Redistributions of source code must retain the above copyright notice,
11+
* this list of conditions and the following disclaimer.
12+
* 2. Redistributions in binary form must reproduce the above copyright notice,
13+
* this list of conditions and the following disclaimer in the documentation
14+
* and/or other materials provided with the distribution.
1615
*
17-
* You should have received a copy of the GNU General Public
18-
* License along with this program. If not, see
19-
* <http://www.gnu.org/licenses/gpl-3.0.html>.
16+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
17+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
20+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
23+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
24+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
25+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
26+
* POSSIBILITY OF SUCH DAMAGE.
2027
* #L%
2128
*/
2229
package org.scijava.plugins.scripteditor.jython;

‎src/main/java/org/scijava/plugins/scripteditor/jython/DefVarDotAutocompletions.java‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
11
/*-
22
* #%L
3-
* Autocompletion for the jython language in the Script Editor
3+
* Jython language support for SciJava Script Editor.
44
* %%
55
* Copyright (C) 2020 - 2022 SciJava developers.
66
* %%
7-
* This program is free software: you can redistribute it and/or modify
8-
* it under the terms of the GNU General Public License as
9-
* published by the Free Software Foundation, either version 3 of the
10-
* License, or (at your option) any later version.
7+
* Redistribution and use in source and binary forms, with or without
8+
* modification, are permitted provided that the following conditions are met:
119
*
12-
* This program is distributed in the hope that it will be useful,
13-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
* GNU General Public License for more details.
10+
* 1. Redistributions of source code must retain the above copyright notice,
11+
* this list of conditions and the following disclaimer.
12+
* 2. Redistributions in binary form must reproduce the above copyright notice,
13+
* this list of conditions and the following disclaimer in the documentation
14+
* and/or other materials provided with the distribution.
1615
*
17-
* You should have received a copy of the GNU General Public
18-
* License along with this program. If not, see
19-
* <http://www.gnu.org/licenses/gpl-3.0.html>.
16+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
17+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
20+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
23+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
24+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
25+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
26+
* POSSIBILITY OF SUCH DAMAGE.
2027
* #L%
2128
*/
2229
package org.scijava.plugins.scripteditor.jython;

‎src/main/java/org/scijava/plugins/scripteditor/jython/DotAutocompletions.java‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
11
/*-
22
* #%L
3-
* Autocompletion for the jython language in the Script Editor
3+
* Jython language support for SciJava Script Editor.
44
* %%
55
* Copyright (C) 2020 - 2022 SciJava developers.
66
* %%
7-
* This program is free software: you can redistribute it and/or modify
8-
* it under the terms of the GNU General Public License as
9-
* published by the Free Software Foundation, either version 3 of the
10-
* License, or (at your option) any later version.
7+
* Redistribution and use in source and binary forms, with or without
8+
* modification, are permitted provided that the following conditions are met:
119
*
12-
* This program is distributed in the hope that it will be useful,
13-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
* GNU General Public License for more details.
10+
* 1. Redistributions of source code must retain the above copyright notice,
11+
* this list of conditions and the following disclaimer.
12+
* 2. Redistributions in binary form must reproduce the above copyright notice,
13+
* this list of conditions and the following disclaimer in the documentation
14+
* and/or other materials provided with the distribution.
1615
*
17-
* You should have received a copy of the GNU General Public
18-
* License along with this program. If not, see
19-
* <http://www.gnu.org/licenses/gpl-3.0.html>.
16+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
17+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
20+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
23+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
24+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
25+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
26+
* POSSIBILITY OF SUCH DAMAGE.
2027
* #L%
2128
*/
2229
package org.scijava.plugins.scripteditor.jython;

‎src/main/java/org/scijava/plugins/scripteditor/jython/EmptyDotAutocompletions.java‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
11
/*-
22
* #%L
3-
* Autocompletion for the jython language in the Script Editor
3+
* Jython language support for SciJava Script Editor.
44
* %%
55
* Copyright (C) 2020 - 2022 SciJava developers.
66
* %%
7-
* This program is free software: you can redistribute it and/or modify
8-
* it under the terms of the GNU General Public License as
9-
* published by the Free Software Foundation, either version 3 of the
10-
* License, or (at your option) any later version.
7+
* Redistribution and use in source and binary forms, with or without
8+
* modification, are permitted provided that the following conditions are met:
119
*
12-
* This program is distributed in the hope that it will be useful,
13-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
* GNU General Public License for more details.
10+
* 1. Redistributions of source code must retain the above copyright notice,
11+
* this list of conditions and the following disclaimer.
12+
* 2. Redistributions in binary form must reproduce the above copyright notice,
13+
* this list of conditions and the following disclaimer in the documentation
14+
* and/or other materials provided with the distribution.
1615
*
17-
* You should have received a copy of the GNU General Public
18-
* License along with this program. If not, see
19-
* <http://www.gnu.org/licenses/gpl-3.0.html>.
16+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
17+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
20+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
23+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
24+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
25+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
26+
* POSSIBILITY OF SUCH DAMAGE.
2027
* #L%
2128
*/
2229
package org.scijava.plugins.scripteditor.jython;

‎src/main/java/org/scijava/plugins/scripteditor/jython/JythonAutoCompletion.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*-
22
* #%L
3-
* Script Editor and Interpreter for SciJava script languages.
3+
* Jython language support for SciJava Script Editor.
44
* %%
5-
* Copyright (C) 2009 - 2022 SciJava developers.
5+
* Copyright (C) 2020 - 2022 SciJava developers.
66
* %%
77
* Redistribution and use in source and binary forms, with or without
88
* modification, are permitted provided that the following conditions are met:

‎src/main/java/org/scijava/plugins/scripteditor/jython/JythonAutoCompletions.java‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
11
/*-
22
* #%L
3-
* Autocompletion for the jython language in the Script Editor
3+
* Jython language support for SciJava Script Editor.
44
* %%
55
* Copyright (C) 2020 - 2022 SciJava developers.
66
* %%
7-
* This program is free software: you can redistribute it and/or modify
8-
* it under the terms of the GNU General Public License as
9-
* published by the Free Software Foundation, either version 3 of the
10-
* License, or (at your option) any later version.
7+
* Redistribution and use in source and binary forms, with or without
8+
* modification, are permitted provided that the following conditions are met:
119
*
12-
* This program is distributed in the hope that it will be useful,
13-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
* GNU General Public License for more details.
10+
* 1. Redistributions of source code must retain the above copyright notice,
11+
* this list of conditions and the following disclaimer.
12+
* 2. Redistributions in binary form must reproduce the above copyright notice,
13+
* this list of conditions and the following disclaimer in the documentation
14+
* and/or other materials provided with the distribution.
1615
*
17-
* You should have received a copy of the GNU General Public
18-
* License along with this program. If not, see
19-
* <http://www.gnu.org/licenses/gpl-3.0.html>.
16+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
17+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
20+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
23+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
24+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
25+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
26+
* POSSIBILITY OF SUCH DAMAGE.
2027
* #L%
2128
*/
2229
package org.scijava.plugins.scripteditor.jython;

‎src/main/java/org/scijava/plugins/scripteditor/jython/JythonAutocompletionProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*-
22
* #%L
3-
* Script Editor and Interpreter for SciJava script languages.
3+
* Jython language support for SciJava Script Editor.
44
* %%
5-
* Copyright (C) 2009 - 2022 SciJava developers.
5+
* Copyright (C) 2020 - 2022 SciJava developers.
66
* %%
77
* Redistribution and use in source and binary forms, with or without
88
* modification, are permitted provided that the following conditions are met:

‎src/main/java/org/scijava/plugins/scripteditor/jython/JythonImportFormat.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*-
22
* #%L
3-
* Script Editor and Interpreter for SciJava script languages.
3+
* Jython language support for SciJava Script Editor.
44
* %%
5-
* Copyright (C) 2009 - 2022 SciJava developers.
5+
* Copyright (C) 2020 - 2022 SciJava developers.
66
* %%
77
* Redistribution and use in source and binary forms, with or without
88
* modification, are permitted provided that the following conditions are met:

0 commit comments

Comments
 (0)