You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ha...@apache.org on 2020/10/05 08:45:02 UTC
[ambari] branch branch-2.7 updated: AMBARI-25562 Nightly test is
failing due to Ambari Metrics Host Aggregator (santal via dgrinenko)
(#3234)
This is an automated email from the ASF dual-hosted git repository.
hapylestat pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 0e435df AMBARI-25562 Nightly test is failing due to Ambari Metrics Host Aggregator (santal via dgrinenko) (#3234)
0e435df is described below
commit 0e435df572cf0b974d27e21c7c3722a6f46b5252
Author: Szilárd Antal <sa...@cloudera.com>
AuthorDate: Mon Oct 5 10:44:50 2020 +0200
AMBARI-25562 Nightly test is failing due to Ambari Metrics Host Aggregator (santal via dgrinenko) (#3234)
---
ambari-metrics/ambari-metrics-host-aggregator/pom.xml | 19 +++++++++++++------
.../host/aggregator/AggregatorWebServiceTest.java | 1 +
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/ambari-metrics/ambari-metrics-host-aggregator/pom.xml b/ambari-metrics/ambari-metrics-host-aggregator/pom.xml
index df8bfdc..afd19f6 100644
--- a/ambari-metrics/ambari-metrics-host-aggregator/pom.xml
+++ b/ambari-metrics/ambari-metrics-host-aggregator/pom.xml
@@ -32,6 +32,7 @@
<name>Ambari Metrics Host Aggregator</name>
<properties>
+ <jersey.version>1.19.4</jersey.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -54,12 +55,18 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
- <version>1.11</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.11</version>
+ <version>${jersey.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
@@ -69,7 +76,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
- <version>1.11</version>
+ <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -79,13 +86,13 @@
<dependency>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
<artifactId>jersey-test-framework-core</artifactId>
- <version>1.11</version>
+ <version>${jersey.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
<artifactId>jersey-test-framework-grizzly2</artifactId>
- <version>1.11</version>
+ <version>${jersey.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -97,7 +104,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.13</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/ambari-metrics/ambari-metrics-host-aggregator/src/test/java/org/apache/hadoop/metrics2/host/aggregator/AggregatorWebServiceTest.java b/ambari-metrics/ambari-metrics-host-aggregator/src/test/java/org/apache/hadoop/metrics2/host/aggregator/AggregatorWebServiceTest.java
index 736fd06..0f15c20 100644
--- a/ambari-metrics/ambari-metrics-host-aggregator/src/test/java/org/apache/hadoop/metrics2/host/aggregator/AggregatorWebServiceTest.java
+++ b/ambari-metrics/ambari-metrics-host-aggregator/src/test/java/org/apache/hadoop/metrics2/host/aggregator/AggregatorWebServiceTest.java
@@ -85,6 +85,7 @@ public class AggregatorWebServiceTest extends JerseyTest {
TimelineMetrics timelineMetrics = TimelineMetricsHolderTest.getTimelineMetricsWithAppID("appid");
WebResource r = resource();
ClientResponse response = r.path("ws").path("v1").path("timeline").path("metrics")
+ .type(MediaType.APPLICATION_JSON)
.accept(MediaType.TEXT_PLAIN)
.post(ClientResponse.class, timelineMetrics);
assertEquals(200, response.getStatus());