diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml index b9915b61333f..40f21a7adc59 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -57,7 +57,7 @@ maven dependency resolution won't pick it up for us. --> org.hamcrest - hamcrest-core + hamcrest compile @@ -404,7 +404,7 @@ org.hamcrest - hamcrest-core + hamcrest compile diff --git a/hbase-asyncfs/pom.xml b/hbase-asyncfs/pom.xml index 4fe6870fa97d..80fa5596abc5 100644 --- a/hbase-asyncfs/pom.xml +++ b/hbase-asyncfs/pom.xml @@ -85,7 +85,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/hbase-backup/pom.xml b/hbase-backup/pom.xml index 61f7ac091010..8e188748f51b 100644 --- a/hbase-backup/pom.xml +++ b/hbase-backup/pom.xml @@ -179,7 +179,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index e54ca13d63cd..7138552e4f48 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -205,7 +205,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index f89cadf308bb..578fd6402b0b 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -137,7 +137,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/hbase-compression/hbase-compression-aircompressor/pom.xml b/hbase-compression/hbase-compression-aircompressor/pom.xml index b1e90583d533..758790830d0d 100644 --- a/hbase-compression/hbase-compression-aircompressor/pom.xml +++ b/hbase-compression/hbase-compression-aircompressor/pom.xml @@ -122,7 +122,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/hbase-compression/hbase-compression-brotli/pom.xml b/hbase-compression/hbase-compression-brotli/pom.xml index f8d3be671122..9ce29672ee49 100644 --- a/hbase-compression/hbase-compression-brotli/pom.xml +++ b/hbase-compression/hbase-compression-brotli/pom.xml @@ -107,7 +107,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/hbase-compression/hbase-compression-lz4/pom.xml b/hbase-compression/hbase-compression-lz4/pom.xml index 5a1b9b4aff57..5d2352149ffe 100644 --- a/hbase-compression/hbase-compression-lz4/pom.xml +++ b/hbase-compression/hbase-compression-lz4/pom.xml @@ -122,7 +122,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/hbase-compression/hbase-compression-snappy/pom.xml b/hbase-compression/hbase-compression-snappy/pom.xml index 48c03fd58960..6dc2c09e4c26 100644 --- a/hbase-compression/hbase-compression-snappy/pom.xml +++ b/hbase-compression/hbase-compression-snappy/pom.xml @@ -122,7 +122,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/hbase-compression/hbase-compression-zstd/pom.xml b/hbase-compression/hbase-compression-zstd/pom.xml index b3ae7bd88122..ed2d462726b7 100644 --- a/hbase-compression/hbase-compression-zstd/pom.xml +++ b/hbase-compression/hbase-compression-zstd/pom.xml @@ -122,7 +122,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml index 60d2a421b540..86f38c007fff 100644 --- a/hbase-endpoint/pom.xml +++ b/hbase-endpoint/pom.xml @@ -217,7 +217,7 @@ them manually. --> org.hamcrest - hamcrest-library + hamcrest test diff --git a/hbase-hbtop/pom.xml b/hbase-hbtop/pom.xml index 53d73a1b8aa9..cf30f631aafd 100644 --- a/hbase-hbtop/pom.xml +++ b/hbase-hbtop/pom.xml @@ -70,7 +70,7 @@ org.hamcrest - hamcrest-core + hamcrest test diff --git a/hbase-http/pom.xml b/hbase-http/pom.xml index 9ebe39468002..98cd5f65571a 100644 --- a/hbase-http/pom.xml +++ b/hbase-http/pom.xml @@ -137,7 +137,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index b84ebb6af5de..d6238e2cec66 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -207,12 +207,7 @@ org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library + hamcrest test diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml index 83de8419969a..bfddfbc8f8ae 100644 --- a/hbase-mapreduce/pom.xml +++ b/hbase-mapreduce/pom.xml @@ -222,7 +222,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/hbase-replication/pom.xml b/hbase-replication/pom.xml index 21c14270c3e9..7bebd6034210 100644 --- a/hbase-replication/pom.xml +++ b/hbase-replication/pom.xml @@ -121,7 +121,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml index 20bec9d81953..95f121181512 100644 --- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml +++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml @@ -2428,4 +2428,17 @@ Copyright (c) 2007-2017 The JRuby project + + + org.hamcrest + hamcrest + + + BSD 3-Clause License + http://www.opensource.org/licenses/BSD-3-Clause + repo + + + + diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index d1f33618692b..f11e84b0715c 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -216,7 +216,7 @@ org.hamcrest - hamcrest-library + hamcrest test diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 723d1da788d4..0eda79a9a44a 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -256,7 +256,7 @@ org.hamcrest - hamcrest-core + hamcrest test @@ -269,11 +269,6 @@ opentelemetry-sdk-testing test - - org.hamcrest - hamcrest-library - test - org.apache.httpcomponents httpclient diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml index 0808ebebf073..fbdaa92ec119 100644 --- a/hbase-testing-util/pom.xml +++ b/hbase-testing-util/pom.xml @@ -150,7 +150,7 @@ org.hamcrest - hamcrest-library + hamcrest compile diff --git a/hbase-zookeeper/pom.xml b/hbase-zookeeper/pom.xml index 1bac78e22025..ebc1685f8304 100644 --- a/hbase-zookeeper/pom.xml +++ b/hbase-zookeeper/pom.xml @@ -130,7 +130,7 @@ org.hamcrest - hamcrest-core + hamcrest test diff --git a/pom.xml b/pom.xml index 296450231870..874c4d5f0519 100644 --- a/pom.xml +++ b/pom.xml @@ -597,7 +597,7 @@ 9.4.14.0 5.13.4 4.3.0 - 1.3 + 3.0 1.49.0 1.29.0-alpha 2.26.1 @@ -1388,12 +1388,7 @@ org.hamcrest - hamcrest-core - ${hamcrest.version} - - - org.hamcrest - hamcrest-library + hamcrest ${hamcrest.version} @@ -2285,6 +2280,24 @@ + + banned-hamcrest-core-and-library + + enforce + + + + + + org.hamcrest:hamcrest-core + org.hamcrest:hamcrest-library + + Use org.hamcrest:hamcrest instead + true + + + + check-aggregate-license @@ -2806,7 +2819,7 @@ org.hamcrest - hamcrest-core + hamcrest ${hamcrest.version} @@ -2862,7 +2875,7 @@ org.hamcrest - hamcrest-core + hamcrest ${hamcrest.version} @@ -2926,7 +2939,7 @@ org.hamcrest - hamcrest-core + hamcrest ${hamcrest.version} @@ -2989,7 +3002,7 @@ org.hamcrest - hamcrest-core + hamcrest ${hamcrest.version}