fix Java15 build (#89)

* fix java15 build Signed-off-by: olivier lamy <[email protected]> * avoid travis spam Signed-off-by: olivier lamy <[email protected]>
codehaus-plexus · Aug 14, 2020 · d900082 · d900082
1 parent 671ad54
commit d900082
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,3 @@ cache:
 branches:
     except:
         - gh-pages
-notifications:
-    email:
-        - [email protected]
diff --git a/...plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java b/...plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java
@@ -210,7 +210,7 @@ public String[] createCommandLine( CompilerConfiguration config )
 
     public static String[] buildCompilerArguments( CompilerConfiguration config, String[] sourceFiles )
     {
-        List<String> args = new ArrayList<String>();
+        List<String> args = new ArrayList<>();
 
         // ----------------------------------------------------------------------
         // Set output
@@ -668,7 +668,7 @@ private static CompilerResult compileInProcess0( Class<?> javacClass, String[] a
     static List<CompilerMessage> parseModernStream( int exitCode, BufferedReader input )
         throws IOException
     {
-        List<CompilerMessage> errors = new ArrayList<CompilerMessage>();
+        List<CompilerMessage> errors = new ArrayList<>();
 
         String line;
 

diff --git a/...ler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java b/...ler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java
@@ -61,11 +61,10 @@ protected String getRoleHint()
     protected int expectedErrors()
     {
         String javaVersion = getJavaVersion();
-        if (javaVersion.contains("9.0")||javaVersion.contains("11")||javaVersion.contains("14")){
+        if (javaVersion.contains("9.0")||javaVersion.contains("11")||javaVersion.contains("14")||javaVersion.contains("15")){
             // 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( javaVersion ) < 0 )
         {
@@ -80,7 +79,7 @@ protected int expectedErrors()
     protected int expectedWarnings()
     {
         String javaVersion = getJavaVersion();
-        if (javaVersion.contains("9.0")||javaVersion.contains("11")||javaVersion.contains("14")){
+        if (javaVersion.contains("9.0")||javaVersion.contains("11")||javaVersion.contains("14")||javaVersion.contains("15")){
             return 1;
         }
         if (javaVersion.contains("9.0")){
@@ -115,6 +114,9 @@ public String getTargetVersion()
         if (javaVersion.contains("14")){
             return "14";
         }
+        if (javaVersion.contains("15")){
+            return "15";
+        }
         return super.getTargetVersion();
     }
 
@@ -134,13 +136,17 @@ public String getSourceVersion()
         {
             return "14";
         }
+        if (javaVersion.contains("15"))
+        {
+            return "15";
+        }
         return super.getTargetVersion();
     }
 
     protected Collection<String> expectedOutputFiles()
     {
         String javaVersion = getJavaVersion();
-        if (javaVersion.contains("9.0")||javaVersion.contains("11")||javaVersion.contains("14"))
+        if (javaVersion.contains("9.0")||javaVersion.contains("11")||javaVersion.contains("14")||javaVersion.contains("15"))
         {
             return Arrays.asList( new String[]{ "org/codehaus/foo/Deprecation.class", "org/codehaus/foo/ExternalDeps.class",
                 "org/codehaus/foo/Person.class"} );