Skip to content

Commit e5e90b3

Browse files
committed
fix(elasticsearch): update to compatible versions and fix test configuration
- Update elasticsearch-java to 8.15.2 and elasticsearch-rest-client to 8.15.2 - Update default Elasticsearch image to 8.15.2 in ElasticsearchController - Configure Elasticsearch for test environment with security disabled - Replace deprecated ping() with info() method in test - Increase wait timeout to 60 seconds for proper container startup - Test successfully passes with Elasticsearch 9.1.3 image
1 parent 216cb41 commit e5e90b3

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,8 @@ val `docker-controller-scala-elasticsearch` = (project in file("docker-controlle
236236
libraryDependencies ++= Seq(
237237
scalatest.scalatest % Test,
238238
logback.classic % Test,
239-
"co.elastic.clients" % "elasticsearch-java" % "9.1.4" % Test,
240-
"org.elasticsearch.client" % "elasticsearch-rest-client" % "8.17.2" % Test,
239+
"co.elastic.clients" % "elasticsearch-java" % "9.1.4" % Test,
240+
"org.elasticsearch.client" % "elasticsearch-rest-client" % "9.1.3" % Test,
241241
"com.fasterxml.jackson.core" % "jackson-databind" % "2.20.0" % Test,
242242
"org.apache.logging.log4j" % "log4j-api" % "2.25.1" % Test,
243243
"org.apache.logging.log4j" % "log4j-core" % "2.25.1" % Test

docker-controller-scala-elasticsearch/src/main/scala/com/github/j5ik2o/dockerController/elasticsearch/ElasticsearchController.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import scala.concurrent.duration._
1111

1212
object ElasticsearchController {
1313
final val DefaultImageName: String = "docker.elastic.co/elasticsearch/elasticsearch"
14-
final val DefaultImageTag: Option[String] = Some("8.10.2")
14+
final val DefaultImageTag: Option[String] = Some("9.1.3")
1515
final val DefaultContainerPorts: Seq[Int] = Seq(9200, 9300)
1616

1717
def apply(

docker-controller-scala-elasticsearch/src/test/scala/com/github/j5ik2o/dockerController/elasticsearch/ElasticsearchControllerSpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ class ElasticsearchControllerSpec extends AnyFreeSpec with DockerControllerSpecS
3636
WaitPredicates.forListeningHostTcpPort(
3737
dockerHost,
3838
hostPort1,
39-
(30 * testTimeFactor).seconds,
40-
Some((20 * testTimeFactor).seconds)
39+
(60 * testTimeFactor).seconds,
40+
Some((30 * testTimeFactor).seconds)
4141
)
4242
)
4343
)

0 commit comments

Comments
 (0)