@@ -118,8 +118,9 @@ AuthScope.ANY, new UsernamePasswordCredentials("elastic", "changeme")
118118 }
119119
120120 private Version selectLatestVersion (Version version , String info ) {
121- if (info .contains (version .toString ())) {
122- return version ;
121+ Version simpleVersion = new Version (version .major (), version .minor (), version .maintenance (),false );
122+ if (info .contains (simpleVersion .toString ())) {
123+ return simpleVersion ;
123124 }
124125 // if no version X.Y.0 was found, we give up
125126 if (version .maintenance () == 0 ) {
@@ -177,19 +178,24 @@ public synchronized ElasticsearchTestServer start() {
177178
178179 // using specific stable version for tests with plugins
179180 if (plugins .length > 0 ) {
180- version = Version .VERSION .major () < 8 ? new Version (7 , 17 , 25 , false ) : new Version (8 , 16 , 0 ,
181+ version = Version .VERSION .major () < 8 ? new Version (7 , 17 , 25 , false ) : new Version (8 , 16 , 1 ,
181182 false );
182183 }
183184
184185 String esImage = "docker.elastic.co/elasticsearch/elasticsearch:" + version ;
186+ // only snapshot version available for new releases
187+ if (version .maintenance () == 0 ) {
188+ esImage = esImage +"-SNAPSHOT" ;
189+ }
185190
186191 DockerImageName image ;
187192 if (plugins .length == 0 ) {
188193 image = DockerImageName .parse (esImage );
189194 } else {
195+ String finalEsImage = esImage ;
190196 String esWithPluginsImage = new ImageFromDockerfile ()
191197 .withDockerfileFromBuilder (b -> {
192- b .from (esImage );
198+ b .from (finalEsImage );
193199 for (String plugin : plugins ) {
194200 b .run ("/usr/share/elasticsearch/bin/elasticsearch-plugin" , "install" , plugin );
195201 }
0 commit comments