#21 Moved CLI target to Java 8 for the moment & Commented out ErrorProne

- Moved CLI module to Java 8 for now to prep for Upgrade to Java 11
- Commented out ErrorProne - ErrorProne bug was causing compilation issues
 - Some imports were reorganized by spotless
 - commented out gradle deps in build.gradle in case someone tries to build from IDE

Author: jimbethancourt

cli/pom.xml

@@ -15,8 +15,8 @@
     <artifactId>cli</artifactId>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

cli/src/main/java/org/hjug/refactorfirst/ReportCommand.java

@@ -1,5 +1,10 @@
 package org.hjug.refactorfirst;
 
+import static picocli.CommandLine.Option;
+
+import java.io.File;
+import java.io.FileReader;
+import java.util.concurrent.Callable;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
@@ -9,12 +14,6 @@
 import org.hjug.refactorfirst.report.json.JsonReportExecutor;
 import picocli.CommandLine.Command;
 
-import java.io.File;
-import java.io.FileReader;
-import java.util.concurrent.Callable;
-
-import static picocli.CommandLine.Option;
-
 @Command(mixinStandardHelpOptions = true, description = "Generate a report")
 @Slf4j
 public class ReportCommand implements Callable<Integer> {

pom.xml

@@ -55,10 +55,10 @@
         <maven.compiler.target>1.8</maven.compiler.target>
 
         <!--For errorprone on Java 8 -->
-        <javac.version>9+181-r4173-1</javac.version>
+        <!--<javac.version>9+181-r4173-1</javac.version>-->
 
         <!--Compiler plugins-->
-        <errorprone.version>2.20.0</errorprone.version>
+        <!--<errorprone.version>2.22.0</errorprone.version>-->
         <lombok.version>1.18.28</lombok.version>
 
         <spotbugs.maven.plugin.version>4.0.0</spotbugs.maven.plugin.version>
@@ -221,19 +221,19 @@
                     <target>8</target>
                     <compilerArgs>
                         <arg>-XDcompilePolicy=simple</arg>
-                        <arg>-Xplugin:ErrorProne</arg>
+                        <!--<arg>-Xplugin:ErrorProne</arg>-->
                     </compilerArgs>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>org.projectlombok</groupId>
                             <artifactId>lombok</artifactId>
                             <version>${lombok.version}</version>
                         </path>
-                        <pathe>
+                        <!--<path>
                             <groupId>com.google.errorprone</groupId>
                             <artifactId>error_prone_core</artifactId>
                             <version>${errorprone.version}</version>
-                        </pathe>
+                        </path>-->
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
@@ -380,7 +380,7 @@
 
     <!-- using github.com/google/error-prone-javac is required when running on JDK 8 -->
     <profiles>
-        <profile>
+        <!--<profile>
             <id>jdk8</id>
             <activation>
                 <jdk>1.8</jdk>
@@ -401,7 +401,7 @@
                     </plugin>
                 </plugins>
             </build>
-        </profile>
+        </profile>-->
         <profile>
             <id>snapshot-release</id>
             <build>

refactor-first-gradle-plugin/build.gradle

@@ -12,7 +12,7 @@ repositories {
 
 dependencies {
     compileOnly gradleApi()
-    api "org.hjug.refactorfirst.graphdatagenerator:graph-data-generator:${version}"
+//    api "org.hjug.refactorfirst.graphdatagenerator:graph-data-generator:${version}"
 }
 
 pluginBundle {

refactor-first-maven-plugin/src/main/java/org/hjug/mavenreport/RefactorFirstMavenCsvReport.java

@@ -1,5 +1,6 @@
 package org.hjug.mavenreport;
 
+import java.io.File;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
@@ -8,8 +9,6 @@
 import org.apache.maven.project.MavenProject;
 import org.hjug.refactorfirst.report.CsvReport;
 
-import java.io.File;
-
 @Mojo(
         name = "csvreport",
         defaultPhase = LifecyclePhase.SITE,

refactor-first-maven-plugin/src/main/java/org/hjug/mavenreport/RefactorFirstMavenJsonReport.java

@@ -1,6 +1,7 @@
 package org.hjug.mavenreport;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.File;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
@@ -9,8 +10,6 @@
 import org.apache.maven.project.MavenProject;
 import org.hjug.refactorfirst.report.json.JsonReportExecutor;
 
-import java.io.File;
-
 @Mojo(
         name = "jsonreport",
         defaultPhase = LifecyclePhase.SITE,

refactor-first-maven-plugin/src/main/java/org/hjug/mavenreport/RefactorFirstRealMavenReport.java

@@ -126,7 +126,6 @@ public void executeReport(Locale locale) throws MavenReportException {
         /**
          * @See https://maven.apache.org/doxia/developers/sink.html#How_to_inject_javascript_code_into_HTML
          */
-
         SinkEventAttributeSet githubButtonJS = new SinkEventAttributeSet();
         // githubButtonJS.addAttribute(SinkEventAttributes.TYPE, "text/javascript");
         // githubButtonJS.addAttribute("async", "");

report/src/main/java/org/hjug/refactorfirst/report/CsvReport.java

@@ -1,18 +1,17 @@
 package org.hjug.refactorfirst.report;
 
-import lombok.extern.slf4j.Slf4j;
-import org.hjug.cbc.CostBenefitCalculator;
-import org.hjug.cbc.RankedDisharmony;
-import org.hjug.git.GitLogReader;
+import static org.hjug.refactorfirst.report.ReportWriter.writeReportToDisk;
 
 import java.io.File;
 import java.nio.file.Paths;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-
-import static org.hjug.refactorfirst.report.ReportWriter.writeReportToDisk;
+import lombok.extern.slf4j.Slf4j;
+import org.hjug.cbc.CostBenefitCalculator;
+import org.hjug.cbc.RankedDisharmony;
+import org.hjug.git.GitLogReader;
 
 @Slf4j
 public class CsvReport {