You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2015/06/20 01:02:10 UTC
ambari git commit: AMBARI-12031. Remove the need for HDP-2.x
deployment to deploy ambari-log4j (smohanty)
Repository: ambari
Updated Branches:
refs/heads/trunk 322abbe05 -> aec96f943
AMBARI-12031. Remove the need for HDP-2.x deployment to deploy ambari-log4j (smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aec96f94
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aec96f94
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aec96f94
Branch: refs/heads/trunk
Commit: aec96f9437cd7ad05b14e75d36bceb81e3867948
Parents: 322abbe
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Fri Jun 19 16:01:46 2015 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Fri Jun 19 16:01:46 2015 -0700
----------------------------------------------------------------------
.../main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml | 3 ---
.../main/resources/stacks/BIGTOP/0.8/services/HDFS/metainfo.xml | 3 ---
.../main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml | 3 ---
.../stacks/HDP/2.3.GlusterFS/services/HDFS/metainfo.xml | 3 ---
.../main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml | 3 ---
.../resources/stacks/PHD/3.0.0.0/services/HDFS/metainfo.xml | 3 ---
.../test/resources/stacks/HDP/2.0.1/services/HDFS/metainfo.xml | 3 ---
.../test/resources/stacks/HDP/2.0.5/services/HDFS/metainfo.xml | 3 ---
dev-support/docker/docker/Dockerfile | 5 -----
9 files changed, 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/aec96f94/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
index b3b7ea3..b678e51 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
@@ -189,9 +189,6 @@
<package>
<name>hadoop-libhdfs</name>
</package>
- <package>
- <name>ambari-log4j</name>
- </package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/aec96f94/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/metainfo.xml
index 7733138..d1d1069 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/metainfo.xml
@@ -174,9 +174,6 @@
<package>
<name>hadoop-libhdfs</name>
</package>
- <package>
- <name>ambari-log4j</name>
- </package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/aec96f94/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml
index b337263..a4d1626 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml
@@ -47,9 +47,6 @@
<package>
<name>hadoop_2_2_*-libhdfs</name>
</package>
- <package>
- <name>ambari-log4j</name>
- </package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/aec96f94/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HDFS/metainfo.xml
index 107a3d6..a9fd866 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HDFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HDFS/metainfo.xml
@@ -46,9 +46,6 @@
<package>
<name>hadoop_2_3_*-libhdfs</name>
</package>
- <package>
- <name>ambari-log4j</name>
- </package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/aec96f94/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml
index b4fcb79..ac7d247 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml
@@ -79,9 +79,6 @@
<package>
<name>hadoop_2_3_*-libhdfs</name>
</package>
- <package>
- <name>ambari-log4j</name>
- </package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/aec96f94/ambari-server/src/main/resources/stacks/PHD/3.0.0.0/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/PHD/3.0.0.0/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/PHD/3.0.0.0/services/HDFS/metainfo.xml
index 5ed7076..14063eb 100644
--- a/ambari-server/src/main/resources/stacks/PHD/3.0.0.0/services/HDFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/PHD/3.0.0.0/services/HDFS/metainfo.xml
@@ -174,9 +174,6 @@
<package>
<name>hadoop-libhdfs</name>
</package>
- <package>
- <name>ambari-log4j</name>
- </package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/aec96f94/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HDFS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HDFS/metainfo.xml
index 92c31e6..660c956 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HDFS/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HDFS/metainfo.xml
@@ -111,9 +111,6 @@
<package>
<name>hadoop-libhdfs</name>
</package>
- <package>
- <name>ambari-log4j</name>
- </package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/aec96f94/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/metainfo.xml
index b5e6bc2..7c0dc74 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/metainfo.xml
@@ -149,9 +149,6 @@
<package>
<name>hadoop-libhdfs</name>
</package>
- <package>
- <name>ambari-log4j</name>
- </package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/aec96f94/dev-support/docker/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/dev-support/docker/docker/Dockerfile b/dev-support/docker/docker/Dockerfile
index bd2c1f4..701ed6e 100644
--- a/dev-support/docker/docker/Dockerfile
+++ b/dev-support/docker/docker/Dockerfile
@@ -62,11 +62,6 @@ WORKDIR /tmp/ambari
RUN mvn versions:set -DnewVersion=1.6.1.0
RUN mvn -B clean install package rpm:rpm -DskipTests -DnewVersion=1.6.1.0 -Dpython.ver="python >= 2.6" -Preplaceurl
-# also build ambari-log4j and install
-WORKDIR /tmp/ambari/contrib/ambari-log4j
-RUN mvn package rpm:rpm
-RUN yum install -y target/rpm/ambari-log4j/RPMS/noarch/ambari-log4j-1.2.1-*.noarch.rpm
-
# clean git code because I want to use the one on local filesystem.
WORKDIR /tmp
RUN rm -rf /tmp/ambari