Code formatting on ITs pom.xml

apache · Jun 26, 2024 · fbba1b0 · fbba1b0
1 parent 3716fc1
commit fbba1b0
Show file tree

Hide file tree

Showing 29 changed files with 218 additions and 244 deletions.
diff --git a/pom.xml b/pom.xml
@@ -168,6 +168,11 @@ under the License.
               <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
@@ -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 @@ under the License.
   <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
@@ -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 @@ under the License.
   <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>
+    <filters>
+      <filter>my.properties</filter>
+    </filters>
     <resources>
       <resource>
-        <directory>src/main/resources</directory>
         <filtering>true</filtering>
+        <directory>src/main/resources</directory>
       </resource>
     </resources>
-    <filters>
-      <filter>my.properties</filter>
-    </filters>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -52,4 +51,4 @@ under the License.
       </plugin>
     </plugins>
   </build>
-</project>
+</project>
diff --git 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
@@ -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 @@ 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/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 @@ under the License.
   <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
@@ -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
@@ -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
@@ -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 @@ under the License.
   <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 @@ under the License.
   <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
@@ -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,17 +17,16 @@ 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.its.it0105</groupId>
   <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 @@ under the License.
       <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
@@ -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
@@ -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 @@ under the License.
   <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 @@ under the License.
         <artifactId>maven-resources-plugin</artifactId>
         <version>@project.version@</version>
         <configuration>
-          <escapeString>&empty;</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
@@ -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 @@ under the License.
   <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 @@ under the License.
     </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 @@ under the License.
     </plugins>
   </build>
 </project>
-