You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mh...@apache.org on 2018/10/07 13:14:58 UTC
asterixdb-bad git commit: Update Asterix dependency
Repository: asterixdb-bad
Updated Branches:
refs/heads/master d0ccc577d -> 3d421ee30
Update Asterix dependency
Change-Id: I6b8fdeda4c5fe31c0c9db1ed235727be2958bd77
Project: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/commit/3d421ee3
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/tree/3d421ee3
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/diff/3d421ee3
Branch: refs/heads/master
Commit: 3d421ee3001c961caddff5cdc5b1f8d6402b1d2d
Parents: d0ccc57
Author: Ian Maxon <ia...@maxons.email>
Authored: Thu Oct 4 18:04:56 2018 -0700
Committer: Ian Maxon <ia...@maxons.email>
Committed: Thu Oct 4 18:04:56 2018 -0700
----------------------------------------------------------------------
.../apache/asterix/bad/test/BADRecoveryTest.java | 16 +++++++---------
asterix-opt-bom/pom.xml | 2 +-
pom.xml | 2 +-
3 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/3d421ee3/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADRecoveryTest.java
----------------------------------------------------------------------
diff --git a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADRecoveryTest.java b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADRecoveryTest.java
index b62e4b9..277d718 100644
--- a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADRecoveryTest.java
+++ b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADRecoveryTest.java
@@ -51,6 +51,8 @@ public class BADRecoveryTest {
private static File installerTargetPath;
private static String ncServiceHomeDirName;
private static String ncServiceHomePath;
+ private static String ncServiceSubDirName;
+ private static String ncServiceSubPath;
private static String scriptHomePath;
private static String reportPath;
@@ -63,15 +65,11 @@ public class BADRecoveryTest {
installerTargetPath =
new File(new File(asterixInstallerPath.getParentFile().getParentFile(), "asterix-server"), "target");
reportPath = new File(installerTargetPath, "failsafe-reports").getAbsolutePath();
- ncServiceHomeDirName = installerTargetPath.list(new FilenameFilter() {
- @Override
- public boolean accept(File dir, String name) {
- return new File(dir, name).isDirectory() && name.startsWith("asterix-server")
- && name.endsWith("binary-assembly");
- }
- })[0];
- ncServiceHomePath = new File(installerTargetPath, ncServiceHomeDirName).getAbsolutePath();
-
+ ncServiceSubDirName =
+ installerTargetPath.list((dir, name) -> name.matches("asterix-server.*binary-assembly"))[0];
+ ncServiceSubPath = new File(installerTargetPath, ncServiceSubDirName).getAbsolutePath();
+ ncServiceHomeDirName = new File(ncServiceSubPath).list(((dir, name) -> name.matches("apache-asterixdb.*")))[0];
+ ncServiceHomePath = new File(ncServiceSubPath, ncServiceHomeDirName).getAbsolutePath();
pb = new ProcessBuilder();
env = pb.environment();
env.put("JAVA_HOME", System.getProperty("java.home"));
http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/3d421ee3/asterix-opt-bom/pom.xml
----------------------------------------------------------------------
diff --git a/asterix-opt-bom/pom.xml b/asterix-opt-bom/pom.xml
index fbd1bd2..0dcd9bd 100644
--- a/asterix-opt-bom/pom.xml
+++ b/asterix-opt-bom/pom.xml
@@ -30,7 +30,7 @@
<!-- project coordinates -->
<groupId>org.apache.asterix</groupId>
<artifactId>asterix-opt-bom</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.5-SNAPSHOT</version>
<packaging>pom</packaging>
<name>asterix-opt-bom</name>
<description>BAD Extension to AsterixDB</description>
http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/3d421ee3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c953683..9159682 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.asterix</groupId>
<artifactId>apache-asterixdb</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.5-SNAPSHOT</version>
</parent>
<modules>
<module>asterix-bad</module>