From: Svjatoslav Agejenko <svjatoslav@svjatoslav.eu>
Date: Sat, 24 Oct 2020 15:13:46 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: meviz-1.2~5
X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=commitdiff_plain;h=300132f3ea8b13925c484a038e6179adf9ad7271;hp=80405d5d0f02459b6e2762b9290a1a6bc4fe2694;p=meviz.git

Merge remote-tracking branch 'origin/master'
---

diff --git a/pom.xml b/pom.xml
index 10f8e4c..55a3ce5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,11 @@
         <url>http://svjatoslav.eu</url>
     </organization>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>eu.svjatoslav</groupId>
@@ -76,10 +81,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.8.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>8</source>
+                    <target>8</target>
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
@@ -98,6 +103,31 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.4</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <!-- workaround for https://bugs.openjdk.java.net/browse/JDK-8212233 -->
+                    <javaApiLinks>
+                        <property>
+                            <name>foo</name>
+                            <value>bar</value>
+                        </property>
+                    </javaApiLinks>
+                    <!-- Workaround for https://stackoverflow.com/questions/49472783/maven-is-unable-to-find-javadoc-command -->
+                    <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>