Repository: ambari Updated Branches: refs/heads/trunk 585f1ed61 -> 8a7b7559c
AMBARI-9718. Allow ambari and ambari-project poms can be published when deploy ambari-views and contrib/views artifacts to Maven repo. (yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8a7b7559 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8a7b7559 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8a7b7559 Branch: refs/heads/trunk Commit: 8a7b7559ce51beb7fd3fe7514b81dd233dba7500 Parents: 585f1ed Author: Yusaku Sako <yus...@hortonworks.com> Authored: Thu Feb 19 20:13:12 2015 -0800 Committer: Yusaku Sako <yus...@hortonworks.com> Committed: Thu Feb 19 20:13:12 2015 -0800 ---------------------------------------------------------------------- ambari-project/pom.xml | 95 --------------------------------------------- ambari-web/pom.xml | 1 + pom.xml | 92 +++++++++++++++++++++++++++++++++++++++---- 3 files changed, 86 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8a7b7559/ambari-project/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml index 41655ba..92e3b5c 100644 --- a/ambari-project/pom.xml +++ b/ambari-project/pom.xml @@ -25,105 +25,10 @@ <version>2.0.0-SNAPSHOT</version> <description>Apache Ambari Project POM</description> <name>Apache Ambari Project POM</name> - <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> - <distribution>repo</distribution> - </license> - </licenses> - <organization> - <name>Apache Software Foundation</name> - <url>http://www.apache.org</url> - </organization> - <issueManagement> - <system>jira</system> - <url>https://issues.apache.org/jira/browse/AMBARI</url> - </issueManagement> <packaging>pom</packaging> <properties> <ambari.dir>${project.parent.basedir}</ambari.dir> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <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> - <pluginRepositories> - <pluginRepository> - <id>maven2-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url>http://download.java.net/maven/2/</url> - <layout>default</layout> - </pluginRepository> - <pluginRepository> - <id>maven2-glassfish-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url>http://download.java.net/maven/glassfish/</url> - </pluginRepository> - <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> - - <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>oss.sonatype.org</id> - <name>OSS Sonatype Staging</name> - <url>https://oss.sonatype.org/content/groups/staging</url> - </repository> - <repository> - <id>spring-milestones</id> - <name>Spring Milestones</name> - <url>http://repo.spring.io/milestone</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>ASF Staging</id> - <url>https://repository.apache.org/content/groups/staging/</url> - </repository> - <repository> - <id>ASF Snapshots</id> - <url>https://repository.apache.org/content/repositories/snapshots/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> <profiles> <profile> <id>dist</id> http://git-wip-us.apache.org/repos/asf/ambari/blob/8a7b7559/ambari-web/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml index 060a7cf..0849111 100644 --- a/ambari-web/pom.xml +++ b/ambari-web/pom.xml @@ -30,6 +30,7 @@ <version>2.0.0-SNAPSHOT</version> <description>Ambari Web</description> <properties> + <ambari.dir>${project.parent.parent.basedir}</ambari.dir> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <build> http://git-wip-us.apache.org/repos/asf/ambari/blob/8a7b7559/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8054fbc..1e4dada 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,26 @@ <name>Ambari Main</name> <version>2.0.0-SNAPSHOT</version> <description>Ambari</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> + <distribution>repo</distribution> + </license> + </licenses> + <organization> + <name>Apache Software Foundation</name> + <url>http://www.apache.org</url> + </organization> + <issueManagement> + <system>jira</system> + <url>https://issues.apache.org/jira/browse/AMBARI</url> + </issueManagement> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <clover.license>${user.home}/clover.license</clover.license> @@ -32,6 +52,14 @@ <deb.architecture>i386 amd64</deb.architecture> <deb.priority>extra</deb.priority> <stack.distribution>HDP</stack.distribution> + <ambari.dir>${project.basedir}</ambari.dir> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <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> <pluginRepositories> <pluginRepository> @@ -41,17 +69,67 @@ <layout>default</layout> </pluginRepository> <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>maven2-glassfish-repository.dev.java.net</id> <name>Java.net Repository for Maven</name> <url>http://download.java.net/maven/glassfish/</url> </pluginRepository> + <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> + + <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>oss.sonatype.org</id> + <name>OSS Sonatype Staging</name> + <url>https://oss.sonatype.org/content/groups/staging</url> + </repository> + <repository> + <id>spring-milestones</id> + <name>Spring Milestones</name> + <url>http://repo.spring.io/milestone</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>ASF Staging</id> + <url>https://repository.apache.org/content/groups/staging/</url> + </repository> + <repository> + <id>ASF Snapshots</id> + <url>https://repository.apache.org/content/repositories/snapshots/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + </repositories> + <build> <pluginManagement> <plugins> @@ -128,7 +206,7 @@ <artifactId>maven-assembly-plugin</artifactId> <configuration> <descriptors> - <descriptor>ambari-project/src/main/assemblies/empty.xml</descriptor> + <descriptor>${ambari.dir}/ambari-project/src/main/assemblies/empty.xml</descriptor> </descriptors> </configuration> <executions>
