[jmeter] branch master updated: Update Hamcrest to 2.1

[vl...@apache.org]

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 5cc84c6  Update Hamcrest to 2.1
5cc84c6 is described below

commit 5cc84c6f8c24b3258235c76164e487d01c6e37aa
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Sat Sep 28 17:27:34 2019 +0300

    Update Hamcrest to 2.1
    
    See https://github.com/hamcrest/JavaHamcrest/issues/274 for "official PGP" key request
---
 checksum.xml             | 1 +
 gradle.properties        | 3 +--
 src/bom/build.gradle.kts | 5 +++--
 src/build.gradle.kts     | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/checksum.xml b/checksum.xml
index 1ce666f..feaae90 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -103,6 +103,7 @@
     <trusted-key id='9ff25980f5ba7e4f' group='org.fusesource.hawtbuf' />
     <trusted-key id='0050076df689fde2' group='org.hamcrest' />
     <trusted-key id='a6adfc93ef34893e' group='org.hamcrest' />
+    <trusted-key id='bede11eaf1164480' group='org.hamcrest' />
     <trusted-key id='313cba932516c4d3' group='org.hsqldb' />
     <trusted-key id='cb43338e060cf9fa' group='org.jacoco' />
     <trusted-key id='8799af90c06efbbd' group='org.jdom' />
diff --git a/gradle.properties b/gradle.properties
index 6754732..0b63c8e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -59,7 +59,7 @@ ftplet-api.version=1.1.1
 ftpserver-core.version=1.1.1
 geronimo-jms_1.1_spec.version=1.1.1
 groovy-all.version=2.4.16
-hamcrest-core.version=1.3
+hamcrest.version=2.1
 hamcrest-date.version=2.0.4
 hsqldb.version=2.4.1
 httpasyncclient.version=4.1.4
@@ -70,7 +70,6 @@ httpmime.version=4.5.8
 jackson.version=2.9.10
 jackson-databind.version=2.9.10
 javax.activation.version=1.2.0
-java-hamcrest.version=2.0.0.0
 jcharts.version=0.7.5
 jdom.version=1.1.3
 jmespath-core.version=0.3.0
diff --git a/src/bom/build.gradle.kts b/src/bom/build.gradle.kts
index 91dac35..4a47ae6 100644
--- a/src/bom/build.gradle.kts
+++ b/src/bom/build.gradle.kts
@@ -124,8 +124,9 @@ dependencies {
         apiv("org.brotli:dec")
         apiv("org.exparity:hamcrest-date")
         apiv("org.freemarker:freemarker")
-        apiv("org.hamcrest:hamcrest-core")
-        apiv("org.hamcrest:java-hamcrest")
+        apiv("org.hamcrest:hamcrest")
+        apiv("org.hamcrest:hamcrest-core", "hamcrest")
+        apiv("org.hamcrest:hamcrest-library", "hamcrest")
         apiv("org.hsqldb:hsqldb")
         apiv("org.jdom:jdom")
         apiv("org.jodd:jodd-core", "jodd")
diff --git a/src/build.gradle.kts b/src/build.gradle.kts
index 549b737..11662be 100644
--- a/src/build.gradle.kts
+++ b/src/build.gradle.kts
@@ -56,7 +56,7 @@ subprojects {
         val testRuntimeOnly by configurations
         testImplementation("org.junit.jupiter:junit-jupiter-api")
         testImplementation("org.junit.jupiter:junit-jupiter-params")
-        testImplementation("org.hamcrest:java-hamcrest")
+        testImplementation("org.hamcrest:hamcrest")
         testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
         testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
         testImplementation("junit:junit")