Ian Maxon has submitted this change and it was merged.
Change subject: Merge release-0.9.4 into master
......................................................................
Merge release-0.9.4 into master
Change-Id:Ied2b685f015e0f35563ebd0510231a5d663494f4
---
M asterixdb/asterix-geo/pom.xml
M asterixdb/pom.xml
M
hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java
3 files changed, 9 insertions(+), 10 deletions(-)
Approvals:
Anon. E. Moose #1000171:
Jenkins: Verified; No violations found; ; Verified
Michael Blow: Looks good to me, approved
diff --git a/asterixdb/asterix-geo/pom.xml b/asterixdb/asterix-geo/pom.xml
index 671e57e..8c891e6 100644
--- a/asterixdb/asterix-geo/pom.xml
+++ b/asterixdb/asterix-geo/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.5-SNAPSHOT</version>
</parent>
<artifactId>asterix-geo</artifactId>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index ab0bd5c..9bf7533 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -73,15 +73,9 @@
<itest.excludes>${global.itest.excludes}</itest.excludes>
<!-- Versions under dependencymanagement or used in many projects via
properties -->
-<<<<<<< HEAD (3477a2 [NO ISSUE] Enable Build/Run w/ Java 11)
- <algebricks.version>0.3.4-SNAPSHOT</algebricks.version>
- <hyracks.version>0.3.4-SNAPSHOT</hyracks.version>
- <hadoop.version>2.8.5</hadoop.version>
-=======
<algebricks.version>0.3.5-SNAPSHOT</algebricks.version>
<hyracks.version>0.3.5-SNAPSHOT</hyracks.version>
- <hadoop.version>2.2.0</hadoop.version>
->>>>>>> BRANCH (478ecc Advance version to AsterixDB 0.9.5-SNAPSHOT and Hyracks
0.3.)
+ <hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
<implementation.title>Apache AsterixDB -
${project.name}</implementation.title>
diff --git
a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java
b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java
index 159df9e..9e52785 100644
---
a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java
+++
b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java
@@ -38,8 +38,13 @@
final String targetDir = getTargetDir();
final String[] list = new File(targetDir).list((dir, name) ->
name.matches(pattern));
final String topLevelPattern = getTopLevelDirPattern();
- final String[] topLevel =
- new File(FileUtil.joinPath(targetDir, list[0])).list((dir,
name) -> name.matches(topLevelPattern));
+ String[] topLevel;
+ if (topLevelPattern == null) {
+ topLevel = new String[] { "" };
+ } else {
+ topLevel = new File(FileUtil.joinPath(targetDir, list[0]))
+ .list((dir, name) -> name.matches(topLevelPattern));
+ }
installerDir = FileUtil.joinPath(targetDir, list[0], topLevel[0]);
Assert.assertNotNull("installerDir", list);
Assert.assertFalse("Ambiguous install dir (" + pattern + "): " +
Arrays.toString(topLevel),
--
To view, visit https://asterix-gerrit.ics.uci.edu/2985
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ied2b685f015e0f35563ebd0510231a5d663494f4
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon <[email protected]>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Ian Maxon <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
