You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@onami.apache.org by si...@apache.org on 2013/03/09 19:48:35 UTC

svn commit: r1454757 - in /incubator/onami/trunk/lifecycle: deploySite.sh pom.xml

Author: simonetripodi
Date: Sat Mar  9 18:48:35 2013
New Revision: 1454757

URL: http://svn.apache.org/r1454757
Log:
releng: Lifecycle just turned to multi-module project, updated site/javadoc plugin

Added:
    incubator/onami/trunk/lifecycle/deploySite.sh   (with props)
Modified:
    incubator/onami/trunk/lifecycle/pom.xml

Added: incubator/onami/trunk/lifecycle/deploySite.sh
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/deploySite.sh?rev=1454757&view=auto
==============================================================================
--- incubator/onami/trunk/lifecycle/deploySite.sh (added)
+++ incubator/onami/trunk/lifecycle/deploySite.sh Sat Mar  9 18:48:35 2013
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+mvn clean site-deploy scm-publish:publish-scm $@

Propchange: incubator/onami/trunk/lifecycle/deploySite.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/onami/trunk/lifecycle/deploySite.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/onami/trunk/lifecycle/deploySite.sh
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/onami/trunk/lifecycle/deploySite.sh
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/onami/trunk/lifecycle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/pom.xml?rev=1454757&r1=1454756&r2=1454757&view=diff
==============================================================================
--- incubator/onami/trunk/lifecycle/pom.xml (original)
+++ incubator/onami/trunk/lifecycle/pom.xml Sat Mar  9 18:48:35 2013
@@ -73,6 +73,12 @@
     </site>
   </distributionManagement>
 
+  <properties>
+    <onami.lifecycle.siteFilePath>${user.home}/onami-sites/onami-lifecycle-site/</onami.lifecycle.siteFilePath>
+    <onami.lifecycle.siteUrlDeployment>file://${onami.lifecycle.siteFilePath}</onami.lifecycle.siteUrlDeployment>
+    <onami.lifecycle.scmPubCheckoutDirectory>${user.home}/onami-sites/onami-lifecycle-site-content</onami.lifecycle.scmPubCheckoutDirectory>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.google.inject</groupId>
@@ -87,53 +93,39 @@
   </dependencies>
 
   <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <configuration>
-          <locales>en</locales>
-          <skipDeploy>true</skipDeploy>
-        </configuration>
-        <executions>
-          <execution>
-            <id>attach-descriptor</id>
-            <goals>
-              <goal>attach-descriptor</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>stage-for-scm-publish</id>
-            <phase>post-site</phase>
-            <goals>
-              <goal>stage</goal>
-            </goals>
-            <configuration>
-              <skipDeploy>false</skipDeploy>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-scm-publish-plugin</artifactId>
+          <configuration>
+            <checkoutDirectory>${onami.lifecycle.scmPubCheckoutDirectory}</checkoutDirectory>
+            <pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/incubator/onami/site/lifecycle</pubScmUrl>
+            <checkinComment>Onami Lifecycle site deployment</checkinComment>
+            <content>${onami.lifecycle.siteFilePath}</content>
+            <tryUpdate>true</tryUpdate>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 
+  <reporting>
+    <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-scm-publish-plugin</artifactId>
-        <inherited>false</inherited>
-        <configuration>
-          <checkinComment>Onami Lifecycle site deployment</checkinComment>
-          <checkoutDirectory>${user.home}/onami-sites/onami-lifecycle-site</checkoutDirectory>
-        </configuration>
-        <executions>
-          <execution>
-            <id>scm-publish</id>
-            <phase>site-deploy</phase>
-            <goals>
-              <goal>publish-scm</goal>
-            </goals>
-          </execution>
-        </executions>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${javadoc.version}</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>aggregate</report>
+              <report>test-aggregate</report>
+            </reports>
+          </reportSet>
+        </reportSets>
       </plugin>
     </plugins>
-  </build>
+  </reporting>
 
 </project>