incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r1177154 - in /incubator/ambari/trunk: agent/pom.xml client/pom.xml controller/pom.xml pom.xml
Date Thu, 29 Sep 2011 02:43:59 GMT
Author: omalley
Date: Thu Sep 29 02:43:58 2011
New Revision: 1177154

URL: http://svn.apache.org/viewvc?rev=1177154&view=rev
Log:
AMBARI-13. More changes to the pom to support the site. Now site-deploy works.

Modified:
    incubator/ambari/trunk/agent/pom.xml
    incubator/ambari/trunk/client/pom.xml
    incubator/ambari/trunk/controller/pom.xml
    incubator/ambari/trunk/pom.xml

Modified: incubator/ambari/trunk/agent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/pom.xml?rev=1177154&r1=1177153&r2=1177154&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/pom.xml (original)
+++ incubator/ambari/trunk/agent/pom.xml Thu Sep 29 02:43:58 2011
@@ -82,6 +82,12 @@
                 </executions>
             </plugin>
         </plugins>
+      <extensions>
+        <extension>
+          <groupId>org.apache.maven.wagon</groupId>
+          <artifactId>wagon-ssh-external</artifactId>
+        </extension>
+      </extensions>
     </build>
 
   <profiles>
@@ -151,4 +157,12 @@
     </profile>
   </profiles>
 
+  <distributionManagement>
+    <site>
+      <id>apache-website</id>
+      <name>Apache website</name>
+      <url>scpexe://people.apache.org/www/incubator.apache.org/ambari/agent</url>
+    </site>
+  </distributionManagement>
+
 </project>

Modified: incubator/ambari/trunk/client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/pom.xml?rev=1177154&r1=1177153&r2=1177154&view=diff
==============================================================================
--- incubator/ambari/trunk/client/pom.xml (original)
+++ incubator/ambari/trunk/client/pom.xml Thu Sep 29 02:43:58 2011
@@ -114,4 +114,12 @@
       </plugins>
     </build>
 
+  <distributionManagement>
+    <site>
+      <id>apache-website</id>
+      <name>Apache website</name>
+      <url>scpexe://people.apache.org/www/incubator.apache.org/client</url>
+    </site>
+  </distributionManagement>
+
 </project>

Modified: incubator/ambari/trunk/controller/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/pom.xml?rev=1177154&r1=1177153&r2=1177154&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/pom.xml (original)
+++ incubator/ambari/trunk/controller/pom.xml Thu Sep 29 02:43:58 2011
@@ -185,4 +185,13 @@
         <scope>test</scope>
       </dependency>
     </dependencies>
+
+  <distributionManagement>
+    <site>
+      <id>apache-website</id>
+      <name>Apache website</name>
+      <url>scpexe://people.apache.org/www/incubator.apache.org/ambari/controller</url>
+    </site>
+  </distributionManagement>
+
 </project>

Modified: incubator/ambari/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/pom.xml?rev=1177154&r1=1177153&r2=1177154&view=diff
==============================================================================
--- incubator/ambari/trunk/pom.xml (original)
+++ incubator/ambari/trunk/pom.xml Thu Sep 29 02:43:58 2011
@@ -173,156 +173,168 @@
     </organization>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
+      <resources>
+        <resource>
+          <directory>src/main/resources</directory>
+          <filtering>true</filtering>
+        </resource>
+      </resources>
+      <pluginManagement>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>2.4.3</version>
-                <configuration>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.2</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <compilerVersion>1.5</compilerVersion>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.1.1</version>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.5</version>
-                <configuration>
-                    <phase>test</phase>
-                    <argLine>-Xmx1024m</argLine>
-                    <includes>
-                        <include>**/Test*.java</include>
-                    </includes>
-                    <excludes>
-                        <exclude>**/IntegrationTest*.java</exclude>
-                        <exclude>**/PerformanceTest*.java</exclude>
-                    </excludes>
-                    <skipTests>${skipTests}</skipTests>
-                    <reportsDirectory>${project.build.directory}/test-reports</reportsDirectory>
-                    <systemProperties>
-                        <property>
-                            <name>AMBARI_LOG_DIR</name>
-                            <value>${project.build.directory}/logs</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
+            <version>2.4.3</version>
+            <configuration>
+              <encoding>UTF-8</encoding>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <version>2.3.2</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>test-jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>2.3.2</version>
+            <configuration>
+              <compilerVersion>1.5</compilerVersion>
+              <source>1.6</source>
+              <target>1.6</target>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.1.1</version>
+            <executions>
+              <execution>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>jar-no-fork</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.5</version>
+            <configuration>
+              <phase>test</phase>
+              <argLine>-Xmx1024m</argLine>
+              <includes>
+                <include>**/Test*.java</include>
+              </includes>
+              <excludes>
+                <exclude>**/IntegrationTest*.java</exclude>
+                <exclude>**/PerformanceTest*.java</exclude>
+              </excludes>
+              <skipTests>${skipTests}</skipTests>
+              <reportsDirectory>${project.build.directory}/test-reports</reportsDirectory>
+              <systemProperties>
+                <property>
+                  <name>AMBARI_LOG_DIR</name>
+                  <value>${project.build.directory}/logs</value>
+                </property>
+              </systemProperties>
+            </configuration>
+          </plugin>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <configuration>
+              <tarLongFileMode>gnu</tarLongFileMode>
+              <descriptors>
+                <descriptor>src/packages/tarball/all.xml</descriptor>
+              </descriptors>
+            </configuration>
+            <executions>
+              <execution>
+                <id>build-tarball</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.4</version>
+            <executions>
+              <execution>
+                <phase>validate</phase>
                 <configuration>
-                    <tarLongFileMode>gnu</tarLongFileMode>
-                    <descriptors>
-                        <descriptor>src/packages/tarball/all.xml</descriptor>
-                    </descriptors>
+                  <tasks name="setup">
+                    <mkdir dir="${basedir}/target"/>
+                    <echo message="0.1.0" file="${basedir}/target/VERSION"/>
+                    <mkdir dir="${basedir}/target/clover"/>
+                    <chmod dir="${basedir}/target/clover" perm="a+w" />
+                  </tasks>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>build-tarball</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.4</version>
-                <executions>
-                    <execution>
-                        <phase>validate</phase>
-                        <configuration>
-                            <tasks name="setup">
-                                <mkdir dir="${basedir}/target"/>
-                                <echo message="0.1.0" file="${basedir}/target/VERSION"/>
-                                <mkdir dir="${basedir}/target/clover"/>
-                                <chmod dir="${basedir}/target/clover" perm="a+w" />
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-site-plugin</artifactId>
-              <version>3.0</version>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.rat</groupId>
-              <artifactId>apache-rat-plugin</artifactId>
-              <version>0.7</version>
-              <executions>
-                <execution>
-                  <phase>verify</phase>
-                  <goals>
-                    <goal>check</goal>
-                  </goals>
-                </execution>
-              </executions>
-              <configuration>
-                <numUnapprovedLicenses>0</numUnapprovedLicenses>
-                <excludes>
-                  <!-- notice files -->
-                  <exclude>CHANGES.txt</exclude>
-                  <!-- generated files -->
-                  <exclude>**/target/**</exclude>
-                  <exclude>**/.classpath</exclude>
-                  <exclude>**/.project</exclude>
-                  <exclude>**/.settings/**</exclude>
-                  <!-- bsd/gpl dual licensed files -->
-                  <exclude>src/main/webapps/css/smoothness/jquery-ui-1.8.13.custom.css</exclude>
-                  <exclude>src/main/webapps/js/jquery.dataTables.min.js</exclude>
-                  <exclude>**/application-grammars.xml</exclude>
-  		  <exclude>**/wadl.xsl</exclude>
-                </excludes>
-              </configuration>
-            </plugin>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-site-plugin</artifactId>
+            <version>3.0</version>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.rat</groupId>
+            <artifactId>apache-rat-plugin</artifactId>
+            <version>0.7</version>
+            <executions>
+              <execution>
+                <phase>verify</phase>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <numUnapprovedLicenses>0</numUnapprovedLicenses>
+              <excludes>
+                <!-- notice files -->
+                <exclude>CHANGES.txt</exclude>
+                <!-- generated files -->
+                <exclude>**/target/**</exclude>
+                <exclude>**/.classpath</exclude>
+                <exclude>**/.project</exclude>
+                <exclude>**/.settings/**</exclude>
+                <!-- bsd/gpl dual licensed files -->
+                <exclude>src/main/webapps/css/smoothness/jquery-ui-1.8.13.custom.css</exclude>
+                <exclude>src/main/webapps/js/jquery.dataTables.min.js</exclude>
+                <exclude>**/application-grammars.xml</exclude>
+  		<exclude>**/wadl.xsl</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-ssh-external</artifactId>
+            <version>1.0</version>
+          </plugin>
         </plugins>
+      </pluginManagement>
+      <extensions>
+        <extension>
+          <groupId>org.apache.maven.wagon</groupId>
+          <artifactId>wagon-ssh-external</artifactId>
+        </extension>
+      </extensions>
     </build>
 
     <profiles>
@@ -758,4 +770,12 @@
         </dependencies>
     </dependencyManagement>
 
+  <distributionManagement>
+    <site>
+      <id>apache-website</id>
+      <name>Apache website</name>
+      <url>scpexe://people.apache.org/www/incubator.apache.org/ambari</url>
+    </site>
+  </distributionManagement>
+
 </project>



Mime
View raw message