ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject ambari git commit: AMBARI-9698. Publish contrib/views artifacts to Maven repository. (yusaku)
Date Thu, 19 Feb 2015 07:37:31 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk ab1c91993 -> 0c6ca6bb4


AMBARI-9698. Publish contrib/views 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/0c6ca6bb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0c6ca6bb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0c6ca6bb

Branch: refs/heads/trunk
Commit: 0c6ca6bb462980860742a4837d7c4a3e74b30de4
Parents: ab1c919
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Wed Feb 18 23:37:07 2015 -0800
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Wed Feb 18 23:37:07 2015 -0800

----------------------------------------------------------------------
 ambari-project/pom.xml                   | 126 +++++++++++++++++++++++
 ambari-views/pom.xml                     | 138 --------------------------
 contrib/views/capacity-scheduler/pom.xml |   1 +
 contrib/views/files/pom.xml              |   9 +-
 contrib/views/jobs/pom.xml               |  13 +--
 contrib/views/pig/pom.xml                |   1 +
 contrib/views/pom.xml                    |  34 ++++++-
 contrib/views/slider/pom.xml             |   1 +
 contrib/views/tez/pom.xml                |   1 +
 9 files changed, 171 insertions(+), 153 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0c6ca6bb/ambari-project/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index bce8c5a..41655ba 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -25,6 +25,11 @@
   <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>
@@ -32,13 +37,24 @@
       <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>
@@ -52,7 +68,33 @@
       <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>
@@ -67,6 +109,20 @@
         <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>
@@ -105,6 +161,76 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>sources</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>javadoc</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <configuration>
+              <docfilessubdirs>true</docfilessubdirs>
+            </configuration>
+            <executions>
+              <execution>
+                <id>attach-javadocs</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <!-- This profile exists to only sign the build artifacts when making a release candidate
+instead of a SNAPSHOT. -->
+    <profile>
+      <id>sign-artifacts</id>
+      <activation>
+        <property>
+          <name>performRelease</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>1.6</version>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>deploy</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
   <dependencyManagement>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0c6ca6bb/ambari-views/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-views/pom.xml b/ambari-views/pom.xml
index 292382b..8fcb5ae 100644
--- a/ambari-views/pom.xml
+++ b/ambari-views/pom.xml
@@ -30,70 +30,6 @@
     <name>Ambari Views</name>
     <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>
@@ -218,80 +154,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- Generate the -sources.jar file that is required by Apache Maven in order
to host this project
-            on a remote repo. -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                          <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- Generate the -javadoc.jar file that is required by Apache Maven in order
to host this project
-            on a remote repo. -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- Sign the build artifacts with the PGP key. Note that PGP must be installed
and in the search path.
-            See https://docs.sonatype.org/display/Repository/How+To+Generate+PGP+Signatures+With+Maven
-->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>sign-artifacts</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>sign</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
-    <profiles>
-        <!-- This profile exists to only sign the build artifacts when making a release
candidate
-        instead of a SNAPSHOT. -->
-        <profile>
-            <id>release-sign-artifacts</id>
-            <activation>
-                <property>
-                    <name>performRelease</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.5</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>deploy</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0c6ca6bb/contrib/views/capacity-scheduler/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/capacity-scheduler/pom.xml b/contrib/views/capacity-scheduler/pom.xml
index 6c2416e..57effe8 100644
--- a/contrib/views/capacity-scheduler/pom.xml
+++ b/contrib/views/capacity-scheduler/pom.xml
@@ -71,6 +71,7 @@
     </dependencies>
 
     <properties>
+      <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
       <ui.directory>${basedir}/src/main/resources/ui</ui.directory>
     </properties>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/0c6ca6bb/contrib/views/files/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/files/pom.xml b/contrib/views/files/pom.xml
index e287165..a584744 100644
--- a/contrib/views/files/pom.xml
+++ b/contrib/views/files/pom.xml
@@ -109,10 +109,11 @@
     </dependencies>
 
     <properties>
-    <hadoop-version>2.2.0</hadoop-version>
-    <nodejs.directory>${basedir}/target/nodejs</nodejs.directory>
-    <npm.version>1.4.3</npm.version>
-    <ui.directory>${basedir}/src/main/resources/ui</ui.directory>
+      <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
+      <hadoop-version>2.2.0</hadoop-version>
+      <nodejs.directory>${basedir}/target/nodejs</nodejs.directory>
+      <npm.version>1.4.3</npm.version>
+      <ui.directory>${basedir}/src/main/resources/ui</ui.directory>
     </properties>
     <build>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/0c6ca6bb/contrib/views/jobs/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/jobs/pom.xml b/contrib/views/jobs/pom.xml
index a2cfe45..12d74da 100644
--- a/contrib/views/jobs/pom.xml
+++ b/contrib/views/jobs/pom.xml
@@ -22,12 +22,15 @@
         <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.ambari</groupId>
+    <groupId>org.apache.ambari.contrib.views</groupId>
     <artifactId>jobs</artifactId>
     <packaging>jar</packaging>
     <name>Jobs</name>
     <version>2.0.0-SNAPSHOT</version>
     <description>Jobs View</description>
+    <properties>
+      <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
+    </properties>
     <build>
         <plugins>
             <plugin>
@@ -128,14 +131,6 @@
                 <version>3.0</version>
             </plugin>
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assemblies/empty.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
-            <plugin>
                 <groupId>org.vafer</groupId>
                 <artifactId>jdeb</artifactId>
                 <version>1.0.1</version>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0c6ca6bb/contrib/views/pig/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/pig/pom.xml b/contrib/views/pig/pom.xml
index 239f95f..304aa31 100644
--- a/contrib/views/pig/pom.xml
+++ b/contrib/views/pig/pom.xml
@@ -116,6 +116,7 @@
   </dependencies>
 
   <properties>
+    <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
     <hadoop-version>2.2.0</hadoop-version>
     <ambari.version>2.0.0-SNAPSHOT</ambari.version>
   </properties>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0c6ca6bb/contrib/views/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/pom.xml b/contrib/views/pom.xml
index b1c8120..780f791 100644
--- a/contrib/views/pom.xml
+++ b/contrib/views/pom.xml
@@ -16,6 +16,12 @@
 -->
 <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</groupId>
+    <artifactId>ambari-project</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../../ambari-project</relativePath>
+  </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari.contrib.views</groupId>
   <artifactId>ambari-contrib-views</artifactId>
@@ -24,6 +30,7 @@
   <name>Ambari Contrib Views</name>
   <properties>
     <ambari.version>2.0.0-SNAPSHOT</ambari.version>
+    <ambari.dir>${project.parent.parent.basedir}</ambari.dir>
   </properties>
   <modules>
     <module>files</module>
@@ -61,11 +68,26 @@
             <exclude>.classpath</exclude>
             <exclude>.project</exclude>
             <exclude>.settings</exclude>
-
+            <exclude>**/.gitkeep</exclude>
+            <exclude>**/.bowerrc</exclude>
+            <exclude>**/.editorconfig</exclude>
+            <exclude>**/.jshintrc</exclude>
+            <exclude>**/.tmp/**</exclude>
             <exclude>**/*.json</exclude>
             <exclude>**/*.svg</exclude>
-            <exclude>**/vendor/*</exclude>
+            <exclude>**/vendor/**</exclude>
             <exclude>**/bin</exclude>
+            <exclude>**/node_modules/**</exclude>
+            <exclude>**/vendor/**</exclude>
+            <exclude>**/public/**</exclude>
+            <exclude>**/dist/**</exclude>
+            <exclude>**/bower_components/**</exclude>
+            <exclude>**/node/**</exclude>
+            <exclude>**/runner.js</exclude>
+            <exclude>**/assets/javascripts/**</exclude>
+            <exclude>**/assets/stylesheets/**</exclude>
+            <exclude>**/assets/static/javascripts/**</exclude>
+            <exclude>**/assets/static/stylesheets/**</exclude>
           </excludes>
         </configuration>
       </plugin>
@@ -108,6 +130,14 @@
           <controlDir>${basedir}/../../ambari-project/src/main/package/deb/control</controlDir>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>${ambari.dir}/ambari-project/src/main/assemblies/empty.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <dependencyManagement>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0c6ca6bb/contrib/views/slider/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/slider/pom.xml b/contrib/views/slider/pom.xml
index 4fe688e..5b90413 100644
--- a/contrib/views/slider/pom.xml
+++ b/contrib/views/slider/pom.xml
@@ -121,6 +121,7 @@
   </repositories>
 
   <properties>
+    <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
     <nodejs.directory>${basedir}/target/nodejs</nodejs.directory>
     <npm.version>1.4.3</npm.version>
     <ui.directory>${basedir}/src/main/resources/ui</ui.directory>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0c6ca6bb/contrib/views/tez/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/tez/pom.xml b/contrib/views/tez/pom.xml
index eb7b023..1bd8838 100644
--- a/contrib/views/tez/pom.xml
+++ b/contrib/views/tez/pom.xml
@@ -22,6 +22,7 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   <properties>
+    <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
     <tez.view.version>0.6.0-SNAPSHOT</tez.view.version>
     <tez.version>0.6.0</tez.version>
   </properties>


Mime
View raw message