@@ -118,9 +118,8 @@ AuthScope.ANY, new UsernamePasswordCredentials("elastic", "changeme")
118118 }
119119
120120 private Version selectLatestVersion (Version version , String info ) {
121- Version simpleVersion = new Version (version .major (), version .minor (), version .maintenance (),false );
122- if (info .contains (simpleVersion .toString ())) {
123- return simpleVersion ;
121+ if (info .contains (version .toString ())) {
122+ return version ;
124123 }
125124 // if no version X.Y.0 was found, we give up
126125 if (version .maintenance () == 0 ) {
@@ -178,24 +177,19 @@ public synchronized ElasticsearchTestServer start() {
178177
179178 // using specific stable version for tests with plugins
180179 if (plugins .length > 0 ) {
181- version = Version .VERSION .major () < 8 ? new Version (7 , 17 , 25 , false ) : new Version (8 , 16 , 1 ,
180+ version = Version .VERSION .major () < 8 ? new Version (7 , 17 , 25 , false ) : new Version (8 , 16 , 0 ,
182181 false );
183182 }
184183
185184 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- }
190185
191186 DockerImageName image ;
192187 if (plugins .length == 0 ) {
193188 image = DockerImageName .parse (esImage );
194189 } else {
195- String finalEsImage = esImage ;
196190 String esWithPluginsImage = new ImageFromDockerfile ()
197191 .withDockerfileFromBuilder (b -> {
198- b .from (finalEsImage );
192+ b .from (esImage );
199193 for (String plugin : plugins ) {
200194 b .run ("/usr/share/elasticsearch/bin/elasticsearch-plugin" , "install" , plugin );
201195 }
0 commit comments