From e5d921edf8a26694b1f96e3a758bb11f22225d53 Mon Sep 17 00:00:00 2001
From: soloturn <soloturn@gmail.com>
Date: Mon, 22 Feb 2021 00:48:16 +0100
Subject: [PATCH] make javadoc work with java8

currently ther  are two problems. first is with diffplus spotless,
which fails the formatting when using java8:
https://github.com/diffplug/spotless/issues/658

second, javadoc fails when using java9 and newer when not setting
JAVA_HOME like on many linux distros, and macos:
https://github.com/apache/maven-javadoc-plugin/commit/4bf64b02

this will be only fixed with the maven-javadoc-plugin- 3.2.1
whenever it will be released.
---
 pom.xml                                                     | 6 +++---
 .../fr/brouillard/oss/jgitver/JGitverModelProcessor.java    | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 835c926..b56275a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
         <maven-invoker-plugin.version>1.10</maven-invoker-plugin.version>
-        <spotless.version>2.6.1</spotless.version>
+        <spotless.version>2.8.1</spotless.version>
     </properties>
 
     <developers>
@@ -458,7 +458,7 @@
                     <configuration>
                         <java>
                             <googleJavaFormat>
-                                <version>1.9</version>
+                                <version>1.7</version>
                                 <style>GOOGLE</style>
                             </googleJavaFormat>
                         </java>
@@ -713,7 +713,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.9.1</version>
+                        <version>3.2.0</version>
                         <configuration>
                             <source>1.8</source>
                         </configuration>
diff --git a/src/main/java/fr/brouillard/oss/jgitver/JGitverModelProcessor.java b/src/main/java/fr/brouillard/oss/jgitver/JGitverModelProcessor.java
index 1694143..ef27884 100644
--- a/src/main/java/fr/brouillard/oss/jgitver/JGitverModelProcessor.java
+++ b/src/main/java/fr/brouillard/oss/jgitver/JGitverModelProcessor.java
@@ -48,8 +48,6 @@
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
-;
-
 /** Replacement ModelProcessor using jgitver while loading POMs in order to adapt versions. */
 @Component(role = ModelProcessor.class)
 public class JGitverModelProcessor extends DefaultModelProcessor {