You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by si...@apache.org on 2020/05/19 05:55:19 UTC

[bookkeeper] branch master updated: Fix wrong module artifactId

This is an automated email from the ASF dual-hosted git repository.

sijie 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 fca0a07  Fix wrong module artifactId
fca0a07 is described below

commit fca0a071c3be99326b9075c24ff17ce76faf7bda
Author: lamber-ken <la...@apache.org>
AuthorDate: Tue May 19 13:55:12 2020 +0800

    Fix wrong module artifactId
    
    ### Motivation
    
    Fix wrong maven artifactId, there are three module use the same artifactId.
    
    ### Changes
    
    ![image](https://user-images.githubusercontent.com/20113411/81897790-e4fe2180-95e9-11ea-9449-92941fe4c1bc.png)
    
    
    
    Reviewers: Matteo Minardi <mi...@hotmail.it>, Enrico Olivelli <eo...@gmail.com>
    
    This closes #2329 from lamber-ken/bk-fix-wrong-artifactId
---
 tests/backward-compat/current-server-old-clients/pom.xml  | 5 +++--
 tests/backward-compat/hierarchical-ledger-manager/pom.xml | 5 +++--
 tests/backward-compat/hostname-bookieid/pom.xml           | 5 +++--
 tests/backward-compat/old-cookie-new-cluster/pom.xml      | 5 +++--
 tests/backward-compat/pom.xml                             | 4 ++--
 tests/backward-compat/recovery-no-password/pom.xml        | 5 +++--
 tests/backward-compat/upgrade-direct/pom.xml              | 5 +++--
 tests/backward-compat/upgrade/pom.xml                     | 5 +++--
 tests/backward-compat/yahoo-custom-version/pom.xml        | 5 +++--
 tests/integration/cluster/pom.xml                         | 5 +++--
 tests/integration/pom.xml                                 | 5 ++---
 tests/integration/smoke/pom.xml                           | 5 +++--
 tests/integration/standalone/pom.xml                      | 5 +++--
 13 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/tests/backward-compat/current-server-old-clients/pom.xml b/tests/backward-compat/current-server-old-clients/pom.xml
index 11d295a..29fb3c9 100644
--- a/tests/backward-compat/current-server-old-clients/pom.xml
+++ b/tests/backward-compat/current-server-old-clients/pom.xml
@@ -18,9 +18,10 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
-    <artifactId>tests-parent</artifactId>
+    <groupId>org.apache.bookkeeper.tests</groupId>
+    <artifactId>backward-compat</artifactId>
     <version>4.11.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
   </parent>
 
   <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
diff --git a/tests/backward-compat/hierarchical-ledger-manager/pom.xml b/tests/backward-compat/hierarchical-ledger-manager/pom.xml
index d0bea4d..92f937f 100644
--- a/tests/backward-compat/hierarchical-ledger-manager/pom.xml
+++ b/tests/backward-compat/hierarchical-ledger-manager/pom.xml
@@ -18,9 +18,10 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
-    <artifactId>tests-parent</artifactId>
+    <groupId>org.apache.bookkeeper.tests</groupId>
+    <artifactId>backward-compat</artifactId>
     <version>4.11.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
   </parent>
 
   <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
diff --git a/tests/backward-compat/hostname-bookieid/pom.xml b/tests/backward-compat/hostname-bookieid/pom.xml
index 0ae23f7..fc6cb7d 100644
--- a/tests/backward-compat/hostname-bookieid/pom.xml
+++ b/tests/backward-compat/hostname-bookieid/pom.xml
@@ -18,9 +18,10 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
-    <artifactId>tests-parent</artifactId>
+    <groupId>org.apache.bookkeeper.tests</groupId>
+    <artifactId>backward-compat</artifactId>
     <version>4.11.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
   </parent>
 
   <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
diff --git a/tests/backward-compat/old-cookie-new-cluster/pom.xml b/tests/backward-compat/old-cookie-new-cluster/pom.xml
index b1dafb7..73d3449 100644
--- a/tests/backward-compat/old-cookie-new-cluster/pom.xml
+++ b/tests/backward-compat/old-cookie-new-cluster/pom.xml
@@ -18,9 +18,10 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
-    <artifactId>tests-parent</artifactId>
+    <groupId>org.apache.bookkeeper.tests</groupId>
+    <artifactId>backward-compat</artifactId>
     <version>4.11.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
   </parent>
 
   <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml
index c7a245b..503eb63 100644
--- a/tests/backward-compat/pom.xml
+++ b/tests/backward-compat/pom.xml
@@ -24,8 +24,8 @@
     <version>4.11.0-SNAPSHOT</version>
     <relativePath>../integration-tests-base-groovy</relativePath>
   </parent>
-  <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
-  <artifactId>tests-parent</artifactId>
+  <groupId>org.apache.bookkeeper.tests</groupId>
+  <artifactId>backward-compat</artifactId>
   <name>Apache BookKeeper :: Tests :: Backward Compatibility</name>
   <modules>
     <module>upgrade</module>
diff --git a/tests/backward-compat/recovery-no-password/pom.xml b/tests/backward-compat/recovery-no-password/pom.xml
index 4b97710..b6c7c03 100644
--- a/tests/backward-compat/recovery-no-password/pom.xml
+++ b/tests/backward-compat/recovery-no-password/pom.xml
@@ -18,9 +18,10 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
-    <artifactId>tests-parent</artifactId>
+    <groupId>org.apache.bookkeeper.tests</groupId>
+    <artifactId>backward-compat</artifactId>
     <version>4.11.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
   </parent>
 
   <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
diff --git a/tests/backward-compat/upgrade-direct/pom.xml b/tests/backward-compat/upgrade-direct/pom.xml
index 4b90945..d7d388c 100644
--- a/tests/backward-compat/upgrade-direct/pom.xml
+++ b/tests/backward-compat/upgrade-direct/pom.xml
@@ -18,9 +18,10 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
-    <artifactId>tests-parent</artifactId>
+    <groupId>org.apache.bookkeeper.tests</groupId>
+    <artifactId>backward-compat</artifactId>
     <version>4.11.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
   </parent>
 
   <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
diff --git a/tests/backward-compat/upgrade/pom.xml b/tests/backward-compat/upgrade/pom.xml
index 2a39243..95e6618 100644
--- a/tests/backward-compat/upgrade/pom.xml
+++ b/tests/backward-compat/upgrade/pom.xml
@@ -18,9 +18,10 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
-    <artifactId>tests-parent</artifactId>
+    <groupId>org.apache.bookkeeper.tests</groupId>
+    <artifactId>backward-compat</artifactId>
     <version>4.11.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
   </parent>
 
   <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
diff --git a/tests/backward-compat/yahoo-custom-version/pom.xml b/tests/backward-compat/yahoo-custom-version/pom.xml
index 3852cd1..eed8d03 100644
--- a/tests/backward-compat/yahoo-custom-version/pom.xml
+++ b/tests/backward-compat/yahoo-custom-version/pom.xml
@@ -18,9 +18,10 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
-    <artifactId>tests-parent</artifactId>
+    <groupId>org.apache.bookkeeper.tests</groupId>
+    <artifactId>backward-compat</artifactId>
     <version>4.11.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
   </parent>
 
   <groupId>org.apache.bookkeeper.tests.backward-compat</groupId>
diff --git a/tests/integration/cluster/pom.xml b/tests/integration/cluster/pom.xml
index 8c7ee7d..42fbac3 100644
--- a/tests/integration/cluster/pom.xml
+++ b/tests/integration/cluster/pom.xml
@@ -19,9 +19,10 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.bookkeeper.tests.integration</groupId>
-    <artifactId>tests-parent</artifactId>
+    <groupId>org.apache.bookkeeper.tests</groupId>
+    <artifactId>integration</artifactId>
     <version>4.11.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
   </parent>
 
   <groupId>org.apache.bookkeeper.tests.integration</groupId>
diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml
index a26758f..ded0de0 100644
--- a/tests/integration/pom.xml
+++ b/tests/integration/pom.xml
@@ -22,10 +22,9 @@
     <groupId>org.apache.bookkeeper.tests</groupId>
     <artifactId>tests-parent</artifactId>
     <version>4.11.0-SNAPSHOT</version>
-    <relativePath>..</relativePath>
   </parent>
-  <groupId>org.apache.bookkeeper.tests.integration</groupId>
-  <artifactId>tests-parent</artifactId>
+  <groupId>org.apache.bookkeeper.tests</groupId>
+  <artifactId>integration</artifactId>
   <name>Apache BookKeeper :: Tests :: Integration</name>
   <modules>
     <module>smoke</module>
diff --git a/tests/integration/smoke/pom.xml b/tests/integration/smoke/pom.xml
index 92fcb13..4add9c1 100644
--- a/tests/integration/smoke/pom.xml
+++ b/tests/integration/smoke/pom.xml
@@ -18,9 +18,10 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.bookkeeper.tests.integration</groupId>
-    <artifactId>tests-parent</artifactId>
+    <groupId>org.apache.bookkeeper.tests</groupId>
+    <artifactId>integration</artifactId>
     <version>4.11.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
   </parent>
 
   <groupId>org.apache.bookkeeper.tests.integration</groupId>
diff --git a/tests/integration/standalone/pom.xml b/tests/integration/standalone/pom.xml
index 91c0bf6..893db1b 100644
--- a/tests/integration/standalone/pom.xml
+++ b/tests/integration/standalone/pom.xml
@@ -19,9 +19,10 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.bookkeeper.tests.integration</groupId>
-    <artifactId>tests-parent</artifactId>
+    <groupId>org.apache.bookkeeper.tests</groupId>
+    <artifactId>integration</artifactId>
     <version>4.11.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
   </parent>
 
   <groupId>org.apache.bookkeeper.tests.integration</groupId>