diff -Nru maven-compiler-plugin-2.0.2/debian/README.source maven-compiler-plugin-2.5.1/debian/README.source --- maven-compiler-plugin-2.0.2/debian/README.source 2011-08-21 21:38:24.000000000 +0000 +++ maven-compiler-plugin-2.5.1/debian/README.source 2013-11-21 15:13:19.000000000 +0000 @@ -1,5 +1,12 @@ Information about maven-compiler-plugin ------------------------------- +--------------------------------------- + +This plugin is a core Maven plugin, if you update it to a new upstream release +the superpom in the maven2-core package must be updated to specify the new +version of the plugin. This pom is bundled in a jar built by the maven2 package, +so the maven2 package has to be rebuilt after installing the updated maven2-core +package. + This package was debianized using the mh_make command from the maven-debian-helper package. diff -Nru maven-compiler-plugin-2.0.2/debian/changelog maven-compiler-plugin-2.5.1/debian/changelog --- maven-compiler-plugin-2.0.2/debian/changelog 2011-09-28 19:44:18.000000000 +0000 +++ maven-compiler-plugin-2.5.1/debian/changelog 2013-11-21 16:55:27.000000000 +0000 @@ -1,3 +1,18 @@ +maven-compiler-plugin (2.5.1-1) unstable; urgency=low + + * Team upload. + * New upstream release + * Refreshed the patch + * debian/control: + - Depend on the new libplexus-compiler-java package + - Updated Standards-Version to 3.9.5 (no changes) + - Use canonical URLs for the Vcs-* fields + * Build depend on debhelper >= 9 + * debian/copyright: Updated to the Copyright Format 1.0 + * Documented the procedure to update the core Maven plugins in README.source + + -- Emmanuel Bourg Thu, 21 Nov 2013 17:55:23 +0100 + maven-compiler-plugin (2.0.2-6) unstable; urgency=low * Add missing Build-Depends-Indep: libmaven-plugin-tools-java. diff -Nru maven-compiler-plugin-2.0.2/debian/compat maven-compiler-plugin-2.5.1/debian/compat --- maven-compiler-plugin-2.0.2/debian/compat 2011-08-21 21:17:03.000000000 +0000 +++ maven-compiler-plugin-2.5.1/debian/compat 2013-11-06 00:38:13.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru maven-compiler-plugin-2.0.2/debian/control maven-compiler-plugin-2.5.1/debian/control --- maven-compiler-plugin-2.0.2/debian/control 2011-09-28 19:44:18.000000000 +0000 +++ maven-compiler-plugin-2.5.1/debian/control 2013-11-21 14:00:57.000000000 +0000 @@ -3,19 +3,24 @@ Priority: optional Maintainer: Debian Java Maintainers Uploaders: Torsten Werner -Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) -Build-Depends-Indep: libmaven2-core-java, libplexus-compiler-api-java, libplexus-compiler-javac-java, - libplexus-compiler-manager-java, libplexus-utils-java, libmaven-plugin-testing-java, - default-jdk-doc, libmaven2-core-java-doc, libplexus-utils-java-doc, libmaven-javadoc-plugin-java, - libmaven-plugin-tools-java -Standards-Version: 3.9.1 -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-compiler-plugin -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-compiler-plugin/ +Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4) +Build-Depends-Indep: default-jdk-doc, + libmaven-javadoc-plugin-java, + libmaven-plugin-testing-java, + libmaven-plugin-tools-java, + libmaven2-core-java, + libmaven2-core-java-doc, + libplexus-compiler-java, + libplexus-utils-java, + libplexus-utils-java-doc +Standards-Version: 3.9.5 +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/maven-compiler-plugin +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/maven-compiler-plugin/ Homepage: http://maven.apache.org/plugins/maven-compiler-plugin/ Package: libmaven-compiler-plugin-java Architecture: all -Depends: ${misc:Depends}, ${maven:Depends} +Depends: ${maven:Depends}, ${misc:Depends} Recommends: ${maven:OptionalDepends} Suggests: libmaven-compiler-plugin-java-doc Description: Maven Compiler plugin @@ -40,7 +45,7 @@ Package: libmaven-compiler-plugin-java-doc Architecture: all Section: doc -Depends: ${misc:Depends}, ${maven:DocDepends} +Depends: ${maven:DocDepends}, ${misc:Depends} Recommends: ${maven:DocOptionalDepends} Suggests: libmaven-compiler-plugin-java Description: Documentation for Maven Compiler Plugin diff -Nru maven-compiler-plugin-2.0.2/debian/copyright maven-compiler-plugin-2.5.1/debian/copyright --- maven-compiler-plugin-2.0.2/debian/copyright 2011-08-21 21:38:24.000000000 +0000 +++ maven-compiler-plugin-2.5.1/debian/copyright 2013-11-06 00:38:13.000000000 +0000 @@ -1,6 +1,6 @@ -Format-Specification: http://dep.debian.net/deps/dep5/ -Name: Maven Compiler Plugin -Maintainer: Apache Maven team +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Maven Compiler Plugin +Upstream-Contact: Apache Maven team Source: http://maven.apache.org/plugins/maven-compiler-plugin/ Files: * @@ -12,5 +12,5 @@ License: Apache-2.0 License: Apache-2.0 - On Debian GNU/Linux system you can find the complete text of the - Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0' + On Debian systems you can find the complete text of the + Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0' diff -Nru maven-compiler-plugin-2.0.2/debian/libmaven-compiler-plugin-java.poms maven-compiler-plugin-2.5.1/debian/libmaven-compiler-plugin-java.poms --- maven-compiler-plugin-2.0.2/debian/libmaven-compiler-plugin-java.poms 2011-08-21 21:38:24.000000000 +0000 +++ maven-compiler-plugin-2.5.1/debian/libmaven-compiler-plugin-java.poms 2013-11-21 15:16:58.000000000 +0000 @@ -2,7 +2,9 @@ # Format of this file is: # [option]* # where option can be: -# --ignore: ignore this POM or +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] # --no-parent: remove the tag from the POM # --package=: an alternative package to use when installing this POM # and its artifact @@ -11,16 +13,16 @@ # --keep-elements=: a list of XML elements to keep in the POM # during a clean operation with mh_cleanpom or mh_installpom # --artifact=: path to the build artifact associated with this POM, -# it will be installed when using the command mh_install +# it will be installed when using the command mh_install. [mh_install] # --java-lib: install the jar into /usr/share/java to comply with Debian # packaging guidelines # --usj-name=: name to use when installing the library in /usr/share/java # --usj-version=: version to use when installing the library in /usr/share/java # --no-usj-versionless: don't install the versionless link in /usr/share/java -# --dest-jar=: the destination for the real jar -# it will be installed with mh_install. +# --dest-jar=: the destination for the real jar. +# It will be installed with mh_install. [mh_install] # --classifier=: Optional, the classifier for the jar. Empty by default. -# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created -# temporarily for certain artifacts such as Javadoc jars. +# --site-xml=: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] # pom.xml --no-parent --has-package-version diff -Nru maven-compiler-plugin-2.0.2/debian/maven.properties maven-compiler-plugin-2.5.1/debian/maven.properties --- maven-compiler-plugin-2.0.2/debian/maven.properties 2011-08-21 21:38:24.000000000 +0000 +++ maven-compiler-plugin-2.5.1/debian/maven.properties 2013-11-21 15:16:08.000000000 +0000 @@ -3,4 +3,5 @@ # maven.test.skip=true maven.test.failure.ignore=true - +maven.compiler.source=1.6 +maven.compiler.target=1.6 diff -Nru maven-compiler-plugin-2.0.2/debian/patches/descriptor.patch maven-compiler-plugin-2.5.1/debian/patches/descriptor.patch --- maven-compiler-plugin-2.0.2/debian/patches/descriptor.patch 2009-07-08 23:58:55.000000000 +0000 +++ maven-compiler-plugin-2.5.1/debian/patches/descriptor.patch 2013-11-21 15:14:47.000000000 +0000 @@ -1,6 +1,6 @@ --- a/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java +++ b/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java -@@ -235,7 +235,7 @@ +@@ -300,7 +300,7 @@ /** * Plexus compiler manager. * diff -Nru maven-compiler-plugin-2.0.2/pom.xml maven-compiler-plugin-2.5.1/pom.xml --- maven-compiler-plugin-2.0.2/pom.xml 2007-02-13 05:27:41.000000000 +0000 +++ maven-compiler-plugin-2.5.1/pom.xml 2012-05-31 09:30:36.000000000 +0000 @@ -1,65 +1,229 @@ - + + + + + + 4.0.0 + - maven-plugins org.apache.maven.plugins - 8 + maven-plugins + 22 + ../maven-plugins/pom.xml - 4.0.0 + maven-compiler-plugin + 2.5.1 maven-plugin + Maven Compiler Plugin - 2.0.2 + The Compiler Plugin is used to compile the sources of your project. 2001 + - 2.0 + ${mavenVersion} + + + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-2.5.1 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-2.5.1 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-compiler-plugin-2.5.1 + JIRA http://jira.codehaus.org/browse/MCOMPILER + + + 2.0.9 + 1.9.1 + + + org.apache.maven maven-plugin-api - 2.0 + ${mavenVersion} + + + org.apache.maven + maven-artifact + ${mavenVersion} + + + org.apache.maven + maven-core + ${mavenVersion} + + + org.apache.maven.reporting + maven-reporting-api + + + org.apache.maven.wagon + wagon-file + + + org.apache.maven.wagon + wagon-http-lightweight + + + org.apache.maven.wagon + wagon-ssh + + + org.apache.maven.wagon + wagon-ssh-external + + + commons-cli + commons-cli + + + classworlds + classworlds + + + org.codehaus.plexus + plexus-container-default + + + org.codehaus.plexus + plexus-interactivity-api + + + + + org.apache.maven + maven-toolchain + 1.0 + + org.codehaus.plexus plexus-utils - 1.0.4 + 3.0 org.codehaus.plexus plexus-compiler-api - 1.5.3 + ${plexusCompilerVersion} + + + org.codehaus.plexus + plexus-component-api + + org.codehaus.plexus plexus-compiler-manager - 1.5.3 + ${plexusCompilerVersion} + + + org.codehaus.plexus + plexus-component-api + + org.codehaus.plexus plexus-compiler-javac - 1.5.3 + ${plexusCompilerVersion} runtime + + + org.codehaus.plexus + plexus-component-api + + + - org.apache.maven - maven-artifact - 2.0 + org.codehaus.plexus + plexus-container-default + 1.0-alpha-9-stable-1 + org.apache.maven.shared maven-plugin-testing-harness - 1.0-beta-1 + 1.1 test - - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-2.0.2 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-2.0.2 - https://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-2.0.2 - - \ No newline at end of file + + + run-its + + 1.8.0 + 2.6.0-01 + + + + + + org.apache.maven.plugins + maven-invoker-plugin + + true + src/it + ${project.build.directory}/it + + */pom.xml + extras/*/pom.xml + + verify + ${project.build.directory}/local-repo + src/it/settings.xml + + clean + test-compile + + + + + + + + + + org.codehaus.groovy + groovy-eclipse-compiler + ${groovyEclipseCompilerVersion} + test + + + org.codehaus.groovy + groovy-all + ${groovyVersion} + test + + + + + + diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/invoker.properties maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/invoker.properties --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/invoker.properties 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/invoker.properties 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,2 @@ +invoker.goals = clean compile -T4 +invoker.maven.version = 3.0+ \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-1/pom.xml maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-1/pom.xml --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-1/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-1/pom.xml 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,26 @@ + + + 4.0.0 + + org.apache.maven.plugins.compiler.it + mcompiler-170 + 1.0-SNAPSHOT + + org.apache.maven.plugins.compiler.it + mcompiler-170-1 + 1.0-SNAPSHOT + mcompiler-170-1 + http://maven.apache.org + + UTF-8 + + + + junit + junit + 3.8.1 + test + + + diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,32 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App2.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App2.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App2.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App2.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App2 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App3.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App3.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App3.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App3.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App3 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App4.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App4.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App4.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App4.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App4 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App5.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App5.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App5.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App5.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App5 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App6.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App6.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App6.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App6.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App6 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App7.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App7.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App7.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-1/src/main/java/org/apache/maven/plugins/compiler/it/App7.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App7 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-1/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-1/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-1/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-1/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,38 @@ +package org.apache.maven.plugins.compiler.it; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-2/pom.xml maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-2/pom.xml --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-2/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-2/pom.xml 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,26 @@ + + + 4.0.0 + + org.apache.maven.plugins.compiler.it + mcompiler-170 + 1.0-SNAPSHOT + + org.apache.maven.plugins.compiler.it + mcompiler-170-2 + 1.0-SNAPSHOT + mcompiler-170-1 + http://maven.apache.org + + UTF-8 + + + + junit + junit + 3.8.1 + test + + + diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,32 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App2.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App2.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App2.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App2.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App2 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App3.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App3.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App3.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App3.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App3 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App4.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App4.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App4.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App4.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App4 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App5.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App5.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App5.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App5.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App5 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App6.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App6.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App6.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App6.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App6 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App7.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App7.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App7.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-2/src/main/java/org/apache/maven/plugins/compiler/it/App7.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App7 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-2/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-2/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-2/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-2/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,38 @@ +package org.apache.maven.plugins.compiler.it; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-3/pom.xml maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-3/pom.xml --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-3/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-3/pom.xml 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,26 @@ + + + 4.0.0 + + org.apache.maven.plugins.compiler.it + mcompiler-170 + 1.0-SNAPSHOT + + org.apache.maven.plugins.compiler.it + mcompiler-170-3 + 1.0-SNAPSHOT + mcompiler-170-1 + http://maven.apache.org + + UTF-8 + + + + junit + junit + 3.8.1 + test + + + diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,32 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App2.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App2.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App2.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App2.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App2 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App3.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App3.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App3.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App3.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App3 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App4.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App4.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App4.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App4.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App4 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App5.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App5.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App5.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App5.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App5 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App6.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App6.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App6.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App6.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App6 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App7.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App7.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App7.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-3/src/main/java/org/apache/maven/plugins/compiler/it/App7.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App7 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-3/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-3/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-3/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-3/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,38 @@ +package org.apache.maven.plugins.compiler.it; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-4/pom.xml maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-4/pom.xml --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-4/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-4/pom.xml 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,26 @@ + + + 4.0.0 + + org.apache.maven.plugins.compiler.it + mcompiler-170 + 1.0-SNAPSHOT + + org.apache.maven.plugins.compiler.it + mcompiler-170-4 + 1.0-SNAPSHOT + mcompiler-170-1 + http://maven.apache.org + + UTF-8 + + + + junit + junit + 3.8.1 + test + + + diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,32 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App2.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App2.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App2.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App2.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App2 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App3.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App3.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App3.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App3.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App3 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App4.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App4.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App4.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App4.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App4 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App5.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App5.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App5.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App5.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App5 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App6.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App6.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App6.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App6.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App6 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App7.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App7.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App7.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-4/src/main/java/org/apache/maven/plugins/compiler/it/App7.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,33 @@ +package org.apache.maven.plugins.compiler.it; + +/** + * Hello world! + * + */ +public class App7 +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public static void mainFoo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void bar( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void foo( String[] args ) + { + System.out.println( "Hello World!" ); + } + + public void barfoo( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-4/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-4/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/mcompiler-170-4/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/mcompiler-170-4/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,38 @@ +package org.apache.maven.plugins.compiler.it; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/pom.xml maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/pom.xml --- maven-compiler-plugin-2.0.2/src/it/MCOMPILER-170/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/MCOMPILER-170/pom.xml 2012-05-05 22:16:38.000000000 +0000 @@ -0,0 +1,29 @@ + + + 4.0.0 + org.apache.maven.plugins.compiler.it + mcompiler-170 + 1.0-SNAPSHOT + pom + + + + + org.apache.maven.plugins + maven-compiler-plugin + @project.version@ + + 1.5 + 1.5 + + + + + + + mcompiler-170-1 + mcompiler-170-2 + mcompiler-170-3 + mcompiler-170-4 + + \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/it/default/pom.xml maven-compiler-plugin-2.5.1/src/it/default/pom.xml --- maven-compiler-plugin-2.0.2/src/it/default/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/default/pom.xml 2008-08-10 20:53:48.000000000 +0000 @@ -0,0 +1,54 @@ + + + + + 4.0.0 + + org.apache.maven.plugins.compiler + default + 1.0-SNAPSHOT + + Test for default configuration + + + UTF-8 + + + + + junit + junit + 3.8.2 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + @pom.version@ + + + + + diff -Nru maven-compiler-plugin-2.0.2/src/it/default/src/main/java/MyClass.java maven-compiler-plugin-2.5.1/src/it/default/src/main/java/MyClass.java --- maven-compiler-plugin-2.0.2/src/it/default/src/main/java/MyClass.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/default/src/main/java/MyClass.java 2008-08-09 16:04:32.000000000 +0000 @@ -0,0 +1,4 @@ +public class MyClass +{ + +} diff -Nru maven-compiler-plugin-2.0.2/src/it/default/src/test/java/MyTest.java maven-compiler-plugin-2.5.1/src/it/default/src/test/java/MyTest.java --- maven-compiler-plugin-2.0.2/src/it/default/src/test/java/MyTest.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/default/src/test/java/MyTest.java 2008-08-09 16:04:32.000000000 +0000 @@ -0,0 +1,7 @@ +import junit.framework.TestCase; + +public class MyTest + extends TestCase +{ + +} diff -Nru maven-compiler-plugin-2.0.2/src/it/default/verify.bsh maven-compiler-plugin-2.5.1/src/it/default/verify.bsh --- maven-compiler-plugin-2.0.2/src/it/default/verify.bsh 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/default/verify.bsh 2008-08-09 16:04:32.000000000 +0000 @@ -0,0 +1,27 @@ +import java.io.*; +import java.util.*; +import java.util.regex.*; + +try +{ + File mainClass = new File( basedir, "target/classes/MyClass.class" ); + if ( !mainClass.isFile() ) + { + System.out.println( "Main class not existent: " + mainClass ); + return false; + } + + File testClass = new File( basedir, "target/test-classes/MyTest.class" ); + if ( !testClass.isFile() ) + { + System.out.println( "Test class not existent: " + testClass ); + return false; + } +} +catch( Throwable t ) +{ + t.printStackTrace(); + return false; +} + +return true; diff -Nru maven-compiler-plugin-2.0.2/src/it/groovy-project-with-new-plexus-compiler/pom.xml maven-compiler-plugin-2.5.1/src/it/groovy-project-with-new-plexus-compiler/pom.xml --- maven-compiler-plugin-2.0.2/src/it/groovy-project-with-new-plexus-compiler/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/groovy-project-with-new-plexus-compiler/pom.xml 2012-05-31 08:08:31.000000000 +0000 @@ -0,0 +1,92 @@ + + + + 4.0.0 + org.apache.maven.its.it0055 + groovy-eclipse-it + 0.1-SNAPSHOT + Hello + + + + org.apache.maven.plugins + maven-compiler-plugin + @project.version@ + + groovy-eclipse-compiler + + + + org.codehaus.groovy + groovy-eclipse-compiler + @groovyEclipseCompilerVersion@ + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.5 + + + add-source + generate-sources + + add-source + + + + src/main/groovy + + + + + add-test-source + generate-test-sources + + add-test-source + + + + src/test/groovy + + + + + + + + + + + org.codehaus.groovy + groovy-all + @groovyVersion@ + + + junit + junit + 4.8.2 + test + + + diff -Nru maven-compiler-plugin-2.0.2/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/GroovyHello.groovy maven-compiler-plugin-2.5.1/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/GroovyHello.groovy --- maven-compiler-plugin-2.0.2/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/GroovyHello.groovy 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/GroovyHello.groovy 2012-05-30 20:10:29.000000000 +0000 @@ -0,0 +1,5 @@ +class GroovyHello implements Helloable { + void sayHello() { + println("Hello World from Groovy!") + } +} \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/GroovyMain.groovy maven-compiler-plugin-2.5.1/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/GroovyMain.groovy --- maven-compiler-plugin-2.0.2/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/GroovyMain.groovy 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/GroovyMain.groovy 2012-05-30 20:10:29.000000000 +0000 @@ -0,0 +1,5 @@ +class GroovyMain { + static void main(String... args) { + new GroovyHello().sayHello() + } +} \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/Helloable.groovy maven-compiler-plugin-2.5.1/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/Helloable.groovy --- maven-compiler-plugin-2.0.2/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/Helloable.groovy 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/groovy-project-with-new-plexus-compiler/src/main/groovy/Helloable.groovy 2012-05-30 20:10:29.000000000 +0000 @@ -0,0 +1,3 @@ +interface Helloable { + void sayHello() +} \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/it/groovy-project-with-new-plexus-compiler/src/main/java/JavaHello.java maven-compiler-plugin-2.5.1/src/it/groovy-project-with-new-plexus-compiler/src/main/java/JavaHello.java --- maven-compiler-plugin-2.0.2/src/it/groovy-project-with-new-plexus-compiler/src/main/java/JavaHello.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/groovy-project-with-new-plexus-compiler/src/main/java/JavaHello.java 2012-05-30 20:10:29.000000000 +0000 @@ -0,0 +1,5 @@ +public class JavaHello implements Helloable { + public void sayHello() { + System.out.println("Hello World from Java!"); + } +} \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/it/groovy-project-with-new-plexus-compiler/src/main/java/JavaMain.java maven-compiler-plugin-2.5.1/src/it/groovy-project-with-new-plexus-compiler/src/main/java/JavaMain.java --- maven-compiler-plugin-2.0.2/src/it/groovy-project-with-new-plexus-compiler/src/main/java/JavaMain.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/groovy-project-with-new-plexus-compiler/src/main/java/JavaMain.java 2012-05-30 20:10:29.000000000 +0000 @@ -0,0 +1,6 @@ +public class JavaMain { + public static void main(String... args) { + new GroovyHello().sayHello(); + new JavaHello().sayHello(); + } +} \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/it/groovy-project-with-new-plexus-compiler/src/test/groovy/GroovyTest.groovy maven-compiler-plugin-2.5.1/src/it/groovy-project-with-new-plexus-compiler/src/test/groovy/GroovyTest.groovy --- maven-compiler-plugin-2.0.2/src/it/groovy-project-with-new-plexus-compiler/src/test/groovy/GroovyTest.groovy 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/groovy-project-with-new-plexus-compiler/src/test/groovy/GroovyTest.groovy 2012-05-30 20:10:29.000000000 +0000 @@ -0,0 +1,11 @@ +import org.junit.Test +import org.junit.Assert + +class GroovyTest { + + @Test + void testMethod() { + GroovyMain.main null + Assert.assertTrue true + } +} \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/it/groovy-project-with-new-plexus-compiler/src/test/java/JavaTest.java maven-compiler-plugin-2.5.1/src/it/groovy-project-with-new-plexus-compiler/src/test/java/JavaTest.java --- maven-compiler-plugin-2.0.2/src/it/groovy-project-with-new-plexus-compiler/src/test/java/JavaTest.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/groovy-project-with-new-plexus-compiler/src/test/java/JavaTest.java 2012-05-30 20:10:29.000000000 +0000 @@ -0,0 +1,11 @@ +import org.junit.Test; +import org.junit.Assert; + +public class JavaTest { + + @Test + public void testMethod() { + JavaMain.main(new String[] {}); + Assert.assertTrue(true); + } +} \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/it/includes-excludes/pom.xml maven-compiler-plugin-2.5.1/src/it/includes-excludes/pom.xml --- maven-compiler-plugin-2.0.2/src/it/includes-excludes/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/includes-excludes/pom.xml 2008-09-23 21:50:26.000000000 +0000 @@ -0,0 +1,63 @@ + + + + + + 4.0.0 + + org.apache.maven.its.it0055 + maven-it-it0055 + 1.0 + jar + + Maven Integration Test :: it0055 + + Test that source includes/excludes with in the compiler plugin config. + This will test excludes and testExcludes... + + + + + junit + junit + 3.8.2 + jar + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + @project.version@ + + + **/PersonTwo.java + + + **/PersonTwoTest.java + + + + + + diff -Nru maven-compiler-plugin-2.0.2/src/it/includes-excludes/src/main/java/org/apache/maven/it0055/Person.java maven-compiler-plugin-2.5.1/src/it/includes-excludes/src/main/java/org/apache/maven/it0055/Person.java --- maven-compiler-plugin-2.0.2/src/it/includes-excludes/src/main/java/org/apache/maven/it0055/Person.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/includes-excludes/src/main/java/org/apache/maven/it0055/Person.java 2008-09-23 21:50:26.000000000 +0000 @@ -0,0 +1,16 @@ +package org.apache.maven.it0055; + +public class Person +{ + private String name; + + public void setName( String name ) + { + this.name = name; + } + + public String getName() + { + return name; + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/includes-excludes/src/main/java/org/apache/maven/it0055/PersonTwo.java maven-compiler-plugin-2.5.1/src/it/includes-excludes/src/main/java/org/apache/maven/it0055/PersonTwo.java --- maven-compiler-plugin-2.0.2/src/it/includes-excludes/src/main/java/org/apache/maven/it0055/PersonTwo.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/includes-excludes/src/main/java/org/apache/maven/it0055/PersonTwo.java 2008-09-23 21:50:26.000000000 +0000 @@ -0,0 +1,16 @@ +package org.apache.maven.it0055; + +public class PersonTwo +{ + private String name; + + public void setName( String name ) + { + this.name = name; + } + + public String getName() + { + return name; + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTest.java maven-compiler-plugin-2.5.1/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTest.java --- maven-compiler-plugin-2.0.2/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTest.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTest.java 2008-09-23 21:50:26.000000000 +0000 @@ -0,0 +1,16 @@ +package org.apache.maven.it0055; + +import junit.framework.TestCase; + +public class PersonTest + extends TestCase +{ + public void testPerson() + { + Person person = new Person(); + + person.setName( "foo" ); + + assertEquals( "foo", person.getName() ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTwoTest.java maven-compiler-plugin-2.5.1/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTwoTest.java --- maven-compiler-plugin-2.0.2/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTwoTest.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTwoTest.java 2008-09-23 21:50:26.000000000 +0000 @@ -0,0 +1,16 @@ +package org.apache.maven.it0001; + +import junit.framework.TestCase; + +public class PersonTwoTest + extends TestCase +{ + public void testPerson() + { + Person person = new Person(); + + person.setName( "foo" ); + + assertEquals( "foo", person.getName() ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/includes-excludes/verify.bsh maven-compiler-plugin-2.5.1/src/it/includes-excludes/verify.bsh --- maven-compiler-plugin-2.0.2/src/it/includes-excludes/verify.bsh 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/includes-excludes/verify.bsh 2008-09-23 21:50:26.000000000 +0000 @@ -0,0 +1,47 @@ +import java.io.*; +import java.util.*; +import java.util.regex.*; + +try +{ + File targetDir = new File( basedir, "target" ); + + File mainClass = new File( targetDir, "classes/org/apache/maven/it0055/Person.class" ); + System.out.println( "Checking for existence of: " + mainClass ); + if ( !mainClass.isFile() ) + { + System.err.println( "FAILED!" ); + return false; + } + + File excludedMainClass = new File( targetDir, "classes/org/apache/maven/it0055/PersonTwo.class" ); + System.out.println( "Checking for absence of: " + excludedMainClass ); + if ( excludedMainClass.exists() ) + { + System.err.println( "FAILED!" ); + return false; + } + + File testClass = new File( targetDir, "test-classes/org/apache/maven/it0055/PersonTest.class" ); + System.out.println( "Checking for existence of: " + testClass ); + if ( !testClass.isFile() ) + { + System.err.println( "FAILED!" ); + return false; + } + + File excludedTestClass = new File( targetDir, "test-classes/org/apache/maven/it0055/PersonTwoTest.class" ); + System.out.println( "Checking for absence of: " + excludedTestClass ); + if ( excludedTestClass.exists() ) + { + System.err.println( "FAILED!" ); + return false; + } +} +catch( Throwable t ) +{ + t.printStackTrace(); + return false; +} + +return true; diff -Nru maven-compiler-plugin-2.0.2/src/it/jdk16-annotation/invoker.properties maven-compiler-plugin-2.5.1/src/it/jdk16-annotation/invoker.properties --- maven-compiler-plugin-2.0.2/src/it/jdk16-annotation/invoker.properties 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/jdk16-annotation/invoker.properties 2010-09-04 14:02:20.000000000 +0000 @@ -0,0 +1,5 @@ +# build project if Jdk is 1.6+, only then annotations get processed. +invoker.java.version = 1.6+ + +# test requires MNG-3203 to work +invoker.maven.version = 2.2.0+ diff -Nru maven-compiler-plugin-2.0.2/src/it/jdk16-annotation/pom.xml maven-compiler-plugin-2.5.1/src/it/jdk16-annotation/pom.xml --- maven-compiler-plugin-2.0.2/src/it/jdk16-annotation/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/jdk16-annotation/pom.xml 2010-09-04 14:02:20.000000000 +0000 @@ -0,0 +1,42 @@ + + 4.0.0 + com.mycompany + jdk16-annotation + jar + 1.0 + jdk16-annotation + http://maven.apache.org + + + + + org.apache.maven.plugins + maven-compiler-plugin + @project.version@ + + + + default-compile + + none + + + + + 1.6 + 1.6 + + + + + + + + junit + junit + 3.8.1 + test + + + diff -Nru maven-compiler-plugin-2.0.2/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/App.java maven-compiler-plugin-2.5.1/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/App.java --- maven-compiler-plugin-2.0.2/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/App.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/App.java 2010-03-09 16:35:24.000000000 +0000 @@ -0,0 +1,13 @@ +package com.mycompany.jdk16annotation; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/ServiceProvider.java maven-compiler-plugin-2.5.1/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/ServiceProvider.java --- maven-compiler-plugin-2.0.2/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/ServiceProvider.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/ServiceProvider.java 2010-03-09 16:35:24.000000000 +0000 @@ -0,0 +1,16 @@ +package com.mycompany.jdk16annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + + + +@Retention(RetentionPolicy.SOURCE) +@Target(ElementType.TYPE) +public @interface ServiceProvider { + Class service(); + int position() default Integer.MAX_VALUE; + String path() default ""; +} diff -Nru maven-compiler-plugin-2.0.2/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/ServiceProviderProcessor.java maven-compiler-plugin-2.5.1/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/ServiceProviderProcessor.java --- maven-compiler-plugin-2.0.2/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/ServiceProviderProcessor.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/jdk16-annotation/src/main/java/com/mycompany/jdk16annotation/ServiceProviderProcessor.java 2010-03-09 16:35:24.000000000 +0000 @@ -0,0 +1,71 @@ +package com.mycompany.jdk16annotation; + +import java.io.IOException; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedSourceVersion; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.Element; +import javax.lang.model.element.TypeElement; + +import javax.tools.Diagnostic.Kind; +import javax.tools.FileObject; +import javax.tools.StandardLocation; + +@SupportedSourceVersion(SourceVersion.RELEASE_6) +public class ServiceProviderProcessor extends AbstractProcessor { + + public @Override Set getSupportedAnnotationTypes() { + return new HashSet(Arrays.asList( + ServiceProvider.class.getCanonicalName() + )); + } + + /** public for ServiceLoader */ + public ServiceProviderProcessor() {} + + @Override + public boolean process(Set annotations, RoundEnvironment roundEnv) { + if (roundEnv.errorRaised()) { + return false; + } + if (roundEnv.processingOver()) { + writeServices(); + return true; + } else { + return true; + } + + } + + private void writeServices() { + try { + FileObject out = processingEnv.getFiler().createResource(StandardLocation.CLASS_OUTPUT, "", "META-INF/one",new Element[0]); + OutputStream os = out.openOutputStream(); + OutputStream os2 = processingEnv.getFiler().createSourceFile("org.Milos", new Element[0]).openOutputStream(); + OutputStreamWriter osr = new OutputStreamWriter(os2); + try { + PrintWriter w = new PrintWriter(new OutputStreamWriter(os, "UTF-8")); + w.write("test"); + w.flush(); + String clazz = "package org;\n class Milos {}"; + osr.write(clazz.toCharArray()); + osr.flush(); + } finally { + osr.close(); + os.close(); + } + + + } catch (IOException x) { + processingEnv.getMessager().printMessage(Kind.ERROR, "Failed to write to one: " + x.toString()); + } + } + +} diff -Nru maven-compiler-plugin-2.0.2/src/it/jdk16-annotation/src/main/resources/META-INF/services/javax.annotation.processing.Processor maven-compiler-plugin-2.5.1/src/it/jdk16-annotation/src/main/resources/META-INF/services/javax.annotation.processing.Processor --- maven-compiler-plugin-2.0.2/src/it/jdk16-annotation/src/main/resources/META-INF/services/javax.annotation.processing.Processor 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/jdk16-annotation/src/main/resources/META-INF/services/javax.annotation.processing.Processor 2010-03-09 16:35:24.000000000 +0000 @@ -0,0 +1 @@ +com.mycompany.jdk16annotation.ServiceProviderProcessor diff -Nru maven-compiler-plugin-2.0.2/src/it/jdk16-annotation/src/test/java/com/mycompany/jdk16annotation/AppTest.java maven-compiler-plugin-2.5.1/src/it/jdk16-annotation/src/test/java/com/mycompany/jdk16annotation/AppTest.java --- maven-compiler-plugin-2.0.2/src/it/jdk16-annotation/src/test/java/com/mycompany/jdk16annotation/AppTest.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/jdk16-annotation/src/test/java/com/mycompany/jdk16annotation/AppTest.java 2010-03-09 16:35:24.000000000 +0000 @@ -0,0 +1,39 @@ +package com.mycompany.jdk16annotation; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +@ServiceProvider(service=App.class, path="xxx", position=1) +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/jdk16-annotation/verify.bsh maven-compiler-plugin-2.5.1/src/it/jdk16-annotation/verify.bsh --- maven-compiler-plugin-2.0.2/src/it/jdk16-annotation/verify.bsh 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/jdk16-annotation/verify.bsh 2012-04-27 20:10:22.000000000 +0000 @@ -0,0 +1,27 @@ +import java.io.*; +import java.util.*; +import java.util.regex.*; + +try +{ + File res = new File( basedir, "target/test-classes/META-INF/one" ); + if ( !res.isFile() ) + { + System.out.println( "generated resource not existent: " + res ); + return false; + } + File java = new File( basedir, "target/generated-test-sources/test-annotations/org/Milos.java" ); + if ( !java.isFile() ) + { + System.out.println( "generated java file not existent: " + java ); + return false; + } + +} +catch( Throwable t ) +{ + t.printStackTrace(); + return false; +} + +return true; diff -Nru maven-compiler-plugin-2.0.2/src/it/mcompiler-106/invoker.properties maven-compiler-plugin-2.5.1/src/it/mcompiler-106/invoker.properties --- maven-compiler-plugin-2.0.2/src/it/mcompiler-106/invoker.properties 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/mcompiler-106/invoker.properties 2011-08-28 21:16:42.000000000 +0000 @@ -0,0 +1 @@ +invoker.goals = clean compile \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/it/mcompiler-106/pom.xml maven-compiler-plugin-2.5.1/src/it/mcompiler-106/pom.xml --- maven-compiler-plugin-2.0.2/src/it/mcompiler-106/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/mcompiler-106/pom.xml 2011-08-28 21:16:42.000000000 +0000 @@ -0,0 +1,27 @@ + + 4.0.0 + org.apache.maven.plugins.compiler.it + mcompiler-106 + 1.0-SNAPSHOT + + + + + org.apache.maven.plugins + maven-compiler-plugin + @project.version@ + + true + 1.5 + 1.5 + + + + + + + + + + diff -Nru maven-compiler-plugin-2.0.2/src/it/mcompiler-106/src/main/java/MyClass.java maven-compiler-plugin-2.5.1/src/it/mcompiler-106/src/main/java/MyClass.java --- maven-compiler-plugin-2.0.2/src/it/mcompiler-106/src/main/java/MyClass.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/mcompiler-106/src/main/java/MyClass.java 2011-08-28 21:16:42.000000000 +0000 @@ -0,0 +1,4 @@ +public class MyClass +{ + +} diff -Nru maven-compiler-plugin-2.0.2/src/it/mcompiler-120/invoker.properties maven-compiler-plugin-2.5.1/src/it/mcompiler-120/invoker.properties --- maven-compiler-plugin-2.0.2/src/it/mcompiler-120/invoker.properties 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/mcompiler-120/invoker.properties 2011-06-07 16:38:54.000000000 +0000 @@ -0,0 +1,2 @@ +invoker.buildResult = failure + diff -Nru maven-compiler-plugin-2.0.2/src/it/mcompiler-120/pom.xml maven-compiler-plugin-2.5.1/src/it/mcompiler-120/pom.xml --- maven-compiler-plugin-2.0.2/src/it/mcompiler-120/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/mcompiler-120/pom.xml 2011-06-07 16:38:54.000000000 +0000 @@ -0,0 +1,49 @@ + + + 4.0.0 + org.maven.test + warningsbuild + 0.1 + Werror warnings build + jar + + + + + junit + junit + 4.4 + test + + + + log4j + log4j + 1.2.14 + jar + compile + + + + + + + + maven-compiler-plugin + @project.version@ + + 1.6 + 1.6 + -Xlint:all, -path + + + + true + + + + + + + diff -Nru maven-compiler-plugin-2.0.2/src/it/mcompiler-120/src/main/java/org/maven/test/Main.java maven-compiler-plugin-2.5.1/src/it/mcompiler-120/src/main/java/org/maven/test/Main.java --- maven-compiler-plugin-2.0.2/src/it/mcompiler-120/src/main/java/org/maven/test/Main.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/mcompiler-120/src/main/java/org/maven/test/Main.java 2011-06-07 16:38:54.000000000 +0000 @@ -0,0 +1,15 @@ +package org.maven.test; +import java.util.ArrayList; +import java.util.List; + + + +public class Main { + /** + * @param args + */ + public static void main(String[] args) { + List blah = new ArrayList(); + blah.add("hello"); + } +} diff -Nru maven-compiler-plugin-2.0.2/src/it/mcompiler-135/invoker.properties maven-compiler-plugin-2.5.1/src/it/mcompiler-135/invoker.properties --- maven-compiler-plugin-2.0.2/src/it/mcompiler-135/invoker.properties 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/mcompiler-135/invoker.properties 2011-08-29 17:19:50.000000000 +0000 @@ -0,0 +1,2 @@ +invoker.goals = clean compile +invoker.java.version = 1.6+ \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/it/mcompiler-135/pom.xml maven-compiler-plugin-2.5.1/src/it/mcompiler-135/pom.xml --- maven-compiler-plugin-2.0.2/src/it/mcompiler-135/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/mcompiler-135/pom.xml 2011-08-29 17:19:50.000000000 +0000 @@ -0,0 +1,27 @@ + + 4.0.0 + org.apache.maven.plugins.compiler.it + mcompiler-135 + 1.0-SNAPSHOT + + + + + org.apache.maven.plugins + maven-compiler-plugin + @project.version@ + + true + 1.6 + 1.6 + + true + src/main/webapp + + + + + + + diff -Nru maven-compiler-plugin-2.0.2/src/it/mcompiler-135/src/main/java/MyClass.java maven-compiler-plugin-2.5.1/src/it/mcompiler-135/src/main/java/MyClass.java --- maven-compiler-plugin-2.0.2/src/it/mcompiler-135/src/main/java/MyClass.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/mcompiler-135/src/main/java/MyClass.java 2011-08-29 17:19:50.000000000 +0000 @@ -0,0 +1,4 @@ +public class MyClass +{ + +} diff -Nru maven-compiler-plugin-2.0.2/src/it/non-english-warnings/invoker.properties maven-compiler-plugin-2.5.1/src/it/non-english-warnings/invoker.properties --- maven-compiler-plugin-2.0.2/src/it/non-english-warnings/invoker.properties 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/non-english-warnings/invoker.properties 2010-08-29 19:16:21.000000000 +0000 @@ -0,0 +1,2 @@ +# NOTE: javac has been localized for Japanese, i.e. javac won't output English messages in this locale... +invoker.mavenOpts = -Duser.language=ja diff -Nru maven-compiler-plugin-2.0.2/src/it/non-english-warnings/pom.xml maven-compiler-plugin-2.5.1/src/it/non-english-warnings/pom.xml --- maven-compiler-plugin-2.0.2/src/it/non-english-warnings/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/non-english-warnings/pom.xml 2010-08-29 19:16:21.000000000 +0000 @@ -0,0 +1,58 @@ + + + + + 4.0.0 + + org.apache.maven.its.compiler + non-english-warnings + 1.0-SNAPSHOT + + MCOMPILER-109 + + Test that warnings in locales other than English are not erroneously classified as errors and fail the build. + The particular locales of interest here are Japanese (ja) and Simplified Chinese (zh_CN) for which javac actually + is localized. + + + + UTF-8 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + @pom.version@ + + false + 1.4 + 1.4 + true + true + + + + + + diff -Nru maven-compiler-plugin-2.0.2/src/it/non-english-warnings/src/main/java/MyClass.java maven-compiler-plugin-2.5.1/src/it/non-english-warnings/src/main/java/MyClass.java --- maven-compiler-plugin-2.0.2/src/it/non-english-warnings/src/main/java/MyClass.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/non-english-warnings/src/main/java/MyClass.java 2010-08-29 19:16:21.000000000 +0000 @@ -0,0 +1,10 @@ +public class MyClass +{ + + public static void main( String[] args ) + { + // the date constructor is deprecated and will cause a warning + System.out.println( new java.util.Date( 2010, 8, 29 ) ); + } + +} diff -Nru maven-compiler-plugin-2.0.2/src/it/non-english-warnings/src/test/java/MyTest.java maven-compiler-plugin-2.5.1/src/it/non-english-warnings/src/test/java/MyTest.java --- maven-compiler-plugin-2.0.2/src/it/non-english-warnings/src/test/java/MyTest.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/non-english-warnings/src/test/java/MyTest.java 2010-08-29 19:16:21.000000000 +0000 @@ -0,0 +1,10 @@ +public class MyTest +{ + + public static void main( String[] args ) + { + // the date constructor is deprecated and will cause a warning + System.out.println( new java.util.Date( 2010, 8, 29 ) ); + } + +} diff -Nru maven-compiler-plugin-2.0.2/src/it/non-english-warnings/verify.bsh maven-compiler-plugin-2.5.1/src/it/non-english-warnings/verify.bsh --- maven-compiler-plugin-2.0.2/src/it/non-english-warnings/verify.bsh 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/non-english-warnings/verify.bsh 2010-08-29 19:16:21.000000000 +0000 @@ -0,0 +1,15 @@ +import java.io.*; +import java.util.*; +import java.util.regex.*; + +File mainClass = new File( basedir, "target/classes/MyClass.class" ); +if ( !mainClass.isFile() ) +{ + throw new FileNotFoundException( "Main class not existent: " + mainClass ); +} + +File testClass = new File( basedir, "target/test-classes/MyTest.class" ); +if ( !testClass.isFile() ) +{ + throw new FileNotFoundException( "Test class not existent: " + testClass ); +} diff -Nru maven-compiler-plugin-2.0.2/src/it/pom.xml maven-compiler-plugin-2.5.1/src/it/pom.xml --- maven-compiler-plugin-2.0.2/src/it/pom.xml 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/pom.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ - - - - - 4.0.0 - - org.apache.maven.plugins.compiler - it - 1.0-SNAPSHOT - pom - Compiler plugin integration tests - - - test1 - - - diff -Nru maven-compiler-plugin-2.0.2/src/it/settings.xml maven-compiler-plugin-2.5.1/src/it/settings.xml --- maven-compiler-plugin-2.0.2/src/it/settings.xml 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/settings.xml 2012-05-08 07:19:52.000000000 +0000 @@ -0,0 +1,55 @@ + + + + + + + + it-repo + + true + + + + local.central + @localRepositoryUrl@ + + true + + + true + + + + + + local.central + @localRepositoryUrl@ + + true + + + true + + + + + + diff -Nru maven-compiler-plugin-2.0.2/src/it/test1/pom.xml maven-compiler-plugin-2.5.1/src/it/test1/pom.xml --- maven-compiler-plugin-2.0.2/src/it/test1/pom.xml 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/it/test1/pom.xml 2008-08-10 20:53:48.000000000 +0000 @@ -29,6 +29,10 @@ Test for fork configuration Test for forking compiler configuration + + UTF-8 + + @@ -37,8 +41,10 @@ org.apache.maven.plugins maven-compiler-plugin + @pom.version@ true + source,lines,vars diff -Nru maven-compiler-plugin-2.0.2/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java maven-compiler-plugin-2.5.1/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java --- maven-compiler-plugin-2.0.2/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java 2007-02-13 05:27:41.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java 2012-05-10 19:39:09.000000000 +0000 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.execution.MavenSession; +import org.apache.maven.toolchain.Toolchain; +import org.apache.maven.toolchain.ToolchainManager; import org.codehaus.plexus.compiler.Compiler; import org.codehaus.plexus.compiler.CompilerConfiguration; import org.codehaus.plexus.compiler.CompilerError; @@ -31,12 +34,13 @@ import org.codehaus.plexus.compiler.util.scan.mapping.SingleTargetSourceMapping; import org.codehaus.plexus.compiler.util.scan.mapping.SourceMapping; import org.codehaus.plexus.compiler.util.scan.mapping.SuffixMapping; +import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.StringUtils; import java.io.File; +import java.lang.reflect.Method; import java.util.ArrayList; import java.util.HashSet; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -50,7 +54,8 @@ * * @author others * @author Trygve Laugstøl - * @version $Id: StaleSourceScannerTest.java 2393 2005-08-08 22:32:59Z kenney $ + * @version $Id: AbstractCompilerMojo.java 1336851 2012-05-10 19:39:09Z hboutemy $ + * @since 2.0 */ public abstract class AbstractCompilerMojo extends AbstractMojo @@ -60,21 +65,22 @@ // ---------------------------------------------------------------------- /** - * Indicates whether the build will continue even if there are compilation errors; defaults to true. + * Indicates whether the build will continue even if there are compilation errors. * * @parameter expression="${maven.compiler.failOnError}" default-value="true" + * @since 2.0.2 */ private boolean failOnError = true; /** - * Set to true to include debugging information in the compiled class files. + * Set to true to include debugging information in the compiled class files. * * @parameter expression="${maven.compiler.debug}" default-value="true" */ private boolean debug = true; /** - * Set to true to show messages about what the compiler is doing. + * Set to true to show messages about what the compiler is doing. * * @parameter expression="${maven.compiler.verbose}" default-value="false" */ @@ -88,14 +94,14 @@ private boolean showDeprecation; /** - * Set to true to optimize the compiled code using the compiler's optimization methods. + * Set to true to optimize the compiled code using the compiler's optimization methods. * * @parameter expression="${maven.compiler.optimize}" default-value="false" */ private boolean optimize; /** - * Set to true to show compilation warnings. + * Set to true to show compilation warnings. * * @parameter expression="${maven.compiler.showWarnings}" default-value="false" */ @@ -104,21 +110,22 @@ /** * The -source argument for the Java compiler. * - * @parameter expression="${maven.compiler.source}" + * @parameter expression="${maven.compiler.source}" default-value="1.5" */ - private String source; + protected String source; /** * The -target argument for the Java compiler. * - * @parameter expression="${maven.compiler.target}" + * @parameter expression="${maven.compiler.target}" default-value="1.5" */ - private String target; + protected String target; /** * The -encoding argument for the Java compiler. * - * @parameter expression="${maven.compiler.encoding}" + * @parameter expression="${encoding}" default-value="${project.build.sourceEncoding}" + * @since 2.1 */ private String encoding; @@ -139,7 +146,7 @@ private String compilerId; /** - * Version of the compiler to use, ex. "1.3", "1.5", if fork is set to true. + * Version of the compiler to use, ex. "1.3", "1.5", if {@link #fork} is set to true. * * @parameter expression="${maven.compiler.compilerVersion}" */ @@ -147,30 +154,32 @@ /** * Allows running the compiler in a separate process. - * If "false" it uses the built in compiler, while if "true" it will use an executable. + * If false it uses the built in compiler, while if true it will use an executable. * - * @parameter default-value="false" + * @parameter expression="${maven.compiler.fork}" default-value="false" */ private boolean fork; /** * Initial size, in megabytes, of the memory allocation pool, ex. "64", "64m" - * if fork is set to true. + * if {@link #fork} is set to true. * * @parameter expression="${maven.compiler.meminitial}" + * @since 2.0.1 */ private String meminitial; /** * Sets the maximum size, in megabytes, of the memory allocation pool, ex. "128", "128m" - * if fork is set to true. + * if {@link #fork} is set to true. * * @parameter expression="${maven.compiler.maxmem}" + * @since 2.0.1 */ private String maxmem; /** - * Sets the executable of the compiler to use when fork is true. + * Sets the executable of the compiler to use when {@link #fork} is true. * * @parameter expression="${maven.compiler.executable}" */ @@ -178,20 +187,60 @@ /** *

- * Sets the arguments to be passed to the compiler (prepending a dash) if fork is set to true. + * Sets whether annotation processing is performed or not. Only applies to JDK 1.6+ + * If not set, both compilation and annotation processing are performed at the same time. + *

+ *

Allowed values are:

+ *
    + *
  • none - no annotation processing is performed.
    • + *
  • only - only annotation processing is done, no compilation.
    • + *
+ * + * @parameter + * @since 2.2 + */ + private String proc; + + /** + *

+ * Names of annotation processors to run. Only applies to JDK 1.6+ + * If not set, the default annotation processors discovery process applies. + *

+ * + * @parameter + * @since 2.2 + */ + private String[] annotationProcessors; + + /** + *

+ * Sets the arguments to be passed to the compiler (prepending a dash) if {@link #fork} is set to true. *

*

* This is because the list of valid arguments passed to a Java compiler * varies based on the compiler version. *

+ *

+ * To pass -Xmaxerrs 1000 -Xlint -Xlint:-path -Averbose=true you should include the following: + *

+ * 
+     * <compilerArguments>
+     *   <Xmaxerrs>1000</Xmaxerrs>
+     *   <Xlint/>
+     *   <Xlint:-path/>
+     *   <Averbose>true</Averbose>
+     * </compilerArguments>
+     *
* * @parameter + * @since 2.0.1 */ - private Map compilerArguments; + protected Map compilerArguments; /** *

- * Sets the unformatted argument string to be passed to the compiler if fork is set to true. + * Sets the unformatted single argument string to be passed to the compiler if {@link #fork} is set to true. + * To pass multiple arguments such as -Xmaxerrs 1000 (which are actually two arguments) you have to use {@link #compilerArguments}. *

*

* This is because the list of valid arguments passed to a Java compiler @@ -200,7 +249,7 @@ * * @parameter */ - private String compilerArgument; + protected String compilerArgument; /** * Sets the name of the output file when compiling a set of @@ -210,6 +259,22 @@ */ private String outputFileName; + /** + * Keyword list to be appended to the -g command-line switch. Legal values are none or a + * comma-separated list of the following keywords: lines, vars, and source. + * If debug level is not specified, by default, nothing will be appended to -g. + * If debug is not turned on, this attribute will be ignored. + * + * @parameter expression="${maven.compiler.debuglevel}" + * @since 2.1 + */ + private String debuglevel; + + /** + * @component + */ + private ToolchainManager toolchainManager; + // ---------------------------------------------------------------------- // Read-only parameters // ---------------------------------------------------------------------- @@ -217,7 +282,7 @@ /** * The directory to run the compiler from if fork is true. * - * @parameter expression="${basedir}" + * @parameter default-value="${basedir}" * @required * @readonly */ @@ -226,7 +291,7 @@ /** * The target directory of the compiler if fork is true. * - * @parameter expression="${project.build.directory}" + * @parameter default-value="${project.build.directory}" * @required * @readonly */ @@ -239,16 +304,56 @@ */ private CompilerManager compilerManager; + /** + * The current build session instance. This is used for toolchain manager API calls. + * + * @parameter default-value="${session}" + * @required + * @readonly + */ + private MavenSession session; + + /** + * Strategy to re use javacc class created: + *

    + *
  • reuseCreated (default): will reuse already created but in case of multi-threaded builds, + * each thread will have its own instance
    • + *
  • reuseSame: the same Javacc class will be used for each compilation even for multi-threaded build
    • + *
  • alwaysNew: a new Javacc class will be created for each compilation
    • + *
+ * Note this parameter value depends on the os/jdk you are using, but the default value should work on most of env. + * + * @parameter default-value="${reuseCreated}" expression="${maven.compiler.compilerReuseStrategy}" + * @since 2.5 + */ + private String compilerReuseStrategy = "reuseCreated"; + + /** + * @parameter default-value="${false}" expression="${maven.compiler.skipMultiThreadWarning}" + * @since 2.5 + */ + private boolean skipMultiThreadWarning; + protected abstract SourceInclusionScanner getSourceInclusionScanner( int staleMillis ); protected abstract SourceInclusionScanner getSourceInclusionScanner( String inputFileEnding ); - protected abstract List getClasspathElements(); + protected abstract List getClasspathElements(); - protected abstract List getCompileSourceRoots(); + protected abstract List getCompileSourceRoots(); protected abstract File getOutputDirectory(); + protected abstract String getSource(); + + protected abstract String getTarget(); + + protected abstract String getCompilerArgument(); + + protected abstract Map getCompilerArguments(); + + protected abstract File getGeneratedSourcesDirectory(); + public void execute() throws MojoExecutionException, CompilationFailureException { @@ -271,11 +376,28 @@ throw new MojoExecutionException( "No such compiler '" + e.getCompilerId() + "'." ); } + //-----------toolchains start here ---------------------------------- + //use the compilerId as identifier for toolchains as well. + Toolchain tc = getToolchain(); + if ( tc != null ) + { + getLog().info( "Toolchain in compiler-plugin: " + tc ); + if ( executable != null ) + { + getLog().warn( "Toolchains are ignored, 'executable' parameter is set to " + executable ); + } + else + { + fork = true; + //TODO somehow shaky dependency between compilerId and tool executable. + executable = tc.findTool( compilerId ); + } + } // ---------------------------------------------------------------------- // // ---------------------------------------------------------------------- - List compileSourceRoots = removeEmptyCompileSourceRoots( getCompileSourceRoots() ); + List compileSourceRoots = removeEmptyCompileSourceRoots( getCompileSourceRoots() ); if ( compileSourceRoots.isEmpty() ) { @@ -307,38 +429,70 @@ compilerConfiguration.setDebug( debug ); + if ( debug && StringUtils.isNotEmpty( debuglevel ) ) + { + String[] split = StringUtils.split( debuglevel, "," ); + for ( int i = 0; i < split.length; i++ ) + { + if ( !( split[i].equalsIgnoreCase( "none" ) || split[i].equalsIgnoreCase( "lines" ) + || split[i].equalsIgnoreCase( "vars" ) || split[i].equalsIgnoreCase( "source" ) ) ) + { + throw new IllegalArgumentException( "The specified debug level: '" + split[i] + "' is unsupported. " + + "Legal values are 'none', 'lines', 'vars', and 'source'." ); + } + } + compilerConfiguration.setDebugLevel( debuglevel ); + } + compilerConfiguration.setVerbose( verbose ); compilerConfiguration.setShowWarnings( showWarnings ); compilerConfiguration.setShowDeprecation( showDeprecation ); - compilerConfiguration.setSourceVersion( source ); + compilerConfiguration.setSourceVersion( getSource() ); - compilerConfiguration.setTargetVersion( target ); + compilerConfiguration.setTargetVersion( getTarget() ); + + compilerConfiguration.setProc( proc ); + + compilerConfiguration.setGeneratedSourcesDirectory( getGeneratedSourcesDirectory() ); + + compilerConfiguration.setAnnotationProcessors( annotationProcessors ); compilerConfiguration.setSourceEncoding( encoding ); - if ( ( compilerArguments != null ) || ( compilerArgument != null ) ) + Map effectiveCompilerArguments = getCompilerArguments(); + + String effectiveCompilerArgument = getCompilerArgument(); + + if ( ( effectiveCompilerArguments != null ) || ( effectiveCompilerArgument != null ) ) { - LinkedHashMap cplrArgsCopy = new LinkedHashMap(); - if ( compilerArguments != null ) + LinkedHashMap cplrArgsCopy = new LinkedHashMap(); + if ( effectiveCompilerArguments != null ) { - for ( Iterator i = compilerArguments.entrySet().iterator(); i.hasNext(); ) + for ( Map.Entry me : effectiveCompilerArguments.entrySet() ) { - Map.Entry me = (Map.Entry) i.next(); - String key = (String) me.getKey(); - String value = (String) me.getValue(); + String key = me.getKey(); + String value = me.getValue(); if ( !key.startsWith( "-" ) ) { key = "-" + key; } - cplrArgsCopy.put( key, value ); + + if ( key.startsWith( "-A" ) && StringUtils.isNotEmpty( value ) ) + { + cplrArgsCopy.put( key + "=" + value, null ); + } + else + { + cplrArgsCopy.put( key, value ); + } } } - if ( !StringUtils.isEmpty( compilerArgument ) ) + if ( !StringUtils.isEmpty( effectiveCompilerArgument ) ) { - cplrArgsCopy.put( compilerArgument, null ); + cplrArgsCopy.put( effectiveCompilerArgument, null ); } compilerConfiguration.setCustomCompilerArguments( cplrArgsCopy ); } @@ -386,8 +540,37 @@ compilerConfiguration.setOutputFileName( outputFileName ); + if ( CompilerConfiguration.CompilerReuseStrategy.AlwaysNew.getStrategy().equals( this.compilerReuseStrategy ) ) + { + compilerConfiguration.setCompilerReuseStrategy( CompilerConfiguration.CompilerReuseStrategy.AlwaysNew ); + } + else if ( CompilerConfiguration.CompilerReuseStrategy.ReuseSame.getStrategy().equals( + this.compilerReuseStrategy ) ) + { + if ( getRequestThreadCount() > 1 ) + { + if ( !skipMultiThreadWarning ) + { + StringBuilder sb = new StringBuilder( + "You are in a multi-thread build and compilerReuseStrategy is set to reuseSame. This can cause issues in some environments (os/jdk)! Consider using reuseCreated strategy." ); + sb.append( System.getProperty( "line.separator" ) ); + sb.append( + "If your env is fine with reuseSame, you can skip this warning with the configuration field skipMultiThreadWarning or -Dmaven.compiler.skipMultiThreadWarning=true" ); + getLog().warn( sb.toString() ); + } + } + compilerConfiguration.setCompilerReuseStrategy( CompilerConfiguration.CompilerReuseStrategy.ReuseSame ); + } + else + { + + compilerConfiguration.setCompilerReuseStrategy( CompilerConfiguration.CompilerReuseStrategy.ReuseCreated ); + } + + getLog().debug( "CompilerReuseStrategy: " + compilerConfiguration.getCompilerReuseStrategy().getStrategy() ); + // TODO: have an option to always compile (without need to clean) - Set staleSources; + Set staleSources; boolean canUpdateTarget; @@ -398,15 +581,15 @@ canUpdateTarget = compiler.canUpdateTarget( compilerConfiguration ); - if ( compiler.getCompilerOutputStyle().equals( CompilerOutputStyle.ONE_OUTPUT_FILE_FOR_ALL_INPUT_FILES ) && - !canUpdateTarget ) + if ( compiler.getCompilerOutputStyle().equals( CompilerOutputStyle.ONE_OUTPUT_FILE_FOR_ALL_INPUT_FILES ) + && !canUpdateTarget ) { getLog().info( "RESCANNING!" ); // TODO: This second scan for source files is sub-optimal String inputFileEnding = compiler.getInputFileEnding( compilerConfiguration ); - Set sources = computeStaleSources( compilerConfiguration, compiler, - getSourceInclusionScanner( inputFileEnding ) ); + Set sources = computeStaleSources( compilerConfiguration, compiler, + getSourceInclusionScanner( inputFileEnding ) ); compilerConfiguration.setSourceFiles( sources ); } @@ -435,50 +618,46 @@ { getLog().debug( "Classpath:" ); - for ( Iterator it = getClasspathElements().iterator(); it.hasNext(); ) + for ( String s : getClasspathElements() ) { - String s = (String) it.next(); - getLog().debug( " " + s ); } getLog().debug( "Source roots:" ); - for ( Iterator it = getCompileSourceRoots().iterator(); it.hasNext(); ) + for ( String root : getCompileSourceRoots() ) { - String root = (String) it.next(); - getLog().debug( " " + root ); } - if ( fork ) + try { - try + if ( fork ) { if ( compilerConfiguration.getExecutable() != null ) { getLog().debug( "Excutable: " ); getLog().debug( " " + compilerConfiguration.getExecutable() ); } + } - String[] cl = compiler.createCommandLine( compilerConfiguration ); - if ( cl != null && cl.length > 0 ) + String[] cl = compiler.createCommandLine( compilerConfiguration ); + if ( cl != null && cl.length > 0 ) + { + StringBuilder sb = new StringBuilder(); + sb.append( cl[0] ); + for ( int i = 1; i < cl.length; i++ ) { - StringBuffer sb = new StringBuffer(); - sb.append( cl[0] ); - for ( int i = 1; i < cl.length; i++ ) - { - sb.append( " " ); - sb.append( cl[i] ); - } - getLog().debug( "Command line options:" ); - getLog().debug( sb ); + sb.append( " " ); + sb.append( cl[i] ); } + getLog().debug( "Command line options:" ); + getLog().debug( sb ); } - catch ( CompilerException ce ) - { - getLog().debug( ce ); - } + } + catch ( CompilerException ce ) + { + getLog().debug( ce ); } } @@ -486,7 +665,13 @@ // Compile! // ---------------------------------------------------------------------- - List messages; + if ( StringUtils.isEmpty( compilerConfiguration.getSourceEncoding() ) ) + { + getLog().warn( "File encoding has not been set, using platform encoding " + ReaderFactory.FILE_ENCODING + + ", i.e. build is platform dependent!" ); + } + + List messages; try { @@ -498,34 +683,82 @@ throw new MojoExecutionException( "Fatal error compiling", e ); } - boolean compilationError = false; - - for ( Iterator i = messages.iterator(); i.hasNext(); ) + List warnings = new ArrayList(); + List errors = new ArrayList(); + if ( messages != null ) { - CompilerError message = (CompilerError) i.next(); - - if ( message.isError() ) + for ( CompilerError message : messages ) { - compilationError = true; - break; + if ( message.isError() ) + { + errors.add( message ); + } + else + { + warnings.add( message ); + } } } - if ( compilationError && failOnError ) + if ( failOnError && !errors.isEmpty() ) { - throw new CompilationFailureException( messages ); + if ( !warnings.isEmpty() ) + { + getLog().info( "-------------------------------------------------------------" ); + getLog().warn( "COMPILATION WARNING : " ); + getLog().info( "-------------------------------------------------------------" ); + for ( CompilerError warning : warnings ) + { + getLog().warn( warning.toString() ); + } + getLog().info( warnings.size() + ( ( warnings.size() > 1 ) ? " warnings " : " warning" ) ); + getLog().info( "-------------------------------------------------------------" ); + } + + getLog().info( "-------------------------------------------------------------" ); + getLog().error( "COMPILATION ERROR : " ); + getLog().info( "-------------------------------------------------------------" ); + + for ( CompilerError error : errors ) + { + getLog().error( error.toString() ); + } + getLog().info( errors.size() + ( ( errors.size() > 1 ) ? " errors " : " error" ) ); + getLog().info( "-------------------------------------------------------------" ); + + throw new CompilationFailureException( errors ); } else { - for ( Iterator i = messages.iterator(); i.hasNext(); ) + for ( CompilerError message : messages ) { - CompilerError message = (CompilerError) i.next(); - getLog().warn( message.toString() ); } } } + /** + * try to get thread count if a Maven 3 build, using reflection as the plugin must not be maven3 api dependant + * + * @return number of thread for this build or 1 if not multi-thread build + */ + protected int getRequestThreadCount() + { + try + { + Method getRequestMethod = this.session.getClass().getMethod( "getRequest" ); + Object mavenExecutionRequest = getRequestMethod.invoke( this.session ); + Method getThreadCountMethod = mavenExecutionRequest.getClass().getMethod( "getThreadCount" ); + String threadCount = (String) getThreadCountMethod.invoke( mavenExecutionRequest ); + return Integer.valueOf( threadCount ); + } + catch ( Exception e ) + { + getLog().debug( "unable to get threadCount for the current build: " + e.getMessage() ); + } + return 1; + } + private String getMemoryValue( String setting ) { String value = null; @@ -537,8 +770,8 @@ } else { - if ( ( isDigits( setting.substring( 0, setting.length() - 1 ) ) ) && - ( setting.toLowerCase().endsWith( "m" ) ) ) + if ( ( isDigits( setting.substring( 0, setting.length() - 1 ) ) ) && ( setting.toLowerCase().endsWith( + "m" ) ) ) { value = setting; } @@ -546,6 +779,18 @@ return value; } + //TODO remove the part with ToolchainManager lookup once we depend on + //3.0.9 (have it as prerequisite). Define as regular component field then. + private Toolchain getToolchain() + { + Toolchain tc = null; + if ( toolchainManager != null ) + { + tc = toolchainManager.getToolchainFromBuildContext( "jdk", session ); + } + return tc; + } + private boolean isDigits( String string ) { for ( int i = 0; i < string.length(); i++ ) @@ -558,8 +803,8 @@ return true; } - private Set computeStaleSources( CompilerConfiguration compilerConfiguration, Compiler compiler, - SourceInclusionScanner scanner ) + private Set computeStaleSources( CompilerConfiguration compilerConfiguration, Compiler compiler, + SourceInclusionScanner scanner ) throws MojoExecutionException, CompilerException { CompilerOutputStyle outputStyle = compiler.getCompilerOutputStyle(); @@ -570,15 +815,15 @@ if ( outputStyle == CompilerOutputStyle.ONE_OUTPUT_FILE_PER_INPUT_FILE ) { - mapping = new SuffixMapping( compiler.getInputFileEnding( compilerConfiguration ), compiler - .getOutputFileEnding( compilerConfiguration ) ); + mapping = new SuffixMapping( compiler.getInputFileEnding( compilerConfiguration ), + compiler.getOutputFileEnding( compilerConfiguration ) ); outputDirectory = getOutputDirectory(); } else if ( outputStyle == CompilerOutputStyle.ONE_OUTPUT_FILE_FOR_ALL_INPUT_FILES ) { - mapping = new SingleTargetSourceMapping( compiler.getInputFileEnding( compilerConfiguration ), compiler - .getOutputFile( compilerConfiguration ) ); + mapping = new SingleTargetSourceMapping( compiler.getInputFileEnding( compilerConfiguration ), + compiler.getOutputFile( compilerConfiguration ) ); outputDirectory = buildDirectory; } @@ -589,12 +834,10 @@ scanner.addSourceMapping( mapping ); - Set staleSources = new HashSet(); + Set staleSources = new HashSet(); - for ( Iterator it = getCompileSourceRoots().iterator(); it.hasNext(); ) + for ( String sourceRoot : getCompileSourceRoots() ) { - String sourceRoot = (String) it.next(); - File rootFile = new File( sourceRoot ); if ( !rootFile.isDirectory() ) @@ -609,7 +852,7 @@ catch ( InclusionScanException e ) { throw new MojoExecutionException( - "Error scanning source root: \'" + sourceRoot + "\' " + "for stale files to recompile.", e ); + "Error scanning source root: \'" + sourceRoot + "\' for stale files to recompile.", e ); } } @@ -620,15 +863,14 @@ * @todo also in ant plugin. This should be resolved at some point so that it does not need to * be calculated continuously - or should the plugins accept empty source roots as is? */ - private static List removeEmptyCompileSourceRoots( List compileSourceRootsList ) + private static List removeEmptyCompileSourceRoots( List compileSourceRootsList ) { - List newCompileSourceRootsList = new ArrayList(); + List newCompileSourceRootsList = new ArrayList(); if ( compileSourceRootsList != null ) { // copy as I may be modifying it - for ( Iterator i = compileSourceRootsList.iterator(); i.hasNext(); ) + for ( String srcDir : compileSourceRootsList ) { - String srcDir = (String) i.next(); if ( !newCompileSourceRootsList.contains( srcDir ) && new File( srcDir ).exists() ) { newCompileSourceRootsList.add( srcDir ); diff -Nru maven-compiler-plugin-2.0.2/src/main/java/org/apache/maven/plugin/CompilationFailureException.java maven-compiler-plugin-2.5.1/src/main/java/org/apache/maven/plugin/CompilationFailureException.java --- maven-compiler-plugin-2.0.2/src/main/java/org/apache/maven/plugin/CompilationFailureException.java 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/main/java/org/apache/maven/plugin/CompilationFailureException.java 2012-04-27 14:46:43.000000000 +0000 @@ -21,32 +21,34 @@ import org.codehaus.plexus.compiler.CompilerError; -import java.util.Iterator; import java.util.List; /** * @author Jason van Zyl - * @version $Id: CompilationFailureException.java 496220 2007-01-15 03:46:19Z brett $ + * @version $Id: CompilationFailureException.java 1331448 2012-04-27 14:46:43Z olamy $ + * @since 2.0 */ +@SuppressWarnings( "serial" ) public class CompilationFailureException extends MojoFailureException { private static final String LS = System.getProperty( "line.separator" ); - public CompilationFailureException( List messages ) + public CompilationFailureException( List messages ) { super( null, shortMessage( messages ), longMessage( messages ) ); } - public static String longMessage( List messages ) + public static String longMessage( List messages ) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); - for ( Iterator it = messages.iterator(); it.hasNext(); ) + if ( messages != null ) { - CompilerError compilerError = (CompilerError) it.next(); - - sb.append( compilerError ).append( LS ); + for ( CompilerError compilerError : messages ) + { + sb.append( compilerError ).append( LS ); + } } return sb.toString(); } @@ -56,8 +58,9 @@ * * @param messages * @return the short error message + * @since 2.0.2 */ - public static String shortMessage( List messages ) + public static String shortMessage( List messages ) { StringBuffer sb = new StringBuffer(); @@ -71,6 +74,7 @@ sb.append( compilerError ).append( LS ); } + return sb.toString(); } } diff -Nru maven-compiler-plugin-2.0.2/src/main/java/org/apache/maven/plugin/CompilerMojo.java maven-compiler-plugin-2.5.1/src/main/java/org/apache/maven/plugin/CompilerMojo.java --- maven-compiler-plugin-2.0.2/src/main/java/org/apache/maven/plugin/CompilerMojo.java 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/main/java/org/apache/maven/plugin/CompilerMojo.java 2011-08-27 16:39:22.000000000 +0000 @@ -28,15 +28,18 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; /** * Compiles application sources * * @author Jason van Zyl - * @version $Id: CompilerMojo.java 496220 2007-01-15 03:46:19Z brett $ + * @version $Id: CompilerMojo.java 1162398 2011-08-27 16:39:22Z rfscholte $ + * @since 2.0 * @goal compile * @phase compile + * @threadSafe * @requiresDependencyResolution compile */ public class CompilerMojo @@ -45,25 +48,25 @@ /** * The source directories containing the sources to be compiled. * - * @parameter expression="${project.compileSourceRoots}" + * @parameter default-value="${project.compileSourceRoots}" * @required * @readonly */ - private List compileSourceRoots; + private List compileSourceRoots; /** * Project classpath. * - * @parameter expression="${project.compileClasspathElements}" + * @parameter default-value="${project.compileClasspathElements}" * @required * @readonly */ - private List classpathElements; + private List classpathElements; /** * The directory for compiled classes. * - * @parameter expression="${project.build.outputDirectory}" + * @parameter default-value="${project.build.outputDirectory}" * @required * @readonly */ @@ -72,7 +75,7 @@ /** * Project artifacts. * - * @parameter expression="${project.artifact}" + * @parameter default-value="${project.artifact}" * @required * @readonly * @todo this is an export variable, really @@ -84,21 +87,32 @@ * * @parameter */ - private Set includes = new HashSet(); + private Set includes = new HashSet(); /** * A list of exclusion filters for the compiler. * * @parameter */ - private Set excludes = new HashSet(); + private Set excludes = new HashSet(); - protected List getCompileSourceRoots() + /** + *

+ * Specify where to place generated source files created by annotation processing. + * Only applies to JDK 1.6+ + *

+ * @parameter default-value="${project.build.directory}/generated-sources/annotations" + * @since 2.2 + */ + private File generatedSourcesDirectory; + + + protected List getCompileSourceRoots() { return compileSourceRoots; } - protected List getClasspathElements() + protected List getClasspathElements() { return classpathElements; } @@ -113,7 +127,10 @@ { super.execute(); - projectArtifact.setFile( outputDirectory ); + if ( outputDirectory.isDirectory() ) + { + projectArtifact.setFile( outputDirectory ); + } } protected SourceInclusionScanner getSourceInclusionScanner( int staleMillis ) @@ -157,4 +174,29 @@ return scanner; } + protected String getSource() + { + return source; + } + + protected String getTarget() + { + return target; + } + + protected String getCompilerArgument() + { + return compilerArgument; + } + + protected Map getCompilerArguments() + { + return compilerArguments; + } + + protected File getGeneratedSourcesDirectory() + { + return generatedSourcesDirectory; + } + } \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java maven-compiler-plugin-2.5.1/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java --- maven-compiler-plugin-2.0.2/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java 2012-04-11 21:15:28.000000000 +0000 @@ -27,22 +27,25 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; /** - * Compiles application test sources + * Compiles application test sources. * * @author Jason van Zyl - * @version $Id: TestCompilerMojo.java 496220 2007-01-15 03:46:19Z brett $ + * @version $Id: TestCompilerMojo.java 1325012 2012-04-11 21:15:28Z olamy $ + * @since 2.0 * @goal testCompile * @phase test-compile + * @threadSafe * @requiresDependencyResolution test */ public class TestCompilerMojo extends AbstractCompilerMojo { /** - * Set this to 'true' to bypass unit tests entirely. + * Set this to 'true' to bypass compilation of test sources. * Its use is NOT RECOMMENDED, but quite convenient on occasion. * * @parameter expression="${maven.test.skip}" @@ -52,25 +55,25 @@ /** * The source directories containing the test-source to be compiled. * - * @parameter expression="${project.testCompileSourceRoots}" + * @parameter default-value="${project.testCompileSourceRoots}" * @required * @readonly */ - private List compileSourceRoots; + private List compileSourceRoots; /** * Project test classpath. * - * @parameter expression="${project.testClasspathElements}" + * @parameter default-value="${project.testClasspathElements}" * @required * @readonly */ - private List classpathElements; + private List classpathElements; /** * The directory where compiled test classes go. * - * @parameter expression="${project.build.testOutputDirectory}" + * @parameter default-value="${project.build.testOutputDirectory}" * @required * @readonly */ @@ -81,14 +84,70 @@ * * @parameter */ - private Set testIncludes = new HashSet(); + private Set testIncludes = new HashSet(); /** * A list of exclusion filters for the compiler. * * @parameter */ - private Set testExcludes = new HashSet(); + private Set testExcludes = new HashSet(); + + /** + * The -source argument for the test Java compiler. + * + * @parameter expression="${maven.compiler.testSource}" + * @since 2.1 + */ + private String testSource; + + /** + * The -target argument for the test Java compiler. + * + * @parameter expression="${maven.compiler.testTarget}" + * @since 2.1 + */ + private String testTarget; + + + /** + *

+ * Sets the arguments to be passed to test compiler (prepending a dash) if fork is set to true. + *

+ *

+ * This is because the list of valid arguments passed to a Java compiler + * varies based on the compiler version. + *

+ * + * @parameter + * @since 2.1 + */ + private Map testCompilerArguments; + + /** + *

+ * Sets the unformatted argument string to be passed to test compiler if fork is set to true. + *

+ *

+ * This is because the list of valid arguments passed to a Java compiler + * varies based on the compiler version. + *

+ * + * @parameter + * @since 2.1 + */ + private String testCompilerArgument; + + /** + *

+ * Specify where to place generated source files created by annotation processing. + * Only applies to JDK 1.6+ + *

+ * @parameter default-value="${project.build.directory}/generated-test-sources/test-annotations" + * @since 2.2 + */ + private File generatedTestSourcesDirectory; + public void execute() throws MojoExecutionException, CompilationFailureException @@ -103,12 +162,12 @@ } } - protected List getCompileSourceRoots() + protected List getCompileSourceRoots() { return compileSourceRoots; } - protected List getClasspathElements() + protected List getClasspathElements() { return classpathElements; } @@ -159,4 +218,29 @@ return scanner; } + protected String getSource() + { + return testSource == null ? source : testSource; + } + + protected String getTarget() + { + return testTarget == null ? target : testTarget; + } + + protected String getCompilerArgument() + { + return testCompilerArgument == null ? compilerArgument : testCompilerArgument; + } + + protected Map getCompilerArguments() + { + return testCompilerArguments == null ? compilerArguments : testCompilerArguments; + } + + protected File getGeneratedSourcesDirectory() + { + return generatedTestSourcesDirectory; + } + } diff -Nru maven-compiler-plugin-2.0.2/src/site/apt/examples/compile-using-different-jdk.apt maven-compiler-plugin-2.5.1/src/site/apt/examples/compile-using-different-jdk.apt --- maven-compiler-plugin-2.0.2/src/site/apt/examples/compile-using-different-jdk.apt 2006-08-01 03:32:47.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/site/apt/examples/compile-using-different-jdk.apt 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ - ------ - Compiling Sources Using A Different JDK - ------ - Edwin Punzalan - ------ - 05 July 2006 - ------ - -~~ Copyright 2006 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. - -~~ NOTE: For help with the syntax of this file, see: -~~ http://maven.apache.org/guides/mini/guide-apt-format.html - - -Compiling Sources Using A Different JDK - - The <<>> parameter can be used to specify the version of the - compiler that the plugin will use. However, you also need to set <<>> - to <<>> for this to work. For example: - -+------- - - [...] - - [...] - - - org.apache.maven.plugins - maven-compiler-plugin - - true - true - - 1.3 - - - - [...] - - [...] - -+------- \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/site/apt/examples/compile-using-different-jdk.apt.vm maven-compiler-plugin-2.5.1/src/site/apt/examples/compile-using-different-jdk.apt.vm --- maven-compiler-plugin-2.0.2/src/site/apt/examples/compile-using-different-jdk.apt.vm 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/site/apt/examples/compile-using-different-jdk.apt.vm 2012-05-10 19:50:23.000000000 +0000 @@ -0,0 +1,91 @@ + ------ + Compiling Sources Using A Different JDK + ------ + Edwin Punzalan + ------ + 2006-07-05 + ------ + +~~ Licensed to the Apache Software Foundation (ASF) under one +~~ or more contributor license agreements. See the NOTICE file +~~ distributed with this work for additional information +~~ regarding copyright ownership. The ASF licenses this file +~~ to you 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. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + +Compiling Sources Using A Different JDK + + The <<>> parameter can be used to specify the version of the + compiler that the plugin will use. However, you also need to set <<>> + to <<>> for this to work. For example: + ++------- + + [...] + + [...] + + + org.apache.maven.plugins + maven-compiler-plugin + ${project.version} + + true + true + + 1.3 + + + + [...] + + [...] + ++------- + + To avoid hard-coding a filesystem path for the executable, you can use a + property. For example: + ++------- + ${JAVA_1_4_HOME}/bin/javac ++------- + + Each developer then defines this property in + {{{http://maven.apache.org/ref/current/maven-settings/settings.html}settings.xml}}, + or sets an environment variable, so that the build remains portable. + ++------- + + [...] + + [...] + + compiler + + C:\Program Files\Java\j2sdk1.4.2_09 + + + + [...] + + compiler + + ++------- + + If you build with a different JDK, you may want to + {{{http://maven.apache.org/plugins/maven-jar-plugin/examples/manifest-customization.html} + customize}} the jar file manifest. diff -Nru maven-compiler-plugin-2.0.2/src/site/apt/examples/compile-with-memory-enhancements.apt maven-compiler-plugin-2.5.1/src/site/apt/examples/compile-with-memory-enhancements.apt --- maven-compiler-plugin-2.0.2/src/site/apt/examples/compile-with-memory-enhancements.apt 2006-08-01 03:32:47.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/site/apt/examples/compile-with-memory-enhancements.apt 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ - ------ - Compile Using Memory Allocation Enhancements - ------ - Edwin Punzalan - ------ - 05 July 2006 - ------ - -~~ Copyright 2006 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. - -~~ NOTE: For help with the syntax of this file, see: -~~ http://maven.apache.org/guides/mini/guide-apt-format.html - - -Compile Using Memory Allocation Enhancements - - The Compiler Plugin accepts configurations for <<>> and - <<>>. You can follow the example below to set the initial memory - size to 128MB and the maximum memory usage to 512MB: - -+----- - - [...] - - [...] - - - org.apache.maven.plugins - maven-compiler-plugin - - true - 128m - 512m - - - - [...] - - [...] - -+----- \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/site/apt/examples/compile-with-memory-enhancements.apt.vm maven-compiler-plugin-2.5.1/src/site/apt/examples/compile-with-memory-enhancements.apt.vm --- maven-compiler-plugin-2.0.2/src/site/apt/examples/compile-with-memory-enhancements.apt.vm 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/site/apt/examples/compile-with-memory-enhancements.apt.vm 2012-05-10 19:50:23.000000000 +0000 @@ -0,0 +1,56 @@ + ------ + Compile Using Memory Allocation Enhancements + ------ + Edwin Punzalan + ------ + 2006-07-05 + ------ + +~~ Licensed to the Apache Software Foundation (ASF) under one +~~ or more contributor license agreements. See the NOTICE file +~~ distributed with this work for additional information +~~ regarding copyright ownership. The ASF licenses this file +~~ to you 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. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + +Compile Using Memory Allocation Enhancements + + The Compiler Plugin accepts configurations for <<>> and + <<>>. You can follow the example below to set the initial memory + size to 128MB and the maximum memory usage to 512MB: + ++----- + + [...] + + [...] + + + org.apache.maven.plugins + maven-compiler-plugin + ${project.version} + + true + 128m + 512m + + + + [...] + + [...] + ++----- \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/site/apt/examples/pass-compiler-arguments.apt maven-compiler-plugin-2.5.1/src/site/apt/examples/pass-compiler-arguments.apt --- maven-compiler-plugin-2.0.2/src/site/apt/examples/pass-compiler-arguments.apt 2006-08-01 03:32:47.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/site/apt/examples/pass-compiler-arguments.apt 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ - ------ - Pass Compiler Arguments - ------ - Edwin Punzalan - ------ - 05 July 2006 - ------ - -~~ Copyright 2006 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. - -~~ NOTE: For help with the syntax of this file, see: -~~ http://maven.apache.org/guides/mini/guide-apt-format.html - - -Pass Compiler Arguments - - Sometimes, you need to pass other compiler arguments that are not handled by - the Compiler Plugin itself but is supported by the <<>> selected. - For such arguments, the Compiler Plugin's <<>> will be - used. The following example passes compiler arguments to the <<>> - compiler: - -+----- - - [...] - - [...] - - - org.apache.maven.plugins - maven-compiler-plugin - - -verbose -bootclasspath ${java.home}\lib\rt.jar - - - - [...] - - [...] - -+----- - - Or you can also use the Map version: - -+----- - - [...] - - [...] - - - org.apache.maven.plugins - maven-compiler-plugin - - - - ${java.home}\lib\rt.jar - - - - - [...] - - [...] - -+----- diff -Nru maven-compiler-plugin-2.0.2/src/site/apt/examples/pass-compiler-arguments.apt.vm maven-compiler-plugin-2.5.1/src/site/apt/examples/pass-compiler-arguments.apt.vm --- maven-compiler-plugin-2.0.2/src/site/apt/examples/pass-compiler-arguments.apt.vm 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/site/apt/examples/pass-compiler-arguments.apt.vm 2012-05-10 19:50:23.000000000 +0000 @@ -0,0 +1,82 @@ + ------ + Pass Compiler Arguments + ------ + Edwin Punzalan + ------ + 2006-07-05 + ------ + +~~ Licensed to the Apache Software Foundation (ASF) under one +~~ or more contributor license agreements. See the NOTICE file +~~ distributed with this work for additional information +~~ regarding copyright ownership. The ASF licenses this file +~~ to you 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. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + +Pass Compiler Arguments + + Sometimes, you need to pass other compiler arguments that are not handled by + the Compiler Plugin itself but is supported by the <<>> selected. + For such arguments, the Compiler Plugin's <<>> will be + used. The following example passes compiler arguments to the <<>> + compiler: + ++----- + + [...] + + [...] + + + org.apache.maven.plugins + maven-compiler-plugin + ${project.version} + + -verbose -bootclasspath ${java.home}\lib\rt.jar + + + + [...] + + [...] + ++----- + + Or you can also use the Map version: + ++----- + + [...] + + [...] + + + org.apache.maven.plugins + maven-compiler-plugin + ${project.version} + + + + ${java.home}\lib\rt.jar + + + + + [...] + + [...] + ++----- diff -Nru maven-compiler-plugin-2.0.2/src/site/apt/examples/set-compiler-source-and-target.apt maven-compiler-plugin-2.5.1/src/site/apt/examples/set-compiler-source-and-target.apt --- maven-compiler-plugin-2.0.2/src/site/apt/examples/set-compiler-source-and-target.apt 2006-08-01 03:32:47.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/site/apt/examples/set-compiler-source-and-target.apt 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ - ------ - Setting the -source and -target of the Java Compiler - ------ - Edwin Punzalan - ------ - 05 July 2006 - ------ - -~~ Copyright 2006 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. - -~~ NOTE: For help with the syntax of this file, see: -~~ http://maven.apache.org/guides/mini/guide-apt-format.html - - -Setting the <<<-source>>> and <<<-target>>> of the Java Compiler - - Sometimes when you may need to compile a certain project to a different - version than what you are currently using. The <<>> can accept - such command using <<<-source>>> and <<<-target>>>. The Compiler Plugin - can also be configured to provide these options during compilation. - - For example, if you want to enable assertions (-source 1.4) and also want the - compiled classes to be compatible with JVM 1.4 (-target 1.4), you can then - put: - -+----- - - [...] - - [...] - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - - - [...] - - [...] - -+----- \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/site/apt/examples/set-compiler-source-and-target.apt.vm maven-compiler-plugin-2.5.1/src/site/apt/examples/set-compiler-source-and-target.apt.vm --- maven-compiler-plugin-2.0.2/src/site/apt/examples/set-compiler-source-and-target.apt.vm 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/site/apt/examples/set-compiler-source-and-target.apt.vm 2012-05-10 19:50:23.000000000 +0000 @@ -0,0 +1,67 @@ + ------ + Setting the -source and -target of the Java Compiler + ------ + Edwin Punzalan + ------ + 2006-07-05 + ------ + +~~ Licensed to the Apache Software Foundation (ASF) under one +~~ or more contributor license agreements. See the NOTICE file +~~ distributed with this work for additional information +~~ regarding copyright ownership. The ASF licenses this file +~~ to you 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. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + +Setting the <<<-source>>> and <<<-target>>> of the Java Compiler + + Sometimes when you may need to compile a certain project to a different + version than what you are currently using. The <<>> can accept + such command using <<<-source>>> and <<<-target>>>. The Compiler Plugin + can also be configured to provide these options during compilation. + + For example, if you want to enable assertions (<<<-source 1.4>>>) and also want the + compiled classes to be compatible with JVM 1.4 (<<<-target 1.4>>>), you can then + put: + ++----- + + [...] + + [...] + + + org.apache.maven.plugins + maven-compiler-plugin + ${project.version} + + 1.4 + 1.4 + + + + [...] + + [...] + ++----- + + <> Merely setting the <<>> option does not guarantee that your code actually runs on a JRE with the + specified version. The pitfall is unintended usage of APIs that only exist in later JREs which would make your code + fail at runtime with a linkage error. To avoid this issue, you can either configure the compiler's boot classpath + to match the target JRE or use the + {{{http://mojo.codehaus.org/animal-sniffer-maven-plugin/}Animal Sniffer Maven Plugin}} to verify your code doesn't + use unintended APIs. diff -Nru maven-compiler-plugin-2.0.2/src/site/apt/index.apt maven-compiler-plugin-2.5.1/src/site/apt/index.apt --- maven-compiler-plugin-2.0.2/src/site/apt/index.apt 2006-08-01 03:32:47.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/site/apt/index.apt 2012-05-10 19:50:23.000000000 +0000 @@ -3,37 +3,46 @@ ------ Edwin Punzalan ------ - 06 July 2006 + 2006-07-06 ------ -~~ Copyright 2006 The Apache Software Foundation. +~~ Licensed to the Apache Software Foundation (ASF) under one +~~ or more contributor license agreements. See the NOTICE file +~~ distributed with this work for additional information +~~ regarding copyright ownership. The ASF licenses this file +~~ to you 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 ~~ -~~ 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 ~~ -~~ 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. +~~ 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. ~~ NOTE: For help with the syntax of this file, see: -~~ http://maven.apache.org/guides/mini/guide-apt-format.html - +~~ http://maven.apache.org/doxia/references/apt-format.html Maven Compiler Plugin The Compiler Plugin is used to compile the sources of your project. The - default compiler is <<>> and is used to compile Java sources. Other - compilers can be used and work has already started on AspectJ, .NET, and C#. + default compiler is <<>> and is used to compile Java sources. + Also note that at present the default <<>> setting is <<<1.5>>> and the default <<>> + setting is <<<1.5>>>, independently of the JDK you run Maven with. + If you want to change these defaults, you should set <<>> and <<>> + as described in + {{{./examples/set-compiler-source-and-target.html}Setting the -source and -target of the Java Compiler}}. - This Compiler Plugin is the Maven 2 version of Maven 1.x's Java Plugin. + Other compilers than <<>> can be used and work has already started + on AspectJ, .NET, and C#. - <> + This Compiler Plugin corresponds to Maven 1.x's Java Plugin. + + <> * Goals Overview @@ -41,26 +50,43 @@ phases within the Maven Lifecycle and are therefore, automatically executed during their respective phases. - * {{{compile-mojo.html}compiler:compile}} is bound to the compile phase and + * {{{./compile-mojo.html}compiler:compile}} is bound to the compile phase and is used to compile the main source files. - * {{{testCompile-mojo.html}compiler:testCompile}} is bound to the + * {{{./testCompile-mojo.html}compiler:testCompile}} is bound to the test-compile phase and is used to compile the test source files. * Usage - Instructions on how to use the Compiler Plugin can be found - {{{usage.html}here}}. + General instructions on how to use the Compiler Plugin can be found on the {{{./usage.html}usage page}}. Some more + specific use cases are described in the examples given below. Last but not least, users occasionally contribute + additional examples, tips or errata to the + {{{http://docs.codehaus.org/display/MAVENUSER/Compiler+Plugin}plugin's wiki page}}. + + In case you still have questions regarding the plugin's usage, please have a look at the {{{./faq.html}FAQ}} and feel + free to contact the {{{./mail-lists.html}user mailing list}}. The posts to the mailing list are archived and could + already contain the answer to your question as part of an older thread. Hence, it is also worth browsing/searching + the {{{./mail-lists.html}mail archive}}. + + If you feel like the plugin is missing a feature or has a defect, you can fill a feature request or bug report in our + {{{./issue-tracking.html}issue tracker}}. When creating a new issue, please provide a comprehensive description of your + concern. Especially for fixing bugs it is crucial that the developers can reproduce your problem. For this reason, + entire debug logs, POMs or most preferably little demo projects attached to the issue are very much appreciated. + Of course, patches are welcome, too. Contributors can check out the project from our + {{{./source-repository.html}source repository}} and will find supplementary information in the + {{{http://maven.apache.org/guides/development/guide-helping.html}guide to helping with Maven}}. * Examples To provide you with better understanding on some usages of the Compiler Plugin, you can take a look into the following examples: - * {{{examples/compile-using-different-jdk.html}Compile Using A Different JDK}} + * {{{./examples/compile-using-different-jdk.html}Compile Using A Different JDK}} + + * {{{./examples/set-compiler-source-and-target.html}Compile Using -source and -target javac Options}} - * {{{examples/set-compiler-source-and-target.html}Compile Using -source and -target javac Options}} + * {{{./examples/compile-with-memory-enhancements.html}Compile Using Memory Allocation Enhancement}} - * {{{examples/compile-with-memory-enhancements.html}Compile Using Memory Allocation Enhancement}} + * {{{./examples/pass-compiler-arguments.html}Pass Compiler Arguments}} - * {{{examples/pass-compiler-arguments.html}Pass Compiler Arguments}} + [] diff -Nru maven-compiler-plugin-2.0.2/src/site/apt/non-javac-compilers.apt maven-compiler-plugin-2.5.1/src/site/apt/non-javac-compilers.apt --- maven-compiler-plugin-2.0.2/src/site/apt/non-javac-compilers.apt 2006-08-01 03:32:47.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/site/apt/non-javac-compilers.apt 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ - ------ - Using Non-Javac Compilers - ------ - Edwin Punzalan - ------ - 19 July 2006 - ------ - -~~ Copyright 2006 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. - -~~ NOTE: For help with the syntax of this file, see: -~~ http://maven.apache.org/guides/mini/guide-apt-format.html - - -Using Non-Javac Compilers - - Contrary to this plugin's name, the Compiler Plugin does not compile the - sources of your project by itself. To compile, the Compiler Plugin uses - another class to compile them. The parameter <<>> determines - which class will be used. Currently, the Compiler Plugin is bundled with the - <<>> compiler artifact with artifactId <<>>, - which can be seen as one of the dependencies declared inside the Compiler - Plugin's POM. - - Plexus have some other compiler Ids available under the groupId - <<>>: - - * <<>> with artifactId <<>>. - - * <<>> with artifactId <<>>. - - * <<>> with artifactId <<>>. - - * <<>> with artifactId <<>>. - - -* Using The Other Plexus Compilers - - To use any of the non-javac compilers, you need to make the artifact available - in the classpath when the Compiler Plugin runs. This is possible by adding the - dependency when declaring the plugin in your project's pom.xml. The example - below shows how to use the <<>> compiler: - -+----- - - [...] - - [...] - - [...] - - maven-compiler-plugin - - csharp - - - - org.codehaus.plexus - plexus-compiler-csharp - 1.5.2 - - - - [...] - -+----- diff -Nru maven-compiler-plugin-2.0.2/src/site/apt/non-javac-compilers.apt.vm maven-compiler-plugin-2.5.1/src/site/apt/non-javac-compilers.apt.vm --- maven-compiler-plugin-2.0.2/src/site/apt/non-javac-compilers.apt.vm 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/site/apt/non-javac-compilers.apt.vm 2012-05-10 19:50:23.000000000 +0000 @@ -0,0 +1,82 @@ + ------ + Using Non-Javac Compilers + ------ + Edwin Punzalan + ------ + 2006-07-19 + ------ + +~~ Licensed to the Apache Software Foundation (ASF) under one +~~ or more contributor license agreements. See the NOTICE file +~~ distributed with this work for additional information +~~ regarding copyright ownership. The ASF licenses this file +~~ to you 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. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + + +Using Non-Javac Compilers + + Contrary to this plugin's name, the Compiler Plugin does not compile the + sources of your project by itself. To compile, the Compiler Plugin uses + another class to compile them. The parameter <<>> determines + which class will be used. Currently, the Compiler Plugin is bundled with the + <<>> compiler artifact with artifactId <<>>, + which can be seen as one of the dependencies declared inside the Compiler + Plugin's POM. + + Plexus Compiler component has some other compiler Ids available under the groupId + <<>>: + + * <<>> with artifactId <<>>. + + * <<>> with artifactId <<>>. + + * <<>> with artifactId <<>>. + + * <<>> with artifactId <<>>. + + +* Using The Other Plexus Compilers + + To use any of the non-javac compilers, you need to make the artifact available + in the classpath when the Compiler Plugin runs. This is possible by adding the + dependency when declaring the plugin in your project's <<>>. The example + below shows how to use the <<>> compiler: + ++----- + + [...] + + [...] + + [...] + + maven-compiler-plugin + ${project.version} + + csharp + + + + org.codehaus.plexus + plexus-compiler-csharp + 1.6 + + + + [...] + ++----- diff -Nru maven-compiler-plugin-2.0.2/src/site/apt/usage.apt maven-compiler-plugin-2.5.1/src/site/apt/usage.apt --- maven-compiler-plugin-2.0.2/src/site/apt/usage.apt 2006-08-01 03:32:47.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/site/apt/usage.apt 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ - ------ - Usage - ------ - Edwin Punzalan - ------ - 05 July 2006 - -~~ Copyright 2006 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. - -~~ NOTE: For help with the syntax of this file, see: -~~ http://maven.apache.org/guides/mini/guide-apt-format.html - - -Maven 2 Compiler Plugin: Usage - -* Compiling Your Java Sources - - The goals for the Compiler Plugin are bound to their respective phases in the - build lifecycle. So to compile your sources, you need only to tell maven - until which lifecycle to execute. The following will compile your sources: - -+----- -mvn compile -+----- - - To compile your test sources, you'll do: - -+----- -mvn test-compile -+----- - - The above command will execute both <<>> and - <<>> since the compile phase happens a few phases - before the test-compile phase. - -* Configuring Your Compiler Plugin - - Since the Compiler Plugin executes automatically during their phases, you - don't have to put <<>> unlike the other plugins. - -+----- - - ... - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - - - - ... - -+----- diff -Nru maven-compiler-plugin-2.0.2/src/site/apt/usage.apt.vm maven-compiler-plugin-2.5.1/src/site/apt/usage.apt.vm --- maven-compiler-plugin-2.0.2/src/site/apt/usage.apt.vm 1970-01-01 00:00:00.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/site/apt/usage.apt.vm 2012-05-10 19:50:23.000000000 +0000 @@ -0,0 +1,79 @@ + ------ + Usage + ------ + Edwin Punzalan + ------ + 2006-07-05 + ------ + +~~ Licensed to the Apache Software Foundation (ASF) under one +~~ or more contributor license agreements. See the NOTICE file +~~ distributed with this work for additional information +~~ regarding copyright ownership. The ASF licenses this file +~~ to you 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. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + +Usage + +* Compiling Your Java Sources + + The goals for the Compiler Plugin are bound to their respective phases in the + build lifecycle. So to compile your sources, you need only to tell maven + until which lifecycle to execute. The following will compile your sources: + ++----- +mvn compile ++----- + + To compile your test sources, you'll do: + ++----- +mvn test-compile ++----- + + The above command will execute both <<>> and + <<>> since the <<>> phase happens a few phases + before the <<>> phase. + +* Configuring Your Compiler Plugin + + Since the Compiler Plugin executes automatically during their phases, you + don't have to put <<>> unlike many other plugins. However, you + should specify the version of the Compiler Plugin. + ++----- + + ... + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${project.version} + + + + + + + + ... + ++----- + + <>: Maven 3.0 will issue warnings if you do not specify the version of a + plugin. diff -Nru maven-compiler-plugin-2.0.2/src/site/fml/faq.fml maven-compiler-plugin-2.5.1/src/site/fml/faq.fml --- maven-compiler-plugin-2.0.2/src/site/fml/faq.fml 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/site/fml/faq.fml 2009-12-31 14:44:28.000000000 +0000 @@ -1,48 +1,40 @@ - + +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you 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. +--> + + - - Is there a way to get Maven to report the number of compile errors found? - -

- Currently, this type of summary information is not built into the compiler plugin, but it - would be possible to add. If this feature is important to you, add your vote to - MNG-1854 - . -

- - - How do I add my generated sources to the compile path of Maven, when using modello? + How do I add my generated sources to the compile path of Maven, when using Modello?

Modello generate the sources in the generate-sources phase and automatically adds the - source directory for compilation in maven. So you don't have to copy the generated sources. + source directory for compilation in Maven. So you don't have to copy the generated sources.

-

You have to declare the modello-plugin in the build of your plugin for source generation - (in that way the sources are generated each time). +

You have to declare the Modello Maven Plugin + in the build of your project for source generation (in that way the sources are generated each time).

-

The Modello website can be found - here +

For more information about Modello, please visit the + Modello website .

diff -Nru maven-compiler-plugin-2.0.2/src/site/site.xml maven-compiler-plugin-2.5.1/src/site/site.xml --- maven-compiler-plugin-2.0.2/src/site/site.xml 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/site/site.xml 2009-08-05 12:53:20.000000000 +0000 @@ -1,25 +1,28 @@ - + +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you 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. +--> + + diff -Nru maven-compiler-plugin-2.0.2/src/test/java/org/apache/maven/plugin/CompilerMojoTestCase.java maven-compiler-plugin-2.5.1/src/test/java/org/apache/maven/plugin/CompilerMojoTestCase.java --- maven-compiler-plugin-2.0.2/src/test/java/org/apache/maven/plugin/CompilerMojoTestCase.java 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/test/java/org/apache/maven/plugin/CompilerMojoTestCase.java 2012-05-10 19:42:56.000000000 +0000 @@ -19,11 +19,6 @@ * under the License. */ -import org.apache.maven.plugin.stubs.CompilerManagerStub; -import org.apache.maven.plugin.stubs.DebugEnabledLog; -import org.apache.maven.plugin.testing.AbstractMojoTestCase; -import org.apache.maven.plugin.testing.stubs.ArtifactStub; - import java.io.File; import java.util.ArrayList; import java.util.Collections; @@ -31,6 +26,12 @@ import java.util.List; import java.util.Set; +import org.apache.maven.artifact.Artifact; +import org.apache.maven.plugin.stubs.CompilerManagerStub; +import org.apache.maven.plugin.stubs.DebugEnabledLog; +import org.apache.maven.plugin.testing.AbstractMojoTestCase; +import org.apache.maven.plugin.testing.stubs.ArtifactStub; + public class CompilerMojoTestCase extends AbstractMojoTestCase { @@ -54,6 +55,10 @@ getTestCompilerMojo( compileMojo, "target/test-classes/unit/compiler-basic-test/plugin-config.xml" ); testCompileMojo.execute(); + + Artifact projectArtifact = (Artifact) getVariableValueFromObject( compileMojo, "projectArtifact" ); + assertNotNull( "MCOMPILER-94: artifact file should only be null if there is nothing to compile", + projectArtifact.getFile() ); testClass = new File( testCompileMojo.getOutputDirectory(), "TestCompile0Test.class" ); @@ -75,6 +80,10 @@ assertFalse( compileMojo.getOutputDirectory().exists() ); + Artifact projectArtifact = (Artifact) getVariableValueFromObject( compileMojo, "projectArtifact" ); + assertNull( "MCOMPILER-94: artifact file should be null if there is nothing to compile", + projectArtifact.getFile() ); + TestCompilerMojo testCompileMojo = getTestCompilerMojo( compileMojo, "target/test-classes/unit/compiler-empty-source-test/plugin-config.xml" ); @@ -94,11 +103,11 @@ CompilerMojo compileMojo = getCompilerMojo( "target/test-classes/unit/compiler-includes-excludes-test/plugin-config.xml" ); - Set includes = new HashSet(); + Set includes = new HashSet(); includes.add( "**/TestCompile4*.java" ); setVariableValueToObject( compileMojo, "includes", includes ); - Set excludes = new HashSet(); + Set excludes = new HashSet(); excludes.add( "**/TestCompile2*.java" ); excludes.add( "**/TestCompile3*.java" ); setVariableValueToObject( compileMojo, "excludes", excludes ); @@ -114,8 +123,9 @@ testClass = new File( compileMojo.getOutputDirectory(), "TestCompile4.class" ); assertTrue( testClass.exists() ); - TestCompilerMojo testCompileMojo = getTestCompilerMojo( compileMojo, - "target/test-classes/unit/compiler-includes-excludes-test/plugin-config.xml" ); + TestCompilerMojo testCompileMojo = + getTestCompilerMojo( compileMojo, + "target/test-classes/unit/compiler-includes-excludes-test/plugin-config.xml" ); setVariableValueToObject( testCompileMojo, "testIncludes", includes ); setVariableValueToObject( testCompileMojo, "testExcludes", excludes ); @@ -169,8 +179,9 @@ File testClass = new File( compileMojo.getOutputDirectory(), "compiled.class" ); assertTrue( testClass.exists() ); - TestCompilerMojo testCompileMojo = getTestCompilerMojo( compileMojo, - "target/test-classes/unit/compiler-one-output-file-test/plugin-config.xml" ); + TestCompilerMojo testCompileMojo = + getTestCompilerMojo( compileMojo, + "target/test-classes/unit/compiler-one-output-file-test/plugin-config.xml" ); setVariableValueToObject( testCompileMojo, "compilerManager", new CompilerManagerStub() ); @@ -201,11 +212,11 @@ setVariableValueToObject( compileMojo, "compilerManager", new CompilerManagerStub() ); - Set includes = new HashSet(); + Set includes = new HashSet(); includes.add( "**/TestCompile4*.java" ); setVariableValueToObject( compileMojo, "includes", includes ); - Set excludes = new HashSet(); + Set excludes = new HashSet(); excludes.add( "**/TestCompile2*.java" ); excludes.add( "**/TestCompile3*.java" ); setVariableValueToObject( compileMojo, "excludes", excludes ); @@ -215,8 +226,9 @@ File testClass = new File( compileMojo.getOutputDirectory(), "compiled.class" ); assertTrue( testClass.exists() ); - TestCompilerMojo testCompileMojo = getTestCompilerMojo( compileMojo, - "target/test-classes/unit/compiler-one-output-file-test2/plugin-config.xml" ); + TestCompilerMojo testCompileMojo = + getTestCompilerMojo( compileMojo, + "target/test-classes/unit/compiler-one-output-file-test2/plugin-config.xml" ); setVariableValueToObject( testCompileMojo, "compilerManager", new CompilerManagerStub() ); setVariableValueToObject( testCompileMojo, "testIncludes", includes ); @@ -295,7 +307,7 @@ File testClassesDir = new File( buildDir, "test-classes" ); setVariableValueToObject( mojo, "outputDirectory", testClassesDir ); - List testClasspathList = new ArrayList(); + List testClasspathList = new ArrayList(); testClasspathList.add( System.getProperty( "localRepository" ) + "/junit/junit/3.8.1/junit-3.8.1.jar" ); testClasspathList.add( compilerMojo.getOutputDirectory().getPath() ); setVariableValueToObject( mojo, "classpathElements", testClasspathList ); diff -Nru maven-compiler-plugin-2.0.2/src/test/java/org/apache/maven/plugin/stubs/CompilerStub.java maven-compiler-plugin-2.5.1/src/test/java/org/apache/maven/plugin/stubs/CompilerStub.java --- maven-compiler-plugin-2.0.2/src/test/java/org/apache/maven/plugin/stubs/CompilerStub.java 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/test/java/org/apache/maven/plugin/stubs/CompilerStub.java 2012-05-10 19:42:56.000000000 +0000 @@ -76,7 +76,7 @@ return false; } - public List compile( CompilerConfiguration compilerConfiguration ) + public List compile( CompilerConfiguration compilerConfiguration ) throws CompilerException { File outputDir = new File( compilerConfiguration.getOutputLocation() ); diff -Nru maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-args-test/plugin-config.xml maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-args-test/plugin-config.xml --- maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-args-test/plugin-config.xml 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-args-test/plugin-config.xml 2007-10-09 20:49:38.000000000 +0000 @@ -1,44 +1,44 @@ - - - - - - - maven-compiler-plugin - - - ${basedir}/target/test-classes/unit/compiler-args-test/src/main/java - - javac - true - ${basedir}/target/test/unit/compiler-args-test/target/classes - ${basedir}/target/test/unit/compiler-args-test/target - - - value1 - value2 - - - param value - - - - - + + + + + + + maven-compiler-plugin + + + ${basedir}/target/test-classes/unit/compiler-args-test/src/main/java + + javac + true + ${basedir}/target/test/unit/compiler-args-test/target/classes + ${basedir}/target/test/unit/compiler-args-test/target + + + value1 + value2 + + + param value + + + + + diff -Nru maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-args-test/src/main/java/TestCompile0.java maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-args-test/src/main/java/TestCompile0.java --- maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-args-test/src/main/java/TestCompile0.java 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-args-test/src/main/java/TestCompile0.java 2008-12-21 22:56:51.000000000 +0000 @@ -1,29 +1,29 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ - -public class TestCompile0 -{ - - public TestCompile0() - { - - System.out.println( "Woo Hoo!" ); - } - +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +public class TestCompile0 +{ + + public TestCompile0() + { + + System.out.println( "Woo Hoo!" ); + } + } \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-fail-test/plugin-config.xml maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-fail-test/plugin-config.xml --- maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-fail-test/plugin-config.xml 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-fail-test/plugin-config.xml 2007-10-09 20:49:38.000000000 +0000 @@ -1,37 +1,37 @@ - - - - - - - maven-compiler-plugin - - - ${basedir}/target/test-classes/unit/compiler-fail-test/src/main/java - - javac - true - ${basedir}/target/test/unit/compiler-fail-test/target/classes - ${basedir}/target/test/unit/compiler-fail-test/target - - - - - + + + + + + + maven-compiler-plugin + + + ${basedir}/target/test-classes/unit/compiler-fail-test/src/main/java + + javac + true + ${basedir}/target/test/unit/compiler-fail-test/target/classes + ${basedir}/target/test/unit/compiler-fail-test/target + + + + + diff -Nru maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-fail-test/src/main/java/TestCompile0.java maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-fail-test/src/main/java/TestCompile0.java --- maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-fail-test/src/main/java/TestCompile0.java 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-fail-test/src/main/java/TestCompile0.java 2008-12-21 22:56:51.000000000 +0000 @@ -1,29 +1,29 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ - -public class TestCompile0 -{ - - public TestCompile0() - { - - System.out.println( "Woo Hoo!" ); - } - +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +public class TestCompile0 +{ + + public TestCompile0() + { + + System.out.println( "Woo Hoo!" ); + } + } \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-failonerror-test/plugin-config.xml maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-failonerror-test/plugin-config.xml --- maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-failonerror-test/plugin-config.xml 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-failonerror-test/plugin-config.xml 2007-10-09 20:49:38.000000000 +0000 @@ -1,38 +1,38 @@ - - - - - - - maven-compiler-plugin - - false - - ${basedir}/target/test-classes/unit/compiler-fail-test/src/main/java - - javac - true - ${basedir}/target/test/unit/compiler-fail-test/target/classes - ${basedir}/target/test/unit/compiler-fail-test/target - - - - - + + + + + + + maven-compiler-plugin + + false + + ${basedir}/target/test-classes/unit/compiler-fail-test/src/main/java + + javac + true + ${basedir}/target/test/unit/compiler-fail-test/target/classes + ${basedir}/target/test/unit/compiler-fail-test/target + + + + + diff -Nru maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile2.java maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile2.java --- maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile2.java 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile2.java 2008-12-21 22:56:51.000000000 +0000 @@ -1,29 +1,29 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ - -public class TestCompile2 -{ - - public TestCompile2() - { - - System.out.println( "Woo Hoo!" ); - } - +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +public class TestCompile2 +{ + + public TestCompile2() + { + + System.out.println( "Woo Hoo!" ); + } + } \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile3.java maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile3.java --- maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile3.java 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile3.java 2008-12-21 22:56:51.000000000 +0000 @@ -1,29 +1,29 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ - -public class TestCompile3 -{ - - public TestCompile3() - { - - System.out.println( "Woo Hoo!" ); - } - +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +public class TestCompile3 +{ + + public TestCompile3() + { + + System.out.println( "Woo Hoo!" ); + } + } \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile4.java maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile4.java --- maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile4.java 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile4.java 2008-12-21 22:56:51.000000000 +0000 @@ -1,29 +1,29 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ - -public class TestCompile4 -{ - - public TestCompile4() - { - - System.out.println( "Woo Hoo!" ); - } - +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +public class TestCompile4 +{ + + public TestCompile4() + { + + System.out.println( "Woo Hoo!" ); + } + } \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-one-output-file-test2/plugin-config.xml maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-one-output-file-test2/plugin-config.xml --- maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-one-output-file-test2/plugin-config.xml 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-one-output-file-test2/plugin-config.xml 2007-10-09 20:49:38.000000000 +0000 @@ -1,38 +1,38 @@ - - - - - - - maven-compiler-plugin - - - ${basedir}/target/test-classes/unit/compiler-one-output-file-test2/src/main/java - - - javac - true - ${basedir}/target/test/unit/compiler-one-output-file-test2/target/classes - ${basedir}/target/test/unit/compiler-one-output-file-test2/target - - - - - + + + + + + + maven-compiler-plugin + + + ${basedir}/target/test-classes/unit/compiler-one-output-file-test2/src/main/java + + + javac + true + ${basedir}/target/test/unit/compiler-one-output-file-test2/target/classes + ${basedir}/target/test/unit/compiler-one-output-file-test2/target + + + + + diff -Nru maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile2.java maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile2.java --- maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile2.java 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile2.java 2008-12-21 22:56:51.000000000 +0000 @@ -1,29 +1,29 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ - -public class TestCompile2 -{ - - public TestCompile2() - { - - System.out.println( "Woo Hoo!" ); - } - +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +public class TestCompile2 +{ + + public TestCompile2() + { + + System.out.println( "Woo Hoo!" ); + } + } \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile3.java maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile3.java --- maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile3.java 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile3.java 2008-12-21 22:56:51.000000000 +0000 @@ -1,29 +1,29 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ - -public class TestCompile3 -{ - - public TestCompile3() - { - - System.out.println( "Woo Hoo!" ); - } - +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +public class TestCompile3 +{ + + public TestCompile3() + { + + System.out.println( "Woo Hoo!" ); + } + } \ No newline at end of file diff -Nru maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile4.java maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile4.java --- maven-compiler-plugin-2.0.2/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile4.java 2007-01-15 03:46:19.000000000 +0000 +++ maven-compiler-plugin-2.5.1/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile4.java 2008-12-21 22:56:51.000000000 +0000 @@ -1,29 +1,29 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - */ - -public class TestCompile4 -{ - - public TestCompile4() - { - - System.out.println( "Woo Hoo!" ); - } - +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +public class TestCompile4 +{ + + public TestCompile4() + { + + System.out.println( "Woo Hoo!" ); + } + } \ No newline at end of file