This is an automated email from the ASF dual-hosted git repository.
ivank pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 8e49979 Move backward compat tests under a parent module
8e49979 is described below
commit 8e499793195ed36bf71dd23d6ca8696c2e56b17b
Author: Ivan Kelly <[email protected]>
AuthorDate: Fri Jan 26 07:10:34 2018 +0100
Move backward compat tests under a parent module
To avoid having to many modules directly in tests/, this patch moves
backward compat tests under their own parent module,
tests/backward-compat.
Master Issue: #1030
Author: Ivan Kelly <[email protected]>
Reviewers: Sijie Guo <[email protected]>
This closes #1054 from ivankelly/move-dir
---
.../hierarchical-ledger-manager}/pom.xml | 11 +++++-----
.../TestCompatHierarchicalLedgerManager.groovy | 0
.../src/test/resources/arquillian.xml | 0
.../hostname-bookieid}/pom.xml | 11 +++++-----
.../TestCompatUpgradeWithHostnameBookieId.groovy | 0
.../src/test/resources/arquillian.xml | 0
.../old-cookie-new-cluster}/pom.xml | 11 +++++-----
...mpatUpgradeOldServerInClusterWithCookies.groovy | 0
.../src/test/resources/arquillian.xml | 0
.../pom.xml | 25 ++++++++++++----------
.../recovery-no-password}/pom.xml | 11 +++++-----
.../tests/TestCompatRecoveryNoPassword.groovy | 0
.../src/test/resources/arquillian.xml | 0
.../upgrade-direct}/pom.xml | 11 +++++-----
.../tests/TestCompatUpgradeDirect.groovy | 0
.../src/test/resources/arquillian.xml | 0
.../upgrade}/pom.xml | 11 +++++-----
.../bookkeeper/tests/TestCompatUpgrade.groovy | 0
.../upgrade}/src/test/resources/arquillian.xml | 0
tests/pom.xml | 7 +-----
20 files changed, 45 insertions(+), 53 deletions(-)
diff --git a/tests/backward-compat-upgrade/pom.xml
b/tests/backward-compat/hierarchical-ledger-manager/pom.xml
similarity index 75%
rename from tests/backward-compat-upgrade/pom.xml
rename to tests/backward-compat/hierarchical-ledger-manager/pom.xml
index 9e9f4f7..e3cb92a 100644
--- a/tests/backward-compat-upgrade/pom.xml
+++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml
@@ -22,15 +22,14 @@
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.bookkeeper.tests</groupId>
- <artifactId>integration-tests-base-groovy</artifactId>
+ <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
+ <artifactId>tests-parent</artifactId>
<version>4.7.0-SNAPSHOT</version>
- <relativePath>../integration-tests-base-groovy</relativePath>
</parent>
- <groupId>org.apache.bookkeeper.tests</groupId>
- <artifactId>backward-compat-upgrade</artifactId>
+ <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
+ <artifactId>hierarchical-ledger-manager</artifactId>
<packaging>jar</packaging>
- <name>Apache BookKeeper :: Tests :: Test upgrade between all released
versions and current version</name>
+ <name>Apache BookKeeper :: Tests :: Backward Compatibility :: Test compat
between old version and new version of hierarchical ledger manager</name>
</project>
diff --git
a/tests/backward-compat-hierarchical-ledger-manager/src/test/groovy/org/apache/bookkeeper/tests/TestCompatHierarchicalLedgerManager.groovy
b/tests/backward-compat/hierarchical-ledger-manager/src/test/groovy/org/apache/bookkeeper/tests/TestCompatHierarchicalLedgerManager.groovy
similarity index 100%
rename from
tests/backward-compat-hierarchical-ledger-manager/src/test/groovy/org/apache/bookkeeper/tests/TestCompatHierarchicalLedgerManager.groovy
rename to
tests/backward-compat/hierarchical-ledger-manager/src/test/groovy/org/apache/bookkeeper/tests/TestCompatHierarchicalLedgerManager.groovy
diff --git a/tests/backward-compat-upgrade/src/test/resources/arquillian.xml
b/tests/backward-compat/hierarchical-ledger-manager/src/test/resources/arquillian.xml
similarity index 100%
rename from tests/backward-compat-upgrade/src/test/resources/arquillian.xml
rename to
tests/backward-compat/hierarchical-ledger-manager/src/test/resources/arquillian.xml
diff --git a/tests/backward-compat-upgrade-direct/pom.xml
b/tests/backward-compat/hostname-bookieid/pom.xml
similarity index 76%
copy from tests/backward-compat-upgrade-direct/pom.xml
copy to tests/backward-compat/hostname-bookieid/pom.xml
index 8749975..d0ae30e 100644
--- a/tests/backward-compat-upgrade-direct/pom.xml
+++ b/tests/backward-compat/hostname-bookieid/pom.xml
@@ -22,15 +22,14 @@
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.bookkeeper.tests</groupId>
- <artifactId>integration-tests-base-groovy</artifactId>
+ <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
+ <artifactId>tests-parent</artifactId>
<version>4.7.0-SNAPSHOT</version>
- <relativePath>../integration-tests-base-groovy</relativePath>
</parent>
- <groupId>org.apache.bookkeeper.tests</groupId>
- <artifactId>backward-compat-upgrade-direct</artifactId>
+ <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
+ <artifactId>hostname-bookieid</artifactId>
<packaging>jar</packaging>
- <name>Apache BookKeeper :: Tests :: Test upgrade between 4.1.0 and current
version</name>
+ <name>Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade
between 4.1.0 and current version (with hostname bookie ID)</name>
</project>
diff --git
a/tests/backward-compat-hostname-bookieid/src/test/groovy/org/apache/bookkeeper/tests/TestCompatUpgradeWithHostnameBookieId.groovy
b/tests/backward-compat/hostname-bookieid/src/test/groovy/org/apache/bookkeeper/tests/TestCompatUpgradeWithHostnameBookieId.groovy
similarity index 100%
rename from
tests/backward-compat-hostname-bookieid/src/test/groovy/org/apache/bookkeeper/tests/TestCompatUpgradeWithHostnameBookieId.groovy
rename to
tests/backward-compat/hostname-bookieid/src/test/groovy/org/apache/bookkeeper/tests/TestCompatUpgradeWithHostnameBookieId.groovy
diff --git
a/tests/backward-compat-upgrade-direct/src/test/resources/arquillian.xml
b/tests/backward-compat/hostname-bookieid/src/test/resources/arquillian.xml
similarity index 100%
rename from
tests/backward-compat-upgrade-direct/src/test/resources/arquillian.xml
rename to
tests/backward-compat/hostname-bookieid/src/test/resources/arquillian.xml
diff --git a/tests/backward-compat-old-cookie-new-cluster/pom.xml
b/tests/backward-compat/old-cookie-new-cluster/pom.xml
similarity index 75%
rename from tests/backward-compat-old-cookie-new-cluster/pom.xml
rename to tests/backward-compat/old-cookie-new-cluster/pom.xml
index 7048c1e..e9bddf0 100644
--- a/tests/backward-compat-old-cookie-new-cluster/pom.xml
+++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml
@@ -22,15 +22,14 @@
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.bookkeeper.tests</groupId>
- <artifactId>integration-tests-base-groovy</artifactId>
+ <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
+ <artifactId>tests-parent</artifactId>
<version>4.7.0-SNAPSHOT</version>
- <relativePath>../integration-tests-base-groovy</relativePath>
</parent>
- <groupId>org.apache.bookkeeper.tests</groupId>
- <artifactId>backward-compat-old-cookie-new-cluster</artifactId>
+ <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
+ <artifactId>old-cookie-new-cluster</artifactId>
<packaging>jar</packaging>
- <name>Apache BookKeeper :: Tests :: Test upgrade 4.1.0 to current in cluster
with cookies</name>
+ <name>Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade
4.1.0 to current in cluster with cookies</name>
</project>
diff --git
a/tests/backward-compat-old-cookie-new-cluster/src/test/groovy/org/apache/bookkeeper/tests/TestCompatUpgradeOldServerInClusterWithCookies.groovy
b/tests/backward-compat/old-cookie-new-cluster/src/test/groovy/org/apache/bookkeeper/tests/TestCompatUpgradeOldServerInClusterWithCookies.groovy
similarity index 100%
rename from
tests/backward-compat-old-cookie-new-cluster/src/test/groovy/org/apache/bookkeeper/tests/TestCompatUpgradeOldServerInClusterWithCookies.groovy
rename to
tests/backward-compat/old-cookie-new-cluster/src/test/groovy/org/apache/bookkeeper/tests/TestCompatUpgradeOldServerInClusterWithCookies.groovy
diff --git
a/tests/backward-compat-recovery-no-password/src/test/resources/arquillian.xml
b/tests/backward-compat/old-cookie-new-cluster/src/test/resources/arquillian.xml
similarity index 100%
rename from
tests/backward-compat-recovery-no-password/src/test/resources/arquillian.xml
rename to
tests/backward-compat/old-cookie-new-cluster/src/test/resources/arquillian.xml
diff --git a/tests/backward-compat-hierarchical-ledger-manager/pom.xml
b/tests/backward-compat/pom.xml
similarity index 62%
rename from tests/backward-compat-hierarchical-ledger-manager/pom.xml
rename to tests/backward-compat/pom.xml
index 5a55f03..11a9b45 100644
--- a/tests/backward-compat-hierarchical-ledger-manager/pom.xml
+++ b/tests/backward-compat/pom.xml
@@ -15,11 +15,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="
- http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.bookkeeper.tests</groupId>
@@ -27,10 +25,15 @@
<version>4.7.0-SNAPSHOT</version>
<relativePath>../integration-tests-base-groovy</relativePath>
</parent>
-
- <groupId>org.apache.bookkeeper.tests</groupId>
- <artifactId>backward-compat-hierarchical-ledger-manager</artifactId>
- <packaging>jar</packaging>
- <name>Apache BookKeeper :: Tests :: Test compat between old version and new
version of hierarchical ledger manager</name>
-
+ <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
+ <artifactId>tests-parent</artifactId>
+ <name>Apache BookKeeper :: Tests :: Backward Compatibility</name>
+ <modules>
+ <module>upgrade</module>
+ <module>upgrade-direct</module>
+ <module>hierarchical-ledger-manager</module>
+ <module>hostname-bookieid</module>
+ <module>recovery-no-password</module>
+ <module>old-cookie-new-cluster</module>
+ </modules>
</project>
diff --git a/tests/backward-compat-recovery-no-password/pom.xml
b/tests/backward-compat/recovery-no-password/pom.xml
similarity index 78%
rename from tests/backward-compat-recovery-no-password/pom.xml
rename to tests/backward-compat/recovery-no-password/pom.xml
index 4e1c528..da4be4c 100644
--- a/tests/backward-compat-recovery-no-password/pom.xml
+++ b/tests/backward-compat/recovery-no-password/pom.xml
@@ -22,16 +22,15 @@
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.bookkeeper.tests</groupId>
- <artifactId>integration-tests-base-groovy</artifactId>
+ <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
+ <artifactId>tests-parent</artifactId>
<version>4.7.0-SNAPSHOT</version>
- <relativePath>../integration-tests-base-groovy</relativePath>
</parent>
- <groupId>org.apache.bookkeeper.tests</groupId>
- <artifactId>backward-compat-recovery-no-password</artifactId>
+ <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
+ <artifactId>recovery-no-password</artifactId>
<packaging>jar</packaging>
- <name>Apache BookKeeper :: Tests :: Test recovery does not work when
password no in metadata</name>
+ <name>Apache BookKeeper :: Tests :: Backward Compatibility :: Test recovery
does not work when password no in metadata</name>
<dependencies>
<dependency>
diff --git
a/tests/backward-compat-recovery-no-password/src/test/groovy/org/apache/bookkeeper/tests/TestCompatRecoveryNoPassword.groovy
b/tests/backward-compat/recovery-no-password/src/test/groovy/org/apache/bookkeeper/tests/TestCompatRecoveryNoPassword.groovy
similarity index 100%
rename from
tests/backward-compat-recovery-no-password/src/test/groovy/org/apache/bookkeeper/tests/TestCompatRecoveryNoPassword.groovy
rename to
tests/backward-compat/recovery-no-password/src/test/groovy/org/apache/bookkeeper/tests/TestCompatRecoveryNoPassword.groovy
diff --git
a/tests/backward-compat-old-cookie-new-cluster/src/test/resources/arquillian.xml
b/tests/backward-compat/recovery-no-password/src/test/resources/arquillian.xml
similarity index 100%
rename from
tests/backward-compat-old-cookie-new-cluster/src/test/resources/arquillian.xml
rename to
tests/backward-compat/recovery-no-password/src/test/resources/arquillian.xml
diff --git a/tests/backward-compat-hostname-bookieid/pom.xml
b/tests/backward-compat/upgrade-direct/pom.xml
similarity index 74%
rename from tests/backward-compat-hostname-bookieid/pom.xml
rename to tests/backward-compat/upgrade-direct/pom.xml
index 3b09d7a..b8dac39 100644
--- a/tests/backward-compat-hostname-bookieid/pom.xml
+++ b/tests/backward-compat/upgrade-direct/pom.xml
@@ -22,15 +22,14 @@
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.bookkeeper.tests</groupId>
- <artifactId>integration-tests-base-groovy</artifactId>
+ <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
+ <artifactId>tests-parent</artifactId>
<version>4.7.0-SNAPSHOT</version>
- <relativePath>../integration-tests-base-groovy</relativePath>
</parent>
- <groupId>org.apache.bookkeeper.tests</groupId>
- <artifactId>backward-compat-hostname-bookieid</artifactId>
+ <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
+ <artifactId>upgrade-direct</artifactId>
<packaging>jar</packaging>
- <name>Apache BookKeeper :: Tests :: Test upgrade between 4.1.0 and current
version (with hostname bookie ID)</name>
+ <name>Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade
between 4.1.0 and current version</name>
</project>
diff --git
a/tests/backward-compat-upgrade-direct/src/test/groovy/org/apache/bookkeeper/tests/TestCompatUpgradeDirect.groovy
b/tests/backward-compat/upgrade-direct/src/test/groovy/org/apache/bookkeeper/tests/TestCompatUpgradeDirect.groovy
similarity index 100%
rename from
tests/backward-compat-upgrade-direct/src/test/groovy/org/apache/bookkeeper/tests/TestCompatUpgradeDirect.groovy
rename to
tests/backward-compat/upgrade-direct/src/test/groovy/org/apache/bookkeeper/tests/TestCompatUpgradeDirect.groovy
diff --git
a/tests/backward-compat-hostname-bookieid/src/test/resources/arquillian.xml
b/tests/backward-compat/upgrade-direct/src/test/resources/arquillian.xml
similarity index 100%
rename from
tests/backward-compat-hostname-bookieid/src/test/resources/arquillian.xml
rename to tests/backward-compat/upgrade-direct/src/test/resources/arquillian.xml
diff --git a/tests/backward-compat-upgrade-direct/pom.xml
b/tests/backward-compat/upgrade/pom.xml
similarity index 76%
rename from tests/backward-compat-upgrade-direct/pom.xml
rename to tests/backward-compat/upgrade/pom.xml
index 8749975..3db16c0 100644
--- a/tests/backward-compat-upgrade-direct/pom.xml
+++ b/tests/backward-compat/upgrade/pom.xml
@@ -22,15 +22,14 @@
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.bookkeeper.tests</groupId>
- <artifactId>integration-tests-base-groovy</artifactId>
+ <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
+ <artifactId>tests-parent</artifactId>
<version>4.7.0-SNAPSHOT</version>
- <relativePath>../integration-tests-base-groovy</relativePath>
</parent>
- <groupId>org.apache.bookkeeper.tests</groupId>
- <artifactId>backward-compat-upgrade-direct</artifactId>
+ <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
+ <artifactId>upgrade</artifactId>
<packaging>jar</packaging>
- <name>Apache BookKeeper :: Tests :: Test upgrade between 4.1.0 and current
version</name>
+ <name>Apache BookKeeper :: Tests :: Backward Compatibility :: Test upgrade
between all released versions and current version</name>
</project>
diff --git
a/tests/backward-compat-upgrade/src/test/groovy/org/apache/bookkeeper/tests/TestCompatUpgrade.groovy
b/tests/backward-compat/upgrade/src/test/groovy/org/apache/bookkeeper/tests/TestCompatUpgrade.groovy
similarity index 100%
rename from
tests/backward-compat-upgrade/src/test/groovy/org/apache/bookkeeper/tests/TestCompatUpgrade.groovy
rename to
tests/backward-compat/upgrade/src/test/groovy/org/apache/bookkeeper/tests/TestCompatUpgrade.groovy
diff --git
a/tests/backward-compat-hierarchical-ledger-manager/src/test/resources/arquillian.xml
b/tests/backward-compat/upgrade/src/test/resources/arquillian.xml
similarity index 100%
rename from
tests/backward-compat-hierarchical-ledger-manager/src/test/resources/arquillian.xml
rename to tests/backward-compat/upgrade/src/test/resources/arquillian.xml
diff --git a/tests/pom.xml b/tests/pom.xml
index 027d3a5..75e270c 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -36,12 +36,7 @@
<module>integration-tests-base-groovy</module>
<module>integration-tests-utils</module>
<module>integration-tests-topologies</module>
- <module>backward-compat-upgrade</module>
- <module>backward-compat-upgrade-direct</module>
- <module>backward-compat-hierarchical-ledger-manager</module>
- <module>backward-compat-hostname-bookieid</module>
- <module>backward-compat-recovery-no-password</module>
- <module>backward-compat-old-cookie-new-cluster</module>
+ <module>backward-compat</module>
</modules>
<build>
<plugins>
--
To stop receiving notification emails like this one, please contact
[email protected].
