This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git
The following commit(s) were added to refs/heads/master by this push:
new 4da44c7 PHOENIX-6831 Remove bogus Ant dependency from hive connector
test util
4da44c7 is described below
commit 4da44c78181f2b76c525b1694f962fa909d2d596
Author: Istvan Toth <[email protected]>
AuthorDate: Wed Nov 9 08:50:03 2022 +0100
PHOENIX-6831 Remove bogus Ant dependency from hive connector test util
---
phoenix-hive-base/pom.xml | 7 -------
.../src/it/java/org/apache/hadoop/hive/ql/QTestUtil.java | 3 +--
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/phoenix-hive-base/pom.xml b/phoenix-hive-base/pom.xml
index 5521583..8903e7e 100644
--- a/phoenix-hive-base/pom.xml
+++ b/phoenix-hive-base/pom.xml
@@ -181,13 +181,6 @@
</exclusion>
</exclusions>
</dependency>
- <!-- Bogus test dependencies from the copied Hive QTestUtil -->
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <scope>provided</scope>
- <version>1.9.1</version>
- </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
diff --git
a/phoenix-hive-base/src/it/java/org/apache/hadoop/hive/ql/QTestUtil.java
b/phoenix-hive-base/src/it/java/org/apache/hadoop/hive/ql/QTestUtil.java
index 54d16de..23fec0b 100644
--- a/phoenix-hive-base/src/it/java/org/apache/hadoop/hive/ql/QTestUtil.java
+++ b/phoenix-hive-base/src/it/java/org/apache/hadoop/hive/ql/QTestUtil.java
@@ -121,7 +121,6 @@ import org.apache.logging.log4j.util.Strings;
import org.apache.phoenix.compat.CompatUtil;
import org.apache.phoenix.compat.HiveCompatUtil;
import org.apache.phoenix.compat.MyResult;
-import org.apache.tools.ant.BuildException;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.ZooKeeper;
@@ -2176,7 +2175,7 @@ public class QTestUtil {
}
int pos = Arrays.binarySearch(cachedQvFileList, tname,
String.CASE_INSENSITIVE_ORDER);
if (pos >= 0) {
- throw new BuildException("Unexpected file list element: " +
cachedQvFileList[pos]);
+ throw new IllegalArgumentException("Unexpected file list element: " +
cachedQvFileList[pos]);
}
List<String> result = null;
for (pos = (-pos - 1); pos < cachedQvFileList.length; ++pos) {
