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 2019/03/03 14:56:13 UTC
[curator] 01/01: Merge branch 'CURATOR-481' of
github.com:Max-Pudov/curator into CURATOR-481
This is an automated email from the ASF dual-hosted git repository.
randgalt pushed a commit to branch CURATOR-481
in repository https://gitbox.apache.org/repos/asf/curator.git
commit e11279d4b5d42c9cff5cffc03c5b060d868833b4
Merge: aa5f161 f91064b
Author: randgalt <ra...@apache.org>
AuthorDate: Sun Mar 3 09:55:59 2019 -0500
Merge branch 'CURATOR-481' of github.com:Max-Pudov/curator into CURATOR-481
.../src/main/java/discovery/InstanceDetails.java | 2 +-
.../server/contexts/GenericDiscoveryContext.java | 8 ++++----
.../server/contexts/IntegerDiscoveryContext.java | 4 ++--
.../server/contexts/StringDiscoveryContext.java | 4 ++--
.../entity/JsonServiceInstanceMarshaller.java | 6 +++---
.../entity/JsonServiceInstancesMarshaller.java | 8 ++++----
.../server/entity/JsonServiceNamesMarshaller.java | 22 +++++++++++-----------
.../x/discovery/server/rest/DiscoveryContext.java | 4 ++--
.../server/jetty_jersey/ServiceDetails.java | 3 +--
curator-x-discovery/pom.xml | 5 +++--
.../curator/x/discovery/ServiceInstance.java | 6 ++----
.../discovery/details/JsonInstanceSerializer.java | 12 ++++++------
.../x/discovery/details/OldServiceInstance.java | 5 ++---
.../TestJsonInstanceSerializerCompatibility.java | 4 ++--
.../discovery/details/TestNewServiceInstance.java | 5 ++---
pom.xml | 8 +-------
16 files changed, 48 insertions(+), 58 deletions(-)
diff --cc pom.xml
index 1c56b84,a938565..d754136
--- a/pom.xml
+++ b/pom.xml
@@@ -60,33 -60,25 +60,33 @@@
<!-- versions -->
<zookeeper-version>3.5.4-beta</zookeeper-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.4</maven-javadoc-plugin-version>
- <doxia-module-confluence-version>1.7</doxia-module-confluence-version>
+ <maven-bundle-plugin-version>4.1.0</maven-bundle-plugin-version>
+ <maven-javadoc-plugin-version>3.0.1</maven-javadoc-plugin-version>
+ <doxia-module-confluence-version>1.8</doxia-module-confluence-version>
<maven-license-plugin-version>1.9.0</maven-license-plugin-version>
- <javassist-version>3.20.0-GA</javassist-version>
+ <javassist-version>3.24.1-GA</javassist-version>
<commons-math-version>2.2</commons-math-version>
- <jackson-version>2.9.7</jackson-version>
- <jersey-version>1.18.1</jersey-version>
+ <jackson-mapper-asl-version>1.9.13</jackson-mapper-asl-version>
+ <jackson-version>2.9.8</jackson-version>
- <jersey-version>1.19.4</jersey-version>
+ <!-- Upgrading to Jersey 2.x is difficult and of unclear benefits, see
+ https://stackoverflow.com/questions/17098341#22033825 -->
++ <jersey-version>1.19.4</jersey-version>
<jsr311-api-version>1.1.1</jsr311-api-version>
+ <!-- See https://stackoverflow.com/questions/43574426#comment93992044_43574427 -->
+ <jaxb-version>2.2.11</jaxb-version>
+ <javax-activation-version>1.1.1</javax-activation-version>
<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>20.0</guava-version>
- <testng-version>6.10</testng-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>
+ <!-- resteasy-jaxrs dependency cannot be higher than 2.x for compatibility with Jersey 1.x -->
+ <resteasy-jaxrs-version>2.3.5.Final</resteasy-jaxrs-version>
+ <guava-version>27.0.1-jre</guava-version>
+ <guava-listenablefuture-version>1.0</guava-listenablefuture-version>
+ <guava-failureaccess-version>1.0.1</guava-failureaccess-version>
+ <testng-version>6.14.3</testng-version>
+ <swift-version>0.23.1</swift-version>
+ <dropwizard-version>1.3.7</dropwizard-version>
+ <maven-shade-plugin-version>3.2.1</maven-shade-plugin-version>
+ <slf4j-version>1.7.25</slf4j-version>
<clirr-maven-plugin-version>2.8</clirr-maven-plugin-version>
<!-- OSGi Properties -->