You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2017/07/21 18:44:10 UTC
[1/5] curator git commit: update mvn parent pom,
plugin and other dependency version
Repository: curator
Updated Branches:
refs/heads/CURATOR-426 329729a6e -> 46ce6b7ae
update mvn parent pom, plugin and other dependency version
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/9454f1ca
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/9454f1ca
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/9454f1ca
Branch: refs/heads/CURATOR-426
Commit: 9454f1ca46bcbd52ba3d7767f2e76a05ffdf56f6
Parents: 95b70d2
Author: Fangmin Lyu <al...@fb.com>
Authored: Sat Mar 11 15:59:45 2017 -0800
Committer: Fangmin Lyu <fa...@apache.org>
Committed: Fri Jul 21 10:28:17 2017 -0700
----------------------------------------------------------------------
.../server/jetty_resteasy/TestStringsWithRestEasy.java | 6 +++---
pom.xml | 13 +++++++------
2 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/9454f1ca/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
----------------------------------------------------------------------
diff --git a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
index cc9592c..13f1e14 100644
--- a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
+++ b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
@@ -19,7 +19,7 @@
package org.apache.curator.x.discovery.server.jetty_resteasy;
import com.google.common.collect.Lists;
-import com.google.common.io.ByteStreams;
+import com.google.common.io.ByteSource;
import com.google.common.io.CharStreams;
import org.apache.curator.test.InstanceSpec;
import org.apache.curator.x.discovery.ServiceInstance;
@@ -70,7 +70,7 @@ public class TestStringsWithRestEasy
root.addEventListener(new ResteasyBootstrap());
server.start();
}
-
+
@AfterMethod
public void teardown() throws Exception
{
@@ -133,7 +133,7 @@ public class TestStringsWithRestEasy
urlConnection.setDoOutput(true);
OutputStream out = urlConnection.getOutputStream();
- ByteStreams.copy(ByteStreams.newInputStreamSupplier(body.getBytes()), out);
+ ByteSource.wrap(body.getBytes()).copyTo(out);
}
BufferedReader in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
try
http://git-wip-us.apache.org/repos/asf/curator/blob/9454f1ca/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3aceb5f..19b6d4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>17</version>
+ <version>18</version>
</parent>
<groupId>org.apache.curator</groupId>
@@ -60,11 +60,12 @@
<!-- versions -->
<zookeeper-version>3.5.3-beta</zookeeper-version>
- <maven-project-info-reports-plugin-version>2.7</maven-project-info-reports-plugin-version>
+ <maven-project-info-reports-plugin-version>2.9</maven-project-info-reports-plugin-version>
<maven-bundle-plugin-version>3.2.0</maven-bundle-plugin-version>
- <maven-javadoc-plugin-version>2.10.3</maven-javadoc-plugin-version>
- <doxia-module-confluence-version>1.6</doxia-module-confluence-version>
+ <maven-javadoc-plugin-version>2.10.4</maven-javadoc-plugin-version>
+ <doxia-module-confluence-version>1.7</doxia-module-confluence-version>
<maven-license-plugin-version>1.9.0</maven-license-plugin-version>
+ <javassist-version>3.20.0-GA</javassist-version>
<commons-math-version>2.2</commons-math-version>
<jackson-mapper-asl-version>1.9.13</jackson-mapper-asl-version>
<jackson-version>2.7.3</jackson-version>
@@ -73,9 +74,9 @@
<jetty-version>6.1.26</jetty-version>
<scannotation-version>1.0.2</scannotation-version>
<resteasy-jaxrs-version>2.3.0.GA</resteasy-jaxrs-version>
- <guava-version>16.0.1</guava-version>
+ <guava-version>20.0</guava-version>
<testng-version>6.10</testng-version>
- <swift-version>0.12.0</swift-version>
+ <swift-version>0.18.0</swift-version>
<dropwizard-version>0.7.0</dropwizard-version>
<maven-shade-plugin-version>2.4.3</maven-shade-plugin-version>
<slf4j-version>1.7.6</slf4j-version>
[5/5] curator git commit: Curator Java 8/Async isn't technically an
extension anymore
Posted by ra...@apache.org.
Curator Java 8/Async isn't technically an extension anymore
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/46ce6b7a
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/46ce6b7a
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/46ce6b7a
Branch: refs/heads/CURATOR-426
Commit: 46ce6b7ae338ced5d2fd71bb7ce0e7df6085b208
Parents: 2204c15
Author: randgalt <ra...@apache.org>
Authored: Fri Jul 21 13:44:01 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Fri Jul 21 13:44:01 2017 -0500
----------------------------------------------------------------------
src/site/site.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/46ce6b7a/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 15e1a0c..d78b5b7 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -107,8 +107,7 @@
<menu name="Extensions" inherit="top">
<item name="Service Discovery" href="curator-x-discovery/index.html"/>
<item name="Service Discovery Server" href="curator-x-discovery-server/index.html"/>
- <item name="Curator Java 8/Async" href="curator-x-async/index.html"/>
- </menu>
+\ </menu>
<menu name="Community" inherit="top">
<item name="Submitting Pull Requests" href="https://cwiki.apache.org/confluence/display/CURATOR/Submitting+Pull+Requests"/>
[4/5] curator git commit: latest updates
Posted by ra...@apache.org.
latest updates
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/2204c155
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/2204c155
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/2204c155
Branch: refs/heads/CURATOR-426
Commit: 2204c15508f7b5757dfcbba8234ca57de8b0884d
Parents: b57f9ef
Author: randgalt <ra...@apache.org>
Authored: Fri Jul 21 13:31:52 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Fri Jul 21 13:31:52 2017 -0500
----------------------------------------------------------------------
src/site/confluence/index.confluence | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/2204c155/src/site/confluence/index.confluence
----------------------------------------------------------------------
diff --git a/src/site/confluence/index.confluence b/src/site/confluence/index.confluence
index 4caf9c8..e6a3d10 100644
--- a/src/site/confluence/index.confluence
+++ b/src/site/confluence/index.confluence
@@ -12,14 +12,9 @@ h2. Getting Started
See the page for quick start: [[Getting Started|getting-started.html]].
-h2. Components
+!images/arrow.png!
-|[[Recipes|curator-recipes/index.html]]|Implementations of some of the common ZooKeeper "recipes". The implementations are built on top of the Curator Framework.|
-|[[Framework|curator-framework/index.html]]|The Curator Framework is a high\-level API that greatly simplifies using ZooKeeper. It adds many features that build on ZooKeeper and handles the complexity of managing connections to the ZooKeeper cluster and retrying operations.|
-|[[Utilities|utilities.html]]|Various utilities that are useful when using ZooKeeper.|
-|[[Client|curator-client/index.html]]|A replacement for the bundled {{ZooKeeper}} class that takes care of some low\-level housekeeping and provides some useful utilities.|
-|[[Errors|errors.html]]|How Curator deals with errors, connection issues, recoverable exceptions, etc.|
-|Extensions|The curator\-recipes package implements the common recipes that are described in the ZooKeeper documentation. To avoid bloating that package, recipes/applications that have a vertical appeal will be put in separate "extension" packages using the naming convention curator\-x\-name.|
+Use the navigation links in the left\-nav menu for detailed information.
h2. Maven / Artifacts
@@ -28,19 +23,16 @@ most users, the only artifact you need is curator\-recipes.
||GroupID/Org||ArtifactID/Name||Description||
|org.apache.curator|curator\-recipes|All of the recipes. Note: this artifact has dependencies on client and framework and, so, Maven (or whatever tool you're using) should pull those in automatically.|
+|org.apache.curator|curator\-async|Asynchronous DSL with O/R modeling, migrations and many other features.|
|org.apache.curator|curator\-framework|The Curator Framework high level API. This is built on top of the client and should pull it in automatically.|
|org.apache.curator|curator\-client|The Curator Client \- replacement for the ZooKeeper class in the ZK distribution.|
|org.apache.curator|curator\-test|Contains the TestingServer, the TestingCluster and a few other tools useful for testing.|
|org.apache.curator|curator\-examples|Example usages of various Curator features.|
|org.apache.curator|curator\-x\-discovery|A Service Discovery implementation built on the Curator Framework.|
-|org.apache.curator|curator\-x\-discovery-server|A RESTful server that can be used with Curator Discovery.|
+|org.apache.curator|curator\-x\-discovery\-server|A RESTful server that can be used with Curator Discovery.|
-h2. Versions
+h2. ZooKeeper Compatibility
-The are currently two released versions of Curator, 2.x.x and 3.x.x:
+Apache Curator is meant to be used with ZooKeeper 3.5\+. However, it is also compatible with ZooKeeper 3.4.x.
+See [[Compatibility|compatibility.html]] for details.
-* Curator 2.x.x \- compatible with both ZooKeeper 3.4.x and ZooKeeper 3.5.x
-* Curator 3.x.x \- compatible only with ZooKeeper 3.5.x and includes support for new features such as dynamic reconfiguration, etc.
-
-ZooKeeper 3.5.x adds a number of new features including dynamic reconfiguration, watcher removal and others. The Curator 3.x.x Jira
-issues tracking these features are here: [[https://issues.apache.org/jira/browse/CURATOR-159]].
[2/5] curator git commit: Merge branch 'CURATOR-378'
Posted by ra...@apache.org.
Merge branch 'CURATOR-378'
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/840b4340
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/840b4340
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/840b4340
Branch: refs/heads/CURATOR-426
Commit: 840b4340693b6148bd83c2af9ae1ac7ea5a69cca
Parents: 95b70d2 9454f1c
Author: Fangmin Lyu <fa...@apache.org>
Authored: Fri Jul 21 10:28:56 2017 -0700
Committer: Fangmin Lyu <fa...@apache.org>
Committed: Fri Jul 21 10:28:56 2017 -0700
----------------------------------------------------------------------
.../server/jetty_resteasy/TestStringsWithRestEasy.java | 6 +++---
pom.xml | 13 +++++++------
2 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[3/5] curator git commit: Merge branch 'master' into CURATOR-426
Posted by ra...@apache.org.
Merge branch 'master' into CURATOR-426
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/b57f9ef6
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b57f9ef6
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/b57f9ef6
Branch: refs/heads/CURATOR-426
Commit: b57f9ef65c1c0fcf948da3f9d66e31c74d5e3db9
Parents: 329729a 840b434
Author: randgalt <ra...@apache.org>
Authored: Fri Jul 21 12:50:52 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Fri Jul 21 12:50:52 2017 -0500
----------------------------------------------------------------------
.../server/jetty_resteasy/TestStringsWithRestEasy.java | 6 +++---
pom.xml | 9 +++++----
2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/b57f9ef6/pom.xml
----------------------------------------------------------------------