sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 03/07: Remove the workaround for the bug in JDK6 javadoc, since we perform release with JDK7 or JDK8 + bootstrap classpath.
Date Thu, 21 Jun 2018 09:57:02 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to tag 0.6
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 0ba15a66bb9ac3f92dfb323cb9df6e167d21904e
Author: Martin Desruisseaux <desruisseaux@apache.org>
AuthorDate: Fri Sep 11 20:14:40 2015 +0000

    Remove the workaround for the bug in JDK6 javadoc, since we perform release with JDK7
or JDK8 + bootstrap classpath.
    
    git-svn-id: https://svn.apache.org/repos/asf/sis/branches/0.6@1702545 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/opengis/annotation/Obligation.java    | 30 -----------
 .../java/org/opengis/annotation/Specification.java | 30 -----------
 .../src/main/java/org/opengis/annotation/UML.java  | 58 ----------------------
 3 files changed, 118 deletions(-)

diff --git a/core/sis-build-helper/src/main/java/org/opengis/annotation/Obligation.java b/core/sis-build-helper/src/main/java/org/opengis/annotation/Obligation.java
deleted file mode 100644
index 14af392..0000000
--- a/core/sis-build-helper/src/main/java/org/opengis/annotation/Obligation.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package org.opengis.annotation;
-
-
-/**
- * A dependency required for the {@link UML} workaround.
- *
- * @author  Martin Desruisseaux (Geomatys)
- * @since   0.5
- * @version 0.5
- * @module
- */
-public enum Obligation {
-    MANDATORY, OPTIONAL, CONDITIONAL, FORBIDDEN
-}
diff --git a/core/sis-build-helper/src/main/java/org/opengis/annotation/Specification.java
b/core/sis-build-helper/src/main/java/org/opengis/annotation/Specification.java
deleted file mode 100644
index 6fd5267..0000000
--- a/core/sis-build-helper/src/main/java/org/opengis/annotation/Specification.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package org.opengis.annotation;
-
-
-/**
- * A dependency required for the {@link UML} workaround.
- *
- * @author  Martin Desruisseaux (Geomatys)
- * @since   0.5
- * @version 0.5
- * @module
- */
-public enum Specification {
-    ISO_19103, ISO_19107, ISO_19108, ISO_19111, ISO_19115, ISO_19115_2, ISO_19139, OGC_01004,
OGC_01009
-}
diff --git a/core/sis-build-helper/src/main/java/org/opengis/annotation/UML.java b/core/sis-build-helper/src/main/java/org/opengis/annotation/UML.java
deleted file mode 100644
index b0a0a4a..0000000
--- a/core/sis-build-helper/src/main/java/org/opengis/annotation/UML.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.
- */
-package org.opengis.annotation;
-
-
-/**
- * Workaround for a bug in the JDK6 Javadoc tools.
- * Attempt to generate Javadoc on the Apache SIS trunk with JDK6 crashes with the following
exception:
- *
- * <pre>java.lang.ClassCastException: com.sun.tools.javadoc.MethodDocImpl cannot be
cast to com.sun.tools.javadoc.AnnotationTypeElementDocImpl</pre>
- *
- * 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
- * @version 0.5
- * @module
- */
-public @interface UML {
-    /**
-     * The UML identifier for the annotated interface, method or code list element.
-     *
-     * @return The UML identifier used in the standard.
-     */
-    String identifier();
-
-    /**
-     * The obligation declared in the UML.
-     *
-     * @return The obligation declared in the standard.
-     */
-    Obligation obligation() default Obligation.MANDATORY;
-
-    /**
-     * The specification where this UML come from.
-     *
-     * @return The originating specification.
-     */
-    Specification specification();
-}


Mime
View raw message