Pseudo-Merge commit 8e95060

Author: Régis Décamps <regisd@google.com>
Date:   Tue Nov 5 11:16:01 2019 +0100

    Fix the build (#569)

    * Fix #570. Build broken on Cirrus by upgrade to Bazel v1.0
      * The `single_file` attribute has been replaced by `allow_single_file`.
        Use **bazel_rules** v4 which fixed this. jflex-de/bazel_rules#13
      * add `--incompatible_depset_union=false`
        bazel_pandoc ProdriveTechnologies/bazel-pandoc#6 needs to update for incompatible_depset_union bazelbuild/bazel#5817
      * Use ProdriveTechnologies/bazel-latex#26 because `run_lualatex.py` is not executable
      * In deps, use `https` rather than `http`
    * Fix build broken on Travis due to upgrade to Xenial
      * Use openjdk11 because whatever I ask for, that's what I get.
      * Upgrade maven-compiler-plugin to 3.8.0 to fix _class file has wrong version 55.0, should be 53.0_
      * Fix maven-compiler-plugin config for ErrorProne
      * Fix config of maven-javadoc-plugin for newer JDK. https://bugs.openjdk.java.net/browse/JDK-8212233
      * In aggregated sources, update to JDK8 because Xenial doesn't support JDK7 anymore.
        Add manual dep on **javax-annotations.jar** because because JDK8 doesn't provide it anymore.
      * Remove the task that builds the docs because `\tightlist` is not known. #571

Updated from target/jflex-parent-1.8.0-SNAPSHOT-sources.jar

compile.sh

@@ -20,6 +20,7 @@ mvnget() {
 
 mvnget org/apache/ant/ant/1.7.0/ant-1.7.0.jar
 mvnget com/google/auto/value/auto-value-annotations/1.6.2/auto-value-annotations-1.6.2.jar
+mvnget javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar
 
 CP=${CP##:}  # Remove leading ':'
 javac -cp "$CP" $(find . -name '*.java')

java/META-INF/MANIFEST.MF

@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Built-By: travis
 Created-By: Apache Maven 3.5.4
-Build-Jdk: 1.8.0_151
+Built-By: travis
+Build-Jdk: 11.0.2
 

java/META-INF/maven/de.jflex/jflex-parent/pom.properties

@@ -1,4 +1,4 @@
 #Created by Apache Maven 3.5.4
-version=1.8.0-SNAPSHOT
 groupId=de.jflex
 artifactId=jflex-parent
+version=1.8.0-SNAPSHOT

java/META-INF/maven/de.jflex/jflex-parent/pom.xml

@@ -205,7 +205,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.7.0</version>
+          <version>3.8.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
@@ -253,7 +253,11 @@
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.1</version>
+          <version>3.1.1</version>
+          <configuration>
+            <!-- https://bugs.openjdk.java.net/browse/JDK-8212233 -->
+            <source>8</source>
+          </configuration>
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
@@ -282,15 +286,15 @@
         </plugin>
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.6</version>
+          <version>3.8.2</version>
         </plugin>
         <plugin>
           <artifactId>maven-source-plugin</artifactId>
           <version>3.0.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.20.1</version>
+          <version>3.0.0-M3</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -300,8 +304,8 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>8</source>
+          <target>8</target>
         </configuration>
       </plugin>
       <plugin>
@@ -444,35 +448,30 @@
     <profile>
       <id>error-prone</id>
       <activation>
-        <jdk>[1.8,)</jdk>
+        <jdk>[1.9,)</jdk>
+        <property>
+          <name>DISABLED</name>
+        </property>
       </activation>
       <build>
         <plugins>
           <plugin>
             <artifactId>maven-compiler-plugin</artifactId>
             <configuration>
-              <compilerId>javac-with-errorprone</compilerId>
-              <forceJavacCompilerUse>true</forceJavacCompilerUse>
+              <source>8</source>
+              <target>8</target>
               <compilerArgs>
-                <arg>-Xep:FallThrough:WARN</arg>
+                <arg>-XDcompilePolicy=simple</arg>
+                <arg>-Xplugin:ErrorProne -Xep:FallThrough:WARN</arg>
               </compilerArgs>
-              <source>1.7</source>
-              <target>1.7</target>
+              <annotationProcessorPaths>
+                <path>
+                  <groupId>com.google.errorprone</groupId>
+                  <artifactId>error_prone_core</artifactId>
+                  <version>2.3.3</version>
+                </path>
+              </annotationProcessorPaths>
             </configuration>
-            <dependencies>
-              <dependency>
-                <groupId>org.codehaus.plexus</groupId>
-                <artifactId>plexus-compiler-javac-errorprone</artifactId>
-                <version>2.8</version>
-              </dependency>
-              <!-- override plexus-compiler-javac-errorprone's dependency on
-                   Error Prone with the latest version -->
-              <dependency>
-                <groupId>com.google.errorprone</groupId>
-                <artifactId>error_prone_core</artifactId>
-                <version>2.1.1</version>
-              </dependency>
-            </dependencies>
           </plugin>
         </plugins>
       </build>