[Release 3.0] Bump gradle 8.10.2 / JDK 23 / 3.0.0.0-alpha1 support on geospatial

.github/workflows/CI.yml

@@ -18,7 +18,7 @@ jobs:
     needs: Get-CI-Image-Tag
     strategy:
       matrix:
-        java: [21]
+        java: [21, 23]
 
     name: Build and Test geospatial Plugin
     runs-on: ubuntu-latest
@@ -54,7 +54,7 @@ jobs:
   Build-windows-macos:
     strategy:
       matrix:
-        java: [21]
+        java: [21, 23]
         os: [windows-latest, macos-latest]
 
     name: Build and Test geospatial Plugin

.github/workflows/test_security.yml

@@ -17,7 +17,7 @@ jobs:
   Build-ad:
     strategy:
       matrix:
-        java: [ 21 ]
+        java: [21, 23]
         os: [ubuntu-latest]
       fail-fast: true
 

CHANGELOG.md

@@ -12,6 +12,7 @@ See the [CONTRIBUTING guide](./CONTRIBUTING.md#Changelog) for instructions on ho
 ### Documentation
 ### Maintenance
 - Set geospatial plugin 3.0.0 baseline JDK version to JDK-21 ([#695](https://github.com/opensearch-project/geospatial/pull/695))
+- Bump gradle 8.10.2 / JDK 23 / 3.0.0.0-alpha1 support on geospatial ([#723](https://github.com/opensearch-project/geospatial/pull/723)) 
 
 ### Refactoring
 

build.gradle

@@ -48,8 +48,8 @@ validateNebulaPom.enabled = false
 
 buildscript {
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
-        buildVersionQualifier = System.getProperty("build.version_qualifier", "")
+        opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT")
+        buildVersionQualifier = System.getProperty("build.version_qualifier", "alpha1")
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
         // 2.2.0-SNAPSHOT -> 2.2.0.0-SNAPSHOT
         version_tokens = opensearch_version.tokenize('-')

client/src/main/java/org/opensearch/geospatial/action/IpEnrichmentActionClient.java

@@ -8,9 +8,9 @@
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
-import org.opensearch.client.node.NodeClient;
 import org.opensearch.common.action.ActionFuture;
 import org.opensearch.core.action.ActionResponse;
+import org.opensearch.transport.client.node.NodeClient;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;

client/src/test/java/org/opensearch/geospatial/action/IpEnrichmentActionClientTests.java

@@ -17,9 +17,9 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.opensearch.client.node.NodeClient;
 import org.opensearch.common.action.ActionFuture;
 import org.opensearch.core.action.ActionResponse;
+import org.opensearch.transport.client.node.NodeClient;
 
 import lombok.SneakyThrows;
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionSha256Sum=2ab88d6de2c23e6adae7363ae6e29cbdd2a709e992929b48b6530fd0c7133bd6
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/org/opensearch/geospatial/action/upload/geojson/ContentBuilder.java

@@ -13,9 +13,9 @@
 import org.opensearch.action.bulk.BulkRequestBuilder;
 import org.opensearch.action.index.IndexRequestBuilder;
 import org.opensearch.action.support.WriteRequest;
-import org.opensearch.client.Client;
 import org.opensearch.core.common.Strings;
 import org.opensearch.geospatial.GeospatialParser;
+import org.opensearch.transport.client.Client;
 
 /**
  * ContentBuilder is responsible for preparing Request that can be executed

src/main/java/org/opensearch/geospatial/action/upload/geojson/IndexManager.java

@@ -12,10 +12,10 @@
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.StepListener;
 import org.opensearch.action.admin.indices.create.CreateIndexRequest;
-import org.opensearch.client.IndicesAdminClient;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.transport.client.IndicesAdminClient;
 
 import lombok.AllArgsConstructor;
 import lombok.NonNull;

src/main/java/org/opensearch/geospatial/action/upload/geojson/PipelineManager.java

@@ -11,7 +11,6 @@
 import org.opensearch.action.StepListener;
 import org.opensearch.action.ingest.DeletePipelineRequest;
 import org.opensearch.action.ingest.PutPipelineRequest;
-import org.opensearch.client.ClusterAdminClient;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.common.xcontent.XContentType;
@@ -20,6 +19,7 @@
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.geospatial.processor.FeatureProcessor;
 import org.opensearch.ingest.Pipeline;
+import org.opensearch.transport.client.ClusterAdminClient;
 
 import lombok.AllArgsConstructor;
 import lombok.NonNull;

src/main/java/org/opensearch/geospatial/action/upload/geojson/UploadGeoJSONTransportAction.java

@@ -16,7 +16,6 @@
 import org.opensearch.ResourceAlreadyExistsException;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
-import org.opensearch.client.Client;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.core.action.ActionListener;
@@ -25,6 +24,7 @@
 import org.opensearch.rest.RestRequest;
 import org.opensearch.tasks.Task;
 import org.opensearch.transport.TransportService;
+import org.opensearch.transport.client.Client;
 
 /**
  * TransportAction to handle import operation

src/main/java/org/opensearch/geospatial/ip2geo/action/DeleteDatasourceAction.java

@@ -6,7 +6,7 @@
 package org.opensearch.geospatial.ip2geo.action;
 
 import org.opensearch.action.ActionType;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 
 /**
  * Ip2Geo datasource delete action

src/main/java/org/opensearch/geospatial/ip2geo/action/DeleteDatasourceTransportAction.java

@@ -10,7 +10,7 @@
 import org.opensearch.ResourceNotFoundException;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.geospatial.annotation.VisibleForTesting;

src/main/java/org/opensearch/geospatial/ip2geo/action/PutDatasourceAction.java

@@ -6,7 +6,7 @@
 package org.opensearch.geospatial.ip2geo.action;
 
 import org.opensearch.action.ActionType;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 
 /**
  * Ip2Geo datasource creation action

src/main/java/org/opensearch/geospatial/ip2geo/action/PutDatasourceTransportAction.java

@@ -15,7 +15,7 @@
 import org.opensearch.action.index.IndexResponse;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.geospatial.annotation.VisibleForTesting;

src/main/java/org/opensearch/geospatial/ip2geo/action/RestDeleteDatasourceHandler.java

@@ -12,10 +12,10 @@
 import java.util.List;
 import java.util.Locale;
 
-import org.opensearch.client.node.NodeClient;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
+import org.opensearch.transport.client.node.NodeClient;
 
 /**
  * Rest handler for Ip2Geo datasource delete request

src/main/java/org/opensearch/geospatial/ip2geo/action/RestGetDatasourceHandler.java

@@ -11,11 +11,11 @@
 
 import java.util.List;
 
-import org.opensearch.client.node.NodeClient;
 import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
+import org.opensearch.transport.client.node.NodeClient;
 
 /**
  * Rest handler for Ip2Geo datasource get request

src/main/java/org/opensearch/geospatial/ip2geo/action/RestPutDatasourceHandler.java

@@ -12,7 +12,6 @@
 import java.io.IOException;
 import java.util.List;
 
-import org.opensearch.client.node.NodeClient;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.core.xcontent.XContentParser;
@@ -21,6 +20,7 @@
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
+import org.opensearch.transport.client.node.NodeClient;
 
 /**
  * Rest handler for Ip2Geo datasource creation

src/main/java/org/opensearch/geospatial/ip2geo/action/RestUpdateDatasourceHandler.java

@@ -12,12 +12,12 @@
 import java.io.IOException;
 import java.util.List;
 
-import org.opensearch.client.node.NodeClient;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.geospatial.ip2geo.common.URLDenyListChecker;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
+import org.opensearch.transport.client.node.NodeClient;
 
 /**
  * Rest handler for Ip2Geo datasource update request

src/main/java/org/opensearch/geospatial/ip2geo/action/UpdateDatasourceAction.java

@@ -6,7 +6,7 @@
 package org.opensearch.geospatial.ip2geo.action;
 
 import org.opensearch.action.ActionType;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 
 /**
  * Ip2Geo datasource update action

src/main/java/org/opensearch/geospatial/ip2geo/action/UpdateDatasourceTransportAction.java

@@ -16,7 +16,7 @@
 import org.opensearch.ResourceNotFoundException;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
-import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.geospatial.exceptions.ConcurrentModificationException;

src/main/java/org/opensearch/geospatial/ip2geo/dao/DatasourceDao.java

@@ -34,7 +34,6 @@
 import org.opensearch.action.index.IndexResponse;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.support.WriteRequest;
-import org.opensearch.client.Client;
 import org.opensearch.cluster.routing.Preference;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.ClusterSettings;
@@ -54,6 +53,7 @@
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.search.SearchHit;
+import org.opensearch.transport.client.Client;
 
 import lombok.extern.log4j.Log4j2;