You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by iv...@apache.org on 2018/08/12 15:09:56 UTC

[bookkeeper] branch master updated: Fix master versions (4.8.0-SNAPSHOT->4.9.0-SNAPSHOT)

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 dd5b938  Fix master versions (4.8.0-SNAPSHOT->4.9.0-SNAPSHOT)
dd5b938 is described below

commit dd5b938fd48bfa1164b94fa083b1b39e6094c7a4
Author: Ivan Kelly <iv...@apache.org>
AuthorDate: Sun Aug 12 17:09:47 2018 +0200

    Fix master versions (4.8.0-SNAPSHOT->4.9.0-SNAPSHOT)
    
    Some pom versions and the versions in bk_test_bin_common.sh were
    missed when the version was bumped to 4.9.0-SNAPSHOT, which is killing
    all builds.
    
    Author: Ivan Kelly <iv...@apache.org>
    
    Reviewers: Enrico Olivelli <eo...@gmail.com>, Sijie Guo <si...@apache.org>
    
    This closes #1599 from ivankelly/broken-master
---
 pom.xml                            | 9 ++-------
 stream/api/pom.xml                 | 2 +-
 stream/clients/java/all/pom.xml    | 2 +-
 stream/clients/java/base/pom.xml   | 2 +-
 stream/clients/java/kv/pom.xml     | 2 +-
 stream/clients/java/pom.xml        | 2 +-
 stream/clients/pom.xml             | 2 +-
 stream/common/pom.xml              | 2 +-
 stream/distributedlog/core/pom.xml | 2 +-
 stream/pom.xml                     | 2 +-
 stream/proto/pom.xml               | 2 +-
 stream/server/pom.xml              | 2 +-
 stream/statelib/pom.xml            | 2 +-
 stream/storage/api/pom.xml         | 2 +-
 stream/storage/impl/pom.xml        | 2 +-
 stream/storage/pom.xml             | 2 +-
 stream/tests-common/pom.xml        | 2 +-
 tests/integration/cluster/pom.xml  | 2 +-
 tools/stream/pom.xml               | 2 +-
 19 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index 642594e..471cec5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -699,15 +699,10 @@
               <artifactId>checkstyle</artifactId>
               <version>${puppycrawl.checkstyle.version}</version>
             </dependency>
-            <dependency>
-              <groupId>org.apache.bookkeeper</groupId>
-              <artifactId>buildtools</artifactId>
-              <version>${project.version}</version>
-            </dependency>
           </dependencies>
           <configuration>
-            <configLocation>bookkeeper/checkstyle.xml</configLocation>
-            <suppressionsLocation>bookkeeper/suppressions.xml</suppressionsLocation>
+            <configLocation>buildtools/src/main/resources/bookkeeper/checkstyle.xml</configLocation>
+            <suppressionsLocation>buildtools/src/main/resources/bookkeeper/suppressions.xml</suppressionsLocation>
             <encoding>UTF-8</encoding>
             <consoleOutput>true</consoleOutput>
             <failOnViolation>true</failOnViolation>
diff --git a/stream/api/pom.xml b/stream/api/pom.xml
index 87bae98..705702f 100644
--- a/stream/api/pom.xml
+++ b/stream/api/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>stream-storage-parent</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.apache.bookkeeper</groupId>
diff --git a/stream/clients/java/all/pom.xml b/stream/clients/java/all/pom.xml
index 395dbcb..503557e 100644
--- a/stream/clients/java/all/pom.xml
+++ b/stream/clients/java/all/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>stream-storage-java-client-parent</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
   <artifactId>stream-storage-java-client</artifactId>
   <name>Apache BookKeeper :: Stream Storage :: Clients :: Java Client </name>
diff --git a/stream/clients/java/base/pom.xml b/stream/clients/java/base/pom.xml
index e01a062..b3f7006 100644
--- a/stream/clients/java/base/pom.xml
+++ b/stream/clients/java/base/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>stream-storage-java-client-parent</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
   <artifactId>stream-storage-java-client-base</artifactId>
   <name>Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: Base</name>
diff --git a/stream/clients/java/kv/pom.xml b/stream/clients/java/kv/pom.xml
index 2a497a5..b2f312f 100644
--- a/stream/clients/java/kv/pom.xml
+++ b/stream/clients/java/kv/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>stream-storage-java-client-parent</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
   <artifactId>stream-storage-java-kv-client</artifactId>
   <name>Apache BookKeeper :: Stream Storage :: Clients :: Java Client :: KV</name>
diff --git a/stream/clients/java/pom.xml b/stream/clients/java/pom.xml
index 40f8cb6..f167c42 100644
--- a/stream/clients/java/pom.xml
+++ b/stream/clients/java/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>stream-storage-clients-parent</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>stream-storage-java-client-parent</artifactId>
diff --git a/stream/clients/pom.xml b/stream/clients/pom.xml
index 58d0bfd..0c04954 100644
--- a/stream/clients/pom.xml
+++ b/stream/clients/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>stream-storage-parent</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>stream-storage-clients-parent</artifactId>
diff --git a/stream/common/pom.xml b/stream/common/pom.xml
index a26aed6..27d52b8 100644
--- a/stream/common/pom.xml
+++ b/stream/common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>stream-storage-parent</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.apache.bookkeeper</groupId>
diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml
index 3de4a2e..0e7d860 100644
--- a/stream/distributedlog/core/pom.xml
+++ b/stream/distributedlog/core/pom.xml
@@ -146,7 +146,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <configuration>
-          <suppressionsLocation>distributedlog/suppressions.xml</suppressionsLocation>
+          <suppressionsLocation>buildtools/src/main/resources/distributedlog/suppressions.xml</suppressionsLocation>
           <excludes>**/thrift/**/*</excludes>
         </configuration>
       </plugin>
diff --git a/stream/pom.xml b/stream/pom.xml
index 1f8e39c..f486681 100644
--- a/stream/pom.xml
+++ b/stream/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>bookkeeper</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <packaging>pom</packaging>
diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml
index 0fdb8d4..8a6ad97 100644
--- a/stream/proto/pom.xml
+++ b/stream/proto/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.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.apache.bookkeeper</groupId>
diff --git a/stream/server/pom.xml b/stream/server/pom.xml
index cb52fd9..3ec5a5d 100644
--- a/stream/server/pom.xml
+++ b/stream/server/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.9.0-SNAPSHOT</version>
   </parent>
   <artifactId>stream-storage-server</artifactId>
   <name>Apache BookKeeper :: Stream Storage :: Server</name>
diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml
index d384d05..230ead2 100644
--- a/stream/statelib/pom.xml
+++ b/stream/statelib/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>stream-storage-parent</artifactId>
     <groupId>org.apache.bookkeeper</groupId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.apache.bookkeeper</groupId>
diff --git a/stream/storage/api/pom.xml b/stream/storage/api/pom.xml
index f7e72ac..67df3e1 100644
--- a/stream/storage/api/pom.xml
+++ b/stream/storage/api/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>stream-storage-service-parent</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>stream-storage-service-api</artifactId>
diff --git a/stream/storage/impl/pom.xml b/stream/storage/impl/pom.xml
index d462732..52cef7f 100644
--- a/stream/storage/impl/pom.xml
+++ b/stream/storage/impl/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>stream-storage-service-parent</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>stream-storage-service-impl</artifactId>
diff --git a/stream/storage/pom.xml b/stream/storage/pom.xml
index 0b82795..3a600cb 100644
--- a/stream/storage/pom.xml
+++ b/stream/storage/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>stream-storage-parent</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>stream-storage-service-parent</artifactId>
diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml
index 3460d79..971aecc 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.9.0-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 b33b7ab..2e79a09 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.9.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.bookkeeper.tests.integration</groupId>
diff --git a/tools/stream/pom.xml b/tools/stream/pom.xml
index 8bfad0e..540e941 100644
--- a/tools/stream/pom.xml
+++ b/tools/stream/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.bookkeeper</groupId>
     <artifactId>bookkeeper-tools-parent</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
   <artifactId>stream-storage-cli</artifactId>
   <name>Apache BookKeeper :: Tools :: Stream</name>