Author: rfscholte
Date: Fri Sep 25 17:16:34 2015
New Revision: 1705332
URL: http://svn.apache.org/viewvc?rev=1705332&view=rev
Log:
Make ITs JDK9 ready. maven-ant-plugin uses value of source/target parameter of
maven-compiler-plugin, so can't use expressions here.
Modified:
maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/system-scope-dep/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/pom.xml?rev=1705332&r1=1705331&r2=1705332&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/pom.xml Fri Sep 25
17:16:34 2015
@@ -111,4 +111,27 @@ under the License.
<url>scp://local.company.com/websites/project.company.com/</url>
</site>
</distributionManagement>
+
+ <profiles>
+ <profile>
+ <id>jdk9</id>
+ <activation>
+ <jdk>[1.9,)</jdk>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/pom.xml?rev=1705332&r1=1705331&r2=1705332&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/pom.xml Fri Sep 25
17:16:34 2015
@@ -67,4 +67,27 @@ under the License.
<properties>
<build.compiler>extJavac</build.compiler>
</properties>
+
+ <profiles>
+ <profile>
+ <id>jdk9</id>
+ <activation>
+ <jdk>[1.9,)</jdk>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml?rev=1705332&r1=1705331&r2=1705332&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml
(original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml Fri Sep
25 17:16:34 2015
@@ -91,4 +91,26 @@ under the License.
<build.compiler>extJavac</build.compiler>
</properties>
+ <profiles>
+ <profile>
+ <id>jdk9</id>
+ <activation>
+ <jdk>[1.9,)</jdk>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/system-scope-dep/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/system-scope-dep/pom.xml?rev=1705332&r1=1705331&r2=1705332&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/system-scope-dep/pom.xml
(original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/system-scope-dep/pom.xml Fri
Sep 25 17:16:34 2015
@@ -70,5 +70,25 @@ under the License.
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>jdk9</id>
+ <activation>
+ <jdk>[1.9,)</jdk>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
</profiles>
</project>
Modified:
maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/pom.xml?rev=1705332&r1=1705331&r2=1705332&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/pom.xml
(original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/pom.xml
Fri Sep 25 17:16:34 2015
@@ -104,4 +104,26 @@ under the License.
<build.compiler>extJavac</build.compiler>
</properties>
+ <profiles>
+ <profile>
+ <id>jdk9</id>
+ <activation>
+ <jdk>[1.9,)</jdk>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified:
maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/pom.xml?rev=1705332&r1=1705331&r2=1705332&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/pom.xml
(original)
+++
maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/pom.xml
Fri Sep 25 17:16:34 2015
@@ -91,4 +91,26 @@ under the License.
<build.compiler>extJavac</build.compiler>
</properties>
+ <profiles>
+ <profile>
+ <id>jdk9</id>
+ <activation>
+ <jdk>[1.9,)</jdk>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml?rev=1705332&r1=1705331&r2=1705332&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml Fri Sep 25
17:16:34 2015
@@ -81,4 +81,27 @@ under the License.
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>jdk9</id>
+ <activation>
+ <jdk>[1.9,)</jdk>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
</project>
