sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1553519 - in /sis/branches/JDK7: ./ core/sis-build-helper/src/site/ core/sis-metadata/src/site/ core/sis-utility/src/site/ core/src/site/ src/site/ storage/sis-netcdf/src/site/ storage/sis-storage/src/site/ storage/src/site/
Date Thu, 26 Dec 2013 17:43:28 GMT
Author: desruisseaux
Date: Thu Dec 26 17:43:27 2013
New Revision: 1553519

URL: http://svn.apache.org/r1553519
Log:
Exclude org.apache.sis.util.resources package from javadoc.
Generate only aggregated javadoc, without per-module javadoc, for avoiding a build failure
in sis-build-helper
and also for reducing disk usage consumption and possible confusion caused by all the duplicated
HTML pages.
Note that we may need to define a profile for releases, since the later require per-module
javadoc (we will
revisit this issue during the next Apache SIS release).

Modified:
    sis/branches/JDK7/core/sis-build-helper/src/site/site.xml
    sis/branches/JDK7/core/sis-metadata/src/site/site.xml
    sis/branches/JDK7/core/sis-utility/src/site/site.xml
    sis/branches/JDK7/core/src/site/site.xml
    sis/branches/JDK7/pom.xml
    sis/branches/JDK7/src/site/site.xml
    sis/branches/JDK7/storage/sis-netcdf/src/site/site.xml
    sis/branches/JDK7/storage/sis-storage/src/site/site.xml
    sis/branches/JDK7/storage/src/site/site.xml

Modified: sis/branches/JDK7/core/sis-build-helper/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/site/site.xml?rev=1553519&r1=1553518&r2=1553519&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/site/site.xml (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/site/site.xml Thu Dec 26 17:43:27 2013
@@ -29,8 +29,9 @@
        ==================================================== -->
   <body>
     <menu name="Quick links">
-      <item name="Module Javadoc"  href="apidocs/index.html"/>
-      <item name="Apache SIS home" href="../index.html"/>
+      <item name="Apache SIS home"    href="http://sis.apache.org"/>
+      <item name="Maven reports home" href="../index.html"/>
+      <item name="Aggregated Javadoc" href="../apidocs/index.html"/>
     </menu>
 
     <menu ref="reports"/> <!-- Replaced by menus for any configured reports (mailing
lists, etc.) -->

Modified: sis/branches/JDK7/core/sis-metadata/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/site/site.xml?rev=1553519&r1=1553518&r2=1553519&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/site/site.xml (original)
+++ sis/branches/JDK7/core/sis-metadata/src/site/site.xml Thu Dec 26 17:43:27 2013
@@ -29,9 +29,10 @@
        ==================================================== -->
   <body>
     <menu name="Quick links">
-      <item name="Module Javadoc"  href="apidocs/index.html"/>
-      <item name="FAQ"             href="http://sis.apache.org/faq.html#metadata"/>
-      <item name="Apache SIS home" href="../index.html"/>
+      <item name="FAQ"                href="http://sis.apache.org/faq.html#metadata"/>
+      <item name="Apache SIS home"    href="http://sis.apache.org"/>
+      <item name="Maven reports home" href="../index.html"/>
+      <item name="Aggregated Javadoc" href="../apidocs/index.html"/>
     </menu>
 
     <menu ref="reports"/> <!-- Replaced by menus for any configured reports (mailing
lists, etc.) -->

Modified: sis/branches/JDK7/core/sis-utility/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/site/site.xml?rev=1553519&r1=1553518&r2=1553519&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/site/site.xml (original)
+++ sis/branches/JDK7/core/sis-utility/src/site/site.xml Thu Dec 26 17:43:27 2013
@@ -29,8 +29,9 @@
        ==================================================== -->
   <body>
     <menu name="Quick links">
-      <item name="Module Javadoc"  href="apidocs/index.html"/>
-      <item name="Apache SIS home" href="../index.html"/>
+      <item name="Apache SIS home"    href="http://sis.apache.org"/>
+      <item name="Maven reports home" href="../index.html"/>
+      <item name="Aggregated Javadoc" href="../apidocs/index.html"/>
     </menu>
 
     <menu ref="reports"/> <!-- Replaced by menus for any configured reports (mailing
lists, etc.) -->

Modified: sis/branches/JDK7/core/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/src/site/site.xml?rev=1553519&r1=1553518&r2=1553519&view=diff
==============================================================================
--- sis/branches/JDK7/core/src/site/site.xml (original)
+++ sis/branches/JDK7/core/src/site/site.xml Thu Dec 26 17:43:27 2013
@@ -33,6 +33,8 @@
         Those menus are NOT inherited - all modules must defines their own.
     -->
     <menu name="Quick links" inherit="none">
+      <item name="Apache SIS home"    href="http://sis.apache.org"/>
+      <item name="Maven reports home" href="../index.html"/>
       <item name="Aggregated Javadoc" href="../apidocs/index.html"/>
       <item name="License"            href="license.html"/>
     </menu>

Modified: sis/branches/JDK7/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/pom.xml?rev=1553519&r1=1553518&r2=1553519&view=diff
==============================================================================
--- sis/branches/JDK7/pom.xml (original)
+++ sis/branches/JDK7/pom.xml Thu Dec 26 17:43:27 2013
@@ -398,7 +398,7 @@ Apache SIS is a free software, Java lang
   <properties>
     <geoapi.version>3.1-M04</geoapi.version>
     <netcdf.version>4.3.18</netcdf.version>
-    <findbugs.version>2.5.2</findbugs.version>
+    <findbugs.version>2.5.3</findbugs.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <website.encoding>UTF-8</website.encoding>
     <website.locale>en</website.locale>
@@ -669,7 +669,7 @@ Apache SIS is a free software, Java lang
           </groups>
 
           <!-- Internal packages to hide from javadoc. -->
-          <excludePackageNames>org.apache.sis.internal:com</excludePackageNames>
+          <excludePackageNames>org.apache.sis.internal:org.apache.sis.util.resources:com</excludePackageNames>
 
           <!-- Custom taglets, some of them implemented in Java. -->
           <tags>
@@ -693,18 +693,36 @@ Apache SIS is a free software, Java lang
             <version>${sis.plugin.version}</version>
           </tagletArtifact>
         </configuration>
+        <reportSets>
+          <reportSet>
+            <id>aggregate</id>
+            <reports>
+              <report>aggregate</report>
+              <report>test-aggregate</report>
+            </reports>
+          </reportSet>
+        </reportSets>
       </plugin>
 
       <!-- Produce Source cross references -->
       <plugin>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.3</version>
+        <version>2.4</version>
+        <reportSets>
+          <reportSet>
+            <id>aggregate</id>
+            <reports>
+              <report>aggregate</report>
+              <report>test-aggregate</report>
+            </reports>
+          </reportSet>
+        </reportSets>
       </plugin>
 
       <!-- Unit tests report -->
       <plugin>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.15</version>
+        <version>2.16</version>
       </plugin>
 
       <!-- "Release Audit" report (checks license headers etc.) -->

Modified: sis/branches/JDK7/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/src/site/site.xml?rev=1553519&r1=1553518&r2=1553519&view=diff
==============================================================================
--- sis/branches/JDK7/src/site/site.xml (original)
+++ sis/branches/JDK7/src/site/site.xml Thu Dec 26 17:43:27 2013
@@ -41,6 +41,7 @@
     -->
     <links>
       <item name="Apache" href="http://www.apache.org"/>
+      <item name="SIS home" href="http://sis.apache.org"/>
       <item name="Open Geospatial Consortium (OGC)" href="http://www.opengeospatial.org"/>
       <item name="GeoAPI" href="http://www.geoapi.org"/>
       <item name="Javadoc" href="http://builds.apache.org/job/sis-jdk7/site/apidocs/index.html"/>

Modified: sis/branches/JDK7/storage/sis-netcdf/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-netcdf/src/site/site.xml?rev=1553519&r1=1553518&r2=1553519&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-netcdf/src/site/site.xml (original)
+++ sis/branches/JDK7/storage/sis-netcdf/src/site/site.xml Thu Dec 26 17:43:27 2013
@@ -29,8 +29,9 @@
        ============================================================ -->
   <body>
     <menu name="Quick links">
-      <item name="Module Javadoc"  href="apidocs/index.html"/>
-      <item name="Apache SIS home" href="../index.html"/>
+      <item name="Apache SIS home"    href="http://sis.apache.org"/>
+      <item name="Maven reports home" href="../index.html"/>
+      <item name="Aggregated Javadoc" href="../apidocs/index.html"/>
     </menu>
 
     <menu ref="reports"/> <!-- Replaced by menus for any configured reports (mailing
lists, etc.) -->

Modified: sis/branches/JDK7/storage/sis-storage/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/site/site.xml?rev=1553519&r1=1553518&r2=1553519&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/site/site.xml (original)
+++ sis/branches/JDK7/storage/sis-storage/src/site/site.xml Thu Dec 26 17:43:27 2013
@@ -29,8 +29,9 @@
        ========================================================== -->
   <body>
     <menu name="Quick links">
-      <item name="Module Javadoc"  href="apidocs/index.html"/>
-      <item name="Apache SIS home" href="../index.html"/>
+      <item name="Apache SIS home"    href="http://sis.apache.org"/>
+      <item name="Maven reports home" href="../index.html"/>
+      <item name="Aggregated Javadoc" href="../apidocs/index.html"/>
     </menu>
 
     <menu ref="reports"/> <!-- Replaced by menus for any configured reports (mailing
lists, etc.) -->

Modified: sis/branches/JDK7/storage/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/src/site/site.xml?rev=1553519&r1=1553518&r2=1553519&view=diff
==============================================================================
--- sis/branches/JDK7/storage/src/site/site.xml (original)
+++ sis/branches/JDK7/storage/src/site/site.xml Thu Dec 26 17:43:27 2013
@@ -33,6 +33,8 @@
         Those menus are NOT inherited - all modules must defines their own.
     -->
     <menu name="Quick links" inherit="none">
+      <item name="Apache SIS home"    href="http://sis.apache.org"/>
+      <item name="Maven reports home" href="../index.html"/>
       <item name="Aggregated Javadoc" href="../apidocs/index.html"/>
       <item name="License"            href="license.html"/>
     </menu>



Mime
View raw message