avijayanhwx closed pull request #7: [AMBARI-24771] Fix CVE issues for Ambari 
Metrics (2.7.3)
URL: https://github.com/apache/ambari-metrics/pull/7
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/ambari-metrics-common/pom.xml b/ambari-metrics-common/pom.xml
index 1c092dc..cb8333c 100644
--- a/ambari-metrics-common/pom.xml
+++ b/ambari-metrics-common/pom.xml
@@ -162,7 +162,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>14.0.1</version>
+      <version>18.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.curator</groupId>
diff --git a/ambari-metrics-flume-sink/pom.xml 
b/ambari-metrics-flume-sink/pom.xml
index 72ebb27..7b4f4fa 100644
--- a/ambari-metrics-flume-sink/pom.xml
+++ b/ambari-metrics-flume-sink/pom.xml
@@ -169,7 +169,7 @@ limitations under the License.
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>14.0.1</version>
+      <version>18.0</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/ambari-metrics-host-aggregator/pom.xml 
b/ambari-metrics-host-aggregator/pom.xml
index 7d8f6b5..38408df 100644
--- a/ambari-metrics-host-aggregator/pom.xml
+++ b/ambari-metrics-host-aggregator/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>14.0.1</version>
+            <version>18.0</version>
         </dependency>
         <dependency>
               <groupId>org.apache.ambari</groupId>
diff --git a/ambari-metrics-timelineservice/pom.xml 
b/ambari-metrics-timelineservice/pom.xml
index d185811..cacece9 100644
--- a/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics-timelineservice/pom.xml
@@ -551,7 +551,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>14.0.1</version>
+      <version>18.0</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -778,7 +778,7 @@
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka-clients</artifactId>
-      <version>0.11.0.1</version>
+      <version>0.11.0.3</version>
     </dependency>
 
     <dependency>
diff --git 
a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/loadsimulator/net/RestMetricsSender.java
 
b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/loadsimulator/net/RestMetricsSender.java
index 455b381..0e707ac 100644
--- 
a/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/loadsimulator/net/RestMetricsSender.java
+++ 
b/ambari-metrics-timelineservice/src/main/java/org/apache/ambari/metrics/core/loadsimulator/net/RestMetricsSender.java
@@ -56,7 +56,7 @@ public RestMetricsSender(String metricsHost) {
   public String pushMetrics(String payload) {
     String responseString = "";
     UrlService svc = null;
-    Stopwatch timer = new Stopwatch().start();
+    Stopwatch timer = Stopwatch.createStarted();
 
     try {
       LOG.info("server: {}", collectorServiceAddress);


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

Reply via email to