Author: gboue
Date: Sun Jun 25 10:41:39 2017
New Revision: 1799794
URL: http://svn.apache.org/viewvc?rev=1799794&view=rev
Log:
Fix build on JDK 9:
- In TestMavenVersion, changing the test comparing Java and Maven versions
together, due to Java versioning scheme change (JDK-8061493). We now use a
fixed version with an underscore to test that it doesn't cause any issues.
- In resolve_collect_dependencies IT, version 3.0.0 of the Assembly Plugin
needs to be used to incorporate Plexus Archiver resolved issue with new JDK
versioning scheme (commit c0357c5 of Plexus Archiver).
- In require-plugin-versions-plugin-with-integration-test-lifecycle IT, Tycho
needs to be updated to 0.22.0 so that an execution environment greater than 1.5
(which JDK 9 no longer supports) can be specified uniquely.
Modified:
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml
Modified:
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java?rev=1799794&r1=1799793&r2=1799794&view=diff
==============================================================================
---
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java
(original)
+++
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java
Sun Jun 25 10:41:39 2017
@@ -19,7 +19,6 @@ package org.apache.maven.plugins.enforce
* under the License.
*/
-import org.apache.commons.lang3.SystemUtils;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
@@ -65,7 +64,7 @@ public class TestMavenVersion
}
// this shouldn't crash
- rule.setVersion( SystemUtils.JAVA_VERSION );
+ rule.setVersion( "2.0.5_01" );
rule.execute( helper );
}
Modified:
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml?rev=1799794&r1=1799793&r2=1799794&view=diff
==============================================================================
---
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml
(original)
+++
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml
Sun Jun 25 10:41:39 2017
@@ -25,7 +25,7 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
- <tycho-version>0.19.0</tycho-version><!-- minimum 0.18.1: depends on
https://bugs.eclipse.org/bugs/show_bug.cgi?id=406056 -->
+ <tycho-version>0.22.0</tycho-version><!-- minimum 0.22.0: depends on
https://bugs.eclipse.org/bugs/show_bug.cgi?id=435313 -->
</properties>
<build>
<plugins>
@@ -68,6 +68,7 @@
<configuration>
<!-- recommended: use p2-based target platform resolver -->
<resolver>p2</resolver>
+
<executionEnvironment>JavaSE-@maven.compiler.source@</executionEnvironment>
</configuration>
</plugin>
<plugin>
Modified:
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml?rev=1799794&r1=1799793&r2=1799794&view=diff
==============================================================================
---
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml
(original)
+++
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml
Sun Jun 25 10:41:39 2017
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.5</version>
+ <version>3.0.0</version>
<executions>
<execution>
<id>assemble</id>
