Repository: curator Updated Branches: refs/heads/master 95b70d2b4 -> 840b43406
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/master Commit: 9454f1ca46bcbd52ba3d7767f2e76a05ffdf56f6 Parents: 95b70d2 Author: Fangmin Lyu <[email protected]> Authored: Sat Mar 11 15:59:45 2017 -0800 Committer: Fangmin Lyu <[email protected]> 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>
