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 0a30ab9d4a chore: bump org.hamcrest to 3.0
0a30ab9d4a is described below
commit 0a30ab9d4a6a5289611b5e4464dcc25bf6f3fb5f
Author: Vladimir Sitnikov <[email protected]>
AuthorDate: Fri Oct 31 12:57:35 2025 +0300
chore: bump org.hamcrest to 3.0
JMeter does not use hamcreset, however, ApacheJMeter_junit still uses junit4
which brings hamcrest as a transitive dependency.
---
src/bom-testing/build.gradle.kts | 6 +++---
src/bom-thirdparty/build.gradle.kts | 6 +++---
src/dist/src/dist/expected_release_jars.csv | 4 ++--
src/licenses/build.gradle.kts | 8 --------
src/licenses/licenses/hamcrest/LICENSE | 27 ---------------------------
5 files changed, 8 insertions(+), 43 deletions(-)
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 7100ba7757..4b32cc4a8b 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -50,9 +50,9 @@ dependencies {
api("org.apache.ftpserver:ftplet-api:1.2.0")
api("org.apache.ftpserver:ftpserver-core:1.2.0")
api("org.apache.mina:mina-core:2.2.4")
- api("org.hamcrest:hamcrest-core:2.2")
- api("org.hamcrest:hamcrest-library:2.2")
- api("org.hamcrest:hamcrest:2.2")
+ api("org.hamcrest:hamcrest-core:3.0")
+ api("org.hamcrest:hamcrest-library:3.0")
+ api("org.hamcrest:hamcrest:3.0")
api("org.hsqldb:hsqldb:2.7.2")
api("org.objenesis:objenesis:3.4")
api("org.openjdk.jmh:jmh-core:1.37")
diff --git a/src/bom-thirdparty/build.gradle.kts
b/src/bom-thirdparty/build.gradle.kts
index 4f607fa2d5..1b7f5d6940 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -75,13 +75,13 @@ dependencies {
because("ApacheJMeter_junit depends on junit4")
}
api("org.checkerframework:checker-qual:3.51.1")
- api("org.hamcrest:hamcrest-core:2.2") {
+ api("org.hamcrest:hamcrest-core:3.0") {
because("ApacheJMeter_junit depends on junit4")
}
- api("org.hamcrest:hamcrest-library:2.2") {
+ api("org.hamcrest:hamcrest-library:3.0") {
because("ApacheJMeter_junit depends on junit4")
}
- api("org.hamcrest:hamcrest:2.2") {
+ api("org.hamcrest:hamcrest:3.0") {
because("ApacheJMeter_junit depends on junit4")
}
api("net.minidev:accessors-smart:2.6.0")
diff --git a/src/dist/src/dist/expected_release_jars.csv
b/src/dist/src/dist/expected_release_jars.csv
index c91bb85148..50bebde88f 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -67,8 +67,8 @@
86636,groovy-sql-5.0.2.jar
98394,groovy-templates-5.0.2.jar
223993,groovy-xml-5.0.2.jar
-123360,hamcrest-2.2.jar
-1499,hamcrest-core-2.2.jar
+126373,hamcrest-3.0.jar
+2403,hamcrest-core-3.0.jar
181512,httpasyncclient-4.1.5.jar
785639,httpclient-4.5.14.jar
327891,httpcore-4.4.16.jar
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index cad6668c4d..7582d3f95b 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -149,14 +149,6 @@ val gatherBinaryLicenses by
tasks.registering(GatherLicenseTask::class) {
expectedLicense = SpdxLicense.Apache_2_0 and SpdxLicense.SAX_PD and
SimpleLicense("The W3C License",
uri("http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/java-binding.zip";))
effectiveLicense = SpdxLicense.Apache_2_0
}
- for (lib in listOf("hamcrest-core", "hamcrest")) {
- overrideLicense("org.hamcrest:$lib:2.2") {
- // https://github.com/hamcrest/JavaHamcrest/issues/264
- // pom.xml lists "New BSD License", however it is BSD_3
- expectedLicense = SpdxLicense.BSD_3_Clause
- licenseFiles = "hamcrest"
- }
- }
overrideLicense("net.sf.jtidy:jtidy:r938") {
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
diff --git a/src/licenses/licenses/hamcrest/LICENSE
b/src/licenses/licenses/hamcrest/LICENSE
deleted file mode 100644
index 4933bda5ba..0000000000
--- a/src/licenses/licenses/hamcrest/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-BSD License
-
-Copyright (c) 2000-2015 www.hamcrest.org
-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 Hamcrest 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.
