You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2026/08/24 11:45:24 UTC
(groovy) branch master updated (e797296544 -> e4a7451c4c)
This is an automated email from the ASF dual-hosted git repository.
paulk-asert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
from e797296544 GROOVY-12292: Honour method-level type-checking annotations over class-level SKIP
new ed23cd5977 minor refactor: remove legacy license and doco tweaks
new 760775b680 minor refactor: remove legacy license files
new 0ae7a97cd7 minor refactor: tweak license details for src jar files
new 94af75b37a minor refactor: tweak license details for allsrc jar file
new a41ff9145e minor refactor: tweak notice details for jar files in dist
new e4a7451c4c minor refactor: tweak notice details for raw jar files
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/groovy/org.apache.groovy-base.gradle | 25 +-
.../main/groovy/org.apache.groovy-common.gradle | 20 ++
.../groovy/org.apache.groovy-doc-aggregator.gradle | 19 +-
build.gradle | 22 +-
gradle/licenses.gradle | 22 +-
.../LICENSE => licenses/LICENSE-ALLSRCJAR | 14 +
licenses/LICENSE-BINZIP | 8 -
licenses/LICENSE-SDK | 8 -
licenses/activation-license.txt | 286 ---------------------
licenses/jsr166y-BINZIP.txt | 5 -
licenses/jsr166y-license.txt | 26 --
.../normalize-stylesheet-groovy-docgenerator.txt | 25 --
licenses/readme.txt | 17 +-
notices/NOTICE-BINZIP | 22 ++
notices/NOTICE-SDK | 22 ++
NOTICE => notices/NOTICE-SRCJAR | 5 +-
notices/ant-BINZIP.txt | 4 +
notices/ivy-BINZIP.txt | 7 +
notices/jackson-BINZIP.txt | 3 +
notices/plexus-BINZIP.txt | 4 +
notices/readme.txt | 13 +-
subprojects/groovy-binary/build.gradle | 1 -
22 files changed, 190 insertions(+), 388 deletions(-)
copy subprojects/groovy-groovysh/LICENSE => licenses/LICENSE-ALLSRCJAR (95%)
delete mode 100644 licenses/activation-license.txt
delete mode 100644 licenses/jsr166y-BINZIP.txt
delete mode 100644 licenses/jsr166y-license.txt
delete mode 100644 licenses/normalize-stylesheet-groovy-docgenerator.txt
copy NOTICE => notices/NOTICE-SRCJAR (78%)
create mode 100644 notices/ant-BINZIP.txt
create mode 100644 notices/ivy-BINZIP.txt
create mode 100644 notices/jackson-BINZIP.txt
create mode 100644 notices/plexus-BINZIP.txt
(groovy) 06/06: minor refactor: tweak notice details for raw jar files
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk-asert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit e4a7451c4c67ab012e0f0fd17f59b3856ed7c135
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Aug 24 21:45:14 2026 +1000
minor refactor: tweak notice details for raw jar files
---
build.gradle | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index eb31aa46df..e4238f6b44 100644
--- a/build.gradle
+++ b/build.gradle
@@ -182,7 +182,21 @@ allprojects {
}
}
+// The raw jar carries Groovy's own classes only; antlr4 and asm are shaded in later
+// by repackageJar, so the JARJAR licensing belongs on that artefact rather than here.
tasks.named('jar') {
+ metaInf {
+ from("$projectDir/licenses/LICENSE-BASE")
+ from("$projectDir/notices/NOTICE-BASE")
+ rename '^([A-Z]+)-([^.]*)', '$1'
+ }
+ exclude '**/package-info.class'
+}
+
+tasks.named('repackageJar') {
+ // this artefact is the one that bundles the shaded antlr4 and asm, so it replaces
+ // the raw jar's plain pair with the JARJAR licensing
+ sourceExcludes = ['META-INF/LICENSE', 'META-INF/NOTICE']
metaInf {
from("$projectDir/licenses/LICENSE-JARJAR")
// LICENSE-JARJAR points at licenses/*.txt; ship those texts
@@ -192,7 +206,6 @@ tasks.named('jar') {
from("$projectDir/notices/NOTICE-JARJAR")
rename '^([A-Z]+)-([^.]*)', '$1'
}
- exclude '**/package-info.class'
}
tasks.named('sourcesJar') {
(groovy) 05/06: minor refactor: tweak notice details for jar files in dist
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk-asert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit a41ff9145e5287ec88a03692913716931dc83fdf
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Aug 24 21:37:54 2026 +1000
minor refactor: tweak notice details for jar files in dist
---
notices/NOTICE-BINZIP | 22 ++++++++++++++++++++++
notices/NOTICE-SDK | 22 ++++++++++++++++++++++
notices/ant-BINZIP.txt | 4 ++++
notices/ivy-BINZIP.txt | 7 +++++++
notices/jackson-BINZIP.txt | 3 +++
notices/plexus-BINZIP.txt | 4 ++++
6 files changed, 62 insertions(+)
diff --git a/notices/NOTICE-BINZIP b/notices/NOTICE-BINZIP
index 18d66e2bfa..c621fd313b 100644
--- a/notices/NOTICE-BINZIP
+++ b/notices/NOTICE-BINZIP
@@ -4,12 +4,29 @@ Copyright 2003-2026 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+This product bundles the Apache Ant jars (ant.apache.org)
+which are available under the terms of the Apache License 2.0
+The <sync> task is based on code Copyright (c) 2002, Landmark
+Graphics Corp that has been kindly donated to the Apache Software Foundation.
+
This product includes/uses ANTLR4 (https://github.com/antlr/antlr4)
Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
This product bundles the FlatLaf and FlatLaf Extras jars (formdev.com)
which are available under the terms of the Apache License 2.0
+This product bundles the Apache Ivy jar (ant.apache.org/ivy)
+which is available under the terms of the Apache License 2.0
+Portions of Ivy were originally developed at Jayasoft SARL (jayasoft.fr)
+and are licensed to the Apache Software Foundation under the
+"Software Grant License Agreement"
+The Scp class is based on the SCPClient from the ganymed ssh library,
+which has a BSD style license.
+
+This product bundles several Jackson jars (github.com/FasterXML/jackson)
+Copyright 2007-, Tatu Saloranta (tatu.saloranta@iki.fi)
+which are available under the terms of the Apache License 2.0
+
This product bundles the JavaParser jar (javaparser.org)
which is available under the terms of the Apache License 2.0
@@ -33,5 +50,10 @@ Contribution License Agreement" and for which the following copyright notices ap
(C) Copyright 2005-2006 Intel Corporation
(C) Copyright 2006 Intel Corporation
+This product bundles the plexus-utils and plexus-xml jars (codehaus-plexus.github.io)
+which are available under the terms of the Apache License 2.0
+They include software developed by the Indiana University Extreme! Lab
+(extreme.indiana.edu), ThoughtWorks (thoughtworks.com) and javolution (javolution.org).
+
This product bundles Prism.js (prismjs.com)
which is available under the terms of the MIT License.
\ No newline at end of file
diff --git a/notices/NOTICE-SDK b/notices/NOTICE-SDK
index 5849ef2681..3a579f7388 100644
--- a/notices/NOTICE-SDK
+++ b/notices/NOTICE-SDK
@@ -4,12 +4,29 @@ Copyright 2003-2026 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+This product bundles the Apache Ant jars (ant.apache.org)
+which are available under the terms of the Apache License 2.0
+The <sync> task is based on code Copyright (c) 2002, Landmark
+Graphics Corp that has been kindly donated to the Apache Software Foundation.
+
This product includes/uses ANTLR4 (https://github.com/antlr/antlr4)
Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
This product bundles the FlatLaf and FlatLaf Extras jars (formdev.com)
which are available under the terms of the Apache License 2.0
+This product bundles the Apache Ivy jar (ant.apache.org/ivy)
+which is available under the terms of the Apache License 2.0
+Portions of Ivy were originally developed at Jayasoft SARL (jayasoft.fr)
+and are licensed to the Apache Software Foundation under the
+"Software Grant License Agreement"
+The Scp class is based on the SCPClient from the ganymed ssh library,
+which has a BSD style license.
+
+This product bundles several Jackson jars (github.com/FasterXML/jackson)
+Copyright 2007-, Tatu Saloranta (tatu.saloranta@iki.fi)
+which are available under the terms of the Apache License 2.0
+
This product bundles the JavaParser jar (javaparser.org)
which is available under the terms of the Apache License 2.0
@@ -33,6 +50,11 @@ Contribution License Agreement" and for which the following copyright notices ap
(C) Copyright 2005-2006 Intel Corporation
(C) Copyright 2006 Intel Corporation
+This product bundles the plexus-utils and plexus-xml jars (codehaus-plexus.github.io)
+which are available under the terms of the Apache License 2.0
+They include software developed by the Indiana University Extreme! Lab
+(extreme.indiana.edu), ThoughtWorks (thoughtworks.com) and javolution (javolution.org).
+
This product bundles Prism.js (prismjs.com)
which is available under the terms of the MIT License.
diff --git a/notices/ant-BINZIP.txt b/notices/ant-BINZIP.txt
new file mode 100644
index 0000000000..2d205c3fad
--- /dev/null
+++ b/notices/ant-BINZIP.txt
@@ -0,0 +1,4 @@
+This product bundles the Apache Ant jars (ant.apache.org)
+which are available under the terms of the Apache License 2.0
+The <sync> task is based on code Copyright (c) 2002, Landmark
+Graphics Corp that has been kindly donated to the Apache Software Foundation.
diff --git a/notices/ivy-BINZIP.txt b/notices/ivy-BINZIP.txt
new file mode 100644
index 0000000000..ceaee1e595
--- /dev/null
+++ b/notices/ivy-BINZIP.txt
@@ -0,0 +1,7 @@
+This product bundles the Apache Ivy jar (ant.apache.org/ivy)
+which is available under the terms of the Apache License 2.0
+Portions of Ivy were originally developed at Jayasoft SARL (jayasoft.fr)
+and are licensed to the Apache Software Foundation under the
+"Software Grant License Agreement"
+The Scp class is based on the SCPClient from the ganymed ssh library,
+which has a BSD style license.
diff --git a/notices/jackson-BINZIP.txt b/notices/jackson-BINZIP.txt
new file mode 100644
index 0000000000..9eb1eea9e2
--- /dev/null
+++ b/notices/jackson-BINZIP.txt
@@ -0,0 +1,3 @@
+This product bundles several Jackson jars (github.com/FasterXML/jackson)
+Copyright 2007-, Tatu Saloranta (tatu.saloranta@iki.fi)
+which are available under the terms of the Apache License 2.0
diff --git a/notices/plexus-BINZIP.txt b/notices/plexus-BINZIP.txt
new file mode 100644
index 0000000000..23ad4843a4
--- /dev/null
+++ b/notices/plexus-BINZIP.txt
@@ -0,0 +1,4 @@
+This product bundles the plexus-utils and plexus-xml jars (codehaus-plexus.github.io)
+which are available under the terms of the Apache License 2.0
+They include software developed by the Indiana University Extreme! Lab
+(extreme.indiana.edu), ThoughtWorks (thoughtworks.com) and javolution (javolution.org).
(groovy) 02/06: minor refactor: remove legacy license files
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk-asert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 760775b68011eacdb01f3028ad50ae419f90b49c
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Aug 24 21:02:42 2026 +1000
minor refactor: remove legacy license files
---
licenses/activation-license.txt | 286 ---------------------
.../normalize-stylesheet-groovy-docgenerator.txt | 25 --
2 files changed, 311 deletions(-)
diff --git a/licenses/activation-license.txt b/licenses/activation-license.txt
deleted file mode 100644
index deeda61090..0000000000
--- a/licenses/activation-license.txt
+++ /dev/null
@@ -1,286 +0,0 @@
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-1. Definitions.
-
-1.1. Contributor means each individual or entity that creates or contributes to
-the creation of Modifications.
-
-1.2. Contributor Version means the combination of the Original Software, prior
-Modifications used by a Contributor (if any), and the Modifications made by
-that particular Contributor.
-
-1.3. Covered Software means (a) the Original Software, or (b) Modifications, or
-(c) the combination of files containing Original Software with files containing
-Modifications, in each case including portions thereof.
-
-1.4. Executable means the Covered Software in any form other than Source Code.
-
-1.5. Initial Developer means the individual or entity that first makes Original
-Software available under this License.
-
-1.6. Larger Work means a work which combines Covered Software or portions
-thereof with code not governed by the terms of this License.
-
-1.7. License means this document.
-
-1.8. Licensable means having the right to grant, to the maximum extent
-possible, whether at the time of the initial grant or subsequently acquired,
-any and all of the rights conveyed herein.
-
-1.9. Modifications means the Source Code and Executable form of any of the
-following: A. Any file that results from an addition to, deletion from or
-modification of the contents of a file containing Original Software or previous
-Modifications; B. Any new file that contains any part of the Original Software
-or previous Modification; or C. Any new file that is contributed or otherwise
-made available under the terms of this License.
-
-1.10. Original Software means the Source Code and Executable form of computer
-software code that is originally released under this License.
-
-1.11. Patent Claims means any patent claim(s), now owned or hereafter acquired,
-including without limitation, method, process, and apparatus claims, in any
-patent Licensable by grantor.
-
-1.12. Source Code means (a) the common form of computer software code in which
-modifications are made and (b) associated documentation included in or with
-such code.
-
-1.13. You (or Your) means an individual or a legal entity exercising rights
-under, and complying with all of the terms of, this License. For legal
-entities, You includes any entity which controls, is controlled by, or is under
-common control with You. For purposes of this definition, control means (a) the
-power, direct or indirect, to cause the direction or management of such entity,
-whether by contract or otherwise, or (b) ownership of more than fifty percent
-(50%) of the outstanding shares or beneficial ownership of such entity.
-
-2. License Grants.
-
-2.1. The Initial Developer Grant. Conditioned upon Your compliance with Section
-3.1 below and subject to third party intellectual property claims, the Initial
-Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-Licensable by Initial Developer, to use, reproduce, modify, display, perform,
-sublicense and distribute the Original Software (or portions thereof), with or
-without Modifications, and/or as part of a Larger Work; and
-
-(b) under Patent Claims infringed by the making, using or selling of Original
-Software, to make, have made, use, practice, sell, and offer for sale, and/or
-otherwise dispose of the Original Software (or portions thereof);
-
-(c) The licenses granted in Sections 2.1(a) and (b) are effective on the date
-Initial Developer first distributes or otherwise makes the Original Software
-available to a third party under the terms of this License;
-
-(d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for
-code that You delete from the Original Software, or (2) for infringements
-caused by: (i) the modification of the Original Software, or (ii) the
-combination of the Original Software with other software or devices.
-
-2.2. Contributor Grant. Conditioned upon Your compliance with Section 3.1 below
-and subject to third party intellectual property claims, each Contributor
-hereby grants You a world-wide, royalty-free, non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-Licensable by Contributor to use, reproduce, modify, display, perform,
-sublicense and distribute the Modifications created by such Contributor (or
-portions thereof), either on an unmodified basis, with other Modifications, as
-Covered Software and/or as part of a Larger Work; and
-
-(b) under Patent Claims infringed by the making, using, or selling of
-Modifications made by that Contributor either alone and/or in combination with
-its Contributor Version (or portions of such combination), to make, use, sell,
-offer for sale, have made, and/or otherwise dispose of: (1) Modifications made
-by that Contributor (or portions thereof); and (2) the combination of
-Modifications made by that Contributor with its Contributor Version (or
-portions of such combination).
-
-(c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the
-date Contributor first distributes or otherwise makes the Modifications
-available to a third party.
-
-(d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for
-any code that Contributor has deleted from the Contributor Version; (2) for
-infringements caused by: (i) third party modifications of Contributor Version,
-or (ii) the combination of Modifications made by that Contributor with other
-software (except as part of the Contributor Version) or other devices; or (3)
-under Patent Claims infringed by Covered Software in the absence of
-Modifications made by that Contributor.
-
-3. Distribution Obligations.
-
-3.1. Availability of Source Code. Any Covered Software that You distribute or
-otherwise make available in Executable form must also be made available in
-Source Code form and that Source Code form must be distributed only under the
-terms of this License. You must include a copy of this License with every copy
-of the Source Code form of the Covered Software You distribute or otherwise
-make available. You must inform recipients of any such Covered Software in
-Executable form as to how they can obtain such Covered Software in Source Code
-form in a reasonable manner on or through a medium customarily used for
-software exchange.
-
-3.2. Modifications. The Modifications that You create or to which You
-contribute are governed by the terms of this License. You represent that You
-believe Your Modifications are Your original creation(s) and/or You have
-sufficient rights to grant the rights conveyed by this License.
-
-3.3. Required Notices. You must include a notice in each of Your Modifications
-that identifies You as the Contributor of the Modification. You may not remove
-or alter any copyright, patent or trademark notices contained within the
-Covered Software, or any notices of licensing or any descriptive text giving
-attribution to any Contributor or the Initial Developer.
-
-3.4. Application of Additional Terms. You may not offer or impose any terms on
-any Covered Software in Source Code form that alters or restricts the
-applicable version of this License or the recipients rights hereunder. You may
-choose to offer, and to charge a fee for, warranty, support, indemnity or
-liability obligations to one or more recipients of Covered Software. However,
-you may do so only on Your own behalf, and not on behalf of the Initial
-Developer or any Contributor. You must make it absolutely clear that any such
-warranty, support, indemnity or liability obligation is offered by You alone,
-and You hereby agree to indemnify the Initial Developer and every Contributor
-for any liability incurred by the Initial Developer or such Contributor as a
-result of warranty, support, indemnity or liability terms You offer.
-
-3.5. Distribution of Executable Versions. You may distribute the Executable
-form of the Covered Software under the terms of this License or under the terms
-of a license of Your choice, which may contain terms different from this
-License, provided that You are in compliance with the terms of this License and
-that the license for the Executable form does not attempt to limit or alter the
-recipients rights in the Source Code form from the rights set forth in this
-License. If You distribute the Covered Software in Executable form under a
-different license, You must make it absolutely clear that any terms which
-differ from this License are offered by You alone, not by the Initial Developer
-or Contributor. You hereby agree to indemnify the Initial Developer and every
-Contributor for any liability incurred by the Initial Developer or such
-Contributor as a result of any such terms You offer.
-
-3.6. Larger Works. You may create a Larger Work by combining Covered Software
-with other code not governed by the terms of this License and distribute the
-Larger Work as a single product. In such a case, You must make sure the
-requirements of this License are fulfilled for the Covered Software.
-
-4. Versions of the License.
-
-4.1. New Versions. Sun Microsystems, Inc. is the initial license steward and
-may publish revised and/or new versions of this License from time to time. Each
-version will be given a distinguishing version number. Except as provided in
-Section 4.3, no one other than the license steward has the right to modify this
-License.
-
-4.2. Effect of New Versions. You may always continue to use, distribute or
-otherwise make the Covered Software available under the terms of the version of
-the License under which You originally received the Covered Software. If the
-Initial Developer includes a notice in the Original Software prohibiting it
-from being distributed or otherwise made available under any subsequent version
-of the License, You must distribute and make the Covered Software available
-under the terms of the version of the License under which You originally
-received the Covered Software. Otherwise, You may also choose to use,
-distribute or otherwise make the Covered Software available under the terms of
-any subsequent version of the License published by the license steward.
-
-4.3. Modified Versions. When You are an Initial Developer and You want to
-create a new license for Your Original Software, You may create and use a
-modified version of this License if You: (a) rename the license and remove any
-references to the name of the license steward (except to note that the license
-differs from this License); and (b) otherwise make it clear that the license
-contains terms which differ from this License.
-
-5. DISCLAIMER OF WARRANTY. COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON
-AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
-DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE
-ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH
-YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
-ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED
-HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-6. TERMINATION.
-
-6.1. This License and the rights granted hereunder will terminate automatically
-if You fail to comply with terms herein and fail to cure such breach within 30
-days of becoming aware of the breach. Provisions which, by their nature, must
-remain in effect beyond the termination of this License shall survive.
-
-6.2. If You assert a patent infringement claim (excluding declaratory judgment
-actions) against Initial Developer or a Contributor (the Initial Developer or
-Contributor against whom You assert such claim is referred to as Participant)
-alleging that the Participant Software (meaning the Contributor Version where
-the Participant is a Contributor or the Original Software where the Participant
-is the Initial Developer) directly or indirectly infringes any patent, then any
-and all rights granted directly or indirectly to You by such Participant, the
-Initial Developer (if the Initial Developer is not the Participant) and all
-Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
-notice from Participant terminate prospectively and automatically at the
-expiration of such 60 day notice period, unless if within such 60 day period
-You withdraw Your claim with respect to the Participant Software against such
-Participant either unilaterally or pursuant to a written agreement with
-Participant.
-
-6.3. In the event of termination under Sections 6.1 or 6.2 above, all end user
-licenses that have been validly granted by You or any distributor hereunder
-prior to termination (excluding licenses granted to You by any distributor)
-shall survive termination.
-
-7. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY,
-WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED
-SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER
-INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
-DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
-POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO
-LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTYS NEGLIGENCE TO
-THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT
-ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-8. U.S. GOVERNMENT END USERS. The Covered Software is a commercial item, as
-that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of commercial
-computer software (as that term is defined at 48 C.F.R. 252.227-7014(a)(1)) and
-commercial computer software documentation as such terms are used in 48 C.F.R.
-12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered
-Software with only those rights set forth herein. This U.S. Government Rights
-clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or
-provision that addresses Government rights in computer software under this
-License.
-
-9. MISCELLANEOUS. This License represents the complete agreement concerning
-subject matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent necessary to
-make it enforceable. This License shall be governed by the law of the
-jurisdiction specified in a notice contained within the Original Software
-(except to the extent applicable law, if any, provides otherwise), excluding
-such jurisdictions conflict-of-law provisions. Any litigation relating to this
-License shall be subject to the jurisdiction of the courts located in the
-jurisdiction and venue specified in a notice contained within the Original
-Software, with the losing party responsible for costs, including, without
-limitation, court costs and reasonable attorneys fees and expenses. The
-application of the United Nations Convention on Contracts for the International
-Sale of Goods is expressly excluded. Any law or regulation which provides that
-the language of a contract shall be construed against the drafter shall not
-apply to this License. You agree that You alone are responsible for compliance
-with the United States export administration regulations (and the export
-control laws and regulation of any other countries) when You use, distribute or
-otherwise make available any Covered Software.
-
-10. RESPONSIBILITY FOR CLAIMS. As between Initial Developer and the
-Contributors, each party is responsible for claims and damages arising,
-directly or indirectly, out of its utilization of rights under this License and
-You agree to work with Initial Developer and Contributors to distribute such
-responsibility on an equitable basis. Nothing herein is intended or shall be
-deemed to constitute any admission of liability.
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE
-(CDDL)
-
-For Covered Software in this distribution, this License shall be governed by
-the laws of the State of California (excluding conflict-of-law provisions).
-
-Any litigation relating to this License shall be subject to the jurisdiction of
-the Federal Courts of the Northern District of California and the state courts
-of the State of California, with venue lying in Santa Clara County, California.
diff --git a/licenses/normalize-stylesheet-groovy-docgenerator.txt b/licenses/normalize-stylesheet-groovy-docgenerator.txt
deleted file mode 100644
index d0a61331be..0000000000
--- a/licenses/normalize-stylesheet-groovy-docgenerator.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-NORMALIZE.CSS LICENSE
-
-The following file is used with documentation:
-
- org/codehaus/groovy/tools/stylesheet.css
-
-Copyright (c) Nicolas Gallagher and Jonathan Neal
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
(groovy) 04/06: minor refactor: tweak license details for allsrc jar file
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk-asert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 94af75b37a6f096f0425299bcf8f005357afc27a
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Aug 24 21:24:55 2026 +1000
minor refactor: tweak license details for allsrc jar file
---
.../src/main/groovy/org.apache.groovy-base.gradle | 11 +-
.../groovy/org.apache.groovy-doc-aggregator.gradle | 14 +-
gradle/licenses.gradle | 22 +-
licenses/LICENSE-ALLSRCJAR | 242 +++++++++++++++++++++
licenses/readme.txt | 8 +-
notices/NOTICE-SRCJAR | 13 ++
notices/readme.txt | 13 +-
7 files changed, 307 insertions(+), 16 deletions(-)
diff --git a/build-logic/src/main/groovy/org.apache.groovy-base.gradle b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
index c32be020a2..0ccdb7ca26 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-base.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
@@ -169,8 +169,11 @@ tasks.withType(Jar).configureEach { jar ->
metaInf {
// the root project's main jar provides its own JARJAR license/notice in its jar task
if (jar.name in ['jar', 'sourcesJar'] && !(jar.name == 'jar' && project == rootProject)) {
+ // the root project's LICENSE/NOTICE cover the whole source zip, which ships
+ // documentation assets the core sources jar does not; give it the plain pair
+ def rootSourcesJar = jar.name == 'sourcesJar' && project == rootProject
def licenseFile = file("${projectDir}/LICENSE")
- if (licenseFile.exists()) {
+ if (licenseFile.exists() && !rootSourcesJar) {
from licenseFile
} else {
licenseFile = file("${rootProject.projectDir}/licenses/LICENSE-BASE")
@@ -178,7 +181,11 @@ tasks.withType(Jar).configureEach { jar ->
rename 'LICENSE-BASE', 'LICENSE'
}
}
- if (file("${projectDir}/NOTICE").exists()) {
+ if (rootSourcesJar) {
+ from("${rootProject.projectDir}/notices/NOTICE-SRCJAR") {
+ rename 'NOTICE-SRCJAR', 'NOTICE'
+ }
+ } else if (file("${projectDir}/NOTICE").exists()) {
from "${projectDir}/NOTICE"
} else {
from("${rootProject.projectDir}/notices/NOTICE-BASE") {
diff --git a/build-logic/src/main/groovy/org.apache.groovy-doc-aggregator.gradle b/build-logic/src/main/groovy/org.apache.groovy-doc-aggregator.gradle
index 860ead3692..d6a6539784 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-doc-aggregator.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-doc-aggregator.gradle
@@ -69,13 +69,17 @@ def sourcesAllJar = tasks.register("sourcesAllJar", Jar) {
from configurations.allSources
archiveClassifier = 'sources'
metaInf {
- // the aggregated sources include the third-party-derived source files
- // covered by the source distribution's LICENSE and NOTICE
- from rootProject.file('LICENSE')
- from rootProject.file('NOTICE')
+ // the aggregated sources carry the jline3- and jsr223-derived source files, but
+ // not the documentation assets the source zip's own LICENSE/NOTICE also cover
+ from(rootProject.file('licenses/LICENSE-ALLSRCJAR')) {
+ rename 'LICENSE-ALLSRCJAR', 'LICENSE'
+ }
+ from(rootProject.file('notices/NOTICE-SRCJAR')) {
+ rename 'NOTICE-SRCJAR', 'NOTICE'
+ }
// that LICENSE points at licenses/*.txt; ship those texts
into('licenses') {
- from project.ext.licensePointerTexts(rootProject.file('LICENSE'))
+ from project.ext.licensePointerTexts(rootProject.file('licenses/LICENSE-ALLSRCJAR'))
}
}
}
diff --git a/gradle/licenses.gradle b/gradle/licenses.gradle
index e8dde29f2a..ade9a8c5dd 100644
--- a/gradle/licenses.gradle
+++ b/gradle/licenses.gradle
@@ -30,10 +30,12 @@ tasks.register('updateLicenses') {
ext.licenseDocFile = "${licensesDir}/LICENSE-DOC"
ext.licenseDocsJarFile = "${licensesDir}/LICENSE-DOCSJAR"
ext.licenseJarJarFile = "${licensesDir}/LICENSE-JARJAR"
+ ext.licenseAllSrcJarFile = "${licensesDir}/LICENSE-ALLSRCJAR"
ext.licenseSdkFile = "${licensesDir}/LICENSE-SDK"
inputs.files(licenseBaseFile, fileTree(licensesDir).include('*.txt'))
outputs.files(licenseBinZipFile, licenseDocFile, licenseDocsJarFile, licenseJarJarFile,
- licenseSrcFile, licenseGroovyDocFile, licenseJsr223File, licenseSdkFile)
+ licenseAllSrcJarFile, licenseSrcFile, licenseGroovyDocFile, licenseJsr223File,
+ licenseSdkFile)
doLast {
def srcFiles = fileTree(licensesDir).include('*-SRC*.txt').sort { it.name }
@@ -55,12 +57,19 @@ tasks.register('updateLicenses') {
}.sort { it.name }
def jsr223Files = fileTree(licensesDir).include('jsr223-BINZIP-SRC.txt')
def jline3Files = fileTree(licensesDir).include('jline3-BINZIP-SRC.txt')
+ // for the aggregated sources jar, which carries the jline3- and jsr223-derived
+ // source files but none of the documentation assets the source zip also ships
+ def allSrcJarFiles = fileTree(licensesDir) {
+ include 'jline3-BINZIP-SRC.txt'
+ include 'jsr223-BINZIP-SRC.txt'
+ }.sort { it.name }
def licenseHdr = '\n\n------------------------------------------------------------------------\n\n'
[
(licenseBinZipFile) : binzipFiles,
(licenseDocFile) : docFiles,
(licenseDocsJarFile) : docsJarFiles,
(licenseJarJarFile) : jarjarFiles,
+ (licenseAllSrcJarFile) : allSrcJarFiles,
(licenseSrcFile) : srcFiles,
(licenseGroovyDocFile) : groovydocFiles,
(licenseJsr223File) : jsr223Files,
@@ -93,10 +102,12 @@ tasks.register('updateNotices') {
ext.noticeGrooidFile = "${noticesDir}/NOTICE-GROOID"
ext.noticeGrooidJarJarFile = "${noticesDir}/NOTICE-GROOIDJARJAR"
ext.noticeJarJarFile = "${noticesDir}/NOTICE-JARJAR"
+ ext.noticeSrcJarFile = "${noticesDir}/NOTICE-SRCJAR"
ext.noticeSdkFile = "${noticesDir}/NOTICE-SDK"
inputs.files(noticeBaseFile, fileTree(noticesDir).include('*.txt'))
outputs.files(noticeBinZipFile, noticeGrooidFile, noticeGrooidJarJarFile,
- noticeJarJarFile, noticeSrcFile, noticeGroovyConsoleFile, noticeSdkFile)
+ noticeJarJarFile, noticeSrcJarFile, noticeSrcFile, noticeGroovyConsoleFile,
+ noticeSdkFile)
doLast {
def srcFiles = fileTree(noticesDir).include('*-SRC*.txt').sort { it.name }
@@ -111,11 +122,18 @@ tasks.register('updateNotices') {
include '*-GROOID*.txt'
include '*-BINZIP*.txt'
}.sort { it.name }
+ // for the sources jars, which carry the third-party-derived source files but
+ // none of the documentation assets the source zip also ships
+ def srcJarFiles = fileTree(noticesDir) {
+ include 'concurrentlinkedhashmap-SRC.txt'
+ include 'concurrentreferencehashmap-SRC.txt'
+ }.sort { it.name }
[
(noticeBinZipFile) : binzipFiles,
(noticeGrooidFile) : grooidFiles,
(noticeGrooidJarJarFile) : grooidJarjarFiles,
(noticeJarJarFile) : jarjarFiles,
+ (noticeSrcJarFile) : srcJarFiles,
(noticeSrcFile) : srcFiles,
(noticeGroovyConsoleFile): files(),
].each { outFile, inFiles ->
diff --git a/licenses/LICENSE-ALLSRCJAR b/licenses/LICENSE-ALLSRCJAR
new file mode 100644
index 0000000000..37cdaec184
--- /dev/null
+++ b/licenses/LICENSE-ALLSRCJAR
@@ -0,0 +1,242 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+------------------------------------------------------------------------
+
+JLine3 License
+
+The following source files within this product:
+
+ org/apache/groovy/groovysh/jline/GroovyEngine.java
+ org/apache/groovy/groovysh/jline/ObjectInspector.groovy
+ org/apache/groovy/groovysh/jline/Utils.groovy
+ org/apache/groovy/groovysh/jline/JrtJavaBasePackages.java
+ org/apache/groovy/groovysh/jline/PackageHelper.java
+
+were derived from similarly named files in the JLine3 source repository which
+have a BSD-style license.
+
+Some parts of the source code from:
+
+ org/apache/groovy/groovysh/jline/GroovyPosixCommands.java
+
+were derived from the JLine3 PosixCommands class.
+
+Details can be found in: licenses/jline3-license.txt
+
+This product bundles several JLine3 jars (optional dependency used with groovysh),
+which are available under a BSD License. For details, see licenses/jline3-license.txt.
+
+------------------------------------------------------------------------
+
+JSR223 License
+
+The following classes within this product:
+
+ org.codehaus.groovy.jsr223.GroovyCompiledScript
+ org.codehaus.groovy.jsr223.GroovyScriptEngineFactory
+ org.codehaus.groovy.jsr223.GroovyScriptEngineImpl
+
+were derived from reference implementation files developed by Sun in
+collaboration with the Groovy community. The reference implementation
+has a BSD-style license. Details can be found in: licenses/jsr223-license.txt
diff --git a/licenses/readme.txt b/licenses/readme.txt
index 7145acfc5f..d0d7cc3dbd 100644
--- a/licenses/readme.txt
+++ b/licenses/readme.txt
@@ -1,17 +1,19 @@
This directory contains generated LICENSE files and snippets used to generate those files.
See the gradle/licenses.gradle file (updateLicenses task) for details on how this is done.
Every generated file starts with LICENSE-BASE followed by its snippets.
-
Snippets have predefined suffix values in their name to determine which files they go into.
LICENSE (the one for source), LICENSE-DOC and LICENSE-JARJAR
get snippets containing SRC, DOC and JARJAR respectively.
LICENSE-BINZIP gets JARJAR and BINZIP snippets.
LICENSE-SDK is LICENSE-BINZIP plus a pointer to the embedded src and doc zips.
LICENSE-DOCSJAR is used as META-INF/LICENSE for the groovydoc classifier jars.
-
+LICENSE-ALLSRCJAR is used for the aggregated sources jar, which carries the
+third-party-derived source files but not the documentation assets the source
+zip also ships; the core sources jar gets plain LICENSE-BASE for the same reason.
In addition, LICENSE files are generated for these subprojects:
groovy-groovydoc, groovy-groovysh, groovy-jsr223
-Those three, and LICENSE-DOCSJAR, name their snippets explicitly rather than by suffix.
+Those three, LICENSE-DOCSJAR and LICENSE-ALLSRCJAR name their snippets explicitly
+rather than by suffix.
The *-license.txt files are the full third-party license texts that the snippets
point at. They are not merged into the generated files; the distributions copy them
into a licenses/ directory instead, so the include lists in
diff --git a/notices/NOTICE-SRCJAR b/notices/NOTICE-SRCJAR
new file mode 100644
index 0000000000..707f4610e4
--- /dev/null
+++ b/notices/NOTICE-SRCJAR
@@ -0,0 +1,13 @@
+Apache Groovy
+Copyright 2003-2026 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+The Java source files in src/main/java/org/apache/groovy/util/concurrent/concurrentlinkedhashmap/
+are from https://github.com/ben-manes/concurrentlinkedhashmap and the following notice applies:
+Copyright 2010-2012 Google Inc. All Rights Reserved.
+
+The Java source file src/main/java/org/apache/groovy/util/concurrent/ConcurrentReferenceHashMap
+is from https://github.com/hazelcast/hazelcast and the following notice applies:
+Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/notices/readme.txt b/notices/readme.txt
index a207e760cd..c8a372f009 100644
--- a/notices/readme.txt
+++ b/notices/readme.txt
@@ -1,9 +1,14 @@
This directory contains generated NOTICE files and snippets used to generate those files.
-See the assemble.gradle file (updateNotices task) for details on how this is done.
+See the gradle/licenses.gradle file (updateNotices task) for details on how this is done.
Snippets have predefined suffix values in their name to determine which files they go into.
-NOTICE (the one for source), NOTICE-DOC, NOTICE-GROOID and NOTICE-JARJAR
-get snippets containing SRC, DOC, GROOID and JARJAR respectively.
+NOTICE (the one for source), NOTICE-GROOID and NOTICE-JARJAR
+get snippets containing SRC, GROOID and JARJAR respectively.
+The doc zip uses NOTICE-BASE as-is; there is no generated NOTICE-DOC.
NOTICE-GROOIDJARJAR gets JARJAR and GROOID snippets.
NOTICE-BINZIP gets GROOID, JARJAR and BINZIP snippets.
+NOTICE-SDK is NOTICE-BINZIP plus a pointer to the embedded src and doc zips.
+NOTICE-SRCJAR is used for the sources jars, which carry the third-party-derived
+source files but not the documentation assets the source zip also ships; it names
+its snippets explicitly rather than by suffix.
In addition, NOTICE files are generated for these subprojects:
-groovy-console
\ No newline at end of file
+groovy-console
(groovy) 01/06: minor refactor: remove legacy license and doco tweaks
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk-asert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit ed23cd59779d9f4f63aeeb243e5a34badcfba485
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Aug 24 21:00:01 2026 +1000
minor refactor: remove legacy license and doco tweaks
---
licenses/LICENSE-BINZIP | 8 --------
licenses/LICENSE-SDK | 8 --------
licenses/jsr166y-BINZIP.txt | 5 -----
licenses/jsr166y-license.txt | 26 --------------------------
licenses/readme.txt | 15 +++++++++++++--
subprojects/groovy-binary/build.gradle | 1 -
6 files changed, 13 insertions(+), 50 deletions(-)
diff --git a/licenses/LICENSE-BINZIP b/licenses/LICENSE-BINZIP
index f2ae064433..e945dbb540 100644
--- a/licenses/LICENSE-BINZIP
+++ b/licenses/LICENSE-BINZIP
@@ -273,14 +273,6 @@ MIT License. For details, see licenses/jquery-js-license.txt.
------------------------------------------------------------------------
-JSR166y License (optionally used by the optional GPars dependency)
-
-This product bundles the jsr166y jar (containing works from
-the JSR-166 EG, Doug Lea, and Jason T. Greene) made available in
-the public domain. For details, see licenses/jsr166y-license.txt.
-
-------------------------------------------------------------------------
-
JSR223 License
The following classes within this product:
diff --git a/licenses/LICENSE-SDK b/licenses/LICENSE-SDK
index 25c2ea8b2c..7aed8b9f4e 100644
--- a/licenses/LICENSE-SDK
+++ b/licenses/LICENSE-SDK
@@ -273,14 +273,6 @@ MIT License. For details, see licenses/jquery-js-license.txt.
------------------------------------------------------------------------
-JSR166y License (optionally used by the optional GPars dependency)
-
-This product bundles the jsr166y jar (containing works from
-the JSR-166 EG, Doug Lea, and Jason T. Greene) made available in
-the public domain. For details, see licenses/jsr166y-license.txt.
-
-------------------------------------------------------------------------
-
JSR223 License
The following classes within this product:
diff --git a/licenses/jsr166y-BINZIP.txt b/licenses/jsr166y-BINZIP.txt
deleted file mode 100644
index f4ffd079b2..0000000000
--- a/licenses/jsr166y-BINZIP.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-JSR166y License (optionally used by the optional GPars dependency)
-
-This product bundles the jsr166y jar (containing works from
-the JSR-166 EG, Doug Lea, and Jason T. Greene) made available in
-the public domain. For details, see licenses/jsr166y-license.txt.
diff --git a/licenses/jsr166y-license.txt b/licenses/jsr166y-license.txt
deleted file mode 100644
index b1c292b54c..0000000000
--- a/licenses/jsr166y-license.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-The person or persons who have associated work with this document (the
-"Dedicator" or "Certifier") hereby either (a) certifies that, to the best of
-his knowledge, the work of authorship identified is in the public domain of
-the country from which the work is published, or (b) hereby dedicates whatever
-copyright the dedicators holds in the work of authorship identified below (the
-"Work") to the public domain. A certifier, moreover, dedicates any copyright
-interest he may have in the associated work, and for these purposes, is
-described as a "dedicator" below.
-
-A certifier has taken reasonable steps to verify the copyright status of this
-work. Certifier recognizes that his good faith efforts may not shield him from
-liability if in fact the work certified is not in the public domain.
-
-Dedicator makes this dedication for the benefit of the public at large and to
-the detriment of the Dedicator's heirs and successors. Dedicator intends this
-dedication to be an overt act of relinquishment in perpetuity of all present
-and future rights under copyright law, whether vested or contingent, in the
-Work. Dedicator understands that such relinquishment of all rights includes
-the relinquishment of all rights to enforce (by lawsuit or otherwise) those
-copyrights in the Work.
-
-Dedicator recognizes that, once placed in the public domain, the Work may be
-freely reproduced, distributed, transmitted, used, modified, built upon, or
-otherwise exploited by anyone for any purpose, commercial or non-commercial,
-and in any way, including by methods that have not yet been invented or
-conceived.
diff --git a/licenses/readme.txt b/licenses/readme.txt
index 8576c8eccb..7145acfc5f 100644
--- a/licenses/readme.txt
+++ b/licenses/readme.txt
@@ -1,8 +1,19 @@
This directory contains generated LICENSE files and snippets used to generate those files.
-See the assemble.gradle file (updateLicenses task) for details on how this is done.
+See the gradle/licenses.gradle file (updateLicenses task) for details on how this is done.
+Every generated file starts with LICENSE-BASE followed by its snippets.
+
Snippets have predefined suffix values in their name to determine which files they go into.
LICENSE (the one for source), LICENSE-DOC and LICENSE-JARJAR
get snippets containing SRC, DOC and JARJAR respectively.
LICENSE-BINZIP gets JARJAR and BINZIP snippets.
+LICENSE-SDK is LICENSE-BINZIP plus a pointer to the embedded src and doc zips.
+LICENSE-DOCSJAR is used as META-INF/LICENSE for the groovydoc classifier jars.
+
In addition, LICENSE files are generated for these subprojects:
-groovy-docgenerator, groovy-groovydoc, groovy-groovysh, groovy-jsr223
\ No newline at end of file
+groovy-groovydoc, groovy-groovysh, groovy-jsr223
+Those three, and LICENSE-DOCSJAR, name their snippets explicitly rather than by suffix.
+The *-license.txt files are the full third-party license texts that the snippets
+point at. They are not merged into the generated files; the distributions copy them
+into a licenses/ directory instead, so the include lists in
+subprojects/groovy-binary/build.gradle must stay in sync with the licenses/*.txt
+files referenced from LICENSE-BINZIP and LICENSE-DOC.
diff --git a/subprojects/groovy-binary/build.gradle b/subprojects/groovy-binary/build.gradle
index 60f02f3493..91e6fc1fc8 100644
--- a/subprojects/groovy-binary/build.gradle
+++ b/subprojects/groovy-binary/build.gradle
@@ -125,7 +125,6 @@ distribution {
include 'hamcrest-license.txt'
include 'jline3-license.txt'
include 'jquery-js-license.txt'
- include 'jsr166y-license.txt'
include 'jsr223-license.txt'
include 'jsvg-license.txt'
include 'junit4-license.txt'
(groovy) 03/06: minor refactor: tweak license details for src jar files
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk-asert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 0ae7a97cd7d4a1bf9e4e8d8dec234bd3fc533647
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Aug 24 21:12:58 2026 +1000
minor refactor: tweak license details for src jar files
---
.../src/main/groovy/org.apache.groovy-base.gradle | 16 +++++++++++-----
.../src/main/groovy/org.apache.groovy-common.gradle | 20 ++++++++++++++++++++
.../groovy/org.apache.groovy-doc-aggregator.gradle | 7 +++++--
build.gradle | 7 +++----
4 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/build-logic/src/main/groovy/org.apache.groovy-base.gradle b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
index 8c4cc8e81c..c32be020a2 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-base.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
@@ -165,13 +165,16 @@ tasks.withType(Jar).configureEach { jar ->
if (jar instanceof RepackageJarTask) {
return
}
+ def licenseTexts = project.ext.licensePointerTexts
metaInf {
// the root project's main jar provides its own JARJAR license/notice in its jar task
if (jar.name in ['jar', 'sourcesJar'] && !(jar.name == 'jar' && project == rootProject)) {
- if (file("${projectDir}/LICENSE").exists()) {
- from "${projectDir}/LICENSE"
+ def licenseFile = file("${projectDir}/LICENSE")
+ if (licenseFile.exists()) {
+ from licenseFile
} else {
- from("${rootProject.projectDir}/licenses/LICENSE-BASE") {
+ licenseFile = file("${rootProject.projectDir}/licenses/LICENSE-BASE")
+ from(licenseFile) {
rename 'LICENSE-BASE', 'LICENSE'
}
}
@@ -182,6 +185,10 @@ tasks.withType(Jar).configureEach { jar ->
rename 'NOTICE-BASE', 'NOTICE'
}
}
+ // the generated subproject LICENSE files point at licenses/*.txt; ship those texts
+ into('licenses') {
+ from licenseTexts(licenseFile)
+ }
} else if (jar.name == 'groovydocJar') {
// generated groovydoc bundles prism assets and a normalize-derived stylesheet
from("${rootProject.projectDir}/licenses/LICENSE-DOCSJAR") {
@@ -191,8 +198,7 @@ tasks.withType(Jar).configureEach { jar ->
rename 'NOTICE-BASE', 'NOTICE'
}
into('licenses') {
- from "${rootProject.projectDir}/licenses/normalize-stylesheet-license.txt"
- from "${rootProject.projectDir}/licenses/prism-license.txt"
+ from licenseTexts("${rootProject.projectDir}/licenses/LICENSE-DOCSJAR")
}
} else if (jar.name == 'javadocJar') {
// javadoc output bundles the JDK tool's own JS libraries (jquery etc.)
diff --git a/build-logic/src/main/groovy/org.apache.groovy-common.gradle b/build-logic/src/main/groovy/org.apache.groovy-common.gradle
index 0273361060..c26ca6f9c9 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-common.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-common.gradle
@@ -73,3 +73,23 @@ tasks.named('rat') {
'.jqwik-database'
]
}
+
+// ASF release policy requires each bundled component's license to be either appended
+// to LICENSE or stored in the package with a pointer to it from LICENSE. Groovy's
+// generated LICENSE files use pointers of the form "licenses/<name>.txt", so every
+// archive packaging one of them must also ship the texts it points at, or the pointer
+// dangles. Deriving that list from the LICENSE itself keeps the two from drifting.
+ext.licensePointerTexts = { licenseFile ->
+ def source = rootProject.file(licenseFile)
+ if (!source.isFile()) {
+ return []
+ }
+ def referenced = (source.text =~ /licenses\/([A-Za-z0-9._-]+\.txt)/).collect { it[1] }
+ (referenced.unique() - 'LICENSE-2.0.txt').collect { name ->
+ def text = rootProject.file("licenses/$name")
+ if (!text.isFile()) {
+ throw new GradleException("$source refers to licenses/$name, which does not exist")
+ }
+ text
+ }
+}
diff --git a/build-logic/src/main/groovy/org.apache.groovy-doc-aggregator.gradle b/build-logic/src/main/groovy/org.apache.groovy-doc-aggregator.gradle
index 7f1a460f30..860ead3692 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-doc-aggregator.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-doc-aggregator.gradle
@@ -73,6 +73,10 @@ def sourcesAllJar = tasks.register("sourcesAllJar", Jar) {
// covered by the source distribution's LICENSE and NOTICE
from rootProject.file('LICENSE')
from rootProject.file('NOTICE')
+ // that LICENSE points at licenses/*.txt; ship those texts
+ into('licenses') {
+ from project.ext.licensePointerTexts(rootProject.file('LICENSE'))
+ }
}
}
@@ -140,8 +144,7 @@ def groovydocAllJar = tasks.register("groovydocAllJar", Jar) {
rename 'NOTICE-BASE', 'NOTICE'
}
into('licenses') {
- from rootProject.file('licenses/normalize-stylesheet-license.txt')
- from rootProject.file('licenses/prism-license.txt')
+ from project.ext.licensePointerTexts(rootProject.file('licenses/LICENSE-DOCSJAR'))
}
}
}
diff --git a/build.gradle b/build.gradle
index 7129d8ee3d..eb31aa46df 100644
--- a/build.gradle
+++ b/build.gradle
@@ -185,10 +185,9 @@ allprojects {
tasks.named('jar') {
metaInf {
from("$projectDir/licenses/LICENSE-JARJAR")
- from("$projectDir/licenses") {
- into('licenses')
- include('asm-license.txt')
- include('antlr4-license.txt')
+ // LICENSE-JARJAR points at licenses/*.txt; ship those texts
+ into('licenses') {
+ from project.ext.licensePointerTexts("$projectDir/licenses/LICENSE-JARJAR")
}
from("$projectDir/notices/NOTICE-JARJAR")
rename '^([A-Z]+)-([^.]*)', '$1'