oltu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1438074 - in /oltu/trunk: deploySite.sh pom.xml
Date Thu, 24 Jan 2013 17:01:42 GMT
Author: simonetripodi
Date: Thu Jan 24 17:01:42 2013
New Revision: 1438074

URL: http://svn.apache.org/viewvc?rev=1438074&view=rev
Log:
[AMBER-77] Update the Oltu website

use the 'site' profile to manage the site - and avoid generate useless reporting during development
improved site and project-info plugins collaborations (old configuration was inherited from
old site-plugin)
updated the script to generate and publish the site

Modified:
    oltu/trunk/deploySite.sh
    oltu/trunk/pom.xml

Modified: oltu/trunk/deploySite.sh
URL: http://svn.apache.org/viewvc/oltu/trunk/deploySite.sh?rev=1438074&r1=1438073&r2=1438074&view=diff
==============================================================================
--- oltu/trunk/deploySite.sh (original)
+++ oltu/trunk/deploySite.sh Thu Jan 24 17:01:42 2013
@@ -19,4 +19,4 @@
 # under the License.
 #
 
-mvn clean site-deploy scm-publish:publish-scm $@
+mvn -P site clean site-deploy scm-publish:publish-scm $@

Modified: oltu/trunk/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/pom.xml?rev=1438074&r1=1438073&r2=1438074&view=diff
==============================================================================
--- oltu/trunk/pom.xml (original)
+++ oltu/trunk/pom.xml Thu Jan 24 17:01:42 2013
@@ -277,12 +277,6 @@
      </notifier>
    </notifiers>
   </ciManagement>
-  <distributionManagement>
-    <site>
-      <id>oltu.website</id>
-      <url>${site.deploymentBaseUrl}</url>
-    </site>
-  </distributionManagement>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -293,13 +287,17 @@
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssZ</maven.build.timestamp.format>
     <implementation.build>${scmBranch}@r${buildNumber}</implementation.build>
     <!--
+     | shared build/report plugins version
+    -->
+    <javadoc.version>2.9</javadoc.version>
+    <!--
      | Oltu website has to be stored in SVN
      |
-     | mvn clean site-deploy scm-publish:publish-scm -Dusername=${uid} -Dpassword=${pwd}
+     | mvn -P site clean site-deploy scm-publish:publish-scm -Dusername=${uid} -Dpassword=${pwd}
      |
      | or
      |
-     | sh deploySite.sh -Dusername=${uid} -Dpassword=${pwd}
+     | sh -P site deploySite.sh -Dusername=${uid} -Dpassword=${pwd}
     -->
     <site.siteFilePath>${user.home}/oltu-site/</site.siteFilePath>
     <site.deploymentBaseUrl>file://${site.siteFilePath}</site.deploymentBaseUrl>
@@ -364,12 +362,6 @@
       <plugins>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.8.1</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-eclipse-plugin</artifactId>
           <version>2.8</version>
         </plugin>
@@ -562,35 +554,6 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.8.1</version>
-        <configuration>
-          <bootclasspath>${sun.boot.class.path}</bootclasspath>
-          <doclet>com.google.doclava.Doclava</doclet>
-          <useStandardDocletOptions>false</useStandardDocletOptions>
-          <additionalJOption>-J-Xmx1024m</additionalJOption>
-          <docletArtifact>
-            <groupId>com.google.doclava</groupId>
-            <artifactId>doclava</artifactId>
-            <version>1.0.3</version>
-          </docletArtifact>
-          <additionalparam>
-            -hdf project.name "${project.name}"
-            -d ${project.reporting.outputDirectory}/apidocs
-          </additionalparam>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <id>default</id>
-            <reports>
-              <report>javadoc</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
         <version>2.2</version>
       </plugin>
@@ -696,6 +659,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
+            <version>${javadoc.version}</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
@@ -754,54 +718,84 @@
         <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>${javadoc.version}</version>
+            <configuration>
+              <aggregate>true</aggregate>
+            </configuration>
+          </plugin>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-site-plugin</artifactId>
             <version>3.2</version>
             <configuration>
               <locales>en</locales>
-              <reportPlugins>
-                <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-project-info-reports-plugin</artifactId>
-                  <version>2.6</version>
-                  <configuration>
-                    <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
-                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-                    <anonymousConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/any23/trunk</anonymousConnection>
-                    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/any23/trunk</developerConnection>
-                    <webAccessUrl>http://svn.apache.org/viewvc/incubator/any23/trunk</webAccessUrl>
-                  </configuration>
-                  <reportSets>
-                    <reportSet>
-                      <reports>
-                        <report>index</report>
-                        <report>mailing-list</report>
-                        <report>project-team</report>
-                        <report>scm</report>
-                        <report>cim</report>
-                        <report>issue-tracking</report>
-                        <report>license</report>
-                      </reports>
-                    </reportSet>
-                  </reportSets>
-                </plugin>
-
-                <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-javadoc-plugin</artifactId>
-                  <version>2.8.1</version>
-                  <reportSets>
-                    <reportSet>
-                      <reports>
-                        <report>aggregate</report>
-                      </reports>
-                    </reportSet>
-                  </reportSets>
-                </plugin>
-              </reportPlugins>
             </configuration>
           </plugin>
         </plugins>
       </build>
+
+      <reporting>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-project-info-reports-plugin</artifactId>
+            <version>2.6</version>
+            <configuration>
+              <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+              <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+            </configuration>
+            <reportSets>
+              <reportSet>
+                <reports>
+                  <report>index</report>
+                  <report>mailing-list</report>
+                  <report>project-team</report>
+                  <report>scm</report>
+                  <report>cim</report>
+                  <report>issue-tracking</report>
+                  <report>license</report>
+                </reports>
+              </reportSet>
+            </reportSets>
+          </plugin>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>${javadoc.version}</version>
+            <configuration>
+              <notimestamp>true</notimestamp>
+              <bootclasspath>${sun.boot.class.path}</bootclasspath>
+              <doclet>com.google.doclava.Doclava</doclet>
+              <useStandardDocletOptions>false</useStandardDocletOptions>
+              <additionalJOption>-J-Xmx1024m</additionalJOption>
+              <docletArtifact>
+                <groupId>com.google.doclava</groupId>
+                <artifactId>doclava</artifactId>
+                <version>1.0.5</version>
+              </docletArtifact>
+              <additionalparam>
+                -quiet
+                -federate JDK http://download.oracle.com/javase/6/docs/api/index.html?
+                -federationxml JDK http://doclava.googlecode.com/svn/static/api/openjdk-6.xml
+                -hdf project.name "Apache Oltu"
+                -apiversion "${project.version}"
+                -d ${project.reporting.outputDirectory}/apidocs
+              </additionalparam>
+            </configuration>
+            <reportSets>
+              <reportSet>
+                <id>default</id>
+                <reports>
+                  <report>javadoc</report>
+                </reports>
+              </reportSet>
+            </reportSets>
+          </plugin>
+        </plugins>
+      </reporting>
     </profile>
   </profiles>
 



Mime
View raw message