Skip to content

Commit fc8f9fa

Browse files
matthiasblaesingmatthiasblaesing
authored
Merge pull request #9059 from matthiasblaesing/update-groovy
Update groovy to 3.0.25
2 parents 3759cc5 + 2f9c131 commit fc8f9fa

File tree

8 files changed

+86
-16
lines changed

8 files changed

+86
-16
lines changed

‎groovy/libs.groovy/external/binaries-list‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
59FA6B2237A01CF380B27CB091D5F095DFE1AC5B org.codehaus.groovy:groovy:3.0.23
18-
D21A9C81632F804C514D48C45D560B8004890E30 org.codehaus.groovy:groovy-ant:3.0.23
17+
0AFC7F7A3B2E3E86482D1F636AA3C1733F9C7473 org.codehaus.groovy:groovy:3.0.25
18+
4C334F0023049A377447B187A53DF90F450C2AC8 org.codehaus.groovy:groovy-ant:3.0.25

groovy/libs.groovy/external/groovy-3.0.23-license.txt renamed to groovy/libs.groovy/external/groovy-3.0.25-license.txt

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Name: Groovy
2-
Version: 3.0.23
3-
Files: groovy-3.0.23.jar groovy-ant-3.0.23.jar
2+
Version: 3.0.25
3+
Files: groovy-3.0.25.jar groovy-ant-3.0.25.jar
44
Description: Groovy Language distribution.
55
License: Apache-2.0-groovy
66
Origin: http://groovy-lang.org/
@@ -267,3 +267,38 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
267267
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
268268
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
269269
THE POSSIBILITY OF SUCH DAMAGE.
270+
271+
------------------------------------------------------------------------
272+
273+
ASM License
274+
275+
ASM: a very small and fast Java bytecode manipulation framework
276+
Copyright (c) 2000-2011 INRIA, France Telecom
277+
All rights reserved.
278+
279+
Redistribution and use in source and binary forms, with or without
280+
modification, are permitted provided that the following conditions
281+
are met:
282+
283+
1. Redistributions of source code must retain the above copyright
284+
notice, this list of conditions and the following disclaimer.
285+
286+
2. Redistributions in binary form must reproduce the above copyright
287+
notice, this list of conditions and the following disclaimer in the
288+
documentation and/or other materials provided with the distribution.
289+
290+
3. Neither the name of the copyright holders nor the names of its
291+
contributors may be used to endorse or promote products derived from
292+
this software without specific prior written permission.
293+
294+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
295+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
296+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
297+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
298+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
299+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
300+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
301+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
302+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
303+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
304+
THE POSSIBILITY OF SUCH DAMAGE.

groovy/libs.groovy/external/groovy-3.0.23-notice.txt renamed to groovy/libs.groovy/external/groovy-3.0.25-notice.txt

File renamed without changes.

‎groovy/libs.groovy/nbproject/project.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ javac.compilerargs=-Xlint -Xlint:-serial
2323
# For more information, please see http://wiki.netbeans.org/SignatureTest
2424
sigtest.gen.fail.on.error=false
2525

26-
release.external/groovy-3.0.23.jar=modules/ext/groovy-3.0.23.jar
27-
release.external/groovy-ant-3.0.23.jar=modules/ext/groovy-ant-3.0.23.jar
26+
release.external/groovy-3.0.25.jar=modules/ext/groovy-3.0.25.jar
27+
release.external/groovy-ant-3.0.25.jar=modules/ext/groovy-ant-3.0.25.jar

‎groovy/libs.groovy/nbproject/project.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@
7676
<package>org.codehaus.groovy.transform.trait</package>
7777
</friend-packages>
7878
<class-path-extension>
79-
<runtime-relative-path>ext/groovy-3.0.23.jar</runtime-relative-path>
80-
<binary-origin>external/groovy-3.0.23.jar</binary-origin>
79+
<runtime-relative-path>ext/groovy-3.0.25.jar</runtime-relative-path>
80+
<binary-origin>external/groovy-3.0.25.jar</binary-origin>
8181
</class-path-extension>
8282
<class-path-extension>
83-
<runtime-relative-path>ext/groovy-ant-3.0.23.jar</runtime-relative-path>
84-
<binary-origin>external/groovy-ant-3.0.23.jar</binary-origin>
83+
<runtime-relative-path>ext/groovy-ant-3.0.25.jar</runtime-relative-path>
84+
<binary-origin>external/groovy-ant-3.0.25.jar</binary-origin>
8585
</class-path-extension>
8686
</data>
8787
</configuration>

‎groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/Bundle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
# under the License.
1717
OpenIDE-Module-Name=Groovy Binaries
1818

19-
groovy=Groovy 3.0.23
20-
groovy-ant=Groovy Ant 3.0.23
19+
groovy=Groovy 3.0.25
20+
groovy-ant=Groovy Ant 3.0.25

‎groovy/libs.groovy/src/org/netbeans/modules/libs/groovy/groovy-all.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
<localizing-bundle>org/netbeans/modules/libs/groovy/Bundle</localizing-bundle>
2828
<volume>
2929
<type>classpath</type>
30-
<resource>jar:nbinst://org.netbeans.modules.libs.groovy/modules/ext/groovy-3.0.23.jar!/</resource>
31-
<resource>jar:nbinst://org.netbeans.modules.libs.groovy/modules/ext/groovy-ant-3.0.23.jar!/</resource>
30+
<resource>jar:nbinst://org.netbeans.modules.libs.groovy/modules/ext/groovy-3.0.25.jar!/</resource>
31+
<resource>jar:nbinst://org.netbeans.modules.libs.groovy/modules/ext/groovy-ant-3.0.25.jar!/</resource>
3232
</volume>
3333
<properties>
3434
<property>
3535
<name>maven-dependencies</name>
3636
<value>
37-
org.codehaus.groovy:groovy:3.0.23
38-
org.codehaus.groovy:groovy-ant:3.0.23
37+
org.codehaus.groovy:groovy:3.0.25
38+
org.codehaus.groovy:groovy-ant:3.0.25
3939
</value>
4040
</property>
4141
</properties>

‎nbbuild/licenses/Apache-2.0-groovy‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,3 +261,38 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
261261
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
262262
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
263263
THE POSSIBILITY OF SUCH DAMAGE.
264+
265+
------------------------------------------------------------------------
266+
267+
ASM License
268+
269+
ASM: a very small and fast Java bytecode manipulation framework
270+
Copyright (c) 2000-2011 INRIA, France Telecom
271+
All rights reserved.
272+
273+
Redistribution and use in source and binary forms, with or without
274+
modification, are permitted provided that the following conditions
275+
are met:
276+
277+
1. Redistributions of source code must retain the above copyright
278+
notice, this list of conditions and the following disclaimer.
279+
280+
2. Redistributions in binary form must reproduce the above copyright
281+
notice, this list of conditions and the following disclaimer in the
282+
documentation and/or other materials provided with the distribution.
283+
284+
3. Neither the name of the copyright holders nor the names of its
285+
contributors may be used to endorse or promote products derived from
286+
this software without specific prior written permission.
287+
288+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
289+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
290+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
291+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
292+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
293+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
294+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
295+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
296+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
297+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
298+
THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)