Skip to content

Commit cc73c80

Browse files
paulk-asertdaniellansun
paulk-asert
authored and
daniellansun
committed
GROOVY-11934: replace old icons with svg and some additional cosmetics
1 parent 070fe25 commit cc73c80

File tree

92 files changed

+604
-139
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+604
-139
lines changed

‎LICENSE‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,15 @@ The following source files within this product:
222222
org/apache/groovy/groovysh/jline/PackageHelper.java
223223

224224
were derived from similarly named files in the JLine3 source repository which
225-
have a BSD-style license. Details can be found in: licenses/jline3-license.txt
225+
have a BSD-style license.
226+
227+
Some parts of the source code from:
228+
229+
org/apache/groovy/groovysh/jline/GroovyPosixCommands.java
230+
231+
were derived from the JLine3 PosixCommands class.
232+
233+
Details can be found in: licenses/jline3-license.txt
226234

227235
This product bundles several JLine3 jars (optional dependency used with groovysh),
228236
which are available under a BSD License. For details, see licenses/jline3-license.txt.

‎NOTICE‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,4 @@ Copyright 2010-2012 Google Inc. All Rights Reserved.
1010

1111
The Java source file src/main/java/org/apache/groovy/util/concurrent/ConcurrentReferenceHashMap
1212
is from https://github.com/hazelcast/hazelcast and the following notice applies:
13-
Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved.
14-
15-
This product bundles icons from the famfamfam.com silk icons set
16-
http://www.famfamfam.com/lab/icons/silk/
17-
Licensed under the Creative Commons Attribution Licence v2.5
18-
http://creativecommons.org/licenses/by/2.5/
13+
Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved.

‎build-logic/src/main/groovy/org.apache.groovy-common.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ tasks.named('rat') {
5858
'out/**', '*.ipr', '**/*.iml', '*.iws', '.idea/**', // Intellij files
5959
'**/style.css', // MIT license as per NOTICE/LICENSE files
6060
'**/jquery-2.1.1.min.js', // MIT license as per NOTICE/LICENSE files
61+
'**/groovy/console/ui/icons/*.svg', // Material Symbols, Apache 2.0 (see credits.txt)
6162
'.classpath', '.project', '.settings/**', 'bin/**', // Eclipse files
6263
'bootstrap/settings.gradle', // empty file
6364
'**/hs_err_pid**.log', // sometimes left over error files

‎gradle/licenses.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,13 @@ tasks.register('updateNotices') {
103103
include '*-GROOID*.txt'
104104
include '*-BINZIP*.txt'
105105
}.sort { it.name }
106-
def groovyconsoleFiles = fileTree(noticesDir).include('silkicons-BINZIP-SRC.txt')
107106
[
108107
(noticeBinZipFile) : binzipFiles,
109108
(noticeGrooidFile) : grooidFiles,
110109
(noticeGrooidJarJarFile) : grooidJarjarFiles,
111110
(noticeJarJarFile) : jarjarFiles,
112111
(noticeSrcFile) : srcFiles,
113-
(noticeGroovyConsoleFile): groovyconsoleFiles,
112+
(noticeGroovyConsoleFile): files(),
114113
].each { outFile, inFiles ->
115114
file(outFile).withWriter('utf-8') { writer ->
116115
writer << ([file(noticeBaseFile)] + inFiles).collect {

‎gradle/verification-metadata.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<key-server uri="hkps://keys.openpgp.org"/>
5353
</key-servers>
5454
<ignored-keys>
55+
<ignored-key id="254E9C64C264C176" reason="Key couldn't be downloaded from any key server"/>
5556
<ignored-key id="74DAFDFD6DAE2441" reason="Key not available on any key server"/>
5657
<ignored-key id="B7E2662A7640A051" reason="Key not available on any key server"/>
5758
</ignored-keys>
@@ -366,6 +367,11 @@
366367
<sha512 value="08ac1c8bbe9574212a0d1230778676de5e0d4231380948d94e07e73cc80eea0cebae684df4759d32bc656ebc38cb0f72583e3a51e9927be167738a44963d1cb9" origin="Generated by Gradle" reason="PGP key B7E2662A7640A051 not available on key servers"/>
367368
</artifact>
368369
</component>
370+
<component group="com.formdev" name="flatlaf-extras" version="3.6">
371+
<artifact name="flatlaf-extras-3.6.jar">
372+
<sha512 value="bc2fca839e470f9499f913b72d02c72561cf92c8e4a59deb0fc6376d38be70bba1a1e6e42e5ca8190a5623fcd4889ef6ed001b22646764bc9c973faad25172f9" origin="Generated by Gradle" reason="PGP key B7E2662A7640A051 not available on key servers"/>
373+
</artifact>
374+
</component>
369375
<component group="com.github.ben-manes" name="gradle-versions-plugin" version="0.53.0">
370376
<artifact name="gradle-versions-plugin-0.53.0.jar">
371377
<sha512 value="c28e3bcf6d8e8cd54086d52665474156962d211e9861785ef0b1ecab3272f8baba5ba9900293362f788163381276d9d2f502a69a05cd07eccb51d015ae36419a" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -510,6 +516,11 @@
510516
<sha512 value="02fcd16a30d0e68b3e9e4899731181c6abb7117baa15c096ca940e01dde08bb86101cbeae552c497f8a90d923b5fa2f2b6f3850baf8dc94dbd399887924a9069" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
511517
</artifact>
512518
</component>
519+
<component group="com.github.weisj" name="jsvg" version="1.4.0">
520+
<artifact name="jsvg-1.4.0.jar">
521+
<sha512 value="7bebf53d20327fe6d7cb851e386ed452ec6ae052c56e89f41005af2b22b8c079182a84471d9a11a6efa825589f843eaf14d71dfe5f7ce49d89b9eea4b73474c6" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
522+
</artifact>
523+
</component>
513524
<component group="com.google.code.findbugs" name="jsr305" version="3.0.2">
514525
<artifact name="jsr305-3.0.2.jar">
515526
<pgp value="7616EB882DAF57A11477AAF559A252FB1199D873"/>

‎licenses/LICENSE-BINZIP‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,15 @@ The following source files within this product:
234234
org/apache/groovy/groovysh/jline/PackageHelper.java
235235

236236
were derived from similarly named files in the JLine3 source repository which
237-
have a BSD-style license. Details can be found in: licenses/jline3-license.txt
237+
have a BSD-style license.
238+
239+
Some parts of the source code from:
240+
241+
org/apache/groovy/groovysh/jline/GroovyPosixCommands.java
242+
243+
were derived from the JLine3 PosixCommands class.
244+
245+
Details can be found in: licenses/jline3-license.txt
238246

239247
This product bundles several JLine3 jars (optional dependency used with groovysh),
240248
which are available under a BSD License. For details, see licenses/jline3-license.txt.
@@ -263,6 +271,13 @@ has a BSD-style license. Details can be found in: licenses/jsr223-license.txt
263271

264272
------------------------------------------------------------------------
265273

274+
JSVG License (used by groovyConsole for SVG toolbar icon rendering)
275+
276+
This product bundles the JSVG jar, which is available under the MIT
277+
License. For details, see licenses/jsvg-license.txt.
278+
279+
------------------------------------------------------------------------
280+
266281
JUnit Licenses (optional dependencies when using Groovy for testing)
267282

268283
This product bundles the JUnit 4 jar, which is available under the

‎licenses/LICENSE-SDK‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,15 @@ The following source files within this product:
234234
org/apache/groovy/groovysh/jline/PackageHelper.java
235235

236236
were derived from similarly named files in the JLine3 source repository which
237-
have a BSD-style license. Details can be found in: licenses/jline3-license.txt
237+
have a BSD-style license.
238+
239+
Some parts of the source code from:
240+
241+
org/apache/groovy/groovysh/jline/GroovyPosixCommands.java
242+
243+
were derived from the JLine3 PosixCommands class.
244+
245+
Details can be found in: licenses/jline3-license.txt
238246

239247
This product bundles several JLine3 jars (optional dependency used with groovysh),
240248
which are available under a BSD License. For details, see licenses/jline3-license.txt.
@@ -263,6 +271,13 @@ has a BSD-style license. Details can be found in: licenses/jsr223-license.txt
263271

264272
------------------------------------------------------------------------
265273

274+
JSVG License (used by groovyConsole for SVG toolbar icon rendering)
275+
276+
This product bundles the JSVG jar, which is available under the MIT
277+
License. For details, see licenses/jsvg-license.txt.
278+
279+
------------------------------------------------------------------------
280+
266281
JUnit Licenses (optional dependencies when using Groovy for testing)
267282

268283
This product bundles the JUnit 4 jar, which is available under the

‎licenses/jsvg-BINZIP.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
JSVG License (used by groovyConsole for SVG toolbar icon rendering)
2+
3+
This product bundles the JSVG jar, which is available under the MIT
4+
License. For details, see licenses/jsvg-license.txt.

‎licenses/jsvg-license.txt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2021-2024 Jannis Weis
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎notices/NOTICE-BINZIP‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,16 @@ The Apache Software Foundation (http://www.apache.org/).
77
This product includes/uses ANTLR4 (https://github.com/antlr/antlr4)
88
Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
99

10+
This product bundles the FlatLaf and FlatLaf Extras jars (formdev.com)
11+
which are available under the terms of the Apache License 2.0
12+
1013
This product bundles the JavaParser jar (javaparser.org)
1114
which is available under the terms of the Apache License 2.0
1215

16+
This product bundles the JSVG jar (github.com/weisJ/jsvg)
17+
Copyright (c) 2021-2024 Jannis Weis
18+
which is available under the terms of the MIT License
19+
1320
This product bundles the JUnit4 jar (junit.org)
1421
which is available under the terms of the Eclipse Public License v1.0
1522

@@ -24,9 +31,4 @@ licensed to the Apache Software Foundation under the "Software Grant and Corpora
2431
Contribution License Agreement" and for which the following copyright notices apply
2532
(C) Copyright 2005 Intel Corporation
2633
(C) Copyright 2005-2006 Intel Corporation
27-
(C) Copyright 2006 Intel Corporation
28-
29-
This product bundles icons from the famfamfam.com silk icons set
30-
http://www.famfamfam.com/lab/icons/silk/
31-
Licensed under the Creative Commons Attribution Licence v2.5
32-
http://creativecommons.org/licenses/by/2.5/
34+
(C) Copyright 2006 Intel Corporation

0 commit comments

Comments
 (0)