Author: rfscholte
Date: Thu Aug 11 22:13:46 2016
New Revision: 1756058
URL: http://svn.apache.org/viewvc?rev=1756058&view=rev
Log:
Integration tests now reuse source/target values project, otherwise some tests
use 1.5 as default which would make them fail when using JDK9
Added:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/plugin/src/main/resources/
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/plugin/src/main/resources/META-INF/
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/plugin/src/main/resources/META-INF/maven/
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/plugin/src/main/resources/META-INF/maven/plugin.xml
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/pluginManagement/src/main/resources/
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/pluginManagement/src/main/resources/META-INF/
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/pluginManagement/src/main/resources/META-INF/maven/
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/pluginManagement/src/main/resources/META-INF/maven/plugin.xml
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/property/src/main/resources/
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/property/src/main/resources/META-INF/
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/property/src/main/resources/META-INF/maven/
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/property/src/main/resources/META-INF/maven/plugin.xml
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/requirement/src/main/resources/
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/requirement/src/main/resources/META-INF/
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/requirement/src/main/resources/META-INF/maven/
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/requirement/src/main/resources/META-INF/maven/plugin.xml
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/test.properties
Removed:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/plugin/src/main/java/
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/pluginManagement/src/main/java/
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/property/src/main/java/
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/requirement/src/main/java/
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/pom.xml
Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml?rev=1756058&r1=1756057&r2=1756058&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml Thu Aug 11 22:13:46
2016
@@ -370,6 +370,10 @@
<sitePluginVersion>3.3</sitePluginVersion>
<antVersion>${antVersion}</antVersion>
</filterProperties>
+ <properties>
+
<maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
+
<maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
+ </properties>
</configuration>
<executions>
<execution>
Added:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/plugin/src/main/resources/META-INF/maven/plugin.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/plugin/src/main/resources/META-INF/maven/plugin.xml?rev=1756058&view=auto
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/plugin/src/main/resources/META-INF/maven/plugin.xml
(added)
+++
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/plugin/src/main/resources/META-INF/maven/plugin.xml
Thu Aug 11 22:13:46 2016
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
+<plugin>
+ <name>target bytecode defined by plugin configuration</name>
+ <description></description>
+ <groupId>org.apache.maven.its.plugin-info-jdk</groupId>
+ <artifactId>plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <goalPrefix></goalPrefix>
+ <isolatedRealm>false</isolatedRealm>
+ <inheritedByDefault>true</inheritedByDefault>
+ <mojos>
+ <mojo>
+ <goal>touch</goal>
+ <description>Goal which touches a timestamp file.</description>
+ <requiresDirectInvocation>false</requiresDirectInvocation>
+ <requiresProject>true</requiresProject>
+ <requiresReports>false</requiresReports>
+ <aggregator>false</aggregator>
+ <requiresOnline>false</requiresOnline>
+ <inheritedByDefault>true</inheritedByDefault>
+ <phase>process-sources</phase>
+
<implementation>org.apache.maven.plugins.issues.plugin.MyMojo</implementation>
+ <language>java</language>
+ <instantiationStrategy>per-lookup</instantiationStrategy>
+ <executionStrategy>once-per-session</executionStrategy>
+ <threadSafe>false</threadSafe>
+ <parameters>
+ <parameter>
+ <name>outputDirectory</name>
+ <type>java.io.File</type>
+ <required>true</required>
+ <editable>true</editable>
+ <description>Location of the file.</description>
+ </parameter>
+ </parameters>
+ <configuration>
+ <outputDirectory
implementation="java.io.File">${project.build.directory}</outputDirectory>
+ </configuration>
+ </mojo>
+ </mojos>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <type>jar</type>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+</plugin>
\ No newline at end of file
Added:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/pluginManagement/src/main/resources/META-INF/maven/plugin.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/pluginManagement/src/main/resources/META-INF/maven/plugin.xml?rev=1756058&view=auto
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/pluginManagement/src/main/resources/META-INF/maven/plugin.xml
(added)
+++
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/pluginManagement/src/main/resources/META-INF/maven/plugin.xml
Thu Aug 11 22:13:46 2016
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
+<plugin>
+ <name>target bytecode defined by pluginManagement configuration</name>
+ <description></description>
+ <groupId>org.apache.maven.its.plugin-info-jdk</groupId>
+ <artifactId>pluginManagement</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <goalPrefix>Management</goalPrefix>
+ <isolatedRealm>false</isolatedRealm>
+ <inheritedByDefault>true</inheritedByDefault>
+ <mojos>
+ <mojo>
+ <goal>touch</goal>
+ <description>Goal which touches a timestamp file.</description>
+ <requiresDirectInvocation>false</requiresDirectInvocation>
+ <requiresProject>true</requiresProject>
+ <requiresReports>false</requiresReports>
+ <aggregator>false</aggregator>
+ <requiresOnline>false</requiresOnline>
+ <inheritedByDefault>true</inheritedByDefault>
+ <phase>process-sources</phase>
+
<implementation>org.apache.maven.plugins.issues.plugin.MyMojo</implementation>
+ <language>java</language>
+ <instantiationStrategy>per-lookup</instantiationStrategy>
+ <executionStrategy>once-per-session</executionStrategy>
+ <threadSafe>false</threadSafe>
+ <parameters>
+ <parameter>
+ <name>outputDirectory</name>
+ <type>java.io.File</type>
+ <required>true</required>
+ <editable>true</editable>
+ <description>Location of the file.</description>
+ </parameter>
+ </parameters>
+ <configuration>
+ <outputDirectory
implementation="java.io.File">${project.build.directory}</outputDirectory>
+ </configuration>
+ </mojo>
+ </mojos>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <type>jar</type>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+</plugin>
\ No newline at end of file
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml?rev=1756058&r1=1756057&r2=1756058&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml
(original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml
Thu Aug 11 22:13:46 2016
@@ -59,6 +59,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <skipDescriptor>true</skipDescriptor>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Added:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/property/src/main/resources/META-INF/maven/plugin.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/property/src/main/resources/META-INF/maven/plugin.xml?rev=1756058&view=auto
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/property/src/main/resources/META-INF/maven/plugin.xml
(added)
+++
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/property/src/main/resources/META-INF/maven/plugin.xml
Thu Aug 11 22:13:46 2016
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
+<plugin>
+ <name>target bytecode defined by maven.compiler.target property</name>
+ <description></description>
+ <groupId>org.apache.maven.its.plugin-info-jdk</groupId>
+ <artifactId>property</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <goalPrefix>property</goalPrefix>
+ <isolatedRealm>false</isolatedRealm>
+ <inheritedByDefault>true</inheritedByDefault>
+ <mojos>
+ <mojo>
+ <goal>touch</goal>
+ <description>Goal which touches a timestamp file.</description>
+ <requiresDirectInvocation>false</requiresDirectInvocation>
+ <requiresProject>true</requiresProject>
+ <requiresReports>false</requiresReports>
+ <aggregator>false</aggregator>
+ <requiresOnline>false</requiresOnline>
+ <inheritedByDefault>true</inheritedByDefault>
+ <phase>process-sources</phase>
+
<implementation>org.apache.maven.plugins.issues.plugin.MyMojo</implementation>
+ <language>java</language>
+ <instantiationStrategy>per-lookup</instantiationStrategy>
+ <executionStrategy>once-per-session</executionStrategy>
+ <threadSafe>false</threadSafe>
+ <parameters>
+ <parameter>
+ <name>outputDirectory</name>
+ <type>java.io.File</type>
+ <required>true</required>
+ <editable>true</editable>
+ <description>Location of the file.</description>
+ </parameter>
+ </parameters>
+ <configuration>
+ <outputDirectory
implementation="java.io.File">${project.build.directory}</outputDirectory>
+ </configuration>
+ </mojo>
+ </mojos>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <type>jar</type>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+</plugin>
\ No newline at end of file
Added:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/requirement/src/main/resources/META-INF/maven/plugin.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/requirement/src/main/resources/META-INF/maven/plugin.xml?rev=1756058&view=auto
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/requirement/src/main/resources/META-INF/maven/plugin.xml
(added)
+++
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/requirement/src/main/resources/META-INF/maven/plugin.xml
Thu Aug 11 22:13:46 2016
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
+<plugin>
+ <name>target bytecode defined by report jdk requirement configuration</name>
+ <description></description>
+ <groupId>org.apache.maven.its.plugin-info-jdk</groupId>
+ <artifactId>requirement</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <goalPrefix>requirement</goalPrefix>
+ <isolatedRealm>false</isolatedRealm>
+ <inheritedByDefault>true</inheritedByDefault>
+ <mojos>
+ <mojo>
+ <goal>touch</goal>
+ <description>Goal which touches a timestamp file.</description>
+ <requiresDirectInvocation>false</requiresDirectInvocation>
+ <requiresProject>true</requiresProject>
+ <requiresReports>false</requiresReports>
+ <aggregator>false</aggregator>
+ <requiresOnline>false</requiresOnline>
+ <inheritedByDefault>true</inheritedByDefault>
+ <phase>process-sources</phase>
+
<implementation>org.apache.maven.plugins.issues.plugin.MyMojo</implementation>
+ <language>java</language>
+ <instantiationStrategy>per-lookup</instantiationStrategy>
+ <executionStrategy>once-per-session</executionStrategy>
+ <threadSafe>false</threadSafe>
+ <parameters>
+ <parameter>
+ <name>outputDirectory</name>
+ <type>java.io.File</type>
+ <required>true</required>
+ <editable>true</editable>
+ <description>Location of the file.</description>
+ </parameter>
+ </parameters>
+ <configuration>
+ <outputDirectory
implementation="java.io.File">${project.build.directory}</outputDirectory>
+ </configuration>
+ </mojo>
+ </mojos>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <type>jar</type>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+</plugin>
\ No newline at end of file
Added:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/test.properties
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/test.properties?rev=1756058&view=auto
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/test.properties
(added)
+++
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/test.properties
Thu Aug 11 22:13:46 2016
@@ -0,0 +1,18 @@
+# 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.
+maven.compiler.source=1.3
+maven.compiler.target=1.3
\ No newline at end of file
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/pom.xml?rev=1756058&r1=1756057&r2=1756058&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/pom.xml
(original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/pom.xml
Thu Aug 11 22:13:46 2016
@@ -62,6 +62,16 @@ under the License.
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.5.1</version>
+ <configuration>
+ <!-- old maven-parent, so fix it like this. -->
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
