This is an automated email from the ASF dual-hosted git repository. jpoth pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 13af109711138a744f7c43e6afd0ee809c9c54df Author: jpoth <poth.j...@gmail.com> AuthorDate: Fri May 17 14:55:59 2019 +0200 CAMEL-13539 Upgrade pubnub-gson to 4.23 for retrofit 2.5.0 --- components/camel-pubnub/pom.xml | 2 +- .../java/org/apache/camel/component/pubnub/PubNubOperationsTest.java | 2 +- parent/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/camel-pubnub/pom.xml b/components/camel-pubnub/pom.xml index b87e049..599d735 100644 --- a/components/camel-pubnub/pom.xml +++ b/components/camel-pubnub/pom.xml @@ -78,7 +78,7 @@ </dependency> <dependency> <groupId>com.github.tomakehurst</groupId> - <artifactId>wiremock</artifactId> + <artifactId>wiremock-jre8</artifactId> <version>${wiremock-version}</version> <scope>test</scope> </dependency> diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubOperationsTest.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubOperationsTest.java index 02ab0e2..eb77303 100644 --- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubOperationsTest.java +++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubOperationsTest.java @@ -58,7 +58,7 @@ public class PubNubOperationsTest extends PubNubTestBase { stubFor(get(urlPathEqualTo("/v2/presence/sub_key/mySubscribeKey/channel/myChannel")).willReturn(aResponse() .withBody("{\"status\" : 200, \"message\" : \"OK\", \"service\" : \"Presence\", \"uuids\" : [{\"uuid\" : \"myUUID0\"}, {\"state\" : {\"abcd\" : {\"age\" : 15}}, " + "\"uuid\" : \"myUUID1\"}, {\"uuid\" : \"b9eb408c-bcec-4d34-b4c4-fabec057ad0d\"}, {\"state\" : {\"abcd\" : {\"age\" : 15}}, \"uuid\" : \"myUUID2\"}," - + " {\"state\" : {\"abcd\" : {\"age\" : 24}}, \"uuid\" : \"myUUID9\"}], \"occupancy\" : 5} Return Occupancy O"))); + + " {\"state\" : {\"abcd\" : {\"age\" : 24}}, \"uuid\" : \"myUUID9\"}], \"occupancy\" : 5}"))); Map<String, Object> headers = new HashMap<>(); headers.put(PubNubConstants.OPERATION, "HERENOW"); PNHereNowResult response = template.requestBodyAndHeaders("direct:publish", null, headers, PNHereNowResult.class); diff --git a/parent/pom.xml b/parent/pom.xml index 87db5a7..25437f4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -563,7 +563,7 @@ <protobuf-javanano-version>3.1.0</protobuf-javanano-version> <protobuf-maven-plugin-version>0.5.1</protobuf-maven-plugin-version> <protonpack-version>1.8</protonpack-version> - <pubnub-version>4.21.0</pubnub-version> + <pubnub-version>4.23.0</pubnub-version> <pulsar-version>2.3.1</pulsar-version> <pulsar-bundle-version>2.3.1_1</pulsar-bundle-version> <qpid-broker-version>7.1.3</qpid-broker-version>