This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push: new 1f5868b999 NIFI-11686 upgrade Elasticsearch low-level REST client to 8.13.3 This closes #8772 1f5868b999 is described below commit 1f5868b999070b162413c5c8e2921249b7f3ea43 Author: Chris Sampson <chris.sampso...@gmail.com> AuthorDate: Tue May 7 21:03:54 2024 +0100 NIFI-11686 upgrade Elasticsearch low-level REST client to 8.13.3 This closes #8772 Signed-off-by: Joseph Witt <joew...@apache.org> --- .../nifi/elasticsearch/ElasticSearchClientServiceImpl.java | 4 +--- .../apache/nifi/processors/elasticsearch/api/PaginationType.java | 3 ++- nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml | 9 +-------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientServiceImpl.java b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientServiceImpl.java index e2efb792f4..0b8b6acec3 100644 --- a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientServiceImpl.java +++ b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientServiceImpl.java @@ -88,9 +88,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @Tags({"elasticsearch", "elasticsearch6", "elasticsearch7", "elasticsearch8", "client"}) -@CapabilityDescription("A controller service for accessing an Elasticsearch client. " + - "Uses the Elasticsearch REST Client (7.13.4, the last version before client connections verify" + - "the server is Elastic provided, this should allow for connections to compatible alternatives, e.g. AWS OpenSearch)") +@CapabilityDescription("A controller service for accessing an Elasticsearch client, using the Elasticsearch (low-level) REST Client.") @DynamicProperty( name = "The name of a Request Header to add", value = "The value of the Header", diff --git a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/api/PaginationType.java b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/api/PaginationType.java index c7199b6524..c8ea776309 100644 --- a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/api/PaginationType.java +++ b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/api/PaginationType.java @@ -22,7 +22,8 @@ import org.apache.nifi.components.DescribedValue; public enum PaginationType implements DescribedValue { SCROLL("pagination-scroll", "Use Elasticsearch \"_scroll\" API to page results. Does not accept additional query parameters."), SEARCH_AFTER("pagination-search_after", "Use Elasticsearch \"search_after\" _search API to page sorted results."), - POINT_IN_TIME("pagination-pit", "Use Elasticsearch (7.10+ with XPack) \"point in time\" _search API to page sorted results."); + POINT_IN_TIME("pagination-pit", "Use Elasticsearch (7.10+ with XPack) \"point in time\" _search API to page sorted results. " + + "Not available for use with AWS OpenSearch."); private final String value; private final String description; diff --git a/nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml b/nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml index eca6230c5f..bb26aea04f 100644 --- a/nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml +++ b/nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml @@ -33,14 +33,7 @@ language governing permissions and limitations under the License. --> </modules> <properties> - <!-- pinned at 7.13.4 as it is the last version prior to Elastic forcing the client to check it is connecting - to an Elastic-provided Elasticsearch instead of an instance provided by someone else (e.g. AWS OpenSearch) - see: https://opensearch.org/blog/community/2021/08/community-clients/ for more info. - - Note: the low-level elasticsearch-rest-client remains licensed with Apache 2.0 - (https://www.elastic.co/guide/en/elasticsearch/client/java-rest/current/_license.html) even after the move - of the main Elasticsearch product and elasticsearch-rest-high-level-client to Elastic 2.0/SSPL 1.0 in v7.11.0+ --> - <elasticsearch.client.version>7.13.4</elasticsearch.client.version> + <elasticsearch.client.version>8.13.3</elasticsearch.client.version> </properties> <dependencyManagement>