Fix maven and update 2.7.0 zip (#268)

* Fix maven and update 2.7.0 zip Signed-off-by: Arpit Bandejiya <[email protected]> * fix RejectedExecutionException import Signed-off-by: Arpit Bandejiya <[email protected]> --------- Signed-off-by: Arpit Bandejiya <[email protected]>
opensearch-project · Apr 11, 2023 · 7d60d9d · 7d60d9d
1 parent 389b816
commit 7d60d9d
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - 'main'
-      - '1.*'
       - '2.*'
 
 jobs:

diff --git a/...java/org/opensearch/search/asynchronous/context/active/AsynchronousSearchActiveStore.java b/...java/org/opensearch/search/asynchronous/context/active/AsynchronousSearchActiveStore.java
@@ -12,7 +12,7 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.util.CollectionUtils;
 import org.opensearch.common.util.concurrent.ConcurrentMapLong;
-import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException;
+import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
 import org.opensearch.search.asynchronous.context.AsynchronousSearchContextId;
 import org.opensearch.search.asynchronous.context.state.AsynchronousSearchStateMachine;
 import org.opensearch.search.asynchronous.context.state.event.SearchDeletedEvent;

diff --git a/...va/org/opensearch/search/asynchronous/management/AsynchronousSearchManagementService.java b/...va/org/opensearch/search/asynchronous/management/AsynchronousSearchManagementService.java
@@ -32,7 +32,7 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.AbstractRunnable;
-import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException;
+import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
 import org.opensearch.common.util.concurrent.ThreadContext;
 import org.opensearch.search.asynchronous.settings.LegacyOpendistroAsynchronousSearchSettings;
 import org.opensearch.tasks.Task;

diff --git a/...java/org/opensearch/search/asynchronous/service/AsynchronousSearchPersistenceService.java b/...java/org/opensearch/search/asynchronous/service/AsynchronousSearchPersistenceService.java
@@ -30,7 +30,7 @@
 import org.opensearch.common.io.stream.NotSerializableExceptionWrapper;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
-import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException;
+import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.index.engine.DocumentMissingException;

diff --git a/...org/opensearch/search/asynchronous/context/active/AsynchronousSearchActiveStoreTests.java b/...org/opensearch/search/asynchronous/context/active/AsynchronousSearchActiveStoreTests.java
@@ -18,7 +18,7 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.OpenSearchExecutors;
-import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException;
+import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
 import org.opensearch.test.ClusterServiceUtils;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.threadpool.ExecutorBuilder;

diff --git a/...opensearch/search/asynchronous/context/permits/AsynchronousSearchContextPermitsTests.java b/...opensearch/search/asynchronous/context/permits/AsynchronousSearchContextPermitsTests.java
@@ -15,7 +15,7 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.OpenSearchExecutors;
-import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException;
+import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.threadpool.ScalingExecutorBuilder;
 import org.opensearch.threadpool.TestThreadPool;

diff --git a/...est/java/org/opensearch/search/asynchronous/integTests/AsynchronousSearchRejectionIT.java b/...est/java/org/opensearch/search/asynchronous/integTests/AsynchronousSearchRejectionIT.java
@@ -30,7 +30,7 @@
 import org.opensearch.action.search.ShardSearchFailure;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
-import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException;
+import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.search.SearchService;
 import org.opensearch.search.aggregations.InternalAggregation;

diff --git a/...a/org/opensearch/search/asynchronous/integTests/SubmitAsynchronousSearchSingleNodeIT.java b/...a/org/opensearch/search/asynchronous/integTests/SubmitAsynchronousSearchSingleNodeIT.java
@@ -24,7 +24,7 @@
 import org.opensearch.common.TriConsumer;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
-import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException;
+import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
 import org.opensearch.index.query.MatchQueryBuilder;
 import org.opensearch.script.Script;
 import org.opensearch.script.ScriptType;

diff --git a/...org/opensearch/search/asynchronous/bwc/2.7.0.0/opensearch-asynchronous-search-2.7.0.0.zip b/...org/opensearch/search/asynchronous/bwc/2.7.0.0/opensearch-asynchronous-search-2.7.0.0.zip
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ on: @@
       push:
         branches:
           - 'main'
-          - '1.*'
           - '2.*'
     jobs:
@@ Expand Down @@