update version to 1.6.0 + fix javadocs + remove java7

asciidoctor · Apr 5, 2019 · 2f1377e · 2f1377e
1 parent d3466ac
commit 2f1377e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,6 @@ jdk:
   - openjdk10
   - openjdk9
   - openjdk8
-  - openjdk7
 # skip installation step entirely
 install: true
 script:

diff --git a/appveyor.yml b/appveyor.yml
@@ -4,7 +4,6 @@ clone_depth: 10
 environment:
   MAVEN_VERSION: 3.5.0
   matrix:
-    - JAVA_HOME: C:\Program Files\Java\jdk1.7.0
     - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
     - JAVA_HOME: C:\Program Files\Java\jdk9
     - JAVA_HOME: C:\Program Files\Java\jdk10

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.asciidoctor</groupId>
     <artifactId>asciidoctor-maven-plugin</artifactId>
-    <version>1.5.8</version>
+    <version>1.6.0</version>
     <packaging>maven-plugin</packaging>
 
     <name>Asciidoctor Maven Plugin and Doxia Parser</name>
@@ -57,8 +57,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.java.version>1.7</project.java.version>
-        <project.execution.environment>JavaSE-1.7</project.execution.environment>
+        <project.java.version>1.8</project.java.version>
+        <project.execution.environment>JavaSE-1.8</project.execution.environment>
         <spock.version>0.7-groovy-2.0</spock.version>
         <groovy.version>2.1.3</groovy.version>
         <!--<asciidoctorj.version>1.6.0-SNAPSHOT</asciidoctorj.version>-->

diff --git a/src/main/java/org/asciidoctor/maven/extensions/AsciidoctorJExtensionRegistry.java b/src/main/java/org/asciidoctor/maven/extensions/AsciidoctorJExtensionRegistry.java
@@ -1,29 +1,18 @@
 package org.asciidoctor.maven.extensions;
 
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
 import org.asciidoctor.Asciidoctor;
-import org.asciidoctor.extension.BlockMacroProcessor;
-import org.asciidoctor.extension.BlockProcessor;
-import org.asciidoctor.extension.DocinfoProcessor;
-import org.asciidoctor.extension.IncludeProcessor;
-import org.asciidoctor.extension.InlineMacroProcessor;
-import org.asciidoctor.extension.JavaExtensionRegistry;
-import org.asciidoctor.extension.Postprocessor;
-import org.asciidoctor.extension.Preprocessor;
-import org.asciidoctor.extension.Processor;
-import org.asciidoctor.extension.Treeprocessor;
+import org.asciidoctor.extension.*;
 
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 
 /**
  * Class responsible for registering extensions. This class is inspired by
- * {@link org.asciidoctor.jruby.extension.spi.ExtensionRegistry}
- * 
+ * {@link org.asciidoctor.extension.spi.ExtensionRegistry}
+ *
  * @author abelsromero
- * */
+ */
 public class AsciidoctorJExtensionRegistry implements ExtensionRegistry {
 
     private JavaExtensionRegistry javaExtensionRegistry;
@@ -34,7 +23,7 @@ public AsciidoctorJExtensionRegistry(Asciidoctor asciidoctorInstance) {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * org.asciidoctor.maven.processors.ProcessorRegistry#register(java.lang.String, java.lang.String)
      */
@@ -85,7 +74,7 @@ public void register(String extensionClassName, String blockName) throws MojoExe
     }
 
     private void register(Object target, String methodName, Object... args) throws MojoExecutionException {
-        for (Method method: javaExtensionRegistry.getClass().getMethods()) {
+        for (Method method : javaExtensionRegistry.getClass().getMethods()) {
 
             if (isMethodMatching(method, methodName, args)) {
                 try {