Fix distributedlog Maven reactor module
- fix version
- add explicitly distributedlog to the modules of Stream project
- fix checkstyle on distributedlog, it wasn't executed
Reviewers: Rajan Dhabalia <rdhabalia@apache.org>
This closes #2364 from eolivelli/fix/fix-dlog-dep
diff --git a/stream/distributedlog/common/pom.xml b/stream/distributedlog/common/pom.xml
index fc318d9..2f50d31 100644
--- a/stream/distributedlog/common/pom.xml
+++ b/stream/distributedlog/common/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
</parent>
<artifactId>distributedlog-common</artifactId>
<name>Apache BookKeeper :: DistributedLog :: Common</name>
diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml
index 65129db..c08f939 100644
--- a/stream/distributedlog/core/pom.xml
+++ b/stream/distributedlog/core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
</parent>
<artifactId>distributedlog-core</artifactId>
<name>Apache BookKeeper :: DistributedLog :: Core Library</name>
@@ -112,7 +112,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <suppressionsLocation>buildtools/src/main/resources/distributedlog/suppressions.xml</suppressionsLocation>
+ <suppressionsLocation>../../buildtools/src/main/resources/distributedlog/suppressions.xml</suppressionsLocation>
+ <configLocation>../../buildtools/src/main/resources/bookkeeper/checkstyle.xml</configLocation>
<excludes>**/thrift/**/*</excludes>
</configuration>
</plugin>
diff --git a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/impl/metadata/ZKLogStreamMetadataStore.java b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/impl/metadata/ZKLogStreamMetadataStore.java
index 9a8886e..e16cec8 100644
--- a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/impl/metadata/ZKLogStreamMetadataStore.java
+++ b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/impl/metadata/ZKLogStreamMetadataStore.java
@@ -17,9 +17,9 @@
*/
package org.apache.distributedlog.impl.metadata;
-import static java.nio.charset.StandardCharsets.UTF_8;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.distributedlog.DistributedLogConstants.EMPTY_BYTES;
import static org.apache.distributedlog.DistributedLogConstants.UNASSIGNED_LOGSEGMENT_SEQNO;
import static org.apache.distributedlog.metadata.LogMetadata.ALLOCATION_PATH;
diff --git a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/impl/subscription/ZKSubscriptionStateStore.java b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/impl/subscription/ZKSubscriptionStateStore.java
index a1c2a9f..bd60b41 100644
--- a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/impl/subscription/ZKSubscriptionStateStore.java
+++ b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/impl/subscription/ZKSubscriptionStateStore.java
@@ -17,8 +17,8 @@
*/
package org.apache.distributedlog.impl.subscription;
-import java.nio.charset.StandardCharsets;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
import org.apache.bookkeeper.common.concurrent.FutureUtils;
diff --git a/stream/distributedlog/io/dlfs/pom.xml b/stream/distributedlog/io/dlfs/pom.xml
index 9c5195f..ab2990f 100644
--- a/stream/distributedlog/io/dlfs/pom.xml
+++ b/stream/distributedlog/io/dlfs/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>distributedlog</artifactId>
<groupId>org.apache.distributedlog</groupId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.apache.distributedlog</groupId>
diff --git a/stream/distributedlog/io/pom.xml b/stream/distributedlog/io/pom.xml
index 92827d4..81c4ebd 100644
--- a/stream/distributedlog/io/pom.xml
+++ b/stream/distributedlog/io/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>distributedlog-io</artifactId>
diff --git a/stream/distributedlog/pom.xml b/stream/distributedlog/pom.xml
index ff537c4..afb3581 100644
--- a/stream/distributedlog/pom.xml
+++ b/stream/distributedlog/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper</artifactId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.apache.distributedlog</groupId>
diff --git a/stream/distributedlog/protocol/pom.xml b/stream/distributedlog/protocol/pom.xml
index 09da6bd..6301ff2 100644
--- a/stream/distributedlog/protocol/pom.xml
+++ b/stream/distributedlog/protocol/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
</parent>
<artifactId>distributedlog-protocol</artifactId>
<name>Apache BookKeeper :: DistributedLog :: Protocol</name>
diff --git a/stream/pom.xml b/stream/pom.xml
index d8a1e8f..73caf4c 100644
--- a/stream/pom.xml
+++ b/stream/pom.xml
@@ -29,6 +29,7 @@
<name>Apache BookKeeper :: Stream Storage :: Parent</name>
<modules>
+ <module>distributedlog</module>
<module>common</module>
<module>tests-common</module>
<module>statelib</module>
