Skip to content

Commit fbba1b0

Browse files
committed
Code formatting on ITs pom.xml
1 parent 3716fc1 commit fbba1b0

File tree

29 files changed

+218
-244
lines changed

29 files changed

+218
-244
lines changed

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,11 @@ under the License.
168168
<include>src/**/*.java</include>
169169
</includes>
170170
</java>
171+
<pom>
172+
<includes>
173+
<include>**/pom.xml</include>
174+
</includes>
175+
</pom>
171176
</configuration>
172177
</plugin>
173178
<plugin>

src/it/MRESOURCES-104/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
32
<!--
43
Licensed to the Apache Software Foundation (ASF) under one
54
or more contributor license agreements. See the NOTICE file
@@ -22,13 +21,13 @@ under the License.
2221
<modelVersion>4.0.0</modelVersion>
2322
<groupId>org.apache.maven.plugins.maven-resources-plugin.its</groupId>
2423
<artifactId>MRESOURCES-104</artifactId>
25-
<name>Bug Test</name>
2624
<version>0.0.1-SNAPSHOT</version>
25+
<name>Bug Test</name>
2726
<build>
2827
<resources>
2928
<resource>
30-
<directory>src/main/resources</directory>
3129
<filtering>true</filtering>
30+
<directory>src/main/resources</directory>
3231
</resource>
3332
</resources>
3433
<plugins>

src/it/MRESOURCES-105/pom.xml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
32
<!--
43
Licensed to the Apache Software Foundation (ASF) under one
54
or more contributor license agreements. See the NOTICE file
@@ -22,18 +21,18 @@ under the License.
2221
<modelVersion>4.0.0</modelVersion>
2322
<groupId>org.apache.maven.plugins.maven-resources-plugin.its</groupId>
2423
<artifactId>MRESOURCES-105</artifactId>
25-
<name>Bug Test</name>
2624
<version>0.0.1-SNAPSHOT</version>
25+
<name>Bug Test</name>
2726
<build>
27+
<filters>
28+
<filter>my.properties</filter>
29+
</filters>
2830
<resources>
2931
<resource>
30-
<directory>src/main/resources</directory>
3132
<filtering>true</filtering>
33+
<directory>src/main/resources</directory>
3234
</resource>
3335
</resources>
34-
<filters>
35-
<filter>my.properties</filter>
36-
</filters>
3736
<plugins>
3837
<plugin>
3938
<groupId>org.apache.maven.plugins</groupId>
@@ -52,4 +51,4 @@ under the License.
5251
</plugin>
5352
</plugins>
5453
</build>
55-
</project>
54+
</project>

src/it/MRESOURCES-106/pom.xml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,23 @@
1717
specific language governing permissions and limitations
1818
under the License.
1919
-->
20-
2120
<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">
2221
<modelVersion>4.0.0</modelVersion>
2322

2423
<groupId>org.apache.maven.plugins</groupId>
2524
<artifactId>MSHARED-106</artifactId>
26-
<packaging>jar</packaging>
2725
<version>1.0-SNAPSHOT</version>
26+
<packaging>jar</packaging>
27+
28+
<properties>
29+
<location>${basedir}/src/main/resources/file.txt</location>
30+
</properties>
2831

2932
<build>
3033
<resources>
3134
<resource>
32-
<directory>src/main/resources</directory>
3335
<filtering>true</filtering>
36+
<directory>src/main/resources</directory>
3437
</resource>
3538
</resources>
3639
<plugins>
@@ -41,8 +44,4 @@
4144
</plugins>
4245
</build>
4346

44-
<properties>
45-
<location>${basedir}/src/main/resources/file.txt</location>
46-
</properties>
47-
4847
</project>

src/it/MRESOURCES-110/pom.xml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
32
<!--
43
Licensed to the Apache Software Foundation (ASF) under one
54
or more contributor license agreements. See the NOTICE file
@@ -18,8 +17,7 @@ KIND, either express or implied. See the License for the
1817
specific language governing permissions and limitations
1918
under the License.
2019
-->
21-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<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">
2321
<modelVersion>4.0.0</modelVersion>
2422

2523
<groupId>org.apache.maven.plugins.maven-resources-plugin.its</groupId>
@@ -37,17 +35,17 @@ under the License.
3735
<build>
3836
<resources>
3937
<resource>
40-
<directory>src/main/resources</directory>
4138
<filtering>true</filtering>
39+
<directory>src/main/resources</directory>
4240
</resource>
4341
</resources>
4442
<plugins>
4543
<plugin>
46-
<artifactId>maven-resources-plugin</artifactId>
47-
<version>@project.version@</version>
48-
<configuration>
49-
<escapeString>!</escapeString>
50-
</configuration>
44+
<artifactId>maven-resources-plugin</artifactId>
45+
<version>@project.version@</version>
46+
<configuration>
47+
<escapeString>!</escapeString>
48+
</configuration>
5149
</plugin>
5250
</plugins>
5351
</build>

src/it/MRESOURCES-131/pom.xml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
specific language governing permissions and limitations
1818
under the License.
1919
-->
20-
2120
<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">
2221
<modelVersion>4.0.0</modelVersion>
2322

@@ -26,6 +25,15 @@
2625
<version>1.0-SNAPSHOT</version>
2726
<packaging>jar</packaging>
2827

28+
<dependencies>
29+
<dependency>
30+
<groupId>junit</groupId>
31+
<artifactId>junit</artifactId>
32+
<version>3.8.1</version>
33+
<scope>test</scope>
34+
</dependency>
35+
</dependencies>
36+
2937
<build>
3038
<pluginManagement>
3139
<plugins>
@@ -39,13 +47,4 @@
3947
</plugins>
4048
</pluginManagement>
4149
</build>
42-
43-
<dependencies>
44-
<dependency>
45-
<groupId>junit</groupId>
46-
<artifactId>junit</artifactId>
47-
<version>3.8.1</version>
48-
<scope>test</scope>
49-
</dependency>
50-
</dependencies>
5150
</project>

src/it/MRESOURCES-166/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717
specific language governing permissions and limitations
1818
under the License.
1919
-->
20-
2120
<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">
2221
<modelVersion>4.0.0</modelVersion>
2322

2423
<groupId>org.apache.maven.plugins</groupId>
2524
<artifactId>maven-resources-plugin-it-filter-MRESOURCES-166</artifactId>
26-
<packaging>jar</packaging>
2725
<version>1.0-SNAPSHOT</version>
26+
<packaging>jar</packaging>
2827

2928
<properties>
3029
<httpd.server.env>sandbox</httpd.server.env>
@@ -33,8 +32,8 @@
3332
<build>
3433
<resources>
3534
<resource>
36-
<directory>src/main/resources</directory>
3735
<filtering>true</filtering>
36+
<directory>src/main/resources</directory>
3837
</resource>
3938
</resources>
4039
<pluginManagement>

src/it/MRESOURCES-171/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
32
<!--
43
Licensed to the Apache Software Foundation (ASF) under one
54
or more contributor license agreements. See the NOTICE file
@@ -22,8 +21,8 @@ under the License.
2221
<modelVersion>4.0.0</modelVersion>
2322
<groupId>org.apache.maven.plugins.maven-resources-plugin.its</groupId>
2423
<artifactId>MRESOURCES-171</artifactId>
25-
<name>Bug Test</name>
2624
<version>0.0.1-SNAPSHOT</version>
25+
<name>Bug Test</name>
2726

2827
<properties>
2928
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -32,8 +31,8 @@ under the License.
3231
<build>
3332
<resources>
3433
<resource>
35-
<directory>src/main/resources</directory>
3634
<filtering>true</filtering>
35+
<directory>src/main/resources</directory>
3736
</resource>
3837
</resources>
3938
<plugins>

src/it/MRESOURCES-18/pom.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
32
<!--
43
Licensed to the Apache Software Foundation (ASF) under one
54
or more contributor license agreements. See the NOTICE file
@@ -18,17 +17,16 @@ KIND, either express or implied. See the License for the
1817
specific language governing permissions and limitations
1918
under the License.
2019
-->
21-
2220
<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">
2321
<modelVersion>4.0.0</modelVersion>
2422

2523
<groupId>org.apache.maven.its.it0105</groupId>
2624
<artifactId>maven-it-it0105</artifactId>
2725
<version>1.0</version>
2826

29-
<name>Maven Integration Test :: it0105</name>
27+
<name>Maven Integration Test :: it0105</name>
3028
<description>MRESOURCES-18</description>
31-
29+
3230
<properties>
3331
<my.property>foo</my.property>
3432
</properties>
@@ -42,12 +40,12 @@ under the License.
4240
<scope>test</scope>
4341
</dependency>
4442
</dependencies>
45-
43+
4644
<build>
4745
<resources>
4846
<resource>
49-
<directory>src/main/resources</directory>
5047
<filtering>true</filtering>
48+
<directory>src/main/resources</directory>
5149
</resource>
5250
</resources>
5351
<plugins>

src/it/MRESOURCES-20/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,19 @@
1717
specific language governing permissions and limitations
1818
under the License.
1919
-->
20-
2120
<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">
2221
<modelVersion>4.0.0</modelVersion>
2322

2423
<groupId>org.apache.maven.plugins</groupId>
2524
<artifactId>maven-resources-plugin-it-filter</artifactId>
26-
<packaging>jar</packaging>
2725
<version>1.0-SNAPSHOT</version>
26+
<packaging>jar</packaging>
2827

2928
<build>
3029
<resources>
3130
<resource>
32-
<directory>src/main/resources</directory>
3331
<filtering>true</filtering>
32+
<directory>src/main/resources</directory>
3433
</resource>
3534
</resources>
3635
<pluginManagement>

0 commit comments

Comments
 (0)