Author: rfscholte Date: Mon Jun 22 19:58:32 2015 New Revision: 1686922 URL: http://svn.apache.org/r1686922 Log: Split up maven3 profile into jdk5 and jdk6
Modified: maven/plugins/trunk/pom.xml Modified: maven/plugins/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=1686922&r1=1686921&r2=1686922&view=diff ============================================================================== --- maven/plugins/trunk/pom.xml (original) +++ maven/plugins/trunk/pom.xml Mon Jun 22 19:58:32 2015 @@ -128,17 +128,16 @@ under the License. </profile> <profile> - <id>maven-3</id> + <id>maven-3_jdk5</id> <activation> <file> <!-- This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) --> <exists>${basedir}</exists> </file> + <jdk>[1.5,)</jdk> </activation> <modules> <!--Moved to maven-3 profile as a workaround for MNG-3814 --> - <module>maven-assembly-plugin</module> - <module>maven-dependency-plugin</module> <module>maven-project-info-reports-plugin</module> <module>maven-remote-resources-plugin</module> <!--Moved to maven-3 profile as they require Maven 3.0 --> @@ -146,6 +145,21 @@ under the License. <module>maven-scm-publish-plugin</module> </modules> </profile> + + <profile> + <id>maven-3_jdk6</id> + <activation> + <file> + <!-- This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) --> + <exists>${basedir}</exists> + </file> + <jdk>[1.6,)</jdk> + </activation> + <modules> + <module>maven-assembly-plugin</module> + <module>maven-dependency-plugin</module> + </modules> + </profile> <profile> <id>non-windows</id>