You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@bookkeeper.apache.org by GitBox <gi...@apache.org> on 2018/06/05 06:52:41 UTC
[GitHub] sijie closed pull request #1479: Fix issues for cherry-picks from
master to branch-4.7
sijie closed pull request #1479: Fix issues for cherry-picks from master to branch-4.7
URL: https://github.com/apache/bookkeeper/pull/1479
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml
index 0f6cc105e..d736044b3 100644
--- a/stream/tests-common/pom.xml
+++ b/stream/tests-common/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>stream-storage-parent</artifactId>
- <version>4.8.0-SNAPSHOT</version>
+ <version>4.7.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>org.apache.bookkeeper.tests</groupId>
diff --git a/tests/docker-images/current-version-image/pom.xml b/tests/docker-images/current-version-image/pom.xml
index 5d2dbaff1..52586a262 100644
--- a/tests/docker-images/current-version-image/pom.xml
+++ b/tests/docker-images/current-version-image/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.bookkeeper.tests</groupId>
<artifactId>docker-images</artifactId>
- <version>4.8.0-SNAPSHOT</version>
+ <version>4.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.bookkeeper.tests</groupId>
diff --git a/tests/docker-images/pom.xml b/tests/docker-images/pom.xml
index 88162c3b9..6910f00b5 100644
--- a/tests/docker-images/pom.xml
+++ b/tests/docker-images/pom.xml
@@ -22,6 +22,7 @@
<groupId>org.apache.bookkeeper.tests</groupId>
<artifactId>tests-parent</artifactId>
<version>4.7.1-SNAPSHOT</version>
+ <relativePath>..</relativePath>
</parent>
<groupId>org.apache.bookkeeper.tests</groupId>
<artifactId>docker-images</artifactId>
diff --git a/tests/integration-tests-base/pom.xml b/tests/integration-tests-base/pom.xml
index 4e29cad5f..1d0ea6539 100644
--- a/tests/integration-tests-base/pom.xml
+++ b/tests/integration-tests-base/pom.xml
@@ -21,6 +21,7 @@
<groupId>org.apache.bookkeeper.tests</groupId>
<artifactId>tests-parent</artifactId>
<version>4.7.1-SNAPSHOT</version>
+ <relativePath>../</relativePath>
</parent>
<groupId>org.apache.bookkeeper.tests</groupId>
diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml
index b33b7ab36..e4a3478f3 100644
--- a/tests/integration/cluster/pom.xml
+++ b/tests/integration/cluster/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.bookkeeper.tests.integration</groupId>
<artifactId>tests-parent</artifactId>
- <version>4.8.0-SNAPSHOT</version>
+ <version>4.7.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.bookkeeper.tests.integration</groupId>
diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml
index 20d301cd7..77c7e9e55 100644
--- a/tests/integration/pom.xml
+++ b/tests/integration/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.bookkeeper.tests</groupId>
- <artifactId>integration-tests-base</artifactId>
+ <artifactId>tests-parent</artifactId>
<version>4.7.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml
index ce512a993..8b0fb9753 100644
--- a/tests/integration/standalone/pom.xml
+++ b/tests/integration/standalone/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.bookkeeper.tests.integration</groupId>
<artifactId>tests-parent</artifactId>
- <version>4.8.0-SNAPSHOT</version>
+ <version>4.7.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.bookkeeper.tests.integration</groupId>
diff --git a/tests/pom.xml b/tests/pom.xml
index 8833ca391..b19b6344f 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -22,6 +22,7 @@
<groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper</artifactId>
<version>4.7.1-SNAPSHOT</version>
+ <relativePath>..</relativePath>
</parent>
<groupId>org.apache.bookkeeper.tests</groupId>
<artifactId>tests-parent</artifactId>
diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml
index e100ea81e..7098aaa6c 100644
--- a/tests/scripts/pom.xml
+++ b/tests/scripts/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.bookkeeper.tests</groupId>
<artifactId>tests-parent</artifactId>
- <version>4.8.0-SNAPSHOT</version>
+ <version>4.7.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.bookkeeper.tests</groupId>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services