Author: olamy
Date: Fri Jan 30 11:00:10 2015
New Revision: 1655983
URL: http://svn.apache.org/r1655983
Log:
ignore .java-version and test with plexus compiler 2.5-SNAPSHOT
Modified:
maven/plugins/trunk/maven-compiler-plugin/pom.xml
maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/invoker.properties
Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/pom.xml?rev=1655983&r1=1655982&r2=1655983&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Fri Jan 30 11:00:10 2015
@@ -63,7 +63,7 @@ under the License.
! The following property is used in the integration tests MCOMPILER-157
-->
<mavenPluginPluginVersion>3.3</mavenPluginPluginVersion>
- <plexusCompilerVersion>2.4</plexusCompilerVersion>
+ <plexusCompilerVersion>2.5-SNAPSHOT</plexusCompilerVersion>
<groovyVersion>1.8.0</groovyVersion>
<groovyEclipseCompilerVersion>2.7.0-01</groovyEclipseCompilerVersion>
<groovy-eclipse-batch>2.0.4-04</groovy-eclipse-batch>
@@ -224,6 +224,7 @@ under the License.
<configuration>
<excludes combine.children="append">
<exclude>src/it/jdk16-annotation/src/main/resources/META-INF/services/javax.annotation.processing.Processor</exclude>
+ <exclude>.java-version</exclude>
</excludes>
</configuration>
</plugin>
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/invoker.properties?rev=1655983&r1=1655982&r2=1655983&view=diff
==============================================================================
---
maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/invoker.properties
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/invoker.properties
Fri Jan 30 11:00:10 2015
@@ -15,6 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-invoker.java.version = 1.7
+invoker.java.version = 1.7+
invoker.goals = clean compile
invoker.buildResult = failure
