Merge remote-tracking branch 'origin/master'
authorSvjatoslav Agejenko <svjatoslav@svjatoslav.eu>
Sat, 24 Oct 2020 15:13:46 +0000 (18:13 +0300)
committerSvjatoslav Agejenko <svjatoslav@svjatoslav.eu>
Sat, 24 Oct 2020 15:13:46 +0000 (18:13 +0300)
1  2 
pom.xml

diff --combined pom.xml
+++ b/pom.xml
@@@ -2,7 -2,7 +2,7 @@@
      <modelVersion>4.0.0</modelVersion>
      <groupId>eu.svjatoslav</groupId>
      <artifactId>meviz</artifactId>
-     <version>1.2-SNAPSHOT</version>
+     <version>1.3-SNAPSHOT</version>
      <packaging>jar</packaging>
      <name>meviz</name>
      <description>media wizard</description>
          <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>
              <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>
                  </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>