This is an automated email from the ASF dual-hosted git repository.

hapylestat pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.6 by this push:
     new 606c9b5  AMBARI-25203 Updated jackson-databind to 2.9.8 and 
boucycastle libs to 1.61 (#2898)
606c9b5 is described below

commit 606c9b5e6b861a4ba5df2a39c6363db6862530ae
Author: Dmytro Grinenko <hapy.les...@gmail.com>
AuthorDate: Mon Apr 1 12:13:22 2019 +0300

    AMBARI-25203 Updated jackson-databind to 2.9.8 and boucycastle libs to 1.61 
(#2898)
---
 ambari-logsearch/ambari-logsearch-it/pom.xml       |  2 -
 .../ambari-logsearch-solr-client/pom.xml           | 12 ++++
 ambari-metrics/ambari-metrics-hadoop-sink/pom.xml  |  6 ++
 .../ambari-metrics-storm-sink-legacy/pom.xml       |  6 ++
 .../ambari-metrics-timelineservice/pom.xml         | 65 +++++++++++++++++++++-
 ambari-metrics/pom.xml                             | 18 ++++++
 ambari-project/pom.xml                             |  5 ++
 7 files changed, 111 insertions(+), 3 deletions(-)

diff --git a/ambari-logsearch/ambari-logsearch-it/pom.xml 
b/ambari-logsearch/ambari-logsearch-it/pom.xml
index 831d95f..a8e4d1c 100644
--- a/ambari-logsearch/ambari-logsearch-it/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-it/pom.xml
@@ -34,7 +34,6 @@
     <it.skip>true</it.skip>
     <jbehave.version>4.0.5</jbehave.version>
     <jersey.version>2.23.1</jersey.version>
-    <jackson-jaxrs.version>2.9.8</jackson-jaxrs.version>
   </properties>
 
   <dependencies>
@@ -65,7 +64,6 @@
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>${jackson-jaxrs.version}</version>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.core</groupId>
diff --git a/ambari-logsearch/ambari-logsearch-solr-client/pom.xml 
b/ambari-logsearch/ambari-logsearch-solr-client/pom.xml
index d9fe686..2c320cc 100644
--- a/ambari-logsearch/ambari-logsearch-solr-client/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-solr-client/pom.xml
@@ -34,6 +34,12 @@
       <groupId>org.apache.solr</groupId>
       <artifactId>solr-solrj</artifactId>
       <version>${solr.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>
@@ -68,6 +74,12 @@
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-java-sdk-s3</artifactId>
       <version>1.11.5</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml 
b/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
index b194622..721fb8a 100644
--- a/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
+++ b/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
@@ -144,6 +144,12 @@ limitations under the License.
       <artifactId>hadoop-common</artifactId>
       <version>${hadoop.version}</version>
       <scope>compile</scope>
+        <exclusions>
+            <exclusion>
+                <artifactId>jackson-core</artifactId>
+                <groupId>com.fasterxml.jackson.core</groupId>
+            </exclusion>
+        </exclusions>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
diff --git a/ambari-metrics/ambari-metrics-storm-sink-legacy/pom.xml 
b/ambari-metrics/ambari-metrics-storm-sink-legacy/pom.xml
index 9e664f0..1e4b2fb 100644
--- a/ambari-metrics/ambari-metrics-storm-sink-legacy/pom.xml
+++ b/ambari-metrics/ambari-metrics-storm-sink-legacy/pom.xml
@@ -169,6 +169,12 @@ limitations under the License.
       <artifactId>storm-core</artifactId>
       <version>${storm.version}</version>
       <scope>compile</scope>
+        <exclusions>
+            <exclusion>
+                <artifactId>jackson-core</artifactId>
+                <groupId>com.fasterxml.jackson.core</groupId>
+            </exclusion>
+        </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.ambari</groupId>
diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml 
b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
index 43e5f82..c7c1304 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
@@ -330,6 +330,14 @@
           <groupId>net.sourceforge.findbugs</groupId>
           <artifactId>annotations</artifactId>
         </exclusion>
+          <exclusion>
+              <artifactId>jackson-core</artifactId>
+              <groupId>com.fasterxml.jackson.core</groupId>
+          </exclusion>
+        <exclusion>
+          <artifactId>jackson-databind</artifactId>
+          <groupId>com.fasterxml.jackson.core</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -373,6 +381,10 @@
           <groupId>org.mortbay.jetty</groupId>
           <artifactId>jsp-2.1-jetty</artifactId>
         </exclusion>
+        <exclusion>
+          <artifactId>jackson-core</artifactId>
+          <groupId>com.fasterxml.jackson.core</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -400,6 +412,12 @@
       <version>${hadoop.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>jackson-core</artifactId>
+          <groupId>com.fasterxml.jackson.core</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.inject.extensions</groupId>
@@ -544,6 +562,18 @@
           <artifactId>commons-httpclient</artifactId>
           <groupId>commons-httpclient</groupId>
         </exclusion>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcmail-jdk15on</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcprov-jdk15on</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcpkix-jdk15on</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -578,6 +608,21 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcmail-jdk15on</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk15on</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk15on</artifactId>
+      <scope>test</scope>
+    </dependency>
     <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -647,7 +692,17 @@
       <groupId>org.apache.phoenix</groupId>
       <artifactId>phoenix-core</artifactId>
       <type>test-jar</type>
-      <version>${phoenix.version}</version>
+        <exclusions>
+            <exclusion>
+                <artifactId>jackson-core</artifactId>
+                <groupId>com.fasterxml.jackson.core</groupId>
+            </exclusion>
+          <exclusion>
+            <artifactId>jackson-databind</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+          </exclusion>
+        </exclusions>
+        <version>${phoenix.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -672,6 +727,14 @@
             <artifactId>zookeeper</artifactId>
             <groupId>org.apache.zookeeper</groupId>
           </exclusion>
+            <exclusion>
+                <artifactId>jackson-core</artifactId>
+                <groupId>com.fasterxml.jackson.core</groupId>
+            </exclusion>
+          <exclusion>
+            <artifactId>jackson-databind</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+          </exclusion>
         </exclusions>
       </dependency>
     <dependency>
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index de482d2..545e212 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -113,6 +113,24 @@
         <scope>test</scope>
       </dependency>
       <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcprov-jdk15on</artifactId>
+        <version>1.61</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcpkix-jdk15on</artifactId>
+        <version>1.61</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcmail-jdk15on</artifactId>
+        <version>1.61</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
         <version>1.12</version>
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 99fd5fb..54fa00c 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -519,6 +519,11 @@
         <version>2.9.8</version>
       </dependency>
       <dependency>
+        <groupId>com.fasterxml.jackson.jaxrs</groupId>
+        <artifactId>jackson-jaxrs-json-provider</artifactId>
+        <version>2.9.8</version>
+      </dependency>
+      <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
         <version>2.9.8</version>

Reply via email to