diff --git a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/AbstractCompiler.java b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/AbstractCompiler.java index 1f6a7d1f..1463346f 100644 --- a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/AbstractCompiler.java +++ b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/AbstractCompiler.java @@ -82,13 +82,6 @@ public CompilerResult performCompile(CompilerConfiguration configuration) throw new CompilerNotImplementedException("The performCompile method has not been implemented."); } - @Deprecated - public List compile(CompilerConfiguration configuration) - throws CompilerException - { - throw new CompilerNotImplementedException("The compile method has not been implemented."); - } - public CompilerOutputStyle getCompilerOutputStyle() { return compilerOutputStyle; @@ -285,23 +278,6 @@ private static String getCanonicalPath( File origFile ) } } - /** - * @deprecated use (String[]) arguments.toArray( new String[ arguments.size() ] ); instead - */ - protected static String[] toStringArray( List arguments ) - { - String[] args = new String[arguments.size()]; - - int argLength = arguments.size(); - - for ( int i = 0; i < argLength; i++ ) - { - args[i] = arguments.get( i ); - } - - return args; - } - protected void logCompiling( String[] sourceFiles, CompilerConfiguration config ) { if ( ( getLogger() != null ) && getLogger().isInfoEnabled() ) diff --git a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/Compiler.java b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/Compiler.java index f8c93abf..e576313f 100644 --- a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/Compiler.java +++ b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/Compiler.java @@ -63,19 +63,6 @@ boolean canUpdateTarget( CompilerConfiguration configuration ) CompilerResult performCompile( CompilerConfiguration configuration ) throws CompilerException; - /** - * This method is provided for backwards compatibility only. Clients should - * use {@link #performCompile(CompilerConfiguration)} instead. - * - * @param configuration the configuration description of the compilation - * to perform - * @return the result of the compilation returned by the language processor - * @throws CompilerException - */ - @Deprecated - List compile( CompilerConfiguration configuration ) - throws CompilerException; - /** * Create the command line that would be executed using this configuration. * If this particular compiler has no concept of a command line then returns diff --git a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerConfiguration.java b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerConfiguration.java index 7387855a..3089cbb5 100644 --- a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerConfiguration.java +++ b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerConfiguration.java @@ -472,31 +472,6 @@ public void addCompilerCustomArgument( String customArgument, String value ) customCompilerArguments.add( new AbstractMap.SimpleImmutableEntry<>( customArgument, value ) ); } - /** - * @deprecated will be removed in 2.X use #getCustomCompilerArgumentsAsMap - * @return - */ - @Deprecated - public LinkedHashMap getCustomCompilerArguments() - { - LinkedHashMap arguments = new LinkedHashMap<>( customCompilerArguments.size() ); - for ( Map.Entry entry : customCompilerArguments ) - { - arguments.put( entry.getKey(), entry.getValue() ); - } - return arguments; - } - - /** - * @deprecated will be removed in 2.X use #setCustomCompilerArgumentsAsMap - * @param customCompilerArguments - */ - @Deprecated - public void setCustomCompilerArguments( LinkedHashMap customCompilerArguments ) - { - setCustomCompilerArgumentsAsMap( customCompilerArguments ); - } - /** * Get all unique argument keys and their value. In case of duplicate keys, last one added wins. * diff --git a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerError.java b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerError.java deleted file mode 100644 index b95796cd..00000000 --- a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerError.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.codehaus.plexus.compiler; -/** - * - * Copyright 2004 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This class encapsulates a message from a compiler. This class is deprecated - * and only exists for backwards compatibility. Clients should be using - * {@link CompilerMessage} instead. - * - * @author Andrew Eisenberg - */ -@Deprecated -public class CompilerError - extends CompilerMessage -{ - - public CompilerError( String message, boolean error ) - { - super( message, error ); - } - -} diff --git a/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java b/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java index 41785ddd..2ed86db2 100644 --- a/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java +++ b/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java @@ -645,18 +645,6 @@ protected static String[] getSourceFiles( CompilerConfiguration config ) return result; } - /** - * This method is just here to maintain the public api. This is now handled in the parse - * compiler output function. - * - * @author Chris Stevenson - * @deprecated - */ - public static CompilerMessage parseLine( String line ) - { - return DefaultCSharpCompilerParser.parseLine( line ); - } - protected static Set getSourceFilesForSourceRoot( CompilerConfiguration config, String sourceLocation ) { DirectoryScanner scanner = new DirectoryScanner(); diff --git a/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java b/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java index b147b118..205a2fbb 100644 --- a/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java +++ b/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java @@ -377,10 +377,6 @@ public void report( Diagnostic diagnostic ) args.add( errorF.toString() ); args.addAll( allSources ); - String to = ( config.getWorkingDirectory() == null ) ? config.getOutputLocation() : - config.getWorkingDirectory().toPath().relativize( new File( config.getOutputLocation() ).toPath() ).toString(); - getLogger().info( "Compiling with " + config.describe( "eclipse" ) + - " to " + to ); getLogger().debug( "ecj command line: " + args ); success = BatchCompiler.compile( args.toArray( new String[args.size()] ), devNull, devNull,