Skip to content

[AMBARI-23056] [branch-2.6] Fix AMS dependencies that have security issues. #447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
avijayanhwx merged 1 commit into from
Feb 23, 2018
Merged

[AMBARI-23056] [branch-2.6] Fix AMS dependencies that have security issues. #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ambari-metrics/ambari-metrics-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<version>2.7.1</version>
<version>2.12.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
Expand Down Expand Up @@ -202,7 +202,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.2.5</version>
<version>4.5.2</version>
</dependency>
</dependencies>
</project>
10 changes: 10 additions & 0 deletions ambari-metrics/ambari-metrics-flume-sink/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,16 @@ limitations under the License.
<artifactId>flume-ng-core</artifactId>
<version>1.5.1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>libthrift</artifactId>
<groupId>org.apache.thrift</groupId>
</exclusion>
<exclusion>
<artifactId>jetty-util</artifactId>
<groupId>org.mortbay.jetty</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.ambari</groupId>
Expand Down
5 changes: 3 additions & 2 deletions ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ limitations under the License.
<packaging>jar</packaging>
<properties>
<sinkJarName>${project.artifactId}-with-common-${project.version}.jar</sinkJarName>
<hadoop.version>2.7.3.2.6.4.0-91</hadoop.version>
</properties>


Expand Down Expand Up @@ -141,7 +142,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>2.4.0</version>
<version>${hadoop.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -159,7 +160,7 @@ limitations under the License.
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
<version>3.2.2</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
32 changes: 28 additions & 4 deletions ambari-metrics/ambari-metrics-timelineservice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
<!-- Needed for generating FindBugs warnings using parent pom -->
<!--<yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>-->
<protobuf.version>2.5.0</protobuf.version>
<hadoop.version>2.7.1.2.3.4.0-3347</hadoop.version>
<phoenix.version>4.4.0.2.3.4.0-3347</phoenix.version>
<hbase.version>1.1.2.2.3.4.0-3347</hbase.version>
<hadoop.version>2.7.3.2.6.4.0-91</hadoop.version>
<phoenix.version>4.7.0.2.6.4.0-91</phoenix.version>
<hbase.version>1.1.2.2.6.4.0-91</hbase.version>
</properties>

<build>
Expand Down Expand Up @@ -532,6 +532,18 @@
<groupId>commons-pool2</groupId>
<artifactId>commons-pool2</artifactId>
</exclusion>
<exclusion>
<artifactId>tika-core</artifactId>
<groupId>org.apache.tika</groupId>
</exclusion>
<exclusion>
<artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
</exclusion>
<exclusion>
<artifactId>commons-httpclient</artifactId>
<groupId>commons-httpclient</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -552,6 +564,18 @@
<groupId>commons-pool2</groupId>
<artifactId>commons-pool2</artifactId>
</exclusion>
<exclusion>
<artifactId>tika-core</artifactId>
<groupId>org.apache.tika</groupId>
</exclusion>
<exclusion>
<artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
</exclusion>
<exclusion>
<artifactId>commons-httpclient</artifactId>
<groupId>commons-httpclient</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
Expand Down Expand Up @@ -596,7 +620,7 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
<version>3.2.2</version>
</dependency>

<dependency>
Expand Down
12 changes: 6 additions & 6 deletions ambari-metrics/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@
<python.ver>python &gt;= 2.6</python.ver>
<deb.python.ver>python (&gt;= 2.6)</deb.python.ver>
<!--TODO change to HDP URL-->
<hbase.tar>http://private-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.3.4.0-3347/tars/hbase-1.1.2.2.3.4.0-3347.tar.gz</hbase.tar>
<hbase.folder>hbase-1.1.2.2.3.4.0-3347</hbase.folder>
<hadoop.tar>http://private-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.3.4.0-3347/tars/hadoop-2.7.1.2.3.4.0-3347.tar.gz</hadoop.tar>
<hadoop.folder>hadoop-2.7.1.2.3.4.0-3347</hadoop.folder>
<hbase.tar>https://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.6.4.0/tars/hbase/hbase-1.1.2.2.6.4.0-91.tar.gz</hbase.tar>
<hbase.folder>hbase-1.1.2.2.6.4.0-91</hbase.folder>
<hadoop.tar>https://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.6.4.0/tars/hadoop/hadoop-2.7.3.2.6.4.0-91.tar.gz</hadoop.tar>
<hadoop.folder>hadoop-2.7.3.2.6.4.0-91</hadoop.folder>
<hbase.winpkg.zip>https://msibuilds.blob.core.windows.net/hdp/2.x/2.2.4.2/2/hbase-0.98.4.2.2.4.2-0002-hadoop2.winpkg.zip</hbase.winpkg.zip>
<hbase.winpkg.folder>hbase-0.98.4.2.2.4.2-0002-hadoop2</hbase.winpkg.folder>
<hadoop.winpkg.zip>https://msibuilds.blob.core.windows.net/hdp/2.x/2.2.4.2/2/hadoop-2.6.0.2.2.4.2-0002.winpkg.zip</hadoop.winpkg.zip>
<hadoop.winpkg.folder>hadoop-2.6.0.2.2.4.2-0002</hadoop.winpkg.folder>
<grafana.folder>grafana-2.6.0</grafana.folder>
<grafana.tar>https://grafanarel.s3.amazonaws.com/builds/grafana-2.6.0.linux-x64.tar.gz</grafana.tar>
<phoenix.tar>http://private-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.3.4.0-3347/tars/phoenix-4.4.0.2.3.4.0-3347.tar.gz</phoenix.tar>
<phoenix.folder>phoenix-4.4.0.2.3.4.0-3347</phoenix.folder>
<phoenix.tar>https://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.6.4.0/tars/phoenix/phoenix-4.7.0.2.6.4.0-91.tar.gz</phoenix.tar>
<phoenix.folder>phoenix-4.7.0.2.6.4.0-91</phoenix.folder>
<resmonitor.install.dir>
/usr/lib/python2.6/site-packages/resource_monitoring
</resmonitor.install.dir>
Expand Down