From 7231bb586a6f2d4559f87bee6e1e2976df0e85b4 Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Wed, 12 Apr 2023 22:17:20 +0200 Subject: [PATCH] Cleanup Closes #2525 --- pom.xml | 33 ------------------ .../core/AbstractElasticsearchTemplate.java | 2 +- .../jupiter/IntegrationtestEnvironment.java | 3 +- .../lombok/999999/lombok-999999.jar | Bin 425 -> 0 bytes .../lombok/999999/lombok-999999.jar.md5 | 1 - .../lombok/999999/lombok-999999.jar.sha1 | 1 - .../lombok/999999/lombok-999999.pom | 8 ----- .../lombok/999999/lombok-999999.pom.md5 | 1 - .../lombok/999999/lombok-999999.pom.sha1 | 1 - .../projectlombok/lombok/maven-metadata.xml | 12 ------- .../lombok/maven-metadata.xml.md5 | 1 - .../lombok/maven-metadata.xml.sha1 | 1 - .../testcontainers-opensearch.properties | 10 ------ 13 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.jar delete mode 100644 src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.jar.md5 delete mode 100644 src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.jar.sha1 delete mode 100644 src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom delete mode 100644 src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom.md5 delete mode 100644 src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom.sha1 delete mode 100644 src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml delete mode 100644 src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml.md5 delete mode 100644 src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml.sha1 delete mode 100644 src/test/resources/testcontainers-opensearch.properties diff --git a/pom.xml b/pom.xml index bde04bc52..a4d5759f4 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,6 @@ --> test integration-test - none @@ -279,24 +278,6 @@ test - - - - org.projectlombok - lombok - - 999999 - test - - org.skyscreamer jsonassert @@ -419,20 +400,6 @@ - - - integration-test-opensearch - ${mvn.integration-test-opensearch.goal} - - test - - - integration-test - - opensearch - - - diff --git a/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java index 9b7a99990..7ff8d6f48 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java @@ -66,7 +66,7 @@ /** * 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. *

* Note: Although this class is public, it is not considered to be part of the official Spring Data diff --git a/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/IntegrationtestEnvironment.java b/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/IntegrationtestEnvironment.java index c6f87cd8c..89b5129c6 100644 --- a/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/IntegrationtestEnvironment.java +++ b/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/IntegrationtestEnvironment.java @@ -20,7 +20,7 @@ */ public enum IntegrationtestEnvironment { - ELASTICSEARCH, OPENSEARCH, UNDEFINED; + ELASTICSEARCH, UNDEFINED; public static final String SYSTEM_PROPERTY = "sde.integration-test.environment"; @@ -29,7 +29,6 @@ public static IntegrationtestEnvironment get() { String property = System.getProperty(SYSTEM_PROPERTY, "elasticsearch"); return switch (property.toUpperCase()) { case "ELASTICSEARCH" -> ELASTICSEARCH; - case "OPENSEARCH" -> OPENSEARCH; default -> UNDEFINED; }; } diff --git a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.jar b/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.jar deleted file mode 100644 index f11c867c5059f6179c26a131960899f58de3d64c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 425 zcmWIWW@Zs#;Nak3_*7FG#DD}i8CV#6T|*poJ^kGD|D9rBU}gyLX6FE@V1gDtA_7e=7P|#0a)pXWGOjOQ69PKn${)i-7^?oTnJ>W?)FoEhwqf zE2$_6@MdHZVL7XxlrB23r;WFonl Rl?^1t41`;N^nDPA0RX@NP|5%R diff --git a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.jar.md5 b/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.jar.md5 deleted file mode 100644 index 48ea84335..000000000 --- a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -f6bbf833798e7af0055b94865a46440e \ No newline at end of file diff --git a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.jar.sha1 b/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.jar.sha1 deleted file mode 100644 index f6cee39f7..000000000 --- a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -59ddfc2b714be7918808eacecc5739b8d277e60e \ No newline at end of file diff --git a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom b/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom deleted file mode 100644 index 3f9fa7a19..000000000 --- a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom +++ /dev/null @@ -1,8 +0,0 @@ - - - 4.0.0 - org.projectlombok - lombok - 999999 - diff --git a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom.md5 b/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom.md5 deleted file mode 100644 index 788bc4133..000000000 --- a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -63317ccd46b6663ff35cb142e05dce10 \ No newline at end of file diff --git a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom.sha1 b/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom.sha1 deleted file mode 100644 index f1cddaef2..000000000 --- a/src/test/resources/local-maven-repo/org/projectlombok/lombok/999999/lombok-999999.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -db353983c68ade94ae7e08acfacc0fc21ed8b64b \ No newline at end of file diff --git a/src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml b/src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml deleted file mode 100644 index 8ddcc39a8..000000000 --- a/src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - org.projectlombok - lombok - - 999999 - - 999999 - - 20210321155422 - - diff --git a/src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml.md5 b/src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml.md5 deleted file mode 100644 index 8c58c1d52..000000000 --- a/src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -998d3b8876980a3ef5a90adc982cc727 \ No newline at end of file diff --git a/src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml.sha1 b/src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml.sha1 deleted file mode 100644 index ec41ca43b..000000000 --- a/src/test/resources/local-maven-repo/org/projectlombok/lombok/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -f4090a49c6eec680c075130b68bf8ee48aac4e94 \ No newline at end of file diff --git a/src/test/resources/testcontainers-opensearch.properties b/src/test/resources/testcontainers-opensearch.properties deleted file mode 100644 index 147af3ce5..000000000 --- a/src/test/resources/testcontainers-opensearch.properties +++ /dev/null @@ -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