Skip to content

Commit 443bbb4

Browse files
shs96cshs96c
committed
Bump hamcrest to 2.2
This version merges the "core" and "all" libraries, and so prevents a split package, which does not play well with the JPMS.
1 parent be43937 commit 443bbb4

File tree

5 files changed

+34
-35
lines changed

5 files changed

+34
-35
lines changed

‎java/client/src/org/openqa/selenium/lift/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ java_export(
1414
"//java/client/src/org/openqa/selenium:core",
1515
"//java/client/src/org/openqa/selenium/support",
1616
artifact("com.google.guava:guava"),
17-
artifact("org.hamcrest:hamcrest-all"),
17+
artifact("org.hamcrest:hamcrest"),
1818
artifact("junit:junit"),
1919
],
2020
)

‎java/client/test/org/openqa/selenium/atoms/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ java_library(
2020
deps = [
2121
"//java/client/test/org/openqa/selenium/build",
2222
artifact("com.google.guava:guava"),
23-
artifact("org.hamcrest:hamcrest-core"),
23+
artifact("org.hamcrest:hamcrest"),
2424
artifact("junit:junit"),
2525
],
2626
)

‎java/client/test/org/openqa/selenium/lift/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ java_test_suite(
1010
"//java/client/src/org/openqa/selenium/lift",
1111
"//java/client/test/org/openqa/selenium/support/ui:clock",
1212
artifact("junit:junit"),
13-
artifact("org.hamcrest:hamcrest-all"),
13+
artifact("org.hamcrest:hamcrest"),
1414
artifact("org.mockito:mockito-core"),
1515
],
1616
)

‎java/maven_deps.bzl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def selenium_java_deps():
77
"com.beust:jcommander:1.72",
88
"com.github.javaparser:javaparser-core:3.15.5",
99
"com.google.code.gson:gson:2.8.6",
10-
"com.google.guava:guava:28.2g-jre",
10+
"com.google.guava:guava:28.2-jre",
1111
"com.google.auto:auto-common:0.10",
1212
"com.google.auto.service:auto-service:1.0-rc6",
1313
"com.google.auto.service:auto-service-annotations:1.0-rc6",
@@ -32,8 +32,7 @@ def selenium_java_deps():
3232
"org.eclipse.jetty:jetty-servlets:9.4.22.v20191022",
3333
"org.eclipse.jetty:jetty-util:9.4.22.v20191022",
3434
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
35-
"org.hamcrest:hamcrest-all:1.3",
36-
"org.hamcrest:hamcrest-core:1.3",
35+
"org.hamcrest:hamcrest:2.2",
3736
"org.mockito:mockito-core:3.1.0",
3837
"org.testng:testng:6.14.3",
3938
"org.zeromq:jeromq:0.5.1",

‎java/maven_install.json

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependency_tree": {
3-
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": 778072837,
3+
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": 1627557576,
44
"conflict_resolution": {},
55
"dependencies": [
66
{
@@ -2985,68 +2985,68 @@
29852985
"url": "https://repo1.maven.org/maven2/org/eclipse/mylyn/github/org.eclipse.egit.github.core/2.1.5/org.eclipse.egit.github.core-2.1.5-sources.jar"
29862986
},
29872987
{
2988-
"coord": "org.hamcrest:hamcrest-all:1.3",
2988+
"coord": "org.hamcrest:hamcrest-core:1.3",
29892989
"dependencies": [],
29902990
"directDependencies": [],
29912991
"exclusions": [
29922992
"io.netty:netty-all"
29932993
],
2994-
"file": "v1/https/repo1.maven.org/maven2/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3.jar",
2994+
"file": "v1/https/repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
29952995
"mirror_urls": [
2996-
"https://repo1.maven.org/maven2/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3.jar",
2997-
"https://jcenter.bintray.com/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3.jar",
2998-
"https://maven.google.com/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3.jar"
2996+
"https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
2997+
"https://jcenter.bintray.com/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
2998+
"https://maven.google.com/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"
29992999
],
3000-
"sha256": "4877670629ab96f34f5f90ab283125fcd9acb7e683e66319a68be6eb2cca60de",
3001-
"url": "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3.jar"
3000+
"sha256": "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9",
3001+
"url": "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"
30023002
},
30033003
{
3004-
"coord": "org.hamcrest:hamcrest-all:jar:sources:1.3",
3004+
"coord": "org.hamcrest:hamcrest-core:jar:sources:1.3",
30053005
"dependencies": [],
30063006
"directDependencies": [],
30073007
"exclusions": [
30083008
"io.netty:netty-all"
30093009
],
3010-
"file": "v1/https/repo1.maven.org/maven2/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3-sources.jar",
3010+
"file": "v1/https/repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar",
30113011
"mirror_urls": [
3012-
"https://repo1.maven.org/maven2/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3-sources.jar",
3013-
"https://jcenter.bintray.com/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3-sources.jar",
3014-
"https://maven.google.com/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3-sources.jar"
3012+
"https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar",
3013+
"https://jcenter.bintray.com/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar",
3014+
"https://maven.google.com/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar"
30153015
],
3016-
"sha256": "c53535c3d25b5bf0b00a324a5583c7dd2fed0fa6d1bbc622e2dec460c24faab3",
3017-
"url": "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3-sources.jar"
3016+
"sha256": "e223d2d8fbafd66057a8848cc94222d63c3cedd652cc48eddc0ab5c39c0f84df",
3017+
"url": "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar"
30183018
},
30193019
{
3020-
"coord": "org.hamcrest:hamcrest-core:1.3",
3020+
"coord": "org.hamcrest:hamcrest:2.2",
30213021
"dependencies": [],
30223022
"directDependencies": [],
30233023
"exclusions": [
30243024
"io.netty:netty-all"
30253025
],
3026-
"file": "v1/https/repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
3026+
"file": "v1/https/repo1.maven.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar",
30273027
"mirror_urls": [
3028-
"https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
3029-
"https://jcenter.bintray.com/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
3030-
"https://maven.google.com/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"
3028+
"https://repo1.maven.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar",
3029+
"https://jcenter.bintray.com/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar",
3030+
"https://maven.google.com/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar"
30313031
],
3032-
"sha256": "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9",
3033-
"url": "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"
3032+
"sha256": "5e62846a89f05cd78cd9c1a553f340d002458380c320455dd1f8fc5497a8a1c1",
3033+
"url": "https://repo1.maven.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar"
30343034
},
30353035
{
3036-
"coord": "org.hamcrest:hamcrest-core:jar:sources:1.3",
3036+
"coord": "org.hamcrest:hamcrest:jar:sources:2.2",
30373037
"dependencies": [],
30383038
"directDependencies": [],
30393039
"exclusions": [
30403040
"io.netty:netty-all"
30413041
],
3042-
"file": "v1/https/repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar",
3042+
"file": "v1/https/repo1.maven.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2-sources.jar",
30433043
"mirror_urls": [
3044-
"https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar",
3045-
"https://jcenter.bintray.com/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar",
3046-
"https://maven.google.com/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar"
3044+
"https://repo1.maven.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2-sources.jar",
3045+
"https://jcenter.bintray.com/org/hamcrest/hamcrest/2.2/hamcrest-2.2-sources.jar",
3046+
"https://maven.google.com/org/hamcrest/hamcrest/2.2/hamcrest-2.2-sources.jar"
30473047
],
3048-
"sha256": "e223d2d8fbafd66057a8848cc94222d63c3cedd652cc48eddc0ab5c39c0f84df",
3049-
"url": "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar"
3048+
"sha256": "f49e697dbc70591f91a90dd7f741f5780f53f63f34a416d6a9879499d4d666af",
3049+
"url": "https://repo1.maven.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2-sources.jar"
30503050
},
30513051
{
30523052
"coord": "org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50",

0 commit comments

Comments
 (0)