You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2018/02/27 00:39:32 UTC
[incubator-pulsar] branch master updated: Upgrade jersey version to
2.25 and powermock to 1.7.3 (#1274)
This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 8a20499 Upgrade jersey version to 2.25 and powermock to 1.7.3 (#1274)
8a20499 is described below
commit 8a204998591a25db1def620bab7005407d635683
Author: Sijie Guo <gu...@gmail.com>
AuthorDate: Mon Feb 26 16:39:30 2018 -0800
Upgrade jersey version to 2.25 and powermock to 1.7.3 (#1274)
* Upgrade jersey version to 2.26
* Include inject dependency
* Fix version parameter
* add hk2
* Jersey 2.26 doesn't allow unknown fields so fix the test case
* Revert "Jersey 2.26 doesn't allow unknown fields so fix the test case"
This reverts commit 82d530d6671f81c0de5ed18a06cbc124d612b4f8.
* bump to 2.25
---
pom.xml | 33 +++++++++++-----------
.../apache/pulsar/broker/admin/AdminApiTest.java | 2 +-
pulsar-common/pom.xml | 1 +
.../service/web/DiscoveryServiceWebTest.java | 2 +-
4 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 06c1822..f60a679 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,6 +113,7 @@ flexible messaging model and an intuitive client API.</description>
<netty.version>4.1.21.Final</netty.version>
<storm.version>1.0.5</storm.version>
<jetty.version>9.3.11.v20160721</jetty.version>
+ <jersey.version>2.25</jersey.version>
<athenz.version>1.7.17</athenz.version>
<prometheus.version>0.0.23</prometheus.version>
<aspectj.version>1.8.9</aspectj.version>
@@ -120,7 +121,7 @@ flexible messaging model and an intuitive client API.</description>
<slf4j.version>1.7.25</slf4j.version>
<log4j2.version>2.10.0</log4j2.version>
<bouncycastle.version>1.55</bouncycastle.version>
- <jackson.version>2.9.3</jackson.version>
+ <jackson.version>2.8.4</jackson.version>
<puppycrawl.checkstyle.version>6.19</puppycrawl.checkstyle.version>
</properties>
@@ -166,13 +167,13 @@ flexible messaging model and an intuitive client API.</description>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
- <version>1.6.5</version>
+ <version>1.7.3</version>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-testng</artifactId>
- <version>1.6.5</version>
+ <version>1.7.3</version>
</dependency>
<dependency>
@@ -311,12 +312,6 @@ flexible messaging model and an intuitive client API.</description>
</dependency>
<dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>2.4.1</version>
- </dependency>
-
- <dependency>
<groupId>net.jpountz.lz4</groupId>
<artifactId>lz4</artifactId>
<version>1.3.0</version>
@@ -367,7 +362,7 @@ flexible messaging model and an intuitive client API.</description>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- <version>2.5.0</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
@@ -385,37 +380,43 @@ flexible messaging model and an intuitive client API.</description>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
- <version>2.23.2</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
- <version>2.23.2</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
- <version>2.23.2</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
- <version>2.23.2</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
- <version>2.0.1</version>
+ <version>2.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
- <version>2.9</version>
+ <version>${jersey.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.jersey.media</groupId>
+ <artifactId>jersey-media-multipart</artifactId>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
index 6108ade..488f237 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
@@ -1487,7 +1487,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
try {
admin.properties().createProperty("test-property", cpa);
} catch (Exception e) {
- fail("Should not happen.");
+ fail("Should not happen : ", e);
}
}
diff --git a/pulsar-common/pom.xml b/pulsar-common/pom.xml
index 97fe23b..0e0348f 100644
--- a/pulsar-common/pom.xml
+++ b/pulsar-common/pom.xml
@@ -48,6 +48,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
+ <version>2.4.1</version>
</dependency>
<dependency>
diff --git a/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/web/DiscoveryServiceWebTest.java b/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/web/DiscoveryServiceWebTest.java
index 7a4f06a..648f574 100644
--- a/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/web/DiscoveryServiceWebTest.java
+++ b/pulsar-discovery-service/src/test/java/org/apache/pulsar/discovery/service/web/DiscoveryServiceWebTest.java
@@ -290,7 +290,7 @@ public class DiscoveryServiceWebTest extends BaseZKStarterTest{
redirectedBroker = e.getCause().getMessage().split(":")[0];
} else {
// fail
- fail();
+ fail("Expected to receive UnknownHostException, but received : " + e);
}
}
return redirectedBroker;
--
To stop receiving notification emails like this one, please contact
mmerli@apache.org.