This is an automated email from the ASF dual-hosted git repository. randgalt pushed a commit to branch CURATOR-558-zk36-updates in repository https://gitbox.apache.org/repos/asf/curator.git
commit 256066c67b2783e90952bfdbb7483186e718c743 Author: randgalt <[email protected]> AuthorDate: Sun Mar 15 13:03:19 2020 -0500 CURATOR-558 - change to version 5.0.0-SNAPSHOT --- curator-client/pom.xml | 4 ++-- .../org/apache/curator/utils/Compatibility.java | 4 ++-- curator-examples/pom.xml | 2 +- curator-framework/pom.xml | 4 ++-- .../curator/framework/api/CuratorEventType.java | 2 +- curator-recipes/pom.xml | 4 ++-- curator-test-zk35/pom.xml | 21 +++++++++++++++++++-- curator-test/pom.xml | 4 ++-- curator-x-async/pom.xml | 2 +- curator-x-discovery-server/pom.xml | 4 ++-- curator-x-discovery/pom.xml | 4 ++-- pom.xml | 2 +- 12 files changed, 37 insertions(+), 20 deletions(-) diff --git a/curator-client/pom.xml b/curator-client/pom.xml index 27238e7..9d30720 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -23,11 +23,11 @@ <parent> <groupId>org.apache.curator</groupId> <artifactId>apache-curator</artifactId> - <version>4.2.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> </parent> <artifactId>curator-client</artifactId> - <version>4.2.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>Curator Client</name> diff --git a/curator-client/src/main/java/org/apache/curator/utils/Compatibility.java b/curator-client/src/main/java/org/apache/curator/utils/Compatibility.java index fa43d35..f79ae1d 100644 --- a/curator-client/src/main/java/org/apache/curator/utils/Compatibility.java +++ b/curator-client/src/main/java/org/apache/curator/utils/Compatibility.java @@ -43,7 +43,7 @@ public class Compatibility { Class<?> multipleAddressesClass = Class.forName("org.apache.zookeeper.server.quorum.MultipleAddresses"); localGetReachableOrOneMethod = multipleAddressesClass.getMethod("getReachableOrOne"); - LoggerFactory.getLogger(Compatibility.class).info("Using org.apache.zookeeper.server.quorum.MultipleAddresses"); + log.info("Using org.apache.zookeeper.server.quorum.MultipleAddresses"); } catch ( ReflectiveOperationException ignore ) { @@ -59,7 +59,7 @@ public class Compatibility catch ( NoSuchFieldException e ) { localAddrField = null; - LoggerFactory.getLogger(Compatibility.class).error("Could not get addr field! Reconfiguration fail!"); + log.error("Could not get addr field! Reconfiguration fail!"); } addrField = localAddrField; } diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index 7d6ffb9..017d885 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.curator</groupId> <artifactId>apache-curator</artifactId> - <version>4.2.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> </parent> <artifactId>curator-examples</artifactId> diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index 86bbe5f..2b0ea12 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -24,11 +24,11 @@ <parent> <groupId>org.apache.curator</groupId> <artifactId>apache-curator</artifactId> - <version>4.2.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> </parent> <artifactId>curator-framework</artifactId> - <version>4.2.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>Curator Framework</name> diff --git a/curator-framework/src/main/java/org/apache/curator/framework/api/CuratorEventType.java b/curator-framework/src/main/java/org/apache/curator/framework/api/CuratorEventType.java index 89e1490..e593da5 100644 --- a/curator-framework/src/main/java/org/apache/curator/framework/api/CuratorEventType.java +++ b/curator-framework/src/main/java/org/apache/curator/framework/api/CuratorEventType.java @@ -99,7 +99,7 @@ public enum CuratorEventType CLOSING, /** - * Corresponds to {@link org.apache.curator.framework.CuratorFramework#watchers()} + * Corresponds to {@link CuratorFramework#watches()} */ ADD_WATCH } diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml index 937cdab..5ef0950 100644 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@ -24,11 +24,11 @@ <parent> <groupId>org.apache.curator</groupId> <artifactId>apache-curator</artifactId> - <version>4.2.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> </parent> <artifactId>curator-recipes</artifactId> - <version>4.2.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>Curator Recipes</name> diff --git a/curator-test-zk35/pom.xml b/curator-test-zk35/pom.xml index 0f1948a..c1fbcd8 100644 --- a/curator-test-zk35/pom.xml +++ b/curator-test-zk35/pom.xml @@ -1,9 +1,26 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?><!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <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";> <parent> <groupId>org.apache.curator</groupId> <artifactId>apache-curator</artifactId> - <version>4.2.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/curator-test/pom.xml b/curator-test/pom.xml index 4f0c5a2..5e52672 100644 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@ -24,11 +24,11 @@ <parent> <groupId>org.apache.curator</groupId> <artifactId>apache-curator</artifactId> - <version>4.2.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> </parent> <artifactId>curator-test</artifactId> - <version>4.2.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <name>Curator Testing</name> <description>Unit testing utilities.</description> diff --git a/curator-x-async/pom.xml b/curator-x-async/pom.xml index 5ffd774..88008b8 100644 --- a/curator-x-async/pom.xml +++ b/curator-x-async/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.apache.curator</groupId> <artifactId>apache-curator</artifactId> - <version>4.2.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml index 27a0f83..d34eb04 100644 --- a/curator-x-discovery-server/pom.xml +++ b/curator-x-discovery-server/pom.xml @@ -24,11 +24,11 @@ <parent> <groupId>org.apache.curator</groupId> <artifactId>apache-curator</artifactId> - <version>4.2.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> </parent> <artifactId>curator-x-discovery-server</artifactId> - <version>4.2.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>Curator Service Discovery Server</name> diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml index 824231d..efcf12f 100644 --- a/curator-x-discovery/pom.xml +++ b/curator-x-discovery/pom.xml @@ -24,11 +24,11 @@ <parent> <groupId>org.apache.curator</groupId> <artifactId>apache-curator</artifactId> - <version>4.2.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> </parent> <artifactId>curator-x-discovery</artifactId> - <version>4.2.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>Curator Service Discovery</name> diff --git a/pom.xml b/pom.xml index 46e5641..16006e0 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ <groupId>org.apache.curator</groupId> <artifactId>apache-curator</artifactId> - <version>4.2.1-SNAPSHOT</version> + <version>5.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Curator</name>
