fix for javadoc.

[importpicture/importpicture.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index b0775c0..cd63603 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,25 +12,12 @@
   
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>1.8</java.version>
+    <java.version>11</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <gpg.skip>true</gpg.skip>
   </properties>
   
-  <!-- Java8でのJavaDocを抑制する -->
-  <profiles>
-    <profile>
-      <id>disable-java8-doclint</id>
-      <activation>
-        <jdk>[1.8,)</jdk>
-      </activation>
-      <properties>
-        <additionalparam>-Xdoclint:none</additionalparam>
-      </properties>
-    </profile>
-  </profiles>
-    
   <!-- DEPLOY先の指定  mvn deploy -->
   <distributionManagement>
     <repository>
@@ -185,6 +172,13 @@
       <type>jar</type>
     </dependency>
 
+    <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-javadoc-plugin -->
+    <dependency>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-javadoc-plugin</artifactId>
+      <version>3.2.0</version>
+    </dependency>
+
   </dependencies>
   
   <build>
@@ -255,18 +249,32 @@
       </plugin>
       
       <!-- mvn release:prepare -->
-      <!-- mvn release:perform -->
+      <!-- mvn release:perform -Dmaven.javadoc.skip -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>${project.version}</version>
+        <version>2.5.3</version>
         <configuration>
           <releaseProfiles>install</releaseProfiles>
-          <tagNameFormat>v${project.version}</tagNameFormat>
+          <tagNameFormat>v@{project.version}</tagNameFormat>
+        </configuration>
+      </plugin>
+
+      <!-- 対策 "[ERROR] Exit code: 1 - javadoc: エラー - ドキュメント化しようとしているコードではモジュールが使用されていますが、" -->
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>3.2.0</version>
+        <configuration>
+          <encoding>UTF-8</encoding>
+          <docencoding>UTF-8</docencoding>
+          <charset>UTF-8</charset>
+          <source>8</source>
         </configuration>
       </plugin>
 
     </plugins>
+    
+    
   </build>
   
 </project>