Author: rfscholte Date: Sat Aug 19 13:13:47 2017 New Revision: 1805505 URL: http://svn.apache.org/viewvc?rev=1805505&view=rev Log: Ensure plugin builds fine with Java9 as well
Added: maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-185/invoker.properties maven/plugins/trunk/maven-shade-plugin/src/it/setup-parent/ maven/plugins/trunk/maven-shade-plugin/src/it/setup-parent/pom.xml Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml maven/plugins/trunk/maven-shade-plugin/src/it/component-descriptor-relocation/pom.xml maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar-package-info/pom.xml maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar/pom.xml maven/plugins/trunk/maven-shade-plugin/src/it/project-with-reactors-included/pom.xml maven/plugins/trunk/maven-shade-plugin/src/it/reloc-abs-resource-path/pom.xml maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/pom.xml maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/pom.xml maven/plugins/trunk/maven-shade-plugin/src/it/users-shader-impl/pom.xml Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=1805505&r1=1805504&r2=1805505&view=diff ============================================================================== --- maven/plugins/trunk/maven-shade-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/pom.xml Sat Aug 19 13:13:47 2017 @@ -230,6 +230,7 @@ <plugin> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-metadata</artifactId> + <version>1.7.1</version> <executions> <execution> <goals> Added: maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-185/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-185/invoker.properties?rev=1805505&view=auto ============================================================================== --- maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-185/invoker.properties (added) +++ maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-185/invoker.properties Sat Aug 19 13:13:47 2017 @@ -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. + +invoker.java.version = 9- Modified: maven/plugins/trunk/maven-shade-plugin/src/it/component-descriptor-relocation/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/component-descriptor-relocation/pom.xml?rev=1805505&r1=1805504&r2=1805505&view=diff ============================================================================== --- maven/plugins/trunk/maven-shade-plugin/src/it/component-descriptor-relocation/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/src/it/component-descriptor-relocation/pom.xml Sat Aug 19 13:13:47 2017 @@ -22,6 +22,13 @@ under the License. <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.maven.plugins.shade.its</groupId> + <artifactId>shade-parent</artifactId> + <version>1.0</version> + <relativePath>../setup-parent</relativePath> + </parent> + <groupId>org.apache.maven.its.shade.cdr</groupId> <artifactId>test</artifactId> <version>1.0</version> @@ -44,6 +51,11 @@ under the License. </snapshots> </repository> </repositories> + + <properties> + <maven.compiler.source>1.4</maven.compiler.source> + <maven.compiler.target>1.4</maven.compiler.target> + </properties> <dependencies> <dependency> @@ -70,10 +82,6 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>2.0.2</version> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> Modified: maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar-package-info/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar-package-info/pom.xml?rev=1805505&r1=1805504&r2=1805505&view=diff ============================================================================== --- maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar-package-info/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar-package-info/pom.xml Sat Aug 19 13:13:47 2017 @@ -19,15 +19,26 @@ under the License. --> <project> <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.maven.plugins.shade.its</groupId> + <artifactId>shade-parent</artifactId> + <version>1.0</version> + <relativePath>../setup-parent</relativePath> + </parent> + <groupId>org.apache.maven.its.shade.mjpi</groupId> <artifactId>test-package-info</artifactId> <version>1</version> <packaging>pom</packaging> <name>mini-jar-with-package-info</name> <description>Test for minimizeJar keeping package-info around.</description> + <properties> - <shade-version>@project.version@</shade-version> + <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.target>1.5</maven.compiler.target> </properties> + <modules> <module>jar-with-package-info</module> <module>test</module> @@ -39,15 +50,11 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>2.3.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>${shade-version}</version> + <version>@project.version@</version> </plugin> </plugins> </pluginManagement> Modified: maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar/pom.xml?rev=1805505&r1=1805504&r2=1805505&view=diff ============================================================================== --- maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar/pom.xml Sat Aug 19 13:13:47 2017 @@ -22,6 +22,13 @@ under the License. <project> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.maven.plugins.shade.its</groupId> + <artifactId>shade-parent</artifactId> + <version>1.0</version> + <relativePath>../setup-parent</relativePath> + </parent> + <groupId>org.apache.maven.its.shade.mj</groupId> <artifactId>test</artifactId> <version>1.0</version> @@ -33,6 +40,11 @@ under the License. contains the referenced classes. </description> + <properties> + <maven.compiler.source>1.4</maven.compiler.source> + <maven.compiler.target>1.4</maven.compiler.target> + </properties> + <dependencies> <dependency> <groupId>junit</groupId> @@ -47,10 +59,6 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>2.0.2</version> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> Modified: maven/plugins/trunk/maven-shade-plugin/src/it/project-with-reactors-included/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/project-with-reactors-included/pom.xml?rev=1805505&r1=1805504&r2=1805505&view=diff ============================================================================== --- maven/plugins/trunk/maven-shade-plugin/src/it/project-with-reactors-included/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/src/it/project-with-reactors-included/pom.xml Sat Aug 19 13:13:47 2017 @@ -20,17 +20,24 @@ under the License. <project> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.maven.plugins.shade.its</groupId> + <artifactId>shade-parent</artifactId> + <version>1.0</version> + <relativePath>../setup-parent</relativePath> + </parent> + <groupId>org.apache.maven.its.shade.pp</groupId> <artifactId>reactors-included</artifactId> <version>1.0-SNAPSHOT</version> <packaging>pom</packaging> - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.target>1.5</maven.compiler.target> </properties> - <name>MSHADE-75</name> <description/> @@ -55,17 +62,4 @@ under the License. <module>two</module> </modules> - <build> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> </project> \ No newline at end of file Modified: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-abs-resource-path/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/reloc-abs-resource-path/pom.xml?rev=1805505&r1=1805504&r2=1805505&view=diff ============================================================================== --- maven/plugins/trunk/maven-shade-plugin/src/it/reloc-abs-resource-path/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/src/it/reloc-abs-resource-path/pom.xml Sat Aug 19 13:13:47 2017 @@ -22,16 +22,17 @@ under the License. <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.maven.plugins.shade.its</groupId> + <artifactId>shade-parent</artifactId> + <version>1.0</version> + <relativePath>../setup-parent</relativePath> + </parent> + <groupId>org.apache.maven.its.shade</groupId> <artifactId>reloc-abs-resource-path</artifactId> <version>1.0</version> - <parent> - <groupId>org.apache.maven</groupId> - <artifactId>maven-parent</artifactId> - <version>21</version> - </parent> - <name>MSHADE-119</name> <description> Test that classes in strings like "/org/apache/velocity/my.properties" get properly relocated Modified: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/pom.xml?rev=1805505&r1=1805504&r2=1805505&view=diff ============================================================================== --- maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/pom.xml Sat Aug 19 13:13:47 2017 @@ -22,6 +22,13 @@ under the License. <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.maven.plugins.shade.its</groupId> + <artifactId>shade-parent</artifactId> + <version>1.0</version> + <relativePath>../setup-parent</relativePath> + </parent> + <groupId>org.apache.maven.its.shade.ra</groupId> <artifactId>test</artifactId> <version>1.0</version> @@ -32,16 +39,17 @@ under the License. Test that annotations are properly relocated. </description> + <properties> + <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.target>1.5</maven.compiler.target> + </properties> + <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>2.0.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> Modified: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/pom.xml?rev=1805505&r1=1805504&r2=1805505&view=diff ============================================================================== --- maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/pom.xml Sat Aug 19 13:13:47 2017 @@ -22,6 +22,13 @@ under the License. <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.maven.plugins.shade.its</groupId> + <artifactId>shade-parent</artifactId> + <version>1.0</version> + <relativePath>../setup-parent</relativePath> + </parent> + <groupId>org.apache.maven.its.shade.rerfa</groupId> <artifactId>test</artifactId> <version>1.0</version> @@ -32,16 +39,17 @@ under the License. Test that enum references in annotations are properly relocated. </description> + <properties> + <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.target>1.5</maven.compiler.target> + </properties> + <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>2.0.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> Added: maven/plugins/trunk/maven-shade-plugin/src/it/setup-parent/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/setup-parent/pom.xml?rev=1805505&view=auto ============================================================================== --- maven/plugins/trunk/maven-shade-plugin/src/it/setup-parent/pom.xml (added) +++ maven/plugins/trunk/maven-shade-plugin/src/it/setup-parent/pom.xml Sat Aug 19 13:13:47 2017 @@ -0,0 +1,43 @@ +<?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. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.maven.plugins.shade.its</groupId> + <artifactId>shade-parent</artifactId> + <version>1.0</version> + <packaging>pom</packaging> + + <profiles> + <profile> + <id>jdk9</id> + <activation> + <jdk>9</jdk> + </activation> + <properties> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.target>1.6</maven.compiler.target> + </properties> + </profile> + </profiles> + +</project> Modified: maven/plugins/trunk/maven-shade-plugin/src/it/users-shader-impl/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/users-shader-impl/pom.xml?rev=1805505&r1=1805504&r2=1805505&view=diff ============================================================================== --- maven/plugins/trunk/maven-shade-plugin/src/it/users-shader-impl/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/src/it/users-shader-impl/pom.xml Sat Aug 19 13:13:47 2017 @@ -23,12 +23,23 @@ under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.maven.plugins.shade.its</groupId> + <artifactId>shade-parent</artifactId> + <version>1.0</version> + <relativePath>../setup-parent</relativePath> + </parent> + <groupId>org.apache.maven.plugins.shade.its</groupId> <artifactId>users-shader-impl</artifactId> <version>1.0-SNAPSHOT</version> <name>users-shader-impl</name> + <properties> + <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.target>1.5</maven.compiler.target> + </properties> <dependencies> <dependency> @@ -40,17 +51,6 @@ under the License. </dependencies> <build> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId>