Skip to content

Commit

Permalink
HSEARCH-4130 Remove test.elasticsearch.run.flavour and java_home
Browse files Browse the repository at this point in the history
I don't know if there exists a way to port them to the Docker version
  • Loading branch information
fax4ever committed Apr 14, 2021
1 parent a48b876 commit 3276a0b
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 43 deletions.
9 changes: 0 additions & 9 deletions CONTRIBUTING.md
Expand Up @@ -261,15 +261,6 @@ Or more simply, if your AWS credentials are already stored in `~/.aws/credential
-Dtest.elasticsearch.connection.aws.region=<Your AWS region ID>
```

When building Hibernate Search with new JDKs,
you may want to run Elasticsearch with a different JDK than the one used by Maven.
This can be done by setting a property
(**this will only work with the profiles for Elasticsearch 5 and above**):

```bash
./mvnw clean install -Dtest.elasticsearch.run.java_home=/path/to/my/jdk
```

### JQAssistant

You can request static analysis and sanity checks with the `jqassistant` profile.
Expand Down
26 changes: 0 additions & 26 deletions Jenkinsfile
Expand Up @@ -464,7 +464,6 @@ stage('Default build') {
-Pdist -Pcoverage -Pjqassistant \
${enableDefaultBuildIT ? '' : '-DskipITs'} \
${toTestJdkArg(environments.content.jdk.default)} \
${toElasticsearchJdkArg(environments.content.jdk.default)} \
"""

// Don't try to report to Coveralls.io or SonarCloud if coverage data is missing
Expand Down Expand Up @@ -760,10 +759,6 @@ abstract class BuildEnvironment {
String getMavenJdkTool(def allEnvironments) {
allEnvironments.content.jdk.default.buildJdkTool
}

String getElasticsearchJdkTool(def allEnvironments) {
allEnvironments.content.esLocal.default.jdkTool
}
}

class JdkBuildEnvironment extends BuildEnvironment {
Expand Down Expand Up @@ -797,13 +792,8 @@ class DatabaseBuildEnvironment extends BuildEnvironment {
class EsLocalBuildEnvironment extends BuildEnvironment {
String versionRange
String mavenProfile
String jdkTool
@Override
String getTag() { "elasticsearch-local-$versionRange" }
@Override
String getElasticsearchJdkTool(def allEnvironments) {
jdkTool
}
}

class EsAwsBuildEnvironment extends BuildEnvironment {
Expand All @@ -814,10 +804,6 @@ class EsAwsBuildEnvironment extends BuildEnvironment {
boolean staticCredentials = false
@Override
String getTag() { "elasticsearch-aws-$version" + (staticCredentials ? "-credentials-static" : "") }
@Override
String getElasticsearchJdkTool(def allEnvironments) {
null // No JDK needed for Elasticsearch: the Elasticsearch instance is remote.
}
String getNameEmbeddableVersion() {
version.replaceAll('\\.', '')
}
Expand Down Expand Up @@ -921,7 +907,6 @@ void mavenNonDefaultBuild(BuildEnvironment buildEnv, String args, String project
sh """ \
mvn -Dsurefire.environment=$testSuffix \
${toTestJdkArg(buildEnv)} \
${toElasticsearchJdkArg(buildEnv)} \
--fail-at-end \
$args \
"""
Expand Down Expand Up @@ -965,14 +950,3 @@ String toTestJdkArg(BuildEnvironment buildEnv) {

return args
}

String toElasticsearchJdkArg(BuildEnvironment buildEnv) {
String elasticsearchJdkTool = buildEnv.getElasticsearchJdkTool(environments)

if (elasticsearchJdkTool == null || buildEnv.getMavenJdkTool(environments) == elasticsearchJdkTool) {
return '' // No specific JDK needed
}

def elasticsearchJdkToolPath = tool(name: elasticsearchJdkTool, type: 'jdk')
return "-Dtest.elasticsearch.run.java_home=$elasticsearchJdkToolPath"
}
6 changes: 0 additions & 6 deletions parents/integrationtest/pom.xml
Expand Up @@ -297,8 +297,6 @@
<id>elasticsearch-5.6</id>
<properties>
<test.elasticsearch.connection.version>${version.org.elasticsearch.latest-5.6}</test.elasticsearch.connection.version>
<!-- flavours are only supported starting with ES 6.3 -->
<test.elasticsearch.run.flavour></test.elasticsearch.run.flavour>
<test.elasticsearch.testdialect>org.hibernate.search.util.impl.integrationtest.backend.elasticsearch.dialect.Elasticsearch5TestDialect</test.elasticsearch.testdialect>
</properties>
</profile>
Expand All @@ -308,8 +306,6 @@
<id>elasticsearch-6.0</id>
<properties>
<test.elasticsearch.connection.version>${version.org.elasticsearch.latest-6.2}</test.elasticsearch.connection.version>
<!-- flavours are only supported starting with ES 6.3 -->
<test.elasticsearch.run.flavour></test.elasticsearch.run.flavour>
<test.elasticsearch.testdialect>org.hibernate.search.util.impl.integrationtest.backend.elasticsearch.dialect.Elasticsearch60TestDialect</test.elasticsearch.testdialect>
</properties>
</profile>
Expand Down Expand Up @@ -406,8 +402,6 @@
<id>elasticsearch-7.11</id>
<properties>
<test.elasticsearch.connection.version>${version.org.elasticsearch.latest-7.11}</test.elasticsearch.connection.version>
<!-- OSS flavour no longer available in 7.11 -->
<test.elasticsearch.run.flavour>default</test.elasticsearch.run.flavour>
<test.elasticsearch.testdialect>org.hibernate.search.util.impl.integrationtest.backend.elasticsearch.dialect.Elasticsearch710TestDialect</test.elasticsearch.testdialect>
</properties>
</profile>
Expand Down
2 changes: 0 additions & 2 deletions pom.xml
Expand Up @@ -480,8 +480,6 @@

<!-- Control how an Elasticsearch instance is run automatically during tests -->
<test.elasticsearch.run.skip>false</test.elasticsearch.run.skip>
<test.elasticsearch.run.java_home>${java.home}</test.elasticsearch.run.java_home>
<test.elasticsearch.run.flavour>oss</test.elasticsearch.run.flavour>
<!--
These properties are transparently passed as system properties to integration tests,
and retrieved by a test utility:
Expand Down

0 comments on commit 3276a0b

Please sign in to comment.