This is an automated email from the ASF dual-hosted git repository.
benyoka 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 7d6fff6 Ambari 25203 branch 2.7 (#2896)
7d6fff6 is described below
commit 7d6fff666acab7b6938e5970d98f47cb4c12d790
Author: benyoka <beny...@users.noreply.github.com>
AuthorDate: Thu Mar 28 13:56:27 2019 +0100
Ambari 25203 branch 2.7 (#2896)
* WIP commit (benyoka)
* AMBARI-25203 finish draft (benyoka)
* AMBARI-25203 bump bouncycastle libs to 1.61 (benyoka)
* AMBARI-25203 reset accidentally added file (benyoka)
---
ambari-infra/ambari-infra-manager-it/pom.xml | 8 ++++++
ambari-infra/ambari-infra-manager/pom.xml | 21 ++++++++++++++-
ambari-infra/ambari-infra-solr-client/pom.xml | 16 ++++++++++++
ambari-infra/ambari-infra-solr-plugin/pom.xml | 10 ++++++++
ambari-infra/pom.xml | 6 ++---
.../pom.xml | 4 +--
ambari-logsearch/ambari-logsearch-server/pom.xml | 4 +--
ambari-logsearch/pom.xml | 6 ++---
.../ambari-metrics-timelineservice/pom.xml | 30 ++++++++++++++++++++++
ambari-metrics/pom.xml | 2 +-
ambari-project/pom.xml | 2 +-
ambari-server/pom.xml | 6 +++++
12 files changed, 102 insertions(+), 13 deletions(-)
diff --git a/ambari-infra/ambari-infra-manager-it/pom.xml
b/ambari-infra/ambari-infra-manager-it/pom.xml
index 6a8352f..ef7398d 100644
--- a/ambari-infra/ambari-infra-manager-it/pom.xml
+++ b/ambari-infra/ambari-infra-manager-it/pom.xml
@@ -150,6 +150,10 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -157,6 +161,10 @@
<artifactId>hadoop-hdfs-client</artifactId>
<version>${hadoop.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/ambari-infra/ambari-infra-manager/pom.xml
b/ambari-infra/ambari-infra-manager/pom.xml
index 163a9c1..31f64bc 100644
--- a/ambari-infra/ambari-infra-manager/pom.xml
+++ b/ambari-infra/ambari-infra-manager/pom.xml
@@ -195,6 +195,12 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -232,11 +238,15 @@
<version>${spring-boot.version}</version>
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jettison</artifactId>
<version>${jersey.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
@@ -317,6 +327,10 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -331,6 +345,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>1.61</version>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
diff --git a/ambari-infra/ambari-infra-solr-client/pom.xml
b/ambari-infra/ambari-infra-solr-client/pom.xml
index 1bcd6a9..146003d 100644
--- a/ambari-infra/ambari-infra-solr-client/pom.xml
+++ b/ambari-infra/ambari-infra-solr-client/pom.xml
@@ -42,6 +42,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>org.apache.lucene</groupId>
@@ -116,6 +122,16 @@
<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>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/ambari-infra/ambari-infra-solr-plugin/pom.xml
b/ambari-infra/ambari-infra-solr-plugin/pom.xml
index 750124c..fbb1fc2 100644
--- a/ambari-infra/ambari-infra-solr-plugin/pom.xml
+++ b/ambari-infra/ambari-infra-solr-plugin/pom.xml
@@ -32,6 +32,16 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
<version>${solr.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ambari</groupId>
diff --git a/ambari-infra/pom.xml b/ambari-infra/pom.xml
index 5f3ac03..fa84c18 100644
--- a/ambari-infra/pom.xml
+++ b/ambari-infra/pom.xml
@@ -342,17 +342,17 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.9.4</version>
+ <version>2.9.8</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.9.4</version>
+ <version>2.9.8</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
- <version>2.9.4</version>
+ <version>2.9.8</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.woodstox</groupId>
diff --git
a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/pom.xml
b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/pom.xml
index c963fb7..a65b1bb 100644
--- a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/pom.xml
@@ -46,12 +46,12 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.9.5</version>
+ <version>2.9.8</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.9.5</version>
+ <version>2.9.8</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
diff --git a/ambari-logsearch/ambari-logsearch-server/pom.xml
b/ambari-logsearch/ambari-logsearch-server/pom.xml
index 80d7084..1ab53a5 100755
--- a/ambari-logsearch/ambari-logsearch-server/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-server/pom.xml
@@ -538,12 +538,12 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>1.60</version>
+ <version>1.61</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <version>1.60</version>
+ <version>1.61</version>
</dependency>
<dependency>
<groupId>org.apache.ambari</groupId>
diff --git a/ambari-logsearch/pom.xml b/ambari-logsearch/pom.xml
index 1e9e59a..8f6e9a6 100644
--- a/ambari-logsearch/pom.xml
+++ b/ambari-logsearch/pom.xml
@@ -327,17 +327,17 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.9.5</version>
+ <version>2.9.8</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.9.5</version>
+ <version>2.9.8</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
- <version>2.9.5</version>
+ <version>2.9.8</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.woodstox</groupId>
diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml
b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
index 18f725a..483581b 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
@@ -605,6 +605,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>
@@ -639,6 +651,24 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcmail-jdk15on</artifactId>
+ <version>1.61</version>
+ <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>
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index 3a30929..2ccc826 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -56,7 +56,7 @@
<distMgmtStagingId>apache.staging.https</distMgmtStagingId>
<distMgmtStagingName>Apache Release Distribution
Repository</distMgmtStagingName>
<distMgmtStagingUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distMgmtStagingUrl>
- <fasterxml.jackson.version>2.9.5</fasterxml.jackson.version>
+ <fasterxml.jackson.version>2.9.8</fasterxml.jackson.version>
</properties>
<distributionManagement>
<repository>
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 360fc42..93f19d4 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -39,7 +39,7 @@
<guice.version>4.1.0</guice.version>
<spring.version>4.3.18.RELEASE</spring.version>
<spring.security.version>4.2.7.RELEASE</spring.security.version>
- <fasterxml.jackson.version>2.9.5</fasterxml.jackson.version>
+ <fasterxml.jackson.version>2.9.8</fasterxml.jackson.version>
<postgres.version>42.2.2</postgres.version>
<forkCount>4</forkCount>
<reuseForks>false</reuseForks>
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 1978f43..f70abe5 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1411,6 +1411,12 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
