honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade hamcrest to 2.1 (#41464) 

hamcrest has some improvements in newer versions, like FileMatchers
that make assertions regarding file exists cleaner. This commit upgrades
to the latest version of hamcrest so we can start using new and improved
matchers.
This commit is contained in:
Ryan Ernst 2019-04-24 23:39:40 -07:00
parent 257682918f
commit 7e3875d781
17 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/version.properties
View File

@ -37,7 +37,7 @@ httpcore = 4.4.11
httpasyncclient = 4.1.4 httpasyncclient = 4.1.4
commonslogging = 1.1.3 commonslogging = 1.1.3
commonscodec = 1.11 commonscodec = 1.11
hamcrest = 1.3 hamcrest = 2.1
securemock = 1.2 securemock = 1.2
mocksocket = 1.2 mocksocket = 1.2

1
client/rest-high-level/build.gradle
View File

@ -61,7 +61,6 @@ dependencies {
testCompile "org.elasticsearch.test:framework:${version}" testCompile "org.elasticsearch.test:framework:${version}"
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}" testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}"
//this is needed to make RestHighLevelClientTests#testApiNamingConventions work from IDEs //this is needed to make RestHighLevelClientTests#testApiNamingConventions work from IDEs
testCompile "org.elasticsearch:rest-api-spec:${version}" testCompile "org.elasticsearch:rest-api-spec:${version}"
// Needed for serialization tests: // Needed for serialization tests:

2
client/rest/build.gradle
View File

@ -47,7 +47,7 @@ dependencies {
testCompile "org.elasticsearch.client:test:${version}" testCompile "org.elasticsearch.client:test:${version}"
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}" testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}" testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
testCompile "org.elasticsearch:securemock:${versions.securemock}" testCompile "org.elasticsearch:securemock:${versions.securemock}"
testCompile "org.elasticsearch:mocksocket:${versions.mocksocket}" testCompile "org.elasticsearch:mocksocket:${versions.mocksocket}"
} }

1
client/sniffer/build.gradle
View File

@ -45,7 +45,6 @@ dependencies {
testCompile "org.elasticsearch.client:test:${version}" testCompile "org.elasticsearch.client:test:${version}"
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}" testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}"
testCompile "org.elasticsearch:securemock:${versions.securemock}" testCompile "org.elasticsearch:securemock:${versions.securemock}"
testCompile "org.elasticsearch:mocksocket:${versions.mocksocket}" testCompile "org.elasticsearch:mocksocket:${versions.mocksocket}"
} }

2
client/test/build.gradle
View File

@ -27,7 +27,7 @@ dependencies {
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}" compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
compile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" compile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
compile "junit:junit:${versions.junit}" compile "junit:junit:${versions.junit}"
compile "org.hamcrest:hamcrest-all:${versions.hamcrest}" compile "org.hamcrest:hamcrest:${versions.hamcrest}"
} }
forbiddenApisMain { forbiddenApisMain {

2
client/transport/build.gradle
View File

@ -32,7 +32,7 @@ dependencies {
compile "org.elasticsearch.plugin:rank-eval-client:${version}" compile "org.elasticsearch.plugin:rank-eval-client:${version}"
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}" testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}" testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
} }
dependencyLicenses { dependencyLicenses {

2
distribution/tools/launchers/build.gradle
View File

@ -24,7 +24,7 @@ dependencies {
compile parent.project('java-version-checker') compile parent.project('java-version-checker')
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}" testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}" testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
} }
archivesBaseName = 'elasticsearch-launchers' archivesBaseName = 'elasticsearch-launchers'

2
libs/core/build.gradle
View File

@ -73,7 +73,7 @@ publishing {
dependencies { dependencies {
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}" testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}" testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
if (!isEclipse && !isIdea) { if (!isEclipse && !isIdea) {
java9Compile sourceSets.main.output java9Compile sourceSets.main.output

2
libs/nio/build.gradle
View File

@ -34,7 +34,7 @@ dependencies {
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}" testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}" testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
if (isEclipse == false || project.path == ":libs:nio-tests") { if (isEclipse == false || project.path == ":libs:nio-tests") {
testCompile("org.elasticsearch.test:framework:${version}") { testCompile("org.elasticsearch.test:framework:${version}") {

2
libs/secure-sm/build.gradle
View File

@ -34,7 +34,7 @@ dependencies {
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}" testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}" testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
if (isEclipse == false || project.path == ":libs:secure-sm-tests") { if (isEclipse == false || project.path == ":libs:secure-sm-tests") {
testCompile("org.elasticsearch.test:framework:${version}") { testCompile("org.elasticsearch.test:framework:${version}") {

2
libs/ssl-config/build.gradle
View File

@ -29,7 +29,7 @@ dependencies {
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}" testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}" testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
} }
if (isEclipse) { if (isEclipse) {

2
libs/x-content/build.gradle
View File

@ -42,7 +42,7 @@ dependencies {
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}" testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}" testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
if (isEclipse == false || project.path == ":libs:x-content-tests") { if (isEclipse == false || project.path == ":libs:x-content-tests") {
testCompile("org.elasticsearch.test:framework:${version}") { testCompile("org.elasticsearch.test:framework:${version}") {

3
qa/vagrant/build.gradle
View File

@ -26,8 +26,7 @@ plugins {
dependencies { dependencies {
compile "junit:junit:${versions.junit}" compile "junit:junit:${versions.junit}"
compile "org.hamcrest:hamcrest-core:${versions.hamcrest}" compile "org.hamcrest:hamcrest:${versions.hamcrest}"
compile "org.hamcrest:hamcrest-library:${versions.hamcrest}"
compile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" compile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}" compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"

3
qa/vagrant/src/main/java/org/elasticsearch/packaging/util/FileMatcher.java
View File

@ -30,12 +30,11 @@ import java.nio.file.attribute.PosixFilePermission;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import static java.nio.file.attribute.PosixFilePermissions.fromString;
import static org.elasticsearch.packaging.util.FileUtils.getBasicFileAttributes; import static org.elasticsearch.packaging.util.FileUtils.getBasicFileAttributes;
import static org.elasticsearch.packaging.util.FileUtils.getFileOwner; import static org.elasticsearch.packaging.util.FileUtils.getFileOwner;
import static org.elasticsearch.packaging.util.FileUtils.getPosixFileAttributes; import static org.elasticsearch.packaging.util.FileUtils.getPosixFileAttributes;
import static java.nio.file.attribute.PosixFilePermissions.fromString;
/** /**
* Asserts that a file at a path matches its status as Directory/File, and its owner. If on a posix system, also matches the permission * Asserts that a file at a path matches its status as Directory/File, and its owner. If on a posix system, also matches the permission
* set is what we expect. * set is what we expect.

12
test/framework/build.gradle
View File

@ -25,7 +25,7 @@ dependencies {
compile "org.elasticsearch:elasticsearch-cli:${version}" compile "org.elasticsearch:elasticsearch-cli:${version}"
compile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" compile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
compile "junit:junit:${versions.junit}" compile "junit:junit:${versions.junit}"
compile "org.hamcrest:hamcrest-all:${versions.hamcrest}" compile "org.hamcrest:hamcrest:${versions.hamcrest}"
compile "org.apache.lucene:lucene-test-framework:${versions.lucene}" compile "org.apache.lucene:lucene-test-framework:${versions.lucene}"
compile "org.apache.lucene:lucene-codecs:${versions.lucene}" compile "org.apache.lucene:lucene-codecs:${versions.lucene}"
compile "commons-logging:commons-logging:${versions.commonslogging}" compile "commons-logging:commons-logging:${versions.commonslogging}"
@ -52,15 +52,7 @@ thirdPartyAudit.ignoreMissingClasses (
'javax.servlet.ServletContextListener', 'javax.servlet.ServletContextListener',
'org.apache.avalon.framework.logger.Logger', 'org.apache.avalon.framework.logger.Logger',
'org.apache.log.Hierarchy', 'org.apache.log.Hierarchy',
'org.apache.log.Logger', 'org.apache.log.Logger'
// we intentionally exclude the ant tasks because people were depending on them from their tests!!!!!!!
'org.apache.tools.ant.BuildException',
'org.apache.tools.ant.DirectoryScanner',
'org.apache.tools.ant.Task',
'org.apache.tools.ant.types.FileSet',
'org.easymock.EasyMock',
'org.easymock.IArgumentMatcher',
'org.jmock.core.Constraint'
) )
test { test {

3
x-pack/plugin/security/cli/build.gradle
View File

@ -11,9 +11,6 @@ dependencies {
compile "org.bouncycastle:bcpkix-jdk15on:${versions.bouncycastle}" compile "org.bouncycastle:bcpkix-jdk15on:${versions.bouncycastle}"
compile "org.bouncycastle:bcprov-jdk15on:${versions.bouncycastle}" compile "org.bouncycastle:bcprov-jdk15on:${versions.bouncycastle}"
testImplementation 'com.google.jimfs:jimfs:1.1' testImplementation 'com.google.jimfs:jimfs:1.1'
testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}"
testCompile 'org.elasticsearch:securemock:1.2'
testCompile "org.elasticsearch.test:framework:${version}" testCompile "org.elasticsearch.test:framework:${version}"
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts') testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
} }

2
x-pack/transport-client/build.gradle
View File

@ -12,7 +12,7 @@ dependencies {
compile "org.elasticsearch.client:transport:${version}" compile "org.elasticsearch.client:transport:${version}"
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}" testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}" testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
} }
dependencyLicenses.enabled = false dependencyLicenses.enabled = false