Repository: ambari Updated Branches: refs/heads/trunk 747326a28 -> 48a8de158
AMBARI-9687. Prepare for publishing Ambari artifacts to Maven repository. (yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/48a8de15 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/48a8de15 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/48a8de15 Branch: refs/heads/trunk Commit: 48a8de15868e9289cb3c71d7ff003f64cabc7d24 Parents: 747326a Author: Yusaku Sako <yus...@hortonworks.com> Authored: Wed Feb 18 00:50:51 2015 -0800 Committer: Yusaku Sako <yus...@hortonworks.com> Committed: Wed Feb 18 00:50:51 2015 -0800 ---------------------------------------------------------------------- ambari-admin/pom.xml | 4 +- ambari-agent/pom.xml | 4 +- ambari-client/groovy-client/pom.xml | 4 +- ambari-client/pom.xml | 4 +- ambari-client/python-client/pom.xml | 4 +- ambari-metrics/ambari-metrics-assembly/pom.xml | 4 +- ambari-metrics/ambari-metrics-common/pom.xml | 2 +- .../ambari-metrics-flume-sink/pom.xml | 4 +- .../ambari-metrics-hadoop-sink/pom.xml | 4 +- .../ambari-metrics-host-monitoring/pom.xml | 4 +- .../ambari-metrics-kafka-sink/pom.xml | 4 +- .../ambari-metrics-storm-sink/pom.xml | 4 +- .../ambari-metrics-timelineservice/pom.xml | 6 +- .../src/main/python/embedded_hbase_service.py | 4 +- ambari-metrics/pom.xml | 2 +- ambari-project/pom.xml | 9 +-- ambari-server/pom.xml | 4 +- ambari-shell/ambari-groovy-shell/pom.xml | 6 +- ambari-shell/ambari-python-shell/pom.xml | 4 +- ambari-shell/pom.xml | 4 +- ambari-views/pom.xml | 63 +++++++++++++++++++- ambari-web/pom.xml | 4 +- contrib/views/capacity-scheduler/pom.xml | 6 +- contrib/views/files/pom.xml | 6 +- contrib/views/jobs/pom.xml | 8 +-- contrib/views/pig/pom.xml | 8 +-- contrib/views/pom.xml | 8 +-- contrib/views/slider/pom.xml | 6 +- contrib/views/tez/pom.xml | 4 +- pom.xml | 2 +- 30 files changed, 127 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-admin/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml index 1222e36..5fa3561 100644 --- a/ambari-admin/pom.xml +++ b/ambari-admin/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-project</artifactId> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../ambari-project</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -27,7 +27,7 @@ <artifactId>ambari-admin</artifactId> <packaging>jar</packaging> <name>Ambari Admin View</name> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <description>Admin control panel</description> <build> <plugins> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-agent/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml index 8537b28..fbc5029 100644 --- a/ambari-agent/pom.xml +++ b/ambari-agent/pom.xml @@ -19,14 +19,14 @@ <parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-project</artifactId> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../ambari-project</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ambari</groupId> <artifactId>ambari-agent</artifactId> <packaging>pom</packaging> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <name>Ambari Agent</name> <description>Ambari Agent</description> <properties> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-client/groovy-client/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-client/groovy-client/pom.xml b/ambari-client/groovy-client/pom.xml index cf7a77f..dc8d888 100644 --- a/ambari-client/groovy-client/pom.xml +++ b/ambari-client/groovy-client/pom.xml @@ -12,14 +12,14 @@ <parent> <artifactId>ambari-client</artifactId> <groupId>org.apache.ambari</groupId> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../../ambari-client/</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ambari</groupId> <artifactId>groovy-client</artifactId> <packaging>jar</packaging> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <name>Ambari Groovy Client</name> <description>Ambari Groovy client</description> <properties> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-client/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-client/pom.xml b/ambari-client/pom.xml index 201328c..82fea14 100755 --- a/ambari-client/pom.xml +++ b/ambari-client/pom.xml @@ -20,14 +20,14 @@ <parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-project</artifactId> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../ambari-project</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ambari</groupId> <artifactId>ambari-client</artifactId> <packaging>pom</packaging> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <name>Ambari Client</name> <description>Ambari client</description> <modules> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-client/python-client/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-client/python-client/pom.xml b/ambari-client/python-client/pom.xml index fb7c498..3c957ee 100644 --- a/ambari-client/python-client/pom.xml +++ b/ambari-client/python-client/pom.xml @@ -19,14 +19,14 @@ <parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-client</artifactId> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../../ambari-client</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ambari</groupId> <artifactId>python-client</artifactId> <packaging>pom</packaging> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <name>Ambari Python Client</name> <description>Ambari Python client</description> <properties> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-metrics/ambari-metrics-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml b/ambari-metrics/ambari-metrics-assembly/pom.xml index 3cb4487..de85973 100644 --- a/ambari-metrics/ambari-metrics-assembly/pom.xml +++ b/ambari-metrics/ambari-metrics-assembly/pom.xml @@ -23,12 +23,12 @@ <parent> <artifactId>ambari-metrics</artifactId> <groupId>org.apache.ambari</groupId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-metrics-assembly</artifactId> <packaging>pom</packaging> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <properties> <collector.dir>${project.basedir}/../ambari-metrics-timelineservice</collector.dir> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-metrics/ambari-metrics-common/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-common/pom.xml b/ambari-metrics/ambari-metrics-common/pom.xml index bd840eb..4658cfe 100644 --- a/ambari-metrics/ambari-metrics-common/pom.xml +++ b/ambari-metrics/ambari-metrics-common/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>ambari-metrics</artifactId> <groupId>org.apache.ambari</groupId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-metrics-common</artifactId> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-metrics/ambari-metrics-flume-sink/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-flume-sink/pom.xml b/ambari-metrics/ambari-metrics-flume-sink/pom.xml index 789d811..f11b8b2 100644 --- a/ambari-metrics/ambari-metrics-flume-sink/pom.xml +++ b/ambari-metrics/ambari-metrics-flume-sink/pom.xml @@ -22,11 +22,11 @@ limitations under the License. <parent> <artifactId>ambari-metrics</artifactId> <groupId>org.apache.ambari</groupId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-metrics-flume-sink</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>jar</packaging> <build> <plugins> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml b/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml index 4a4e354..848a8f2 100644 --- a/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml +++ b/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml @@ -22,11 +22,11 @@ limitations under the License. <parent> <artifactId>ambari-metrics</artifactId> <groupId>org.apache.ambari</groupId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-metrics-hadoop-sink</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>jar</packaging> <properties> <sinkJarName>${project.artifactId}-with-common-${project.version}.jar</sinkJarName> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-metrics/ambari-metrics-host-monitoring/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-host-monitoring/pom.xml b/ambari-metrics/ambari-metrics-host-monitoring/pom.xml index efe7112..7461bd6 100644 --- a/ambari-metrics/ambari-metrics-host-monitoring/pom.xml +++ b/ambari-metrics/ambari-metrics-host-monitoring/pom.xml @@ -22,11 +22,11 @@ <parent> <artifactId>ambari-metrics</artifactId> <groupId>org.apache.ambari</groupId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <artifactId>ambari-metrics-host-monitoring</artifactId> <properties> <resmonitor.install.dir> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-metrics/ambari-metrics-kafka-sink/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-kafka-sink/pom.xml b/ambari-metrics/ambari-metrics-kafka-sink/pom.xml index 22a3772..e385935 100644 --- a/ambari-metrics/ambari-metrics-kafka-sink/pom.xml +++ b/ambari-metrics/ambari-metrics-kafka-sink/pom.xml @@ -22,11 +22,11 @@ limitations under the License. <parent> <artifactId>ambari-metrics</artifactId> <groupId>org.apache.ambari</groupId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-metrics-kafka-sink</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>jar</packaging> <build> <plugins> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-metrics/ambari-metrics-storm-sink/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-storm-sink/pom.xml b/ambari-metrics/ambari-metrics-storm-sink/pom.xml index 9b1092e..d069622 100644 --- a/ambari-metrics/ambari-metrics-storm-sink/pom.xml +++ b/ambari-metrics/ambari-metrics-storm-sink/pom.xml @@ -22,11 +22,11 @@ limitations under the License. <parent> <artifactId>ambari-metrics</artifactId> <groupId>org.apache.ambari</groupId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-metrics-storm-sink</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>jar</packaging> <properties> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-metrics/ambari-metrics-timelineservice/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml b/ambari-metrics/ambari-metrics-timelineservice/pom.xml index 81c9a75..97cc6af 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml +++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml @@ -22,11 +22,11 @@ <parent> <artifactId>ambari-metrics</artifactId> <groupId>org.apache.ambari</groupId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-metrics-timelineservice</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <name>ambari-metrics-timelineservice</name> <packaging>jar</packaging> @@ -280,7 +280,7 @@ <dependency> <groupId>org.apache.ambari</groupId> <artifactId>ambari-metrics-common</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-metrics/ambari-metrics-timelineservice/src/main/python/embedded_hbase_service.py ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/main/python/embedded_hbase_service.py b/ambari-metrics/ambari-metrics-timelineservice/src/main/python/embedded_hbase_service.py index 70cdd41..7667d7d 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/src/main/python/embedded_hbase_service.py +++ b/ambari-metrics/ambari-metrics-timelineservice/src/main/python/embedded_hbase_service.py @@ -36,9 +36,9 @@ MASTER_JVM_ARGS = '{0} ' \ '-classpath "{5}" org.apache.hadoop.hbase.master.HMaster start' #-Xmx1000m "-XX:+UseConcMarkSweepGC" "-Djava.net.preferIPv4Stack=true" -# -Dhbase.log.dir="C:\test\ambari-metrics-timelineservice-0.1.0-SNAPSHOT\hbase\logs" -Dhbase.log.file="hbase.log" -Dhbase.home.dir="C:\test\ambari-metrics-timelineservice-0.1.0-SNAPSHOT\hbase" -Dhbase.id.str="Administrator" +# -Dhbase.log.dir="C:\test\ambari-metrics-timelineservice-2.0.0-SNAPSHOT\hbase\logs" -Dhbase.log.file="hbase.log" -Dhbase.home.dir="C:\test\ambari-metrics-timelineservice-2.0.0-SNAPSHOT\hbase" -Dhbase.id.str="Administrator" # -XX:OnOutOfMemoryError="taskkill /F /PID p" -Dhbase.root.logger="INFO,console" -Dhbase.security.logger="INFO,DRFAS" -# -classpath "C:\test\ambari-metrics-timelineservice-0.1.0-SNAPSHOT\hbase\conf;C:\jdk1.7.0_67\lib\tools.jar;C:\test\ambari-metrics-timelineservice-0.1.0-SNAPSHOT\hbase;C:\test\ambari-metrics-timelineservice-0.1.0-SNAPSHOT\hbase\lib\*" +# -classpath "C:\test\ambari-metrics-timelineservice-2.0.0-SNAPSHOT\hbase\conf;C:\jdk1.7.0_67\lib\tools.jar;C:\test\ambari-metrics-timelineservice-2.0.0-SNAPSHOT\hbase;C:\test\ambari-metrics-timelineservice-2.0.0-SNAPSHOT\hbase\lib\*" # org.apache.hadoop.hbase.master.HMaster start def _build_master_java_args(username = None): hbase_home_dir = os.path.abspath(EMBEDDED_HBASE_SUBDIR) http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-metrics/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml index efccf63..41ba1fc 100644 --- a/ambari-metrics/pom.xml +++ b/ambari-metrics/pom.xml @@ -19,7 +19,7 @@ <groupId>org.apache.ambari</groupId> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-metrics</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>ambari-metrics-common</module> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-project/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml index d08e2ee..bce8c5a 100644 --- a/ambari-project/pom.xml +++ b/ambari-project/pom.xml @@ -18,11 +18,11 @@ <parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari</artifactId> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> </parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-project</artifactId> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <description>Apache Ambari Project POM</description> <name>Apache Ambari Project POM</name> <licenses> @@ -109,11 +109,6 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.apache.ambari</groupId> - <artifactId>ambari-api</artifactId> - <version>1.0.3-SNAPSHOT</version> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>2.1</version> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-server/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 210d2f4..e287e54 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -12,7 +12,7 @@ <parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-project</artifactId> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../ambari-project</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -20,7 +20,7 @@ <artifactId>ambari-server</artifactId> <packaging>${packagingFormat}</packaging> <name>Ambari Server</name> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <description>Ambari Server</description> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-shell/ambari-groovy-shell/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-shell/ambari-groovy-shell/pom.xml b/ambari-shell/ambari-groovy-shell/pom.xml index 973a104..7d2f6da 100644 --- a/ambari-shell/ambari-groovy-shell/pom.xml +++ b/ambari-shell/ambari-groovy-shell/pom.xml @@ -12,7 +12,7 @@ <parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-shell</artifactId> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../../ambari-shell</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -20,7 +20,7 @@ <artifactId>ambari-groovy-shell</artifactId> <packaging>jar</packaging> <name>Ambari Groovy Shell</name> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <description>Ambari Groovy Shell</description> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -51,7 +51,7 @@ <dependency> <groupId>org.apache.ambari</groupId> <artifactId>groovy-client</artifactId> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.mockito</groupId> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-shell/ambari-python-shell/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-shell/ambari-python-shell/pom.xml b/ambari-shell/ambari-python-shell/pom.xml index ad78f53..d78c6ea 100644 --- a/ambari-shell/ambari-python-shell/pom.xml +++ b/ambari-shell/ambari-python-shell/pom.xml @@ -19,14 +19,14 @@ <parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-shell</artifactId> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../../ambari-shell</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ambari</groupId> <artifactId>ambari-python-shell</artifactId> <packaging>pom</packaging> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <name>Ambari Python Shell</name> <description>Ambari Python Shell</description> <properties> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-shell/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-shell/pom.xml b/ambari-shell/pom.xml index 9dd8825..c0568a6 100644 --- a/ambari-shell/pom.xml +++ b/ambari-shell/pom.xml @@ -21,14 +21,14 @@ <parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-project</artifactId> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../ambari-project</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ambari</groupId> <artifactId>ambari-shell</artifactId> <packaging>pom</packaging> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <name>Ambari Shell</name> <description>Ambari Shell</description> <modules> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-views/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-views/pom.xml b/ambari-views/pom.xml index db710e4..292382b 100644 --- a/ambari-views/pom.xml +++ b/ambari-views/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-project</artifactId> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../ambari-project</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -28,13 +28,72 @@ <artifactId>ambari-views</artifactId> <packaging>jar</packaging> <name>Ambari Views</name> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <description>Ambari View interfaces.</description> <url>http://ambari.apache.org/</url> <scm> <url>https://github.com/apache/ambari</url> <connection>https://git-wip-us.apache.org/repos/asf/ambari.git</connection> </scm> + + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + </license> + </licenses> + + <organization> + <name>Apache Software Foundation</name> + <url>http://www.apache.org</url> + </organization> + + <properties> + <distMgmtSnapshotsId>apache.snapshots.https</distMgmtSnapshotsId> + <distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName> + <distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl> + <distMgmtStagingId>apache.staging.https</distMgmtStagingId> + <distMgmtStagingName>Apache Release Distribution Repository</distMgmtStagingName> + <distMgmtStagingUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distMgmtStagingUrl> + </properties> + + + <distributionManagement> + <repository> + <id>${distMgmtStagingId}</id> + <name>${distMgmtStagingName}</name> + <url>${distMgmtStagingUrl}</url> + </repository> + <snapshotRepository> + <id>${distMgmtSnapshotsId}</id> + <name>${distMgmtSnapshotsName}</name> + <url>${distMgmtSnapshotsUrl}</url> + </snapshotRepository> + </distributionManagement> + + <repositories> + <repository> + <id>${distMgmtSnapshotsId}</id> + <name>${distMgmtSnapshotsName}</name> + <url>${distMgmtSnapshotsUrl}</url> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>maven2-repository.atlassian</id> + <name>Atlassian Maven Repository</name> + <url>https://maven.atlassian.com/repository/public</url> + <layout>default</layout> + </pluginRepository> + <pluginRepository> + <id>${distMgmtSnapshotsId}</id> + <name>${distMgmtSnapshotsName}</name> + <url>${distMgmtSnapshotsUrl}</url> + <layout>default</layout> + </pluginRepository> + </pluginRepositories> + <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/ambari-web/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml index 39628bb..060a7cf 100644 --- a/ambari-web/pom.xml +++ b/ambari-web/pom.xml @@ -20,14 +20,14 @@ <parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-project</artifactId> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../ambari-project</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-web</artifactId> <packaging>pom</packaging> <name>Ambari Web</name> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <description>Ambari Web</description> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/contrib/views/capacity-scheduler/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/capacity-scheduler/pom.xml b/contrib/views/capacity-scheduler/pom.xml index c06cfb1..6c2416e 100644 --- a/contrib/views/capacity-scheduler/pom.xml +++ b/contrib/views/capacity-scheduler/pom.xml @@ -17,15 +17,15 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.ambari.view</groupId> + <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>capacity-scheduler</artifactId> <version>0.3.0-SNAPSHOT</version> <name>Capacity Scheduler</name> <parent> - <groupId>org.apache.ambari.views</groupId> + <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>ambari-contrib-views</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/contrib/views/files/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/files/pom.xml b/contrib/views/files/pom.xml index 7813712..e287165 100644 --- a/contrib/views/files/pom.xml +++ b/contrib/views/files/pom.xml @@ -17,15 +17,15 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.ambari.view</groupId> + <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>files</artifactId> <version>0.1.0-SNAPSHOT</version> <name>Files</name> <parent> - <groupId>org.apache.ambari.views</groupId> + <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>ambari-contrib-views</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/contrib/views/jobs/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/jobs/pom.xml b/contrib/views/jobs/pom.xml index 59ebf52..a2cfe45 100644 --- a/contrib/views/jobs/pom.xml +++ b/contrib/views/jobs/pom.xml @@ -17,16 +17,16 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <groupId>org.apache.ambari.views</groupId> + <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>ambari-contrib-views</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ambari</groupId> <artifactId>jobs</artifactId> <packaging>jar</packaging> <name>Jobs</name> - <version>1.3.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <description>Jobs View</description> <build> <plugins> @@ -215,4 +215,4 @@ </properties> </profile> </profiles> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/contrib/views/pig/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/pig/pom.xml b/contrib/views/pig/pom.xml index 7aeab3a..239f95f 100644 --- a/contrib/views/pig/pom.xml +++ b/contrib/views/pig/pom.xml @@ -17,15 +17,15 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.ambari.view</groupId> + <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>pig</artifactId> <version>0.1.0-SNAPSHOT</version> <name>Pig</name> <parent> - <groupId>org.apache.ambari.views</groupId> + <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>ambari-contrib-views</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <dependencies> @@ -117,7 +117,7 @@ <properties> <hadoop-version>2.2.0</hadoop-version> - <ambari.version>1.3.0-SNAPSHOT</ambari.version> + <ambari.version>2.0.0-SNAPSHOT</ambari.version> </properties> <build> <plugins> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/contrib/views/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/pom.xml b/contrib/views/pom.xml index e6037f3..b1c8120 100644 --- a/contrib/views/pom.xml +++ b/contrib/views/pom.xml @@ -17,13 +17,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.ambari.views</groupId> + <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>ambari-contrib-views</artifactId> <packaging>pom</packaging> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <name>Ambari Contrib Views</name> <properties> - <ambari.version>1.3.0-SNAPSHOT</ambari.version> + <ambari.version>2.0.0-SNAPSHOT</ambari.version> </properties> <modules> <module>files</module> @@ -142,7 +142,7 @@ <dependency> <groupId>org.apache.ambari</groupId> <artifactId>ambari-views</artifactId> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> </dependency> </dependencies> </dependencyManagement> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/contrib/views/slider/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/slider/pom.xml b/contrib/views/slider/pom.xml index 1269506..4fe688e 100644 --- a/contrib/views/slider/pom.xml +++ b/contrib/views/slider/pom.xml @@ -11,15 +11,15 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.ambari.view</groupId> + <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>slider</artifactId> <version>0.0.1-SNAPSHOT</version> <name>Slider</name> <parent> - <groupId>org.apache.ambari.views</groupId> + <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>ambari-contrib-views</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/contrib/views/tez/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/tez/pom.xml b/contrib/views/tez/pom.xml index 6023401..eb7b023 100644 --- a/contrib/views/tez/pom.xml +++ b/contrib/views/tez/pom.xml @@ -17,9 +17,9 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <groupId>org.apache.ambari.views</groupId> + <groupId>org.apache.ambari.contrib.views</groupId> <artifactId>ambari-contrib-views</artifactId> - <version>0.1.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <properties> <tez.view.version>0.6.0-SNAPSHOT</tez.view.version> http://git-wip-us.apache.org/repos/asf/ambari/blob/48a8de15/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b33ee85..8054fbc 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ <artifactId>ambari</artifactId> <packaging>pom</packaging> <name>Ambari Main</name> - <version>2.0.0.0</version> + <version>2.0.0-SNAPSHOT</version> <description>Ambari</description> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>