Skip to content

HSEARCH-3227 Upgrade to Elasticsearch 6.3.1 #1702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

HSEARCH-3227 Upgrade to Elasticsearch 6.3.1 #1702

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca884c2
Upgrade to Elasticsearch 6.3.1
frekele Jul 5, 2018
a83f67a
Added test profile elasticsearch-6.3
frekele Jul 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 53 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@
<!-- Elasticsearch -->
<!-- When updating the following versions you will likely need to update the
matching test profile as well, e.g. elasticsearch-5.2 for the 5.2+ series -->
<version.org.elasticsearch.client>5.6.8</version.org.elasticsearch.client>
<version.feature-pack.org.elasticsearch.client>5.6.8.hibernate01</version.feature-pack.org.elasticsearch.client>
<version.org.elasticsearch.client>6.3.1</version.org.elasticsearch.client>
<version.feature-pack.org.elasticsearch.client>6.3.1.hibernate01</version.feature-pack.org.elasticsearch.client>
<version.com.google.code.gson>2.8.2</version.com.google.code.gson>
<version.feature-pack.com.google.code.gson>2.8.2.hibernate03</version.feature-pack.com.google.code.gson>
<version.uk.co.lucasweb.aws-v4-signer-java>1.3</version.uk.co.lucasweb.aws-v4-signer-java>
Expand Down Expand Up @@ -2365,18 +2365,63 @@
</build>
</profile>

<!-- Elasticsearch 5.2+ test environment (default) -->
<!-- Elasticsearch 5.2+ test environment -->
<profile>
<id>elasticsearch-5.2</id>
<properties>
<version.elasticsearch.plugin>5.7</version.elasticsearch.plugin>
<test.elasticsearch.host.version>5.6.8</test.elasticsearch.host.version>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>com.github.alexcojocaru</groupId>
<artifactId>elasticsearch-maven-plugin</artifactId>
<version>${version.elasticsearch.plugin}</version>
<configuration>
<skip>${test.elasticsearch.host.provided}</skip>
<version>${test.elasticsearch.host.version}</version>
<timeout>90</timeout><!-- Make it work on our slow CI -->
<pathConf>${project.build.directory}/elasticsearch-maven-plugin/5.0/configuration/</pathConf>
<pathInitScript>${project.build.directory}/elasticsearch-maven-plugin/5.0/init/init.script</pathInitScript>
<autoCreateIndex>false</autoCreateIndex>
</configuration>
<!-- Different executions from 2.x: the "start" goal has been renamed in version 5 -->
<executions>
<execution >
<id>start-elasticsearch</id>
<phase>pre-integration-test</phase>
<goals>
<goal>runforked</goal>
</goals>
</execution>
<execution>
<id>stop-elasticsearch</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>

<!-- Elasticsearch 6.3+ test environment (default) -->
<profile>
<id>elasticsearch-6.3</id>
<activation>
<!-- Activate by default, i.e. if test.elasticsearch.host.version has not been defined explicitly -->
<property>
<name>!test.elasticsearch.host.version</name>
</property>
</activation>
<properties>
<version.elasticsearch.plugin>5.7</version.elasticsearch.plugin>
<test.elasticsearch.host.version>5.6.8</test.elasticsearch.host.version>
<version.elasticsearch.plugin>6.6</version.elasticsearch.plugin>
<test.elasticsearch.host.version>6.3.1</test.elasticsearch.host.version>
</properties>
<build>
<pluginManagement>
Expand All @@ -2389,13 +2434,13 @@
<skip>${test.elasticsearch.host.provided}</skip>
<version>${test.elasticsearch.host.version}</version>
<timeout>90</timeout><!-- Make it work on our slow CI -->
<pathConf>${project.build.directory}/elasticsearch-maven-plugin/5.0/configuration/</pathConf>
<pathInitScript>${project.build.directory}/elasticsearch-maven-plugin/5.0/init/init.script</pathInitScript>
<pathConf>${project.build.directory}/elasticsearch-maven-plugin/6.0/configuration/</pathConf>
<pathInitScript>${project.build.directory}/elasticsearch-maven-plugin/6.0/init/init.script</pathInitScript>
<autoCreateIndex>false</autoCreateIndex>
</configuration>
<!-- Different executions from 2.x: the "start" goal has been renamed in version 5 -->
<executions>
<execution >
<execution>
<id>start-elasticsearch</id>
<phase>pre-integration-test</phase>
<goals>
Expand Down