Delete the elasticsearch-high-level-client extension

Because we've deprecated it a while ago (in Quarkus 3.0) and it no longer works with Elasticsearch 8.
quarkusio · Aug 4, 2023 · 80139bc · 80139bc
1 parent dcc17a6
commit 80139bc
Show file tree

Hide file tree

Showing 29 changed files with 5 additions and 1,183 deletions.
diff --git a/.github/native-tests.json b/.github/native-tests.json
@@ -39,7 +39,7 @@
         {
             "category": "Data6",
             "timeout": 95,
-            "test-modules": "elasticsearch-rest-client, elasticsearch-rest-high-level-client, elasticsearch-java-client, hibernate-search-orm-elasticsearch, hibernate-search-orm-elasticsearch-tenancy, hibernate-search-orm-opensearch, hibernate-search-orm-elasticsearch-coordination-outbox-polling",
+            "test-modules": "elasticsearch-rest-client, elasticsearch-java-client, hibernate-search-orm-elasticsearch, hibernate-search-orm-elasticsearch-tenancy, hibernate-search-orm-opensearch, hibernate-search-orm-elasticsearch-coordination-outbox-polling",
             "os-name": "ubuntu-latest"
         },
         {

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -109,8 +109,6 @@
         <agroal.version>2.1</agroal.version>
         <jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
         <elasticsearch-opensource-components.version>8.8.2</elasticsearch-opensource-components.version>
-        <!-- for the now proprietary components of Elasticsearch, we use the last Open Source version -->
-        <elasticsearch-proprietary-components-keeping-old-opensource-version.version>7.10.2</elasticsearch-proprietary-components-keeping-old-opensource-version.version>
         <rxjava.version>2.2.21</rxjava.version>
         <wildfly.openssl-java.version>2.2.5.Final</wildfly.openssl-java.version>
         <wildfly.openssl-linux.version>2.2.2.Final</wildfly.openssl-linux.version>
@@ -753,16 +751,6 @@
                 <artifactId>quarkus-elasticsearch-rest-client-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-elasticsearch-rest-high-level-client</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-elasticsearch-rest-high-level-client-deployment</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-elasticsearch-java-client</artifactId>
@@ -5765,18 +5753,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>org.elasticsearch.client</groupId>
-                <artifactId>elasticsearch-rest-high-level-client</artifactId>
-                <version>${elasticsearch-proprietary-components-keeping-old-opensource-version.version}</version>
-                <exclusions>
-                    <!-- exclude log4j2 to get its version from log4j2-jboss-logmanager -->
-                    <exclusion>
-                        <groupId>org.apache.logging.log4j</groupId>
-                        <artifactId>log4j-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <groupId>org.elasticsearch.client</groupId>
                 <artifactId>elasticsearch-rest-client-sniffer</artifactId>

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/Capability.java b/core/deployment/src/main/java/io/quarkus/deployment/Capability.java
@@ -73,8 +73,6 @@ public interface Capability {
     String MONGODB_PANACHE = QUARKUS_PREFIX + ".mongodb.panache";
     String MONGODB_PANACHE_KOTLIN = MONGODB_PANACHE + ".kotlin";
 
-    String ELASTICSEARCH_REST_HIGH_LEVEL_CLIENT = QUARKUS_PREFIX + ".elasticsearch-rest-high-level-client";
-
     String FLYWAY = QUARKUS_PREFIX + ".flyway";
     String LIQUIBASE = QUARKUS_PREFIX + ".liquibase";
 

diff --git a/devtools/bom-descriptor-json/pom.xml b/devtools/bom-descriptor-json/pom.xml
@@ -473,19 +473,6 @@
                         </exclusion>
                     </exclusions>
                 </dependency>
-                <dependency>
-                    <groupId>io.quarkus</groupId>
-                    <artifactId>quarkus-elasticsearch-rest-high-level-client</artifactId>
-                    <version>${project.version}</version>
-                    <type>pom</type>
-                    <scope>test</scope>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>*</groupId>
-                            <artifactId>*</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
                 <dependency>
                     <groupId>io.quarkus</groupId>
                     <artifactId>quarkus-elytron-security</artifactId>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -487,19 +487,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-elasticsearch-rest-high-level-client-deployment</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-elytron-security-deployment</artifactId>

diff --git a/docs/src/main/asciidoc/elasticsearch.adoc b/docs/src/main/asciidoc/elasticsearch.adoc
@@ -19,10 +19,8 @@ Quarkus provides two ways of accessing Elasticsearch:
 
 [WARNING]
 ====
-A third Quarkus extension for the "high level REST Client" exists, but is deprecated and will be removed in a future version,
-as this client has been deprecated by Elastic and has some licensing issues.
-
-It is highly recommended to upgrade to the new Elasticsearch Java client extension.
+A third Quarkus extension for the "high level REST Client" used to exist,
+but was removed as this client has been deprecated by Elastic and has some licensing issues.
 ====
 
 == Prerequisites

diff --git a/docs/src/main/asciidoc/native-and-ssl.adoc b/docs/src/main/asciidoc/native-and-ssl.adoc
@@ -85,7 +85,7 @@ As SSL is de facto the standard nowadays, we decided to enable its support autom
  * the Agroal connection pooling extension (`quarkus-agroal`),
  * the Amazon Services extension (`quarkus-amazon-*`),
  * the Consul Config extension (`quarkus-config-consul`),
- * the Elasticsearch client extensions (`quarkus-elasticsearch-rest-client` and `quarkus-elasticsearch-rest-high-level-client`) and thus the Hibernate Search Elasticsearch extension (`quarkus-hibernate-search-orm-elasticsearch`),
+ * the Elasticsearch client extensions (`quarkus-elasticsearch-rest-client` and `quarkus-elasticsearch-java-client`) and thus the Hibernate Search Elasticsearch extension (`quarkus-hibernate-search-orm-elasticsearch`),
  * the Elytron Security OAuth2 extension (`quarkus-elytron-security-oauth2`),
  * the gRPC extension (`quarkus-grpc`),
  * the Infinispan Client extension (`quarkus-infinispan-client`).

diff --git a/extensions/elasticsearch-rest-high-level-client/deployment/pom.xml b/extensions/elasticsearch-rest-high-level-client/deployment/pom.xml
diff --git a/.../elasticsearch/restclient/highlevel/deployment/ElasticsearchHighLevelClientProcessor.java b/.../elasticsearch/restclient/highlevel/deployment/ElasticsearchHighLevelClientProcessor.java
diff --git a/extensions/elasticsearch-rest-high-level-client/pom.xml b/extensions/elasticsearch-rest-high-level-client/pom.xml
diff --git a/extensions/elasticsearch-rest-high-level-client/runtime/pom.xml b/extensions/elasticsearch-rest-high-level-client/runtime/pom.xml