You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by eo...@apache.org on 2020/06/22 08:49:26 UTC
[bookkeeper] branch fix/fix-dlop-dep-411 created (now 2169b06)
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a change to branch fix/fix-dlop-dep-411
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git.
at 2169b06 Fix distributedlog Maven reactor module - add explicitly distributedlog to the modules of Stream project - fix checkstyle on distributedlog, it wasn't executed
This branch includes the following new commits:
new 2169b06 Fix distributedlog Maven reactor module - add explicitly distributedlog to the modules of Stream project - fix checkstyle on distributedlog, it wasn't executed
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[bookkeeper] 01/01: Fix distributedlog Maven reactor module - add
explicitly distributedlog to the modules of Stream project - fix checkstyle
on distributedlog, it wasn't executed
Posted by eo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch fix/fix-dlop-dep-411
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
commit 2169b06e20b0a7637f0e4d4a47760d2515bbba5b
Author: Enrico Olivelli <en...@diennea.com>
AuthorDate: Mon Jun 22 10:49:03 2020 +0200
Fix distributedlog Maven reactor module
- add explicitly distributedlog to the modules of Stream project
- fix checkstyle on distributedlog, it wasn't executed
---
stream/distributedlog/core/pom.xml | 3 ++-
.../apache/distributedlog/impl/metadata/ZKLogStreamMetadataStore.java | 2 +-
.../distributedlog/impl/subscription/ZKSubscriptionStateStore.java | 2 +-
stream/pom.xml | 1 +
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/stream/distributedlog/core/pom.xml b/stream/distributedlog/core/pom.xml
index 65129db..e22e2d6 100644
--- a/stream/distributedlog/core/pom.xml
+++ b/stream/distributedlog/core/pom.xml
@@ -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/pom.xml b/stream/pom.xml
index 39aabd3..5613dfb 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>