diff options
Diffstat (limited to 'zkfacade/src/main/java')
13 files changed, 459 insertions, 56 deletions
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java index 37b1fa1c9fb..51cb387b734 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java @@ -279,7 +279,7 @@ public class Curator implements AutoCloseable { */ public void createAtomically(Path... paths) { try { - CuratorTransaction transaction = framework().inTransaction(); + @SuppressWarnings("deprecation") CuratorTransaction transaction = framework().inTransaction(); for (Path path : paths) { if ( ! exists(path)) { transaction = transaction.create().forPath(path.getAbsolute(), new byte[0]).and(); diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCurator.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCurator.java index 3da7678c44e..1f583ada7a1 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCurator.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCurator.java @@ -12,31 +12,40 @@ import com.yahoo.vespa.curator.Curator; import com.yahoo.vespa.curator.recipes.CuratorLockException; import org.apache.curator.CuratorZookeeperClient; import org.apache.curator.framework.CuratorFramework; +import org.apache.curator.framework.WatcherRemoveCuratorFramework; import org.apache.curator.framework.api.ACLBackgroundPathAndBytesable; import org.apache.curator.framework.api.ACLCreateModeBackgroundPathAndBytesable; import org.apache.curator.framework.api.ACLCreateModePathAndBytesable; +import org.apache.curator.framework.api.ACLCreateModeStatBackgroundPathAndBytesable; import org.apache.curator.framework.api.ACLPathAndBytesable; +import org.apache.curator.framework.api.ACLableExistBuilderMain; import org.apache.curator.framework.api.BackgroundCallback; import org.apache.curator.framework.api.BackgroundPathAndBytesable; import org.apache.curator.framework.api.BackgroundPathable; import org.apache.curator.framework.api.BackgroundVersionable; import org.apache.curator.framework.api.ChildrenDeletable; -import org.apache.curator.framework.api.CreateBackgroundModeACLable; +import org.apache.curator.framework.api.CreateBackgroundModeStatACLable; import org.apache.curator.framework.api.CreateBuilder; +import org.apache.curator.framework.api.CreateBuilder2; +import org.apache.curator.framework.api.CreateBuilderMain; +import org.apache.curator.framework.api.CreateProtectACLCreateModePathAndBytesable; import org.apache.curator.framework.api.CuratorListener; import org.apache.curator.framework.api.CuratorWatcher; import org.apache.curator.framework.api.DeleteBuilder; +import org.apache.curator.framework.api.DeleteBuilderMain; import org.apache.curator.framework.api.ErrorListenerPathAndBytesable; import org.apache.curator.framework.api.ErrorListenerPathable; import org.apache.curator.framework.api.ExistsBuilder; -import org.apache.curator.framework.api.ExistsBuilderMain; import org.apache.curator.framework.api.GetACLBuilder; import org.apache.curator.framework.api.GetChildrenBuilder; +import org.apache.curator.framework.api.GetConfigBuilder; import org.apache.curator.framework.api.GetDataBuilder; import org.apache.curator.framework.api.GetDataWatchBackgroundStatable; import org.apache.curator.framework.api.PathAndBytesable; import org.apache.curator.framework.api.Pathable; -import org.apache.curator.framework.api.ProtectACLCreateModePathAndBytesable; +import org.apache.curator.framework.api.ProtectACLCreateModeStatPathAndBytesable; +import org.apache.curator.framework.api.ReconfigBuilder; +import org.apache.curator.framework.api.RemoveWatchesBuilder; import org.apache.curator.framework.api.SetACLBuilder; import org.apache.curator.framework.api.SetDataBackgroundVersionable; import org.apache.curator.framework.api.SetDataBuilder; @@ -45,13 +54,16 @@ import org.apache.curator.framework.api.UnhandledErrorListener; import org.apache.curator.framework.api.VersionPathAndBytesable; import org.apache.curator.framework.api.WatchPathable; import org.apache.curator.framework.api.Watchable; +import org.apache.curator.framework.api.transaction.CuratorMultiTransaction; import org.apache.curator.framework.api.transaction.CuratorTransaction; import org.apache.curator.framework.api.transaction.CuratorTransactionBridge; import org.apache.curator.framework.api.transaction.CuratorTransactionFinal; import org.apache.curator.framework.api.transaction.CuratorTransactionResult; import org.apache.curator.framework.api.transaction.TransactionCheckBuilder; import org.apache.curator.framework.api.transaction.TransactionCreateBuilder; +import org.apache.curator.framework.api.transaction.TransactionCreateBuilder2; import org.apache.curator.framework.api.transaction.TransactionDeleteBuilder; +import org.apache.curator.framework.api.transaction.TransactionOp; import org.apache.curator.framework.api.transaction.TransactionSetDataBuilder; import org.apache.curator.framework.imps.CuratorFrameworkState; import org.apache.curator.framework.listen.Listenable; @@ -64,6 +76,8 @@ import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent; import org.apache.curator.framework.recipes.cache.PathChildrenCacheListener; import org.apache.curator.framework.recipes.locks.InterProcessLock; import org.apache.curator.framework.recipes.locks.InterProcessSemaphoreMutex; +import org.apache.curator.framework.schema.SchemaSet; +import org.apache.curator.framework.state.ConnectionStateErrorPolicy; import org.apache.curator.framework.state.ConnectionStateListener; import org.apache.curator.utils.EnsurePath; import org.apache.zookeeper.CreateMode; @@ -71,6 +85,7 @@ import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.Watcher; import org.apache.zookeeper.data.ACL; import org.apache.zookeeper.data.Stat; +import org.apache.zookeeper.server.quorum.flexible.QuorumVerifier; import java.nio.file.Paths; import java.time.Duration; @@ -82,6 +97,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; @@ -633,64 +649,101 @@ public class MockCurator extends Curator { // ----- file system methods above. ----- // ----- There's nothing to see unless you are interested in an illustration of ----- // ----- the folly of fluent API's or, more generally, mankind. ----- + private abstract static class MockProtectACLCreateModeStatPathAndBytesable<String> + implements ProtectACLCreateModeStatPathAndBytesable<String> { - private abstract class MockBackgroundACLPathAndBytesableBuilder<T> implements PathAndBytesable<T>, ProtectACLCreateModePathAndBytesable<T> { - - public BackgroundPathAndBytesable<T> withACL(List<ACL> list) { + public BackgroundPathAndBytesable<String> withACL(List<ACL> list) { throw new UnsupportedOperationException("Not implemented in MockCurator"); } - public ACLBackgroundPathAndBytesable<T> withMode(CreateMode createMode) { + public BackgroundPathAndBytesable<String> withACL(List<ACL> list, boolean b) { throw new UnsupportedOperationException("Not implemented in MockCurator"); } - @Override - public ACLCreateModeBackgroundPathAndBytesable<String> withProtection() { + public ProtectACLCreateModeStatPathAndBytesable<String> withMode(CreateMode createMode) { throw new UnsupportedOperationException("Not implemented in MockCurator"); } - public T forPath(String s, byte[] bytes) throws Exception { - throw new UnsupportedOperationException("Not implemented in MockCurator"); + @Override + public ACLCreateModeBackgroundPathAndBytesable<java.lang.String> withProtection() { + return null; } - public T forPath(String s) throws Exception { - throw new UnsupportedOperationException("Not implemented in MockCurator"); + @Override + public ErrorListenerPathAndBytesable<String> inBackground() { + return null; } - } + @Override + public ErrorListenerPathAndBytesable<String> inBackground(Object o) { + return null; + } - private class MockCreateBuilder extends MockBackgroundACLPathAndBytesableBuilder<String> implements CreateBuilder { + @Override + public ErrorListenerPathAndBytesable<String> inBackground(BackgroundCallback backgroundCallback) { + return null; + } - private boolean createParents = false; - private CreateMode createMode = CreateMode.PERSISTENT; + @Override + public ErrorListenerPathAndBytesable<String> inBackground(BackgroundCallback backgroundCallback, Object o) { + return null; + } @Override - public ProtectACLCreateModePathAndBytesable<String> creatingParentsIfNeeded() { - createParents = true; - return this; + public ErrorListenerPathAndBytesable<String> inBackground(BackgroundCallback backgroundCallback, Executor executor) { + return null; } @Override - public ACLCreateModeBackgroundPathAndBytesable<String> withProtection() { - // Protection against the server crashing after creating the file but before returning to the client. - // Not relevant for an in-memory mock, obviously - return this; + public ErrorListenerPathAndBytesable<String> inBackground(BackgroundCallback backgroundCallback, Object o, Executor executor) { + return null; } - public ACLBackgroundPathAndBytesable<String> withMode(CreateMode createMode) { - this.createMode = createMode; - return this; + @Override + public ACLBackgroundPathAndBytesable<String> storingStatIn(Stat stat) { + return null; } + } + + private class MockCreateBuilder implements CreateBuilder { + + private boolean createParents = false; + private CreateMode createMode = CreateMode.PERSISTENT; + @Override - public CreateBackgroundModeACLable compressed() { - throw new UnsupportedOperationException("Not implemented in MockCurator"); + public ProtectACLCreateModeStatPathAndBytesable<String> creatingParentsIfNeeded() { + createParents = true; + return new MockProtectACLCreateModeStatPathAndBytesable<>() { + + @Override + public String forPath(String s, byte[] bytes) throws Exception { + return createNode(s, bytes, createParents, createMode, fileSystem.root(), listeners); + } + + @Override + public String forPath(String s) throws Exception { + return createNode(s, new byte[0], createParents, createMode, fileSystem.root(), listeners); + } + + }; } @Override - public ProtectACLCreateModePathAndBytesable<String> creatingParentContainersIfNeeded() { - // TODO: Add proper support for container nodes, see https://issues.apache.org/jira/browse/ZOOKEEPER-2163. - return creatingParentsIfNeeded(); + public ProtectACLCreateModeStatPathAndBytesable<String> creatingParentContainersIfNeeded() { + return new MockProtectACLCreateModeStatPathAndBytesable<>() { + + @Override + public String forPath(String s, byte[] bytes) throws Exception { + return createNode(s, bytes, createParents, createMode, fileSystem.root(), listeners); + } + + @Override + public String forPath(String s) throws Exception { + return createNode(s, new byte[0], createParents, createMode, fileSystem.root(), listeners); + } + + }; } @Override @@ -699,6 +752,11 @@ public class MockCurator extends Curator { throw new UnsupportedOperationException("Not implemented in MockCurator"); } + @Override + public ACLCreateModeStatBackgroundPathAndBytesable<String> withProtection() { + return null; + } + public String forPath(String s) throws Exception { return createNode(s, new byte[0], createParents, createMode, fileSystem.root(), listeners); } @@ -736,9 +794,50 @@ public class MockCurator extends Curator { public ErrorListenerPathAndBytesable<String> inBackground(BackgroundCallback backgroundCallback, Object o, Executor executor) { throw new UnsupportedOperationException("Not implemented in MockCurator"); } + + @Override + public CreateBuilderMain withTtl(long l) { + return null; + } + + @Override + public CreateBuilder2 orSetData() { + return null; + } + + @Override + public CreateBuilder2 orSetData(int i) { + return null; + } + + @Override + public CreateBackgroundModeStatACLable compressed() { + return null; + } + + @Override + public CreateProtectACLCreateModePathAndBytesable<String> storingStatIn(Stat stat) { + return null; + } + + @Override + public BackgroundPathAndBytesable<String> withACL(List<ACL> list) { + return null; + } + + @Override + public ACLBackgroundPathAndBytesable<String> withMode(CreateMode createMode) { + this.createMode = createMode; + return this; + } + + @Override + public BackgroundPathAndBytesable<String> withACL(List<ACL> list, boolean b) { + return null; + } } - private class MockBackgroundPathableBuilder<T> implements BackgroundPathable<T>, Watchable<BackgroundPathable<T>> { + private static class MockBackgroundPathableBuilder<T> implements BackgroundPathable<T>, Watchable<BackgroundPathable<T>> { @Override public ErrorListenerPathable<T> inBackground() { @@ -821,7 +920,12 @@ public class MockCurator extends Curator { } @Override - public ExistsBuilderMain creatingParentContainersIfNeeded() { + public ACLableExistBuilderMain creatingParentsIfNeeded() { + throw new UnsupportedOperationException("Not implemented in MockCurator"); + } + + @Override + public ACLableExistBuilderMain creatingParentContainersIfNeeded() { throw new UnsupportedOperationException("Not implemented in MockCurator"); } } @@ -851,6 +955,10 @@ public class MockCurator extends Curator { return null; } + @Override + public DeleteBuilderMain quietly() { + return this; + } } private class MockGetDataBuilder extends MockBackgroundPathableBuilder<byte[]> implements GetDataBuilder { @@ -860,18 +968,48 @@ public class MockCurator extends Curator { throw new UnsupportedOperationException("Not implemented in MockCurator"); } + public byte[] forPath(String path) throws Exception { + return getData(path, fileSystem.root()); + } + @Override - public WatchPathable<byte[]> storingStatIn(Stat stat) { + public ErrorListenerPathable<byte[]> inBackground() { throw new UnsupportedOperationException("Not implemented in MockCurator"); } - public byte[] forPath(String path) throws Exception { - return getData(path, fileSystem.root()); + @Override + public ErrorListenerPathable<byte[]> inBackground(Object o) { + throw new UnsupportedOperationException("Not implemented in MockCurator"); + } + + @Override + public ErrorListenerPathable<byte[]> inBackground(BackgroundCallback backgroundCallback) { + throw new UnsupportedOperationException("Not implemented in MockCurator"); + } + + @Override + public ErrorListenerPathable<byte[]> inBackground(BackgroundCallback backgroundCallback, Object o) { + throw new UnsupportedOperationException("Not implemented in MockCurator"); + } + + @Override + public ErrorListenerPathable<byte[]> inBackground(BackgroundCallback backgroundCallback, Executor executor) { + throw new UnsupportedOperationException("Not implemented in MockCurator"); + } + + @Override + public ErrorListenerPathable<byte[]> inBackground(BackgroundCallback backgroundCallback, Object o, Executor executor) { + throw new UnsupportedOperationException("Not implemented in MockCurator"); } + @Override + public WatchPathable<byte[]> storingStatIn(Stat stat) { + throw new UnsupportedOperationException("Not implemented in MockCurator"); + } } - private class MockSetDataBuilder extends MockBackgroundACLPathAndBytesableBuilder<Stat> implements SetDataBuilder { + // extends MockBackgroundACLPathAndBytesableBuilder<Stat> + private class MockSetDataBuilder implements SetDataBuilder { @Override public SetDataBackgroundVersionable compressed() { @@ -890,6 +1028,11 @@ public class MockCurator extends Curator { } @Override + public Stat forPath(String s) throws Exception { + return null; + } + + @Override public ErrorListenerPathAndBytesable<Stat> inBackground() { throw new UnsupportedOperationException("Not implemented in MockCurator"); } @@ -991,11 +1134,6 @@ public class MockCurator extends Curator { private CreateMode createMode = CreateMode.PERSISTENT; @Override - public PathAndBytesable<CuratorTransactionBridge> withACL(List<ACL> list) { - throw new UnsupportedOperationException("Not implemented in MockCurator"); - } - - @Override public ACLCreateModePathAndBytesable<CuratorTransactionBridge> compressed() { throw new UnsupportedOperationException("Not implemented in MockCurator"); } @@ -1018,6 +1156,20 @@ public class MockCurator extends Curator { return new MockCuratorTransactionBridge(); } + @Override + public TransactionCreateBuilder2 withTtl(long l) { + return this; + } + + @Override + public Object withACL(List list, boolean b) { + return this; + } + + @Override + public Object withACL(List list) { + return this; + } } private class MockTransactionDeleteBuilder implements TransactionDeleteBuilder { @@ -1155,11 +1307,31 @@ public class MockCurator extends Curator { } @Override + public ReconfigBuilder reconfig() { + throw new UnsupportedOperationException("Not implemented in MockCurator"); + } + + @Override + public GetConfigBuilder getConfig() { + throw new UnsupportedOperationException("Not implemented in MockCurator"); + } + + @Override public CuratorTransaction inTransaction() { return new MockCuratorTransactionFinal(); } @Override + public CuratorMultiTransaction transaction() { + throw new UnsupportedOperationException("Not implemented in MockCurator"); + } + + @Override + public TransactionOp transactionOp() { + throw new UnsupportedOperationException("Not implemented in MockCurator"); + } + + @Override @Deprecated public void sync(String path, Object backgroundContextObject) { throw new UnsupportedOperationException("Not implemented in MockCurator"); @@ -1228,10 +1400,241 @@ public class MockCurator extends Curator { } @Override + public WatcherRemoveCuratorFramework newWatcherRemoveCuratorFramework() { + return new WatcherRemoveCuratorFramework() { + @Override + public void removeWatchers() { + + } + + @Override + public void start() { + + } + + @Override + public void close() { + + } + + @Override + public CuratorFrameworkState getState() { + return null; + } + + @Override + public boolean isStarted() { + return false; + } + + @Override + public CreateBuilder create() { + return null; + } + + @Override + public DeleteBuilder delete() { + return null; + } + + @Override + public ExistsBuilder checkExists() { + return null; + } + + @Override + public GetDataBuilder getData() { + return null; + } + + @Override + public SetDataBuilder setData() { + return null; + } + + @Override + public GetChildrenBuilder getChildren() { + return null; + } + + @Override + public GetACLBuilder getACL() { + return null; + } + + @Override + public SetACLBuilder setACL() { + return null; + } + + @Override + public ReconfigBuilder reconfig() { + return null; + } + + @Override + public GetConfigBuilder getConfig() { + return null; + } + + @Override + public CuratorTransaction inTransaction() { + return null; + } + + @Override + public CuratorMultiTransaction transaction() { + return null; + } + + @Override + public TransactionOp transactionOp() { + return null; + } + + @Override + public void sync(String s, Object o) { + + } + + @Override + public void createContainers(String s) throws Exception { + + } + + @Override + public SyncBuilder sync() { + return null; + } + + @Override + public RemoveWatchesBuilder watches() { + return null; + } + + @Override + public Listenable<ConnectionStateListener> getConnectionStateListenable() { + return null; + } + + @Override + public Listenable<CuratorListener> getCuratorListenable() { + return null; + } + + @Override + public Listenable<UnhandledErrorListener> getUnhandledErrorListenable() { + return null; + } + + @Override + public CuratorFramework nonNamespaceView() { + return null; + } + + @Override + public CuratorFramework usingNamespace(String s) { + return null; + } + + @Override + public String getNamespace() { + return null; + } + + @Override + public CuratorZookeeperClient getZookeeperClient() { + return null; + } + + @Override + public EnsurePath newNamespaceAwareEnsurePath(String s) { + return null; + } + + @Override + public void clearWatcherReferences(Watcher watcher) { + + } + + @Override + public boolean blockUntilConnected(int i, TimeUnit timeUnit) throws InterruptedException { + return false; + } + + @Override + public void blockUntilConnected() throws InterruptedException { + + } + + @Override + public WatcherRemoveCuratorFramework newWatcherRemoveCuratorFramework() { + return null; + } + + @Override + public ConnectionStateErrorPolicy getConnectionStateErrorPolicy() { + return null; + } + + @Override + public QuorumVerifier getCurrentConfig() { + return null; + } + + @Override + public SchemaSet getSchemaSet() { + return null; + } + + @Override + public boolean isZk34CompatibilityMode() { + return false; + } + + @Override + public CompletableFuture<Void> runSafe(Runnable runnable) { + return null; + } + }; + + } + + @Override + public ConnectionStateErrorPolicy getConnectionStateErrorPolicy() { + throw new UnsupportedOperationException("Not implemented in MockCurator"); + } + + @Override + public QuorumVerifier getCurrentConfig() { + throw new UnsupportedOperationException("Not implemented in MockCurator"); + } + + @Override + public SchemaSet getSchemaSet() { + throw new UnsupportedOperationException("Not implemented in MockCurator"); + } + + @Override + public boolean isZk34CompatibilityMode() { + return false; + } + + @Override + public CompletableFuture<Void> runSafe(Runnable runnable) { + throw new UnsupportedOperationException("Not implemented in MockCurator"); + } + + @Override public SyncBuilder sync() { throw new UnsupportedOperationException("Not implemented in MockCurator"); } - + + @Override + public RemoveWatchesBuilder watches() { + throw new UnsupportedOperationException("Not implemented in MockCurator"); + } + } } diff --git a/zkfacade/src/main/java/org/apache/curator/framework/api/package-info.java b/zkfacade/src/main/java/org/apache/curator/framework/api/package-info.java index be9e84013c1..b51f289414b 100644 --- a/zkfacade/src/main/java/org/apache/curator/framework/api/package-info.java +++ b/zkfacade/src/main/java/org/apache/curator/framework/api/package-info.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 2, minor = 13, micro = 0)) +@ExportPackage(version = @Version(major = 4, minor = 2, micro = 0)) package org.apache.curator.framework.api; import com.yahoo.osgi.annotation.ExportPackage; import com.yahoo.osgi.annotation.Version; diff --git a/zkfacade/src/main/java/org/apache/curator/framework/api/transaction/package-info.java b/zkfacade/src/main/java/org/apache/curator/framework/api/transaction/package-info.java index be3ece0357b..5b1ae61f6eb 100644 --- a/zkfacade/src/main/java/org/apache/curator/framework/api/transaction/package-info.java +++ b/zkfacade/src/main/java/org/apache/curator/framework/api/transaction/package-info.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 2, minor = 13, micro = 0)) +@ExportPackage(version = @Version(major = 4, minor = 2, micro = 0)) package org.apache.curator.framework.api.transaction; import com.yahoo.osgi.annotation.ExportPackage; import com.yahoo.osgi.annotation.Version; diff --git a/zkfacade/src/main/java/org/apache/curator/framework/listen/package-info.java b/zkfacade/src/main/java/org/apache/curator/framework/listen/package-info.java index 79c67cedf75..bfa177d1d3d 100644 --- a/zkfacade/src/main/java/org/apache/curator/framework/listen/package-info.java +++ b/zkfacade/src/main/java/org/apache/curator/framework/listen/package-info.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 2, minor = 13, micro = 0)) +@ExportPackage(version = @Version(major = 4, minor = 2, micro = 0)) package org.apache.curator.framework.listen; import com.yahoo.osgi.annotation.ExportPackage; import com.yahoo.osgi.annotation.Version; diff --git a/zkfacade/src/main/java/org/apache/curator/framework/package-info.java b/zkfacade/src/main/java/org/apache/curator/framework/package-info.java index 3e3b8433556..b17de5a8cb0 100644 --- a/zkfacade/src/main/java/org/apache/curator/framework/package-info.java +++ b/zkfacade/src/main/java/org/apache/curator/framework/package-info.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 2, minor = 13, micro = 0)) +@ExportPackage(version = @Version(major = 4, minor = 2, micro = 0)) package org.apache.curator.framework; import com.yahoo.osgi.annotation.ExportPackage; import com.yahoo.osgi.annotation.Version; diff --git a/zkfacade/src/main/java/org/apache/curator/framework/recipes/atomic/package-info.java b/zkfacade/src/main/java/org/apache/curator/framework/recipes/atomic/package-info.java index a607d5dcda5..5db72b4d54d 100644 --- a/zkfacade/src/main/java/org/apache/curator/framework/recipes/atomic/package-info.java +++ b/zkfacade/src/main/java/org/apache/curator/framework/recipes/atomic/package-info.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 2, minor = 13, micro = 0)) +@ExportPackage(version = @Version(major = 4, minor = 2, micro = 0)) package org.apache.curator.framework.recipes.atomic; import com.yahoo.osgi.annotation.ExportPackage; import com.yahoo.osgi.annotation.Version; diff --git a/zkfacade/src/main/java/org/apache/curator/framework/recipes/barriers/package-info.java b/zkfacade/src/main/java/org/apache/curator/framework/recipes/barriers/package-info.java index 2db4beef75f..662ac123219 100644 --- a/zkfacade/src/main/java/org/apache/curator/framework/recipes/barriers/package-info.java +++ b/zkfacade/src/main/java/org/apache/curator/framework/recipes/barriers/package-info.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 2, minor = 13, micro = 0)) +@ExportPackage(version = @Version(major = 4, minor = 2, micro = 0)) package org.apache.curator.framework.recipes.barriers; import com.yahoo.osgi.annotation.ExportPackage; import com.yahoo.osgi.annotation.Version; diff --git a/zkfacade/src/main/java/org/apache/curator/framework/recipes/cache/package-info.java b/zkfacade/src/main/java/org/apache/curator/framework/recipes/cache/package-info.java index 0465bbf2039..eb67b4fbcc9 100644 --- a/zkfacade/src/main/java/org/apache/curator/framework/recipes/cache/package-info.java +++ b/zkfacade/src/main/java/org/apache/curator/framework/recipes/cache/package-info.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 2, minor = 13, micro = 0)) +@ExportPackage(version = @Version(major = 4, minor = 2, micro = 0)) package org.apache.curator.framework.recipes.cache; import com.yahoo.osgi.annotation.ExportPackage; import com.yahoo.osgi.annotation.Version; diff --git a/zkfacade/src/main/java/org/apache/curator/framework/recipes/locks/package-info.java b/zkfacade/src/main/java/org/apache/curator/framework/recipes/locks/package-info.java index 63b067bcffc..d9db23bb26e 100644 --- a/zkfacade/src/main/java/org/apache/curator/framework/recipes/locks/package-info.java +++ b/zkfacade/src/main/java/org/apache/curator/framework/recipes/locks/package-info.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 2, minor = 13, micro = 0)) +@ExportPackage(version = @Version(major = 4, minor = 2, micro = 0)) package org.apache.curator.framework.recipes.locks; import com.yahoo.osgi.annotation.ExportPackage; import com.yahoo.osgi.annotation.Version; diff --git a/zkfacade/src/main/java/org/apache/curator/framework/state/package-info.java b/zkfacade/src/main/java/org/apache/curator/framework/state/package-info.java index eec4f00ddb4..26ccffbc9af 100644 --- a/zkfacade/src/main/java/org/apache/curator/framework/state/package-info.java +++ b/zkfacade/src/main/java/org/apache/curator/framework/state/package-info.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 2, minor = 13, micro = 0)) +@ExportPackage(version = @Version(major = 4, minor = 2, micro = 0)) package org.apache.curator.framework.state; import com.yahoo.osgi.annotation.ExportPackage; import com.yahoo.osgi.annotation.Version; diff --git a/zkfacade/src/main/java/org/apache/curator/package-info.java b/zkfacade/src/main/java/org/apache/curator/package-info.java index 120aa4558d2..ede2602e96c 100644 --- a/zkfacade/src/main/java/org/apache/curator/package-info.java +++ b/zkfacade/src/main/java/org/apache/curator/package-info.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 2, minor = 13, micro = 0)) +@ExportPackage(version = @Version(major = 4, minor = 2, micro = 0)) package org.apache.curator; import com.yahoo.osgi.annotation.ExportPackage; import com.yahoo.osgi.annotation.Version; diff --git a/zkfacade/src/main/java/org/apache/curator/retry/package-info.java b/zkfacade/src/main/java/org/apache/curator/retry/package-info.java index 98130481c4c..32cfbc8bbf4 100644 --- a/zkfacade/src/main/java/org/apache/curator/retry/package-info.java +++ b/zkfacade/src/main/java/org/apache/curator/retry/package-info.java @@ -1,5 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage(version = @Version(major = 2, minor = 13, micro = 0)) +@ExportPackage(version = @Version(major = 4, minor = 2, micro = 0)) package org.apache.curator.retry; import com.yahoo.osgi.annotation.ExportPackage; import com.yahoo.osgi.annotation.Version; |