Merge branch 'error-prone-2.2.0'

Author: olamy

.travis.yml

@@ -1,10 +1,11 @@
 language: java
 jdk:
+
   - oraclejdk8
   - oraclejdk9
   - openjdk7
 
-script: "mvn --show-version --errors --batch-mode clean verify"
+script: "mvn --show-version --errors --batch-mode clean verify -DredirectTestOutputToFile=false"
 
 cache:
     directories:

plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java

@@ -31,7 +31,9 @@
 import org.apache.maven.artifact.versioning.VersionRange;
 
 import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.StringUtils;
 
+import javax.print.DocFlavor;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -129,7 +131,7 @@ public void testCompilingSources()
                 System.out.println( "----" );
             }
 
-            assertEquals( "Wrong number of compilation errors.", expectedErrors(), numCompilerErrors );
+            assertEquals( "Wrong number of compilation errors: " + messages, expectedErrors(), numCompilerErrors );
         }
 
         if ( expectedWarnings() != numCompilerWarnings )
@@ -190,9 +192,17 @@ private List<CompilerConfiguration> getCompilerConfigurations()
 
             configureCompilerConfig( compilerConfig );
 
-            //compilerConfig.setTargetVersion( "1.5" );
+            String target = getTargetVersion();
+            if( StringUtils.isNotEmpty( target) )
+            {
+                compilerConfig.setTargetVersion( target );
+            }
 
-            //compilerConfig.setSourceVersion( "1.5" );
+            String source = getSourceVersion();
+            if( StringUtils.isNotEmpty( source) )
+            {
+                compilerConfig.setSourceVersion( source );
+            }
 
             compilerConfigurations.add( compilerConfig );
 
@@ -201,6 +211,17 @@ private List<CompilerConfiguration> getCompilerConfigurations()
         return compilerConfigurations;
     }
 
+    public String getTargetVersion()
+    {
+        return null;
+    }
+
+    public String getSourceVersion()
+    {
+        return null;
+    }
+
+
     private List<String> normalizePaths( Collection<String> relativePaths )
     {
         List<String> normalizedPaths = new ArrayList<String>();

plexus-compilers/plexus-compiler-aspectj/pom.xml

@@ -14,7 +14,7 @@
   <description>AspectJ Compiler support for Plexus Compiler component.</description>
 
   <properties>
-    <aspectj.version>1.7.1</aspectj.version>
+    <aspectj.version>1.8.9</aspectj.version>
   </properties>
 
   <dependencies>

plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java

@@ -1,12 +1,14 @@
 package org.codehaus.plexus.compiler.ajc;
 
+import org.aspectj.ajdt.ajc.BuildArgParser;
 import org.aspectj.ajdt.internal.core.builder.AjBuildConfig;
 import org.aspectj.ajdt.internal.core.builder.AjBuildManager;
 import org.aspectj.bridge.AbortException;
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.ISourceLocation;
 import org.aspectj.bridge.MessageHandler;
 import org.aspectj.org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
+import org.aspectj.tools.ajc.Main;
 import org.codehaus.plexus.compiler.AbstractCompiler;
 import org.codehaus.plexus.compiler.CompilerConfiguration;
 import org.codehaus.plexus.compiler.CompilerException;
@@ -260,10 +262,18 @@ public CompilerResult performCompile( CompilerConfiguration config )
         return new CompilerResult().compilerMessages( compileInProcess( buildConfig ) );
     }
 
+    private static class AspectJMessagePrinter extends Main.MessagePrinter
+    {
+        public AspectJMessagePrinter( boolean verbose )
+        {
+            super( verbose );
+        }
+    }
+
     private AjBuildConfig buildCompilerConfig( CompilerConfiguration config )
         throws CompilerException
     {
-        AjBuildConfig buildConfig = new AjBuildConfig();
+        AjBuildConfig buildConfig = new AjBuildConfig(new BuildArgParser(new AspectJMessagePrinter(config.isVerbose())));
         buildConfig.setIncrementalMode( false );
 
         String[] files = getSourceFiles( config );
@@ -493,7 +503,15 @@ private List<File> buildFileList( List<String> locations )
     private void setSourceVersion( AjBuildConfig buildConfig, String sourceVersion )
         throws CompilerException
     {
-        if ( "1.7".equals( sourceVersion ) )
+        if ( "1.9".equals( sourceVersion ) )
+        {
+            buildConfig.getOptions().sourceLevel = ClassFileConstants.JDK1_9;
+        }
+        else if ( "1.8".equals( sourceVersion ) )
+        {
+            buildConfig.getOptions().sourceLevel = ClassFileConstants.JDK1_8;
+        }
+        else if ( "1.7".equals( sourceVersion ) )
         {
             buildConfig.getOptions().sourceLevel = ClassFileConstants.JDK1_7;
         }

plexus-compilers/plexus-compiler-aspectj/src/test/java/org/codehaus/plexus/compiler/ajc/AspectJCompilerTest.java

@@ -3,6 +3,7 @@
 import java.io.File;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import org.codehaus.plexus.compiler.AbstractCompilerTest;
@@ -25,11 +26,24 @@ protected String getRoleHint()
 
     protected int expectedErrors()
     {
+        // olamy well I agree it's hackhish but I don't want to waste too much time with aspectj which is probably
+        // not used a lot anymore...
+        if (getJavaVersion().startsWith( "9" ) || getJavaVersion().startsWith( "10" ))
+        {
+            return 11;
+        }
         return 1;
     }
 
     protected Collection<String> expectedOutputFiles()
     {
+        String javaVersion = System.getProperty( "java.version" );
+        // olamy well I agree it's hackhish but I don't want to waste too much time with aspectj which is probably
+        // not used a lot anymore...
+        if (javaVersion.startsWith( "9" ) || javaVersion.startsWith( "10" ))
+        {
+            return Collections.emptyList();
+        }
         return Arrays.asList( new String[]{ "org/codehaus/foo/ExternalDeps.class", "org/codehaus/foo/Person.class" } );
     }
 

plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java

@@ -61,6 +61,11 @@ protected String getRoleHint()
     protected int expectedErrors()
     {
 
+        if (getJavaVersion().contains("9.0")){
+            // lots of new warnings about obsoletions for future releases
+            return 5;
+        }
+
         // javac output changed for misspelled modifiers starting in 1.6...they now generate 2 errors per occurrence, not one.
         if ( "1.5".compareTo( getJavaVersion() ) < 0 )
         {
@@ -74,6 +79,12 @@ protected int expectedErrors()
 
     protected int expectedWarnings()
     {
+        if (getJavaVersion().contains("9.0")){
+            // lots of new warnings about obsoletions for future releases
+            return 8;
+        }
+
+
         if (getJavaVersion().contains("1.8")){
             // lots of new warnings about obsoletions for future releases
             return 30;
@@ -88,8 +99,30 @@ protected int expectedWarnings()
         return 2;
     }
 
+    @Override
+    public String getTargetVersion()
+    {
+        if (getJavaVersion().contains("9.0")){
+            return "1.7";
+        }
+        return super.getTargetVersion();
+    }
+
+    @Override
+    public String getSourceVersion()
+    {
+        if (getJavaVersion().contains("9.0")){
+            return "1.7";
+        }
+        return super.getTargetVersion();
+    }
+
     protected Collection<String> expectedOutputFiles()
     {
+        if (getJavaVersion().contains("9.0")){
+            return Arrays.asList( new String[]{ "org/codehaus/foo/Deprecation.class", "org/codehaus/foo/ExternalDeps.class",
+                "org/codehaus/foo/Person.class"} );
+        }
         return Arrays.asList( new String[]{ "org/codehaus/foo/Deprecation.class", "org/codehaus/foo/ExternalDeps.class",
             "org/codehaus/foo/Person.class", "org/codehaus/foo/ReservedWord.class" } );
     }

pom.xml

@@ -43,6 +43,7 @@
   <properties>
     <scm.url>scm:git:[email protected]:codehaus-plexus/plexus-compiler.git</scm.url>
     <javaVersion>7</javaVersion>
+    <redirectTestOutputToFile>true</redirectTestOutputToFile>
   </properties>
 
   <dependencyManagement>
@@ -81,6 +82,14 @@
   <build>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.20</version>
+          <configuration>
+            <redirectTestOutputToFile>${redirectTestOutputToFile}</redirectTestOutputToFile>
+          </configuration>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
@@ -122,6 +131,7 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
         <version>1.16</version>
+
         <executions>
           <execution>
             <phase>test</phase>
@@ -169,7 +179,6 @@
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-surefire-plugin</artifactId>
-              <version>2.20</version>
               <configuration>
                 <systemProperties combine.children="append">
                   <property>