浏览代码

[Gradle] Simple fix the dependencies in test-framework (#134746) (#134779)

The transitive dependencies in test-framework inheritely have a version conflict that
results in a jarHell in our example builds.
We fix that for now by excluding hamcrest-core for now as it has been
in the past before we changed transitive dependency handling.
Rene Groeschke 3 周之前
父节点
当前提交
5dc10ba127
共有 1 个文件被更改,包括 15 次插入2 次删除
  1. 15 2
      test/framework/build.gradle

+ 15 - 2
test/framework/build.gradle

@@ -11,6 +11,15 @@ import org.elasticsearch.gradle.internal.info.BuildParams;
 apply plugin: 'elasticsearch.build'
 apply plugin: 'elasticsearch.publish'
 
+configurations {
+  // we do not want to expose a version conflict in transitive dependencies by
+  // bringing in different versions of hamcrest and hamcrest-core.
+  // Therefore we exclude transitive deps on hamcrest-core here as we have a direct
+  // dependency on a newer version.
+  runtimeElements {
+    exclude group: 'org.hamcrest', module: 'hamcrest-core'
+  }
+}
 dependencies {
   api project(":client:rest")
   api project(':modules:transport-netty4')
@@ -19,9 +28,13 @@ dependencies {
   api project(":libs:cli")
   api project(":libs:entitlement:bridge")
   api "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
-  api "junit:junit:${versions.junit}"
+  api("junit:junit:${versions.junit}") {
+//    exclude group: 'org.hamcrest'
+  }
   api "org.hamcrest:hamcrest:${versions.hamcrest}"
-  api "org.apache.lucene:lucene-test-framework:${versions.lucene}"
+  api("org.apache.lucene:lucene-test-framework:${versions.lucene}") {
+//    exclude group: 'org.hamcrest'
+  }
   api "org.apache.lucene:lucene-codecs:${versions.lucene}"
   api "commons-logging:commons-logging:${versions.commonslogging}"
   api "commons-codec:commons-codec:${versions.commonscodec}"