You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2023/04/28 08:24:16 UTC
[jmeter] branch master updated: chore: remove licenses of unused dependencies
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new 68fce9a2dd chore: remove licenses of unused dependencies
68fce9a2dd is described below
commit 68fce9a2dd14f3ca93c91b1cf74f78d19ac26bd9
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Fri Apr 28 11:23:38 2023 +0300
chore: remove licenses of unused dependencies
xpp3_min has been replaced with mxparser
checker-qual not includes the license
jxlayer is no longer used after one of darklaf updates
---
src/licenses/build.gradle.kts | 30 +++---
src/licenses/licenses/checker-qual/LICENSE | 20 ----
src/licenses/licenses/jxlayer/LICENSE | 28 -----
src/licenses/licenses/xpp3_min-1.1.4c/CC0-1.0.txt | 119 ----------------------
src/licenses/licenses/xpp3_min-1.1.4c/LICENSE.txt | 46 ---------
5 files changed, 13 insertions(+), 230 deletions(-)
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 02655d0735..9bcd571eec 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -117,11 +117,6 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
effectiveLicense = SpdxLicense.BSD_3_Clause
}
- overrideLicense("org.swinglabs:jxlayer") {
- // See https://repo1.maven.org/maven2/org/swinglabs/jxlayer/3.0.4/jxlayer-3.0.4-sources.jar
- effectiveLicense = SpdxLicense.BSD_3_Clause
- }
-
for (mig in listOf("com.miglayout:miglayout-core", "com.miglayout:miglayout-swing")) {
overrideLicense(mig) {
expectedLicense = SimpleLicense("BSD", uri("http://www.debian.org/misc/bsd.license"))
@@ -137,21 +132,20 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
}
}
- overrideLicense("xpp3:xpp3_min:1.1.4c") {
- // pom.xml contains multiple licenses
- expectedLicense = SpdxLicense.CC0_1_0 and
+ overrideLicense("org.reactivestreams:reactive-streams") {
+ expectedLicense =
SimpleLicense(
- "Indiana University Extreme! Lab Software License, vesion 1.1.1",
- uri("http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/LICENSE.txt")
+ "CC0",
+ uri("http://creativecommons.org/publicdomain/zero/1.0/")
)
- effectiveLicense = SpdxLicense.CC0_1_0 and ExtraLicense.Indiana_University_1_1_1
+ effectiveLicense = SpdxLicense.CC0_1_0
}
overrideLicense("org.brotli:dec:0.1.2") {
expectedLicense = SpdxLicense.MIT
}
- overrideLicense("org.slf4j:slf4j-api:1.7.30") {
+ overrideLicense("org.slf4j:slf4j-api") {
expectedLicense = SpdxLicense.MIT
}
@@ -181,10 +175,6 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
expectedLicense = SimpleLicense("Java HTML Tidy License", uri("http://jtidy.svn.sourceforge.net/viewvc/jtidy/trunk/jtidy/LICENSE.txt?revision=95"))
effectiveLicense = SpdxLicense.BSD_3_Clause
}
- // https://github.com/typetools/checker-framework/issues/2798
- overrideLicense("org.checkerframework:checker-qual:2.10.0") {
- expectedLicense = SpdxLicense.MIT
- }
}
val renderLicenseForSource by tasks.registering(Apache2LicenseRenderer::class) {
@@ -202,7 +192,13 @@ val renderLicenseForBinary by tasks.registering(Apache2LicenseRenderer::class) {
artifactType.set(ArtifactType.BINARY)
metadata.from(gatherSourceLicenses)
metadata.from(gatherBinaryLicenses)
- licenseCategory.put(ExtraLicense.Indiana_University_1_1_1.asExpression(), AsfLicenseCategory.A)
+ licenseCategory.put(
+ SimpleLicense(
+ "Indiana University Extreme! Lab Software License",
+ uri("https://raw.githubusercontent.com/x-stream/mxparser/master/LICENSE.txt")
+ ).expression,
+ AsfLicenseCategory.A
+ )
}
tasks.build.configure {
diff --git a/src/licenses/licenses/checker-qual/LICENSE b/src/licenses/licenses/checker-qual/LICENSE
deleted file mode 100644
index 5a4b90e2da..0000000000
--- a/src/licenses/licenses/checker-qual/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-The Checker Framework
-Copyright 2004-present by the Checker Framework developers
-
-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.
diff --git a/src/licenses/licenses/jxlayer/LICENSE b/src/licenses/licenses/jxlayer/LICENSE
deleted file mode 100644
index 64c6a33430..0000000000
--- a/src/licenses/licenses/jxlayer/LICENSE
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2006-2008, Alexander Potochkin
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
- * Neither the name of the JXLayer project nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/src/licenses/licenses/xpp3_min-1.1.4c/CC0-1.0.txt b/src/licenses/licenses/xpp3_min-1.1.4c/CC0-1.0.txt
deleted file mode 100644
index a343ccd433..0000000000
--- a/src/licenses/licenses/xpp3_min-1.1.4c/CC0-1.0.txt
+++ /dev/null
@@ -1,119 +0,0 @@
-Creative Commons Legal Code
-
-CC0 1.0 Universal CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES
-NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE
-AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION
-ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE
-OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS
-LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION
-OR WORKS PROVIDED HEREUNDER.
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer exclusive
-Copyright and Related Rights (defined below) upon the creator and subsequent
-owner(s) (each and all, an "owner") of an original work of authorship and/or
-a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for the
-purpose of contributing to a commons of creative, cultural and scientific
-works ("Commons") that the public can reliably and without fear of later claims
-of infringement build upon, modify, incorporate in other works, reuse and
-redistribute as freely as possible in any form whatsoever and for any purposes,
-including without limitation commercial purposes. These owners may contribute
-to the Commons to promote the ideal of a free culture and the further production
-of creative, cultural and scientific works, or to gain reputation or greater
-distribution for their Work in part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any expectation
-of additional consideration or compensation, the person associating CC0 with
-a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
-and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
-and publicly distribute the Work under its terms, with knowledge of his or
-her Copyright and Related Rights in the Work and the meaning and intended
-legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be protected
-by copyright and related or neighboring rights ("Copyright and Related Rights").
-Copyright and Related Rights include, but are not limited to, the following:
-
-i. the right to reproduce, adapt, distribute, perform, display, communicate,
-and translate a Work;
-
- ii. moral rights retained by the original author(s) and/or performer(s);
-
-iii. publicity and privacy rights pertaining to a person's image or likeness
-depicted in a Work;
-
-iv. rights protecting against unfair competition in regards to a Work, subject
-to the limitations in paragraph 4(a), below;
-
-v. rights protecting the extraction, dissemination, use and reuse of data
-in a Work;
-
-vi. database rights (such as those arising under Directive 96/9/EC of the
-European Parliament and of the Council of 11 March 1996 on the legal protection
-of databases, and under any national implementation thereof, including any
-amended or successor version of such directive); and
-
-vii. other similar, equivalent or corresponding rights throughout the world
-based on applicable law or treaty, and any national implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention of,
-applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
-unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
-and Related Rights and associated claims and causes of action, whether now
-known or unknown (including existing as well as future claims and causes of
-action), in the Work (i) in all territories worldwide, (ii) for the maximum
-duration provided by applicable law or treaty (including future time extensions),
-(iii) in any current or future medium and for any number of copies, and (iv)
-for any purpose whatsoever, including without limitation commercial, advertising
-or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the
-benefit of each member of the public at large and to the detriment of Affirmer's
-heirs and successors, fully intending that such Waiver shall not be subject
-to revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason be
-judged legally invalid or ineffective under applicable law, then the Waiver
-shall be preserved to the maximum extent permitted taking into account Affirmer's
-express Statement of Purpose. In addition, to the extent the Waiver is so
-judged Affirmer hereby grants to each affected person a royalty-free, non
-transferable, non sublicensable, non exclusive, irrevocable and unconditional
-license to exercise Affirmer's Copyright and Related Rights in the Work (i)
-in all territories worldwide, (ii) for the maximum duration provided by applicable
-law or treaty (including future time extensions), (iii) in any current or
-future medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional purposes
-(the "License"). The License shall be deemed effective as of the date CC0
-was applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder of
-the License, and in such case Affirmer hereby affirms that he or she will
-not (i) exercise any of his or her remaining Copyright and Related Rights
-in the Work or (ii) assert any associated claims and causes of action with
-respect to the Work, in either case contrary to Affirmer's express Statement
-of Purpose.
-
- 4. Limitations and Disclaimers.
-
-a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered,
-licensed or otherwise affected by this document.
-
-b. Affirmer offers the Work as-is and makes no representations or warranties
-of any kind concerning the Work, express, implied, statutory or otherwise,
-including without limitation warranties of title, merchantability, fitness
-for a particular purpose, non infringement, or the absence of latent or other
-defects, accuracy, or the present or absence of errors, whether or not discoverable,
-all to the greatest extent permissible under applicable law.
-
-c. Affirmer disclaims responsibility for clearing rights of other persons
-that may apply to the Work or any use thereof, including without limitation
-any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims
-responsibility for obtaining any necessary consents, permissions or other
-rights required for any use of the Work.
-
-d. Affirmer understands and acknowledges that Creative Commons is not a party
-to this document and has no duty or obligation with respect to this CC0 or
-use of the Work.
diff --git a/src/licenses/licenses/xpp3_min-1.1.4c/LICENSE.txt b/src/licenses/licenses/xpp3_min-1.1.4c/LICENSE.txt
deleted file mode 100644
index 4cc7224e81..0000000000
--- a/src/licenses/licenses/xpp3_min-1.1.4c/LICENSE.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-Indiana University Extreme! Lab Software License
-
-Version 1.1.1
-
-Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the distribution.
-
-3. The end-user documentation included with the redistribution, if any,
- must include the following acknowledgment:
-
- "This product includes software developed by the Indiana University
- Extreme! Lab (http://www.extreme.indiana.edu/)."
-
-Alternately, this acknowledgment may appear in the software itself,
-if and wherever such third-party acknowledgments normally appear.
-
-4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab"
-must not be used to endorse or promote products derived from this
-software without prior written permission. For written permission,
-please contact http://www.extreme.indiana.edu/.
-
-5. Products derived from this software may not use "Indiana Univeristy"
-name nor may "Indiana Univeristy" appear in their name, without prior
-written permission of the Indiana University.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.