You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/11/05 21:41:26 UTC
[1/5] git commit: SLIDER-602 AgentRegistryIT-testAgentRegistry failing
Repository: incubator-slider
Updated Branches:
refs/heads/releases/slider-0.52 [created] 57130b5d6
refs/heads/releases/slider-0.60 [created] 5034161db
SLIDER-602 AgentRegistryIT-testAgentRegistry failing
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/7fb01c36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/7fb01c36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/7fb01c36
Branch: refs/heads/releases/slider-0.52
Commit: 7fb01c36a16cf3ae20278dda2ef02b93b8342d46
Parents: 96c9006
Author: Steve Loughran <st...@apache.org>
Authored: Sun Nov 2 20:20:56 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sun Nov 2 20:20:56 2014 +0000
----------------------------------------------------------------------
.../funtest/lifecycle/AgentRegistryIT.groovy | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7fb01c36/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentRegistryIT.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentRegistryIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentRegistryIT.groovy
index 5b8b3cd..c7fa5da 100644
--- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentRegistryIT.groovy
+++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentRegistryIT.groovy
@@ -82,13 +82,15 @@ public class AgentRegistryIT extends AgentCommandTestBase
// resolve the ~ path
- resolve(0, [ARG_LIST, ARG_PATH, "/"])
- resolve(0, [ARG_LIST, ARG_PATH, "/users"])
+ resolve(0, [ARG_LIST, ARG_PATH, "/"]).dumpOutput()
+ resolve(0, [ARG_LIST, ARG_PATH, "/users"]).dumpOutput()
- resolve(0, [ARG_LIST, ARG_PATH, TILDE]).dumpOutput()
+ def home = homepath()
+ resolve(0, [ARG_LIST, ARG_PATH, home]).dumpOutput()
- String sliderApps = "${TILDE}/services/${SliderKeys.APP_TYPE}"
+
+ String sliderApps = "${home}/services/${SliderKeys.APP_TYPE}"
resolve(0, [ARG_LIST, ARG_PATH, sliderApps]).dumpOutput()
// running app
@@ -133,4 +135,12 @@ public class AgentRegistryIT extends AgentCommandTestBase
//cluster now missing
exists(EXIT_UNKNOWN_INSTANCE, CLUSTER)
}
+
+ /**
+ * Return the home registry path
+ * @return
+ */
+ public String homepath() {
+ return RegistryUtils.homePathForCurrentUser()
+ }
}
[4/5] git commit: SLIDER-614 updating release POMs for 0.52
Posted by st...@apache.org.
SLIDER-614 updating release POMs for 0.52
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/57130b5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/57130b5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/57130b5d
Branch: refs/heads/releases/slider-0.52
Commit: 57130b5d65b0b5e4e78fe5e394394acb6bca6665
Parents: b6d91f0
Author: Steve Loughran <st...@apache.org>
Authored: Wed Nov 5 14:34:40 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Nov 5 14:34:40 2014 +0000
----------------------------------------------------------------------
app-packages/accumulo/pom.xml | 2 +-
app-packages/command-logger/application-pkg/pom.xml | 2 +-
app-packages/command-logger/slider-pkg/pom.xml | 2 +-
app-packages/hbase-win/pom.xml | 2 +-
app-packages/hbase/pom.xml | 2 +-
app-packages/storm-win/pom.xml | 2 +-
app-packages/storm/pom.xml | 2 +-
pom.xml | 2 +-
slider-agent/pom.xml | 2 +-
slider-assembly/pom.xml | 2 +-
slider-core/pom.xml | 2 +-
slider-funtest/pom.xml | 2 +-
slider-providers/accumulo/accumulo-funtests/pom.xml | 2 +-
slider-providers/accumulo/slider-accumulo-provider/pom.xml | 2 +-
slider-providers/hbase/hbase-funtests/pom.xml | 2 +-
slider-providers/hbase/slider-hbase-provider/pom.xml | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/57130b5d/app-packages/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index c3a5b55..551efb4 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.51.0-incubating-SNAPSHOT</version>
+ <version>0.52</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/57130b5d/app-packages/command-logger/application-pkg/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/application-pkg/pom.xml b/app-packages/command-logger/application-pkg/pom.xml
index 051ac84..489bd9a 100644
--- a/app-packages/command-logger/application-pkg/pom.xml
+++ b/app-packages/command-logger/application-pkg/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.51.0-incubating-SNAPSHOT</version>
+ <version>0.52</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/57130b5d/app-packages/command-logger/slider-pkg/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/slider-pkg/pom.xml b/app-packages/command-logger/slider-pkg/pom.xml
index 49128b4..42fe4f9 100644
--- a/app-packages/command-logger/slider-pkg/pom.xml
+++ b/app-packages/command-logger/slider-pkg/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.51.0-incubating-SNAPSHOT</version>
+ <version>0.52</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/57130b5d/app-packages/hbase-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/pom.xml b/app-packages/hbase-win/pom.xml
index 2df22ee..5b22c0a 100644
--- a/app-packages/hbase-win/pom.xml
+++ b/app-packages/hbase-win/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.51.0-incubating-SNAPSHOT</version>
+ <version>0.52</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/57130b5d/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index f80346a..f571050 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.51.0-incubating-SNAPSHOT</version>
+ <version>0.52</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/57130b5d/app-packages/storm-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm-win/pom.xml b/app-packages/storm-win/pom.xml
index 490ca96..10374d6 100644
--- a/app-packages/storm-win/pom.xml
+++ b/app-packages/storm-win/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.51.0-incubating-SNAPSHOT</version>
+ <version>0.52</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/57130b5d/app-packages/storm/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml
index b8e558f..bed9338 100644
--- a/app-packages/storm/pom.xml
+++ b/app-packages/storm/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.51.0-incubating-SNAPSHOT</version>
+ <version>0.52</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/57130b5d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b8110a0..95a8e6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
<name>Slider</name>
- <version>0.51.0-incubating-SNAPSHOT</version>
+ <version>0.52</version>
<packaging>pom</packaging>
<description>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/57130b5d/slider-agent/pom.xml
----------------------------------------------------------------------
diff --git a/slider-agent/pom.xml b/slider-agent/pom.xml
index 61c2e67..8a478f7 100644
--- a/slider-agent/pom.xml
+++ b/slider-agent/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.51.0-incubating-SNAPSHOT</version>
+ <version>0.52</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>slider-agent</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/57130b5d/slider-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml
index d3cb928..c79772d 100644
--- a/slider-assembly/pom.xml
+++ b/slider-assembly/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.51.0-incubating-SNAPSHOT</version>
+ <version>0.52</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/57130b5d/slider-core/pom.xml
----------------------------------------------------------------------
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index 8f3df0a..204ad5a 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.51.0-incubating-SNAPSHOT</version>
+ <version>0.52</version>
</parent>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/57130b5d/slider-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml
index 295b8eb..5b4f5be 100644
--- a/slider-funtest/pom.xml
+++ b/slider-funtest/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.51.0-incubating-SNAPSHOT</version>
+ <version>0.52</version>
</parent>
<properties>
<work.dir>package-tmp</work.dir>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/57130b5d/slider-providers/accumulo/accumulo-funtests/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/accumulo-funtests/pom.xml b/slider-providers/accumulo/accumulo-funtests/pom.xml
index 69a6964..686f48d 100644
--- a/slider-providers/accumulo/accumulo-funtests/pom.xml
+++ b/slider-providers/accumulo/accumulo-funtests/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.51.0-incubating-SNAPSHOT</version>
+ <version>0.52</version>
<relativePath>../../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/57130b5d/slider-providers/accumulo/slider-accumulo-provider/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/slider-accumulo-provider/pom.xml b/slider-providers/accumulo/slider-accumulo-provider/pom.xml
index afd4da3..1cb43c5 100644
--- a/slider-providers/accumulo/slider-accumulo-provider/pom.xml
+++ b/slider-providers/accumulo/slider-accumulo-provider/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.51.0-incubating-SNAPSHOT</version>
+ <version>0.52</version>
<relativePath>../../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/57130b5d/slider-providers/hbase/hbase-funtests/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/hbase-funtests/pom.xml b/slider-providers/hbase/hbase-funtests/pom.xml
index 9189968..f970a10 100644
--- a/slider-providers/hbase/hbase-funtests/pom.xml
+++ b/slider-providers/hbase/hbase-funtests/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.51.0-incubating-SNAPSHOT</version>
+ <version>0.52</version>
<relativePath>../../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/57130b5d/slider-providers/hbase/slider-hbase-provider/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/slider-hbase-provider/pom.xml b/slider-providers/hbase/slider-hbase-provider/pom.xml
index a3d9d4b..78f6518 100644
--- a/slider-providers/hbase/slider-hbase-provider/pom.xml
+++ b/slider-providers/hbase/slider-hbase-provider/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.51.0-incubating-SNAPSHOT</version>
+ <version>0.52</version>
<relativePath>../../../</relativePath>
</parent>
[2/5] git commit: SLIDER-603 : NPE in AppsThroughAgentIT
Posted by st...@apache.org.
SLIDER-603 : NPE in AppsThroughAgentIT
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ecca0aad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ecca0aad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ecca0aad
Branch: refs/heads/releases/slider-0.52
Commit: ecca0aad72b7b4901bde60a2a24532b3ad4ca5b6
Parents: 7fb01c3
Author: Steve Loughran <st...@apache.org>
Authored: Sun Nov 2 20:59:42 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sun Nov 2 20:59:42 2014 +0000
----------------------------------------------------------------------
.../apache/slider/test/SliderTestUtils.groovy | 12 ++++++
.../apache/slider/test/TestAssertions.groovy | 41 ++++++++++++++++++++
.../funtest/framework/CommandTestBase.groovy | 10 -----
3 files changed, 53 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ecca0aad/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
index 2af0a2f..1b32471 100644
--- a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
@@ -475,6 +475,18 @@ class SliderTestUtils extends Assert {
assert 0 == service.serviceExitCode;
}
+ public static void assertContainersLive(ClusterDescription clusterDescription,
+ String component, int expected) {
+ log.info("Asserting component $component expected count $expected}",)
+ def instances = clusterDescription?.instances?.get(component)
+ int actual = instances != null ? instances.size() : 0
+ if (expected != actual) {
+ log.warn(
+ "$component actual=$actual, expected $expected in \n$clusterDescription")
+ }
+ assert expected == actual
+ }
+
/**
* Execute a closure, assert it fails with a given exit code and text
* @param exitCode exit code
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ecca0aad/slider-core/src/test/groovy/org/apache/slider/test/TestAssertions.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/test/TestAssertions.groovy b/slider-core/src/test/groovy/org/apache/slider/test/TestAssertions.groovy
new file mode 100644
index 0000000..abfbe65
--- /dev/null
+++ b/slider-core/src/test/groovy/org/apache/slider/test/TestAssertions.groovy
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.slider.test
+
+import org.apache.slider.api.ClusterDescription
+import org.junit.Test
+
+/**
+ * Test for some of the command test base operations
+ */
+class TestAssertions {
+ @Test
+ public void testNoInstances() throws Throwable {
+ ClusterDescription clusterDescription = new ClusterDescription();
+ clusterDescription.instances = null
+ SliderTestUtils.assertContainersLive(clusterDescription, "example", 0);
+ }
+
+ @Test
+ public void testEmptyInstances() throws Throwable {
+ ClusterDescription clusterDescription = new ClusterDescription();
+ SliderTestUtils.assertContainersLive(clusterDescription, "example", 0);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ecca0aad/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
index 9a1824d..f14e9f1 100644
--- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
+++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
@@ -176,16 +176,6 @@ abstract class CommandTestBase extends SliderTestUtils {
"and YARN RM @ ${SLIDER_CONFIG.get(YarnConfiguration.RM_ADDRESS)}")
}
- public static void assertContainersLive(ClusterDescription clusterDescription,
- String component, int count) {
- log.info("Asserting component count.")
- int instanceCount = clusterDescription.instances[component].size()
- if (count != instanceCount) {
- log.warn(clusterDescription.toString())
- }
- assert count == instanceCount
- }
-
public static void logShell(SliderShell shell) {
shell.dumpOutput();
}
[3/5] git commit: SLIDER-604 AppsThroughAgentIT to spin waiting for
live instance count
Posted by st...@apache.org.
SLIDER-604 AppsThroughAgentIT to spin waiting for live instance count
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b6d91f04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b6d91f04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b6d91f04
Branch: refs/heads/releases/slider-0.52
Commit: b6d91f047738c98097d794dc6927d30279ed5d9a
Parents: ecca0aa
Author: Steve Loughran <st...@apache.org>
Authored: Sun Nov 2 21:53:19 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sun Nov 2 21:54:00 2014 +0000
----------------------------------------------------------------------
.../apache/slider/test/SliderTestUtils.groovy | 17 ++++++-
.../funtest/framework/CommandTestBase.groovy | 51 ++++++++++++++++++--
.../funtest/lifecycle/AMFailuresIT.groovy | 4 +-
.../funtest/lifecycle/AgentFailuresIT.groovy | 3 +-
.../lifecycle/AppsThroughAgentDemo.groovy | 3 +-
.../funtest/lifecycle/AppsThroughAgentIT.groovy | 4 +-
.../AppsThroughAgentQueueAndLabelsIT.groovy | 2 +-
7 files changed, 70 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b6d91f04/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
index 1b32471..8bf1959 100644
--- a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
@@ -478,8 +478,7 @@ class SliderTestUtils extends Assert {
public static void assertContainersLive(ClusterDescription clusterDescription,
String component, int expected) {
log.info("Asserting component $component expected count $expected}",)
- def instances = clusterDescription?.instances?.get(component)
- int actual = instances != null ? instances.size() : 0
+ int actual = extractLiveContainerCount(clusterDescription, component)
if (expected != actual) {
log.warn(
"$component actual=$actual, expected $expected in \n$clusterDescription")
@@ -488,6 +487,20 @@ class SliderTestUtils extends Assert {
}
/**
+ * Robust extraction of live container count
+ * @param clusterDescription status
+ * @param component component to resolve
+ * @return the number of containers live.
+ */
+ public static int extractLiveContainerCount(
+ ClusterDescription clusterDescription,
+ String component) {
+ def instances = clusterDescription?.instances?.get(component)
+ int actual = instances != null ? instances.size() : 0
+ return actual
+ }
+
+ /**
* Execute a closure, assert it fails with a given exit code and text
* @param exitCode exit code
* @param text text (can be "")
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b6d91f04/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
index f14e9f1..640deaf 100644
--- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
+++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
@@ -1084,15 +1084,60 @@ abstract class CommandTestBase extends SliderTestUtils {
ClusterDescription cd = execStatus(application);
log.info("Parsed status \n$cd")
fail(message)
- };
-
+ }
}
- public ClusterDescription expectContainersLive(String clustername,
+ public ClusterDescription assertContainersLive(String clustername,
String component,
int count) {
ClusterDescription cd = execStatus(clustername)
assertContainersLive(cd, component, count)
return cd;
}
+
+ /**
+ * Outcome checker for the live container count
+ * @param args argument map, must contain "application", "component" and "live"
+ * @return
+ */
+ Outcome hasLiveContainerCountReached(Map<String, String> args) {
+ assert args['application']
+ assert args['component']
+ assert args['live']
+ String application = args['application']
+ String component = args['component']
+ int expectedCount = args['live'].toInteger();
+ ClusterDescription cd = execStatus(application)
+ def actual = extractLiveContainerCount(cd, component)
+ log.debug(
+ "live $component count = $actual; expected=$expectedCount")
+ return Outcome.fromBool(actual >= expectedCount)
+ }
+
+ /**
+ * Wait for the live container count to be reached
+ * @param application application name
+ * @param component component name
+ * @param expected expected count
+ * @param container_launch_timeout launch timeout
+ */
+ void expectLiveContainerCountReached(
+ String application,
+ String component,
+ int expected,
+ int container_launch_timeout) {
+
+ repeatUntilSuccess(
+ this.&hasLiveContainerCountReached,
+ container_launch_timeout,
+ PROBE_SLEEP_TIME,
+ [live : Integer.toString(expected),
+ component : component,
+ application: application],
+ true,
+ "countainer count not reached") {
+ describe "container count not reached"
+ assertContainersLive(application, component, expected)
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b6d91f04/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AMFailuresIT.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AMFailuresIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AMFailuresIT.groovy
index 7cc01b8..a78ae87 100644
--- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AMFailuresIT.groovy
+++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AMFailuresIT.groovy
@@ -76,7 +76,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions {
// Wait for 20 secs for AM and agent to both reach STARTED state
sleep(1000 * 20)
- def cd = expectContainersLive(APPLICATION_NAME, COMMAND_LOGGER, 1)
+ def cd = assertContainersLive(APPLICATION_NAME, COMMAND_LOGGER, 1)
def loggerInstances = cd.instances[COMMAND_LOGGER]
assert loggerInstances.size() == 1
@@ -104,7 +104,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions {
ensureYarnApplicationIsUp(appId)
// There should be exactly 1 live logger container
- def cd2 = expectContainersLive(APPLICATION_NAME, COMMAND_LOGGER, 1)
+ def cd2 = assertContainersLive(APPLICATION_NAME, COMMAND_LOGGER, 1)
// No new containers should be requested for the agents
def loggerStats2 = cd2.statistics[COMMAND_LOGGER]
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b6d91f04/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailuresIT.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailuresIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailuresIT.groovy
index efd6194..a6930b2 100644
--- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailuresIT.groovy
+++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailuresIT.groovy
@@ -20,7 +20,6 @@ package org.apache.slider.funtest.lifecycle
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
-import org.apache.hadoop.yarn.api.records.YarnApplicationState
import org.apache.slider.common.SliderExitCodes
import org.apache.slider.common.params.Arguments
import org.apache.slider.common.params.SliderActions
@@ -67,7 +66,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions {
CONTAINER_LAUNCH_TIMEOUT)
sleep(1000 * 20)
assertAppRunning(appId)
- def cd = expectContainersLive(APPLICATION_NAME, COMMAND_LOGGER, 1)
+ def cd = assertContainersLive(APPLICATION_NAME, COMMAND_LOGGER, 1)
assert cd.statistics[COMMAND_LOGGER]["containers.requested"] >= 2
assertAppRunning(appId)
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b6d91f04/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentDemo.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentDemo.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentDemo.groovy
index 5be7211..1d65ce7 100644
--- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentDemo.groovy
+++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentDemo.groovy
@@ -26,7 +26,6 @@ import org.apache.slider.common.params.SliderActions
import org.apache.slider.funtest.framework.AgentCommandTestBase
import org.apache.slider.funtest.framework.FuntestProperties
import org.apache.slider.funtest.framework.SliderShell
-import org.junit.After
import org.junit.Before
import org.junit.Test
@@ -77,7 +76,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions {
[ACTION_STATUS,
APPLICATION_NAME])
- expectContainersLive(APPLICATION_NAME, COMMAND_LOGGER, 2)
+ assertContainersLive(APPLICATION_NAME, COMMAND_LOGGER, 2)
String amWebUrl = getInfoAmWebUrl(APPLICATION_NAME)
log.info("Dumping data from AM Web URL");
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b6d91f04/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentIT.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentIT.groovy
index 75807c3..5cd6dc5 100644
--- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentIT.groovy
+++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentIT.groovy
@@ -76,8 +76,8 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions {
sleep(1000 * 10)
status(0, APPLICATION_NAME)
-
- expectContainersLive(APPLICATION_NAME, COMMAND_LOGGER, 2)
+ expectLiveContainerCountReached(APPLICATION_NAME, COMMAND_LOGGER, 2,
+ CONTAINER_LAUNCH_TIMEOUT)
String amWebUrl = getInfoAmWebUrl(APPLICATION_NAME)
log.info("Dumping data from AM Web URL");
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b6d91f04/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentQueueAndLabelsIT.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentQueueAndLabelsIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentQueueAndLabelsIT.groovy
index f6a1b1e..51bb440 100644
--- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentQueueAndLabelsIT.groovy
+++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentQueueAndLabelsIT.groovy
@@ -94,7 +94,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions {
expectContainerRequestedCountReached(APPLICATION_NAME, COMMAND_LOGGER, 1,
CONTAINER_LAUNCH_TIMEOUT)
- expectContainersLive(APPLICATION_NAME, COMMAND_LOGGER, 1)
+ assertContainersLive(APPLICATION_NAME, COMMAND_LOGGER, 1)
//flex
slider(EXIT_SUCCESS,
[5/5] git commit: SLIDER-544 updating release POMs for 0.60-incubating
Posted by st...@apache.org.
SLIDER-544 updating release POMs for 0.60-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/5034161d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/5034161d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/5034161d
Branch: refs/heads/releases/slider-0.60
Commit: 5034161db043f99d325a6654081728d42e8d190a
Parents: 70c1b1a
Author: Steve Loughran <st...@apache.org>
Authored: Wed Nov 5 20:39:38 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Nov 5 20:39:38 2014 +0000
----------------------------------------------------------------------
app-packages/accumulo/pom.xml | 2 +-
app-packages/command-logger/application-pkg/pom.xml | 2 +-
app-packages/command-logger/slider-pkg/pom.xml | 2 +-
app-packages/hbase-win/pom.xml | 2 +-
app-packages/hbase/pom.xml | 2 +-
app-packages/storm-win/pom.xml | 2 +-
app-packages/storm/pom.xml | 2 +-
pom.xml | 2 +-
slider-agent/pom.xml | 2 +-
slider-assembly/pom.xml | 2 +-
slider-core/pom.xml | 2 +-
slider-funtest/pom.xml | 2 +-
slider-providers/accumulo/accumulo-funtests/pom.xml | 2 +-
slider-providers/accumulo/slider-accumulo-provider/pom.xml | 2 +-
slider-providers/hbase/hbase-funtests/pom.xml | 2 +-
slider-providers/hbase/slider-hbase-provider/pom.xml | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5034161d/app-packages/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index a8f2981..7e9959a 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.53-incubating-SNAPSHOT</version>
+ <version>0.60-incubating</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5034161d/app-packages/command-logger/application-pkg/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/application-pkg/pom.xml b/app-packages/command-logger/application-pkg/pom.xml
index 0808728..f5364de 100644
--- a/app-packages/command-logger/application-pkg/pom.xml
+++ b/app-packages/command-logger/application-pkg/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.53-incubating-SNAPSHOT</version>
+ <version>0.60-incubating</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5034161d/app-packages/command-logger/slider-pkg/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/slider-pkg/pom.xml b/app-packages/command-logger/slider-pkg/pom.xml
index b3bcfe5..c413b8c 100644
--- a/app-packages/command-logger/slider-pkg/pom.xml
+++ b/app-packages/command-logger/slider-pkg/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.53-incubating-SNAPSHOT</version>
+ <version>0.60-incubating</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5034161d/app-packages/hbase-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/pom.xml b/app-packages/hbase-win/pom.xml
index 7c847f0..fc0a2e3 100644
--- a/app-packages/hbase-win/pom.xml
+++ b/app-packages/hbase-win/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.53-incubating-SNAPSHOT</version>
+ <version>0.60-incubating</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5034161d/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index 2136c34..44b2ca7 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.53-incubating-SNAPSHOT</version>
+ <version>0.60-incubating</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5034161d/app-packages/storm-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm-win/pom.xml b/app-packages/storm-win/pom.xml
index 5e5cd4a..8db9111 100644
--- a/app-packages/storm-win/pom.xml
+++ b/app-packages/storm-win/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.53-incubating-SNAPSHOT</version>
+ <version>0.60-incubating</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5034161d/app-packages/storm/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml
index d2d6e78..4e24a8d 100644
--- a/app-packages/storm/pom.xml
+++ b/app-packages/storm/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.53-incubating-SNAPSHOT</version>
+ <version>0.60-incubating</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5034161d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5a22cc4..bafcc0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
<name>Slider</name>
- <version>0.53-incubating-SNAPSHOT</version>
+ <version>0.60-incubating</version>
<packaging>pom</packaging>
<description>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5034161d/slider-agent/pom.xml
----------------------------------------------------------------------
diff --git a/slider-agent/pom.xml b/slider-agent/pom.xml
index 42f3cf2..95af5ba 100644
--- a/slider-agent/pom.xml
+++ b/slider-agent/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.53-incubating-SNAPSHOT</version>
+ <version>0.60-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>slider-agent</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5034161d/slider-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml
index fb1d99d..fa6f1ad 100644
--- a/slider-assembly/pom.xml
+++ b/slider-assembly/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.53-incubating-SNAPSHOT</version>
+ <version>0.60-incubating</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5034161d/slider-core/pom.xml
----------------------------------------------------------------------
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index 8768760..4a6756c 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.53-incubating-SNAPSHOT</version>
+ <version>0.60-incubating</version>
</parent>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5034161d/slider-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml
index 715fb23..0a4c7ce 100644
--- a/slider-funtest/pom.xml
+++ b/slider-funtest/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.53-incubating-SNAPSHOT</version>
+ <version>0.60-incubating</version>
</parent>
<properties>
<work.dir>package-tmp</work.dir>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5034161d/slider-providers/accumulo/accumulo-funtests/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/accumulo-funtests/pom.xml b/slider-providers/accumulo/accumulo-funtests/pom.xml
index 4241ed4..0364fbd 100644
--- a/slider-providers/accumulo/accumulo-funtests/pom.xml
+++ b/slider-providers/accumulo/accumulo-funtests/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.53-incubating-SNAPSHOT</version>
+ <version>0.60-incubating</version>
<relativePath>../../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5034161d/slider-providers/accumulo/slider-accumulo-provider/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/slider-accumulo-provider/pom.xml b/slider-providers/accumulo/slider-accumulo-provider/pom.xml
index 44db712..7e2a678 100644
--- a/slider-providers/accumulo/slider-accumulo-provider/pom.xml
+++ b/slider-providers/accumulo/slider-accumulo-provider/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.53-incubating-SNAPSHOT</version>
+ <version>0.60-incubating</version>
<relativePath>../../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5034161d/slider-providers/hbase/hbase-funtests/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/hbase-funtests/pom.xml b/slider-providers/hbase/hbase-funtests/pom.xml
index 4e5b421..9752f74 100644
--- a/slider-providers/hbase/hbase-funtests/pom.xml
+++ b/slider-providers/hbase/hbase-funtests/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.53-incubating-SNAPSHOT</version>
+ <version>0.60-incubating</version>
<relativePath>../../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5034161d/slider-providers/hbase/slider-hbase-provider/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/slider-hbase-provider/pom.xml b/slider-providers/hbase/slider-hbase-provider/pom.xml
index cc8ba79..1ff467e 100644
--- a/slider-providers/hbase/slider-hbase-provider/pom.xml
+++ b/slider-providers/hbase/slider-hbase-provider/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.53-incubating-SNAPSHOT</version>
+ <version>0.60-incubating</version>
<relativePath>../../../</relativePath>
</parent>