mirror of
https://github.com/spring-projects/spring-data-elasticsearch.git
synced 2025-06-29 23:32:12 +00:00
Peter-Josef Meisch
GitHub
parent
d597baccd3
commit
6100c2491a
33
pom.xml
33
pom.xml
@ -43,7 +43,6 @@
|
||||
-->
|
||||
<mvn.unit-test.goal>test</mvn.unit-test.goal>
|
||||
<mvn.integration-test-elasticsearch.goal>integration-test</mvn.integration-test-elasticsearch.goal>
|
||||
<mvn.integration-test-opensearch.goal>none</mvn.integration-test-opensearch.goal>
|
||||
</properties>
|
||||
|
||||
<developers>
|
||||
@ -279,24 +278,6 @@
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
|
||||
<!--
|
||||
we don't use lombok in Spring Data Elasticsearch anymore. But the dependency is set in the parent project, and so the
|
||||
lombok compiler stuff is executed regardless of the fact that we don't need it.
|
||||
On AdoptOpenJdk 16.0.0 this leads to an error, so the project does not build.
|
||||
Therefore we replace lombok with a jar - that just contains an empty file - that lives in a local maven repository in
|
||||
src/test/resources/local-maven-repo/
|
||||
It was installed with
|
||||
mvn deploy:deploy-file -DgroupId=org.projectlombok -DartifactId=lombok -Dversion=999999 -Durl=file:./src/test/resources/local-maven-repo/ -DrepositoryId=local-maven-repo -DupdateReleaseInfo=true -Dfile=path/to/empty.jar
|
||||
-->
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<!--suppress MavenPackageUpdate -->
|
||||
<version>999999</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.skyscreamer</groupId>
|
||||
<artifactId>jsonassert</artifactId>
|
||||
@ -419,20 +400,6 @@
|
||||
</systemPropertyVariables>
|
||||
</configuration>
|
||||
</execution>
|
||||
<!-- execution to run the integration tests against Opensearch -->
|
||||
<execution>
|
||||
<id>integration-test-opensearch</id>
|
||||
<phase>${mvn.integration-test-opensearch.goal}</phase>
|
||||
<goals>
|
||||
<goal>test</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<groups>integration-test</groups>
|
||||
<systemPropertyVariables>
|
||||
<sde.integration-test.environment>opensearch</sde.integration-test.environment>
|
||||
</systemPropertyVariables>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
||||
@ -66,7 +66,7 @@ import org.springframework.util.StringUtils;
|
||||
/**
|
||||
* This class contains methods that are common to different implementations of the {@link ElasticsearchOperations}
|
||||
* interface that use different clients, like RestHighLevelClient and the next Java client from Elasticsearch or some
|
||||
* future implementation that might use an Opensearch client. This class must not contain imports or use classes that
|
||||
* external implementation that might use a different client. This class must not contain imports or use classes that
|
||||
* are specific to one of these implementations.
|
||||
* <p>
|
||||
* <strong>Note:</strong> Although this class is public, it is not considered to be part of the official Spring Data
|
||||
|
||||
@ -20,7 +20,7 @@ package org.springframework.data.elasticsearch.junit.jupiter;
|
||||
*/
|
||||
public enum IntegrationtestEnvironment {
|
||||
|
||||
ELASTICSEARCH, OPENSEARCH, UNDEFINED;
|
||||
ELASTICSEARCH, UNDEFINED;
|
||||
|
||||
public static final String SYSTEM_PROPERTY = "sde.integration-test.environment";
|
||||
|
||||
@ -29,7 +29,6 @@ public enum IntegrationtestEnvironment {
|
||||
String property = System.getProperty(SYSTEM_PROPERTY, "elasticsearch");
|
||||
return switch (property.toUpperCase()) {
|
||||
case "ELASTICSEARCH" -> ELASTICSEARCH;
|
||||
case "OPENSEARCH" -> OPENSEARCH;
|
||||
default -> UNDEFINED;
|
||||
};
|
||||
}
|
||||
|
||||
Binary file not shown.
@ -1 +0,0 @@
|
||||
f6bbf833798e7af0055b94865a46440e
|
||||
@ -1 +0,0 @@
|
||||
59ddfc2b714be7918808eacecc5739b8d277e60e
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>999999</version>
|
||||
</project>
|
||||
@ -1 +0,0 @@
|
||||
63317ccd46b6663ff35cb142e05dce10
|
||||
@ -1 +0,0 @@
|
||||
db353983c68ade94ae7e08acfacc0fc21ed8b64b
|
||||
@ -1,12 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<metadata>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<versioning>
|
||||
<release>999999</release>
|
||||
<versions>
|
||||
<version>999999</version>
|
||||
</versions>
|
||||
<lastUpdated>20210321155422</lastUpdated>
|
||||
</versioning>
|
||||
</metadata>
|
||||
@ -1 +0,0 @@
|
||||
998d3b8876980a3ef5a90adc982cc727
|
||||
@ -1 +0,0 @@
|
||||
f4090a49c6eec680c075130b68bf8ee48aac4e94
|
||||
@ -1,10 +0,0 @@
|
||||
#
|
||||
# properties defining the image, these are not passed to the container on startup
|
||||
#
|
||||
sde.testcontainers.image-name=opensearchproject/opensearch
|
||||
sde.testcontainers.image-version=1.0.0
|
||||
#
|
||||
#
|
||||
# Opensearch as default has TLS and Basic auth enabled, we do not want this here, Testcontainers cannot ignore self signed certificates
|
||||
#
|
||||
plugins.security.disabled=true
|
||||
Loading…
x
Reference in New Issue
Block a user