#951: fix javadoc doclint config

eclipse-leshan · Jan 28, 2021 · 0170771 · 0170771
1 parent 36f5756
commit 0170771
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 24 deletions.
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/model/ObjectLoader.java b/leshan-core/src/main/java/org/eclipse/leshan/core/model/ObjectLoader.java
@@ -96,7 +96,6 @@ public static List<ObjectModel> loadDdfFile(InputStream input, String streamName
      * 
      * @throws InvalidDDFFileException if DDF file is invalid
      * @throws InvalidModelException if model is invalid
-     * @throws IOException
      * 
      * @since 1.1
      */
@@ -118,7 +117,6 @@ public static List<ObjectModel> loadDdfFile(InputStream input, String streamName
      * 
      * @throws InvalidDDFFileException if DDF file is invalid
      * @throws InvalidModelException if model is invalid
-     * @throws IOException
      * 
      * @since 1.1
      */
@@ -165,7 +163,6 @@ public static List<ObjectModel> loadDdfResources(String path, String[] filenames
      * 
      * @throws InvalidDDFFileException if DDF file is invalid
      * @throws InvalidModelException if model is invalid
-     * @throws IOException
      * 
      * @since 1.1
      */
@@ -190,7 +187,6 @@ public static List<ObjectModel> loadDdfResources(String path, String[] filenames
      * 
      * @throws InvalidDDFFileException if DDF file is invalid
      * @throws InvalidModelException if model is invalid
-     * @throws IOException
      * 
      * @since 1.1
      */

diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/model/URN.java b/leshan-core/src/main/java/org/eclipse/leshan/core/model/URN.java
@@ -42,7 +42,6 @@ public static String generateURN(int objectId, String objectVersion) {
     /**
      * Return URN "kind" from object id.
      * 
-     * @param objectId
      * @return {@link #OMA_LABEL}, {@link #EXT_LABEL} or {@link #X_LABEL} for valid object id. {@link #INVALID_LABEL} is
      *         returned for invalid id and {@link #RESERVED_LABEL} for reserved range.
      * 

diff --git a/pom.xml b/pom.xml
@@ -128,14 +128,14 @@ Contributors:
                 <jdk>[1.8,)</jdk>
             </activation>
             <properties>
-                <jdk8orGreater>true</jdk8orGreater>
+                <javadoc.doclint>all,-missing</javadoc.doclint>
             </properties>
         </profile>
         <profile>
             <!-- This profile activate the usage of toolchain to compile using JDK 1.7-->
             <id>useToolchain</id>
             <properties>
-                <jdk8orGreater>false</jdk8orGreater>
+                <javadoc.doclint></javadoc.doclint>
             </properties>
             <build>
                 <plugins>
@@ -159,23 +159,6 @@ Contributors:
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>configure-doclint</id>
-            <activation>
-                <property><name>jdk8orGreater</name><value>true</value></property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <configuration>
-                            <doclint>all,-missing</doclint>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <!-- Release nightly/snapshot build on eclipse nexus -->
             <id>release-nightly</id>
@@ -400,6 +383,7 @@ Contributors:
                     <configuration>
                         <excludePackageNames>org.eclipse.leshan.core.util</excludePackageNames>
                         <quiet>true</quiet>
+                        <doclint>${javadoc.doclint}</doclint>
                     </configuration>
                 </plugin>
                 <plugin>