From ce0a0ee9c3150dcbeb9811ef486cc54c9b02e124 Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Fri, 14 Aug 2020 08:54:51 +0800 Subject: [PATCH 1/2] fix java15 build Signed-off-by: olivier lamy --- .../plexus/compiler/javac/JavacCompiler.java | 4 ++-- .../compiler/javac/AbstractJavacCompilerTest.java | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java index d215d0a3..9ff79e93 100644 --- a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java +++ b/plexus-compilers/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 args = new ArrayList(); + List args = new ArrayList<>(); // ---------------------------------------------------------------------- // Set output @@ -668,7 +668,7 @@ private static CompilerResult compileInProcess0( Class javacClass, String[] a static List parseModernStream( int exitCode, BufferedReader input ) throws IOException { - List errors = new ArrayList(); + List errors = new ArrayList<>(); String line; diff --git a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java b/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java index 7ca7c380..9f79cdf1 100644 --- a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java +++ b/plexus-compilers/plexus-compiler-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 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"} ); From 6a00b117e245f9ec67498cac239378895897247c Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Fri, 14 Aug 2020 08:56:34 +0800 Subject: [PATCH 2/2] avoid travis spam Signed-off-by: olivier lamy --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 02fd1643..0561d934 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,3 @@ cache: branches: except: - gh-pages -notifications: - email: - - olamy@apache.org