[plexus-compiler] 02/03: Merge tag 'upstream/2.2'

[Miguel Landaeta]

This is an automated email from the git hooks/post-receive script.

nomadium pushed a commit to branch master
in repository plexus-compiler.

commit 34ccd89f58ebf6df8da22e84e82a0bfe9aedc71b
Merge: 72fbc1a 3958df8
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Tue Mar 3 12:18:39 2015 -0300

    Merge tag 'upstream/2.2'
    
    Upstream release 2.2

 plexus-compiler-api/pom.xml                        |   2 +-
 .../codehaus/plexus/compiler/AbstractCompiler.java |   1 -
 .../org/codehaus/plexus/compiler/Compiler.java     |   1 -
 .../plexus/compiler/CompilerConfiguration.java     |   1 -
 .../codehaus/plexus/compiler/CompilerError.java    |  48 +-
 .../plexus/compiler/CompilerException.java         |   1 -
 .../codehaus/plexus/compiler/CompilerMessage.java  |   9 +-
 .../compiler/CompilerNotImplementedException.java  |   1 -
 .../plexus/compiler/CompilerOutputStyle.java       |  11 +-
 .../plexus/compiler/util/StreamPumper.java         |   1 -
 .../util/scan/AbstractSourceInclusionScanner.java  |   1 -
 .../compiler/util/scan/InclusionScanException.java |   1 -
 .../util/scan/SimpleSourceInclusionScanner.java    |   1 -
 .../compiler/util/scan/SourceInclusionScanner.java |   2 -
 .../compiler/util/scan/StaleSourceScanner.java     |   5 +-
 .../scan/mapping/SingleTargetSourceMapping.java    |   1 -
 .../compiler/util/scan/mapping/SourceMapping.java  |   1 -
 .../compiler/util/scan/mapping/SuffixMapping.java  |   1 -
 .../scan/AbstractSourceInclusionScannerTest.java   |  14 +-
 .../scan/SimpleSourceInclusionScannerTest.java     |  18 +-
 .../compiler/util/scan/StaleSourceScannerTest.java |   3 +-
 plexus-compiler-manager/pom.xml                    |   2 +-
 .../plexus/compiler/manager/CompilerManager.java   |   1 -
 .../compiler/manager/DefaultCompilerManager.java   |   4 +-
 .../compiler/manager/NoSuchCompilerException.java  |   1 -
 .../compiler/manager/CompilerManagerTest.java      |   1 -
 plexus-compiler-test/pom.xml                       |   2 +-
 .../plexus/compiler/AbstractCompilerTckTest.java   |  37 +-
 .../plexus/compiler/AbstractCompilerTest.java      |  21 +-
 plexus-compilers/plexus-compiler-aspectj/pom.xml   |   6 +-
 .../plexus/compiler/ajc/AspectJCompiler.java       |   7 +-
 .../plexus/compiler/ajc/AspectJCompilerTest.java   |   3 +-
 plexus-compilers/plexus-compiler-csharp/pom.xml    |   2 +-
 .../plexus/compiler/csharp/CSharpCompiler.java     |   3 +-
 .../plexus/compiler/csharp/CSharpCompilerTest.java | 130 ++--
 plexus-compilers/plexus-compiler-eclipse/pom.xml   |   8 +-
 .../compiler/eclipse/EclipseJavaCompiler.java      | 102 ++-
 .../plexus/compiler/eclipse/SourceCodeLocator.java |   1 -
 .../compiler/eclipse/EclipseCompilerTckTest.java   |   1 -
 .../compiler/eclipse/EclipseCompilerTest.java      |   6 +-
 plexus-compilers/plexus-compiler-javac/pom.xml     |   2 +-
 .../plexus/compiler/javac/JavacCompiler.java       |  17 +-
 .../compiler/javac/AbstractJavacCompilerTest.java  |  27 +-
 .../compiler/javac/ErrorMessageParserTest.java     | 683 +++++++++++++--------
 plexus-compilers/plexus-compiler-jikes/pom.xml     |   2 +-
 .../plexus/compiler/jikes/JikesCompilerTest.java   |   7 +-
 plexus-compilers/pom.xml                           |   2 +-
 pom.xml                                            |   6 +-
 48 files changed, 740 insertions(+), 468 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-compiler.git