Skip to content

Commit 4c8382a

Browse files
authored
Merge branch 'scijava:main' into patch-2
2 parents 50d33cb + 57c1efb commit 4c8382a

File tree

2 files changed

+30
-2
lines changed

2 files changed

+30
-2
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111

1212
<artifactId>script-editor-jython</artifactId>
13-
<version>0.1.3-SNAPSHOT</version>
13+
<version>0.1.4-SNAPSHOT</version>
1414

1515
<name>Jython Script Editor plugin</name>
1616
<description>Jython language support for SciJava Script Editor.</description>
@@ -113,7 +113,7 @@
113113
<antlr-runtime.version>3.5.2</antlr-runtime.version>
114114

115115
<!-- TEMP: Until pom-scijava 32.0.0 is released and used here. -->
116-
<script-editor.version>0.6.1</script-editor.version>
116+
<script-editor.version>0.7.1</script-editor.version>
117117
</properties>
118118

119119
<dependencies>

src/main/java/org/scijava/plugins/scripteditor/jython/ConstructorAutocompletions.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
/*-
2+
* #%L
3+
* Jython language support for SciJava Script Editor.
4+
* %%
5+
* Copyright (C) 2020 - 2022 SciJava developers.
6+
* %%
7+
* Redistribution and use in source and binary forms, with or without
8+
* modification, are permitted provided that the following conditions are met:
9+
*
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.
15+
*
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.
27+
* #L%
28+
*/
129
package org.scijava.plugins.scripteditor.jython;
230

331
import java.util.Arrays;

0 commit comments

Comments
 (0)