Code formatting on ITs pom.xml
diff --git a/pom.xml b/pom.xml
index 1167764..d7fd104 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,6 +168,11 @@
<include>src/**/*.java</include>
</includes>
</java>
+ <pom>
+ <includes>
+ <include>**/pom.xml</include>
+ </includes>
+ </pom>
</configuration>
</plugin>
<plugin>
diff --git a/src/it/MRESOURCES-104/pom.xml b/src/it/MRESOURCES-104/pom.xml
index 5d9030c..6d28e49 100644
--- a/src/it/MRESOURCES-104/pom.xml
+++ b/src/it/MRESOURCES-104/pom.xml
@@ -1,5 +1,4 @@
<?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
@@ -22,13 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.maven-resources-plugin.its</groupId>
<artifactId>MRESOURCES-104</artifactId>
- <name>Bug Test</name>
<version>0.0.1-SNAPSHOT</version>
+ <name>Bug Test</name>
<build>
<resources>
<resource>
- <directory>src/main/resources</directory>
<filtering>true</filtering>
+ <directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
diff --git a/src/it/MRESOURCES-105/pom.xml b/src/it/MRESOURCES-105/pom.xml
index f5929fe..9b4abb9 100644
--- a/src/it/MRESOURCES-105/pom.xml
+++ b/src/it/MRESOURCES-105/pom.xml
@@ -1,5 +1,4 @@
<?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
@@ -22,18 +21,18 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.maven-resources-plugin.its</groupId>
<artifactId>MRESOURCES-105</artifactId>
- <name>Bug Test</name>
<version>0.0.1-SNAPSHOT</version>
+ <name>Bug Test</name>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<filters>
<filter>my.properties</filter>
</filters>
+ <resources>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -52,4 +51,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/it/MRESOURCES-106/pom.xml b/src/it/MRESOURCES-106/pom.xml
index 09210bb..096efb1 100644
--- a/src/it/MRESOURCES-106/pom.xml
+++ b/src/it/MRESOURCES-106/pom.xml
@@ -17,20 +17,23 @@
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</groupId>
<artifactId>MSHARED-106</artifactId>
- <packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <properties>
+ <location>${basedir}/src/main/resources/file.txt</location>
+ </properties>
<build>
<resources>
<resource>
- <directory>src/main/resources</directory>
<filtering>true</filtering>
+ <directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
@@ -41,8 +44,4 @@
</plugins>
</build>
- <properties>
- <location>${basedir}/src/main/resources/file.txt</location>
- </properties>
-
</project>
diff --git a/src/it/MRESOURCES-110/pom.xml b/src/it/MRESOURCES-110/pom.xml
index 2058a90..22bcf31 100644
--- a/src/it/MRESOURCES-110/pom.xml
+++ b/src/it/MRESOURCES-110/pom.xml
@@ -1,5 +1,4 @@
<?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
@@ -18,8 +17,7 @@
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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.maven-resources-plugin.its</groupId>
@@ -37,17 +35,17 @@
<build>
<resources>
<resource>
- <directory>src/main/resources</directory>
<filtering>true</filtering>
+ <directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>@project.version@</version>
- <configuration>
- <escapeString>!</escapeString>
- </configuration>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <escapeString>!</escapeString>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git a/src/it/MRESOURCES-131/pom.xml b/src/it/MRESOURCES-131/pom.xml
index 89496e9..e846bb8 100644
--- a/src/it/MRESOURCES-131/pom.xml
+++ b/src/it/MRESOURCES-131/pom.xml
@@ -17,7 +17,6 @@
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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -26,6 +25,15 @@
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<build>
<pluginManagement>
<plugins>
@@ -39,13 +47,4 @@
</plugins>
</pluginManagement>
</build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
diff --git a/src/it/MRESOURCES-166/pom.xml b/src/it/MRESOURCES-166/pom.xml
index bbab8c6..e94b2de 100644
--- a/src/it/MRESOURCES-166/pom.xml
+++ b/src/it/MRESOURCES-166/pom.xml
@@ -17,14 +17,13 @@
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</groupId>
<artifactId>maven-resources-plugin-it-filter-MRESOURCES-166</artifactId>
- <packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<properties>
<httpd.server.env>sandbox</httpd.server.env>
@@ -33,8 +32,8 @@
<build>
<resources>
<resource>
- <directory>src/main/resources</directory>
<filtering>true</filtering>
+ <directory>src/main/resources</directory>
</resource>
</resources>
<pluginManagement>
diff --git a/src/it/MRESOURCES-171/pom.xml b/src/it/MRESOURCES-171/pom.xml
index e9ad721..aea39c6 100644
--- a/src/it/MRESOURCES-171/pom.xml
+++ b/src/it/MRESOURCES-171/pom.xml
@@ -1,5 +1,4 @@
<?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
@@ -22,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.maven-resources-plugin.its</groupId>
<artifactId>MRESOURCES-171</artifactId>
- <name>Bug Test</name>
<version>0.0.1-SNAPSHOT</version>
+ <name>Bug Test</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -32,8 +31,8 @@
<build>
<resources>
<resource>
- <directory>src/main/resources</directory>
<filtering>true</filtering>
+ <directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
diff --git a/src/it/MRESOURCES-18/pom.xml b/src/it/MRESOURCES-18/pom.xml
index 153ac06..e804799 100644
--- a/src/it/MRESOURCES-18/pom.xml
+++ b/src/it/MRESOURCES-18/pom.xml
@@ -1,5 +1,4 @@
<?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
@@ -18,7 +17,6 @@
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>
@@ -26,9 +24,9 @@
<artifactId>maven-it-it0105</artifactId>
<version>1.0</version>
- <name>Maven Integration Test :: it0105</name>
+ <name>Maven Integration Test :: it0105</name>
<description>MRESOURCES-18</description>
-
+
<properties>
<my.property>foo</my.property>
</properties>
@@ -42,12 +40,12 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<build>
<resources>
<resource>
- <directory>src/main/resources</directory>
<filtering>true</filtering>
+ <directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
diff --git a/src/it/MRESOURCES-20/pom.xml b/src/it/MRESOURCES-20/pom.xml
index bd2ffb7..d4c5672 100644
--- a/src/it/MRESOURCES-20/pom.xml
+++ b/src/it/MRESOURCES-20/pom.xml
@@ -17,20 +17,19 @@
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</groupId>
<artifactId>maven-resources-plugin-it-filter</artifactId>
- <packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<build>
<resources>
<resource>
- <directory>src/main/resources</directory>
<filtering>true</filtering>
+ <directory>src/main/resources</directory>
</resource>
</resources>
<pluginManagement>
diff --git a/src/it/MRESOURCES-231/pom.xml b/src/it/MRESOURCES-231/pom.xml
index b420f4c..cdbfe9c 100644
--- a/src/it/MRESOURCES-231/pom.xml
+++ b/src/it/MRESOURCES-231/pom.xml
@@ -1,5 +1,4 @@
<?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
@@ -22,13 +21,16 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.maven-resources-plugin.its</groupId>
<artifactId>MRESOURCES-231</artifactId>
- <name>Bug Test</name>
<version>0.0.1-SNAPSHOT</version>
+ <name>Bug Test</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
<build>
<resources>
<resource>
- <directory>src/main/resources</directory>
<filtering>true</filtering>
+ <directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
@@ -37,12 +39,9 @@
<artifactId>maven-resources-plugin</artifactId>
<version>@project.version@</version>
<configuration>
- <escapeString>∅</escapeString>
+ <escapeString>∅</escapeString>
</configuration>
</plugin>
</plugins>
</build>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
</project>
diff --git a/src/it/MRESOURCES-257/pom.xml b/src/it/MRESOURCES-257/pom.xml
index faa2990..80abd1b 100644
--- a/src/it/MRESOURCES-257/pom.xml
+++ b/src/it/MRESOURCES-257/pom.xml
@@ -1,5 +1,4 @@
<?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
@@ -22,21 +21,16 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.maven-resources-plugin.its</groupId>
<artifactId>MRESOURCES-257</artifactId>
- <name>Bug Test</name>
<version>0.0.1-SNAPSHOT</version>
+ <name>Bug Test</name>
+
+ <description>This is a minimal description
+ of the project developed by ${project.developers[0].email}</description>
<organization>
<name>orga</name>
</organization>
- <description>This is a minimal description
- of the project developed by ${project.developers[0].email}
- </description>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<developers>
<developer>
<id>jdoe</id>
@@ -56,11 +50,15 @@
</developer>
</developers>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<build>
<resources>
<resource>
- <directory>src/main/resources</directory>
<filtering>true</filtering>
+ <directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
@@ -72,4 +70,3 @@
</plugins>
</build>
</project>
-
diff --git a/src/it/MRESOURCES-77/pom.xml b/src/it/MRESOURCES-77/pom.xml
index 080c9aa..f3af061 100644
--- a/src/it/MRESOURCES-77/pom.xml
+++ b/src/it/MRESOURCES-77/pom.xml
@@ -17,38 +17,46 @@
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</groupId>
<artifactId>maven-resources-plugin-it-filter</artifactId>
- <packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <!--
+ Look at SomeResource.txt after being processed with filtering.
+ Note the tokens for ${projectProperty} and ${profileProperty} for the "filter resolution" case should be resolved and evaluated
+ using the POM property values of the filter tokens
+ -->
+ <properties>
+ <projectProperty>foo-projectProperty-bar</projectProperty>
+ </properties>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<filters>
<filter>src/main/filters/my.filter</filter>
<filter>src/main/filters/filter2.properties</filter>
<filter>src/main/filters/filter3.properties</filter>
</filters>
+ <resources>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>@project.version@</version>
+ <version>@project.version@</version>
<executions>
<execution>
<id>custom-resources</id>
- <phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
+ <phase>process-resources</phase>
<configuration>
<outputDirectory>${project.build.directory}</outputDirectory>
<resources>
@@ -67,15 +75,6 @@
</plugins>
</build>
- <!--
- Look at SomeResource.txt after being processed with filtering.
- Note the tokens for ${projectProperty} and ${profileProperty} for the "filter resolution" case should be resolved and evaluated
- using the POM property values of the filter tokens
- -->
- <properties>
- <projectProperty>foo-projectProperty-bar</projectProperty>
- </properties>
-
<profiles>
<profile>
<activation>
diff --git a/src/it/MRESOURCES-78/pom.xml b/src/it/MRESOURCES-78/pom.xml
index e4662ff..edb5374 100644
--- a/src/it/MRESOURCES-78/pom.xml
+++ b/src/it/MRESOURCES-78/pom.xml
@@ -18,37 +18,37 @@
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.opennms</groupId>
- <artifactId>resources-test</artifactId>
- <name>OpenNMS Resources Test</name>
- <version>1.0</version>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/filtered</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>@project.version@</version>
- <configuration>
- <encoding>UTF-8</encoding>
- <escapeString>\</escapeString>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <properties>
- <escaped>this is escaped</escaped>
- <escaped.at>this is escaped.at</escaped.at>
- <foo>this is foo</foo>
- <bar>this is bar</bar>
- </properties>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.opennms</groupId>
+ <artifactId>resources-test</artifactId>
+ <version>1.0</version>
+ <name>OpenNMS Resources Test</name>
+ <properties>
+ <escaped>this is escaped</escaped>
+ <escaped.at>this is escaped.at</escaped.at>
+ <foo>this is foo</foo>
+ <bar>this is bar</bar>
+ </properties>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/filtered</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <escapeString>\</escapeString>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/src/it/MRESOURCES-99/pom.xml b/src/it/MRESOURCES-99/pom.xml
index b9320d7..3939367 100644
--- a/src/it/MRESOURCES-99/pom.xml
+++ b/src/it/MRESOURCES-99/pom.xml
@@ -17,14 +17,13 @@
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</groupId>
<artifactId>maven-resources-plugin-it-filter</artifactId>
- <packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<properties>
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'</maven.build.timestamp.format>
@@ -32,8 +31,8 @@
<build>
<resources>
<resource>
+ <filtering>true</filtering>
<directory>src/main/resources</directory>
- <filtering>true</filtering>
</resource>
</resources>
<pluginManagement>
diff --git a/src/it/binaries-filtering/pom.xml b/src/it/binaries-filtering/pom.xml
index ff1b992..3c3bc18 100644
--- a/src/it/binaries-filtering/pom.xml
+++ b/src/it/binaries-filtering/pom.xml
@@ -17,20 +17,19 @@
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</groupId>
<artifactId>maven-resources-plugin-binaries-filtering</artifactId>
- <packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<build>
<resources>
<resource>
- <directory>src/main/resources</directory>
<filtering>true</filtering>
+ <directory>src/main/resources</directory>
</resource>
</resources>
<pluginManagement>
@@ -49,8 +48,8 @@
<nonFilteredFileExtensions>
<nonFilteredFileExtension>img</nonFilteredFileExtension>
</nonFilteredFileExtensions>
- </configuration>
- </plugin>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/src/it/copy-resources-it/pom.xml b/src/it/copy-resources-it/pom.xml
index 73fc56b..00a3a3b 100644
--- a/src/it/copy-resources-it/pom.xml
+++ b/src/it/copy-resources-it/pom.xml
@@ -17,20 +17,19 @@
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</groupId>
<artifactId>maven-resources-plugin-copy-resources-it</artifactId>
- <packaging>jar</packaging>
<version>1.0.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
<build>
<resources>
<resource>
- <directory>src/main/resources</directory>
<filtering>true</filtering>
+ <directory>src/main/resources</directory>
</resource>
</resources>
<pluginManagement>
@@ -47,19 +46,19 @@
<executions>
<execution>
<id>copy-resources</id>
- <phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
+ <phase>validate</phase>
<configuration>
<outputDirectory>${basedir}/target/extra-resources</outputDirectory>
- <resources>
+ <resources>
<resource>
<directory>src/non-packaged-resources</directory>
<filtering>true</filtering>
</resource>
- </resources>
- </configuration>
+ </resources>
+ </configuration>
</execution>
</executions>
</plugin>
diff --git a/src/it/custom-delimiter/pom.xml b/src/it/custom-delimiter/pom.xml
index 81a5ed1..0176168 100644
--- a/src/it/custom-delimiter/pom.xml
+++ b/src/it/custom-delimiter/pom.xml
@@ -17,26 +17,34 @@
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</groupId>
<artifactId>maven-resources-plugin-it-filter</artifactId>
- <packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <!--
+ Look at SomeResource.txt after being processed with filtering.
+ Note the tokens for ${projectProperty} and ${profileProperty} for the "filter resolution" case should be resolved and evaluated
+ using the POM property values of the filter tokens
+ -->
+ <properties>
+ <projectProperty>foo-projectProperty-bar</projectProperty>
+ </properties>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<filters>
<filter>src/main/filters/my.filter</filter>
<filter>src/main/filters/filter2.properties</filter>
</filters>
+ <resources>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
@@ -50,15 +58,6 @@
</plugins>
</build>
- <!--
- Look at SomeResource.txt after being processed with filtering.
- Note the tokens for ${projectProperty} and ${profileProperty} for the "filter resolution" case should be resolved and evaluated
- using the POM property values of the filter tokens
- -->
- <properties>
- <projectProperty>foo-projectProperty-bar</projectProperty>
- </properties>
-
<profiles>
<profile>
<activation>
diff --git a/src/it/escapeInterpolation/pom.xml b/src/it/escapeInterpolation/pom.xml
index 0f3fbc3..faf3adb 100644
--- a/src/it/escapeInterpolation/pom.xml
+++ b/src/it/escapeInterpolation/pom.xml
@@ -17,31 +17,39 @@
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</groupId>
<artifactId>maven-resources-plugin-it-escapeInterpolation</artifactId>
- <packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <!--
+ Look at SomeResource.txt after being processed with filtering.
+ Note the tokens for ${projectProperty} and ${profileProperty} for the "filter resolution" case should be resolved and evaluated
+ using the POM property values of the filter tokens
+ -->
+ <properties>
+ <projectProperty>foo-projectProperty-bar</projectProperty>
+ </properties>
<build>
+ <filters>
+ <filter>src/main/filters/my.filter</filter>
+ </filters>
<resources>
<resource>
- <directory>src/main/resources</directory>
<filtering>true</filtering>
+ <directory>src/main/resources</directory>
</resource>
</resources>
<testResources>
<testResource>
+ <filtering>true</filtering>
<directory>src/test/resources</directory>
- <filtering>true</filtering>
</testResource>
- </testResources>
- <filters>
- <filter>src/main/filters/my.filter</filter>
- </filters>
+ </testResources>
<pluginManagement>
<plugins>
<plugin>
@@ -55,15 +63,6 @@
</pluginManagement>
</build>
- <!--
- Look at SomeResource.txt after being processed with filtering.
- Note the tokens for ${projectProperty} and ${profileProperty} for the "filter resolution" case should be resolved and evaluated
- using the POM property values of the filter tokens
- -->
- <properties>
- <projectProperty>foo-projectProperty-bar</projectProperty>
- </properties>
-
<profiles>
<profile>
<activation>
diff --git a/src/it/filter-filenames/pom.xml b/src/it/filter-filenames/pom.xml
index befb406..1b9009b 100644
--- a/src/it/filter-filenames/pom.xml
+++ b/src/it/filter-filenames/pom.xml
@@ -17,20 +17,19 @@
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</groupId>
<artifactId>maven-resources-plugin-it-filter-filenames</artifactId>
- <packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<build>
<resources>
<resource>
- <directory>src/main/resources</directory>
<filtering>true</filtering>
+ <directory>src/main/resources</directory>
</resource>
</resources>
<pluginManagement>
diff --git a/src/it/filter-test-resources/pom.xml b/src/it/filter-test-resources/pom.xml
index b96fa70..d690a90 100644
--- a/src/it/filter-test-resources/pom.xml
+++ b/src/it/filter-test-resources/pom.xml
@@ -17,34 +17,13 @@
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</groupId>
<artifactId>maven-resources-plugin-it-filter</artifactId>
- <packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
-
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- <filters>
- <filter>src/test/filters/my.filter</filter>
- </filters>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>@project.version@</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <packaging>jar</packaging>
<!--
Look at SomeResource.txt after being processed with filtering.
@@ -55,6 +34,26 @@
<projectProperty>foo-projectProperty-bar</projectProperty>
</properties>
+ <build>
+ <filters>
+ <filter>src/test/filters/my.filter</filter>
+ </filters>
+ <testResources>
+ <testResource>
+ <filtering>true</filtering>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<profiles>
<profile>
<activation>
diff --git a/src/it/filter/pom.xml b/src/it/filter/pom.xml
index d9c47f2..c337c19 100644
--- a/src/it/filter/pom.xml
+++ b/src/it/filter/pom.xml
@@ -17,36 +17,13 @@
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</groupId>
<artifactId>maven-resources-plugin-it-filter</artifactId>
- <packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <filters>
- <filter>src/main/filters/my.filter</filter>
- <filter>src/main/filters/filter2.properties</filter>
- <filter>src/main/filters/filter3.properties</filter>
- </filters>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>@project.version@</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <packaging>jar</packaging>
<!--
Look at SomeResource.txt after being processed with filtering.
@@ -57,6 +34,28 @@
<projectProperty>foo-projectProperty-bar</projectProperty>
</properties>
+ <build>
+ <filters>
+ <filter>src/main/filters/my.filter</filter>
+ <filter>src/main/filters/filter2.properties</filter>
+ <filter>src/main/filters/filter3.properties</filter>
+ </filters>
+ <resources>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<profiles>
<profile>
<activation>
diff --git a/src/it/include-git-ignore/pom.xml b/src/it/include-git-ignore/pom.xml
index b1ca9e6..f768420 100644
--- a/src/it/include-git-ignore/pom.xml
+++ b/src/it/include-git-ignore/pom.xml
@@ -17,14 +17,13 @@
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</groupId>
<artifactId>maven-resources-plugin-it-includeEmptyDirs</artifactId>
- <packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -50,7 +49,7 @@
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- </plugin>
+ </plugin>
</plugins>
</build>
diff --git a/src/it/includeEmptyDirs/pom.xml b/src/it/includeEmptyDirs/pom.xml
index 03f85e5..2c44592 100644
--- a/src/it/includeEmptyDirs/pom.xml
+++ b/src/it/includeEmptyDirs/pom.xml
@@ -17,25 +17,33 @@
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</groupId>
<artifactId>maven-resources-plugin-it-includeEmptyDirs</artifactId>
- <packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <!--
+ Look at SomeResource.txt after being processed with filtering.
+ Note the tokens for ${projectProperty} and ${profileProperty} for the "filter resolution" case should be resolved and evaluated
+ using the POM property values of the filter tokens
+ -->
+ <properties>
+ <projectProperty>foo-projectProperty-bar</projectProperty>
+ </properties>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<filters>
<filter>src/main/filters/my.filter</filter>
</filters>
+ <resources>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
<pluginManagement>
<plugins>
<plugin>
@@ -54,19 +62,10 @@
<configuration>
<includeEmptyDirs>true</includeEmptyDirs>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
- <!--
- Look at SomeResource.txt after being processed with filtering.
- Note the tokens for ${projectProperty} and ${profileProperty} for the "filter resolution" case should be resolved and evaluated
- using the POM property values of the filter tokens
- -->
- <properties>
- <projectProperty>foo-projectProperty-bar</projectProperty>
- </properties>
-
<profiles>
<profile>
<activation>
diff --git a/src/it/profile-override/pom.xml b/src/it/profile-override/pom.xml
index 46cb866..6a9fd47 100644
--- a/src/it/profile-override/pom.xml
+++ b/src/it/profile-override/pom.xml
@@ -17,20 +17,19 @@
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</groupId>
<artifactId>maven-resources-plugin-it-profile-override</artifactId>
- <packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<build>
<resources>
<resource>
- <directory>src/main/resources/test</directory>
<filtering>false</filtering>
+ <directory>src/main/resources/test</directory>
</resource>
</resources>
<pluginManagement>
@@ -51,8 +50,8 @@
<build>
<resources>
<resource>
- <directory>src/main/resources/production</directory>
<filtering>false</filtering>
+ <directory>src/main/resources/production</directory>
</resource>
</resources>
</build>
diff --git a/src/it/skip-yes/pom.xml b/src/it/skip-yes/pom.xml
index 5f4677d..2dc2c98 100644
--- a/src/it/skip-yes/pom.xml
+++ b/src/it/skip-yes/pom.xml
@@ -17,20 +17,19 @@
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</groupId>
<artifactId>maven-resources-plugin-it-skip-yes</artifactId>
- <packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<build>
<resources>
<resource>
- <directory>src/main/resources</directory>
<filtering>true</filtering>
+ <directory>src/main/resources</directory>
</resource>
</resources>
<pluginManagement>
diff --git a/src/it/user-filters/filter/pom.xml b/src/it/user-filters/filter/pom.xml
index a8ea5e4..1a2e90c 100644
--- a/src/it/user-filters/filter/pom.xml
+++ b/src/it/user-filters/filter/pom.xml
@@ -17,8 +17,7 @@
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">
+<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.plugins.resources.its</groupId>
<artifactId>user-filters-filter</artifactId>
diff --git a/src/it/user-filters/module/pom.xml b/src/it/user-filters/module/pom.xml
index d0718e7..213dc33 100644
--- a/src/it/user-filters/module/pom.xml
+++ b/src/it/user-filters/module/pom.xml
@@ -17,13 +17,18 @@
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">
+<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.plugins.resources.its</groupId>
<artifactId>user-filters-module</artifactId>
- <name>User Filter Resources Test</name>
<version>1.0.16-SNAPSHOT</version>
+ <name>User Filter Resources Test</name>
+ <properties>
+ <escaped>this is escaped</escaped>
+ <escaped.at>this is escaped.at</escaped.at>
+ <foo>this is foo</foo>
+ <bar>this is bar</bar>
+ </properties>
<build>
<resources>
<resource>
@@ -55,10 +60,4 @@
</plugin>
</plugins>
</build>
- <properties>
- <escaped>this is escaped</escaped>
- <escaped.at>this is escaped.at</escaped.at>
- <foo>this is foo</foo>
- <bar>this is bar</bar>
- </properties>
</project>
diff --git a/src/it/user-filters/pom.xml b/src/it/user-filters/pom.xml
index ce5a980..10fab29 100644
--- a/src/it/user-filters/pom.xml
+++ b/src/it/user-filters/pom.xml
@@ -17,8 +17,7 @@
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">
+<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.plugins.resources.its</groupId>
<artifactId>user-filters-parent</artifactId>
