sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1628831 - in /sis/trunk: core/sis-build-helper/src/main/java/org/opengis/annotation/Specification.java core/sis-build-helper/src/main/java/org/opengis/annotation/UML.java pom.xml
Date Wed, 01 Oct 2014 20:34:50 GMT
Author: desruisseaux
Date: Wed Oct  1 20:34:50 2014
New Revision: 1628831

URL: http://svn.apache.org/r1628831
Log:
Add missing enumeration values, needed for our workaround of JDK6 javadoc bug.

Modified:
    sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/Specification.java
    sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/UML.java
    sis/trunk/pom.xml

Modified: sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/Specification.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/Specification.java?rev=1628831&r1=1628830&r2=1628831&view=diff
==============================================================================
--- sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/Specification.java
[UTF-8] (original)
+++ sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/Specification.java
[UTF-8] Wed Oct  1 20:34:50 2014
@@ -26,5 +26,5 @@ package org.opengis.annotation;
  * @module
  */
 public enum Specification {
-    ISO_19103, ISO_19107, ISO_19111, ISO_19115
+    ISO_19103, ISO_19107, ISO_19111, ISO_19115, ISO_19115_2, OGC_01009
 }

Modified: sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/UML.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/UML.java?rev=1628831&r1=1628830&r2=1628831&view=diff
==============================================================================
--- sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/UML.java [UTF-8]
(original)
+++ sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/UML.java [UTF-8]
Wed Oct  1 20:34:50 2014
@@ -26,6 +26,8 @@ package org.opengis.annotation;
  * The problem is caused by existence of the <code>@UML</code> annotation, defined
in GeoAPI.
  * Adding dependency to the GeoAPI JAR file does not help. The workaround applied here is
to
  * redefine the UML annotation without the <code>@Documented</code> meta-annotation.
+ * The {@code UML} annotation defined here should have precedence over the GeoAPI annotation
+ * at Javadoc generation time only (not at compile-time).
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.5

Modified: sis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/pom.xml?rev=1628831&r1=1628830&r2=1628831&view=diff
==============================================================================
--- sis/trunk/pom.xml (original)
+++ sis/trunk/pom.xml Wed Oct  1 20:34:50 2014
@@ -577,7 +577,7 @@ Apache SIS is a free software, Java lang
           </groups>
 
           <!-- Internal packages to hide from javadoc. -->
-          <excludePackageNames>org.apache.sis.internal:org.apache.sis.util.resources:org.apache.sis.referencing.operation.provider:com</excludePackageNames>
+          <excludePackageNames>org.apache.sis.internal:org.apache.sis.util.resources:org.apache.sis.referencing.operation.provider:com:org.opengis</excludePackageNames>
 
           <!-- Custom taglets, some of them implemented in Java. -->
           <tags>



Mime
View raw message