You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/06/11 20:06:07 UTC
[maven-war-plugin] 01/02: Fix formatting
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git
commit 31ed4e9a7f3e96c8ad1ddb72ffee43d97daa1886
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Jun 11 21:21:31 2023 +0200
Fix formatting
---
src/it/MWAR-306/pom.xml | 44 ++++++++---------
src/it/MWAR-311/pom.xml | 60 ++++++++++++------------
src/it/MWAR-314/pom.xml | 40 ++++++++--------
src/it/MWAR-371/pom.xml | 52 ++++++++++----------
src/it/MWAR-96/pom.xml | 2 +-
src/it/web-resources-filtering-delimiter/pom.xml | 5 +-
src/it/web-resources-filtering/pom.xml | 5 +-
7 files changed, 101 insertions(+), 107 deletions(-)
diff --git a/src/it/MWAR-306/pom.xml b/src/it/MWAR-306/pom.xml
index facc3b5..93ced0b 100644
--- a/src/it/MWAR-306/pom.xml
+++ b/src/it/MWAR-306/pom.xml
@@ -18,28 +18,28 @@ 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>
- <groupId>foo.bar</groupId>
+ 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>foo.bar</groupId>
<artifactId>MWAR-306</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>war</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>@project.groupId@</groupId>
- <artifactId>@project.artifactId@</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>@project.groupId@</groupId>
+ <artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
- <configuration>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- <webResources>
- <resource>
- <directory>src/main/webapp</directory>
- <filtering>true</filtering>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ <webResources>
+ <resource>
+ <directory>src/main/webapp</directory>
+ <filtering>true</filtering>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/src/it/MWAR-311/pom.xml b/src/it/MWAR-311/pom.xml
index 820173b..c59505a 100644
--- a/src/it/MWAR-311/pom.xml
+++ b/src/it/MWAR-311/pom.xml
@@ -25,40 +25,40 @@ under the License.
<name>Maven War Plugin Bug</name>
<description>Filtering of properties files (as a web resource) broken in maven-war-plugin version 2.4.</description>
<packaging>war</packaging>
-
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <my.maven.property>foo foo</my.maven.property>
+ <my.maven.property>foo foo</my.maven.property>
</properties>
-
+
<build>
- <filters>
- <filter>src/main/resources/default.properties</filter>
- </filters>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>@project.groupId@</groupId>
- <artifactId>@project.artifactId@</artifactId>
+ <filters>
+ <filter>src/main/resources/default.properties</filter>
+ </filters>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>@project.groupId@</groupId>
+ <artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
- <configuration>
- <webResources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/app.properties</include>
- </includes>
- </resource>
- </webResources>
- <archiveClasses>true</archiveClasses>
- </configuration>
- </plugin>
- </plugins>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/app.properties</include>
+ </includes>
+ </resource>
+ </webResources>
+ <archiveClasses>true</archiveClasses>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/src/it/MWAR-314/pom.xml b/src/it/MWAR-314/pom.xml
index da9ef17..38b5efc 100644
--- a/src/it/MWAR-314/pom.xml
+++ b/src/it/MWAR-314/pom.xml
@@ -1,5 +1,5 @@
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,22 +18,22 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
- <modelVersion>4.0.0</modelVersion>
- <groupId>mwar314</groupId>
- <artifactId>mwar314</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>war</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>@project.version@</version>
- <configuration>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>mwar314</groupId>
+ <artifactId>mwar314</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/it/MWAR-371/pom.xml b/src/it/MWAR-371/pom.xml
index 1f72884..a14e904 100644
--- a/src/it/MWAR-371/pom.xml
+++ b/src/it/MWAR-371/pom.xml
@@ -18,34 +18,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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>mwar371</groupId>
- <artifactId>mwar371</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Maven Integration Test :: MWAR-371</name>
+ 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>mwar371</groupId>
+ <artifactId>mwar371</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Maven Integration Test :: MWAR-371</name>
<description>MWAR-371 integration test</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
-
- <modules>
- <module>generic</module>
- <module>custom</module>
- </modules>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>@project.version@</version>
- <configuration>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
\ No newline at end of file
+
+ <modules>
+ <module>generic</module>
+ <module>custom</module>
+ </modules>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
diff --git a/src/it/MWAR-96/pom.xml b/src/it/MWAR-96/pom.xml
index 3a303a5..1e895f7 100644
--- a/src/it/MWAR-96/pom.xml
+++ b/src/it/MWAR-96/pom.xml
@@ -25,7 +25,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
<name>MWAR-96 MWAR-144 Tests</name>
<url>http://maven.apache.org</url>
- <build>
+ <build>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
diff --git a/src/it/web-resources-filtering-delimiter/pom.xml b/src/it/web-resources-filtering-delimiter/pom.xml
index 8439116..9979ce9 100644
--- a/src/it/web-resources-filtering-delimiter/pom.xml
+++ b/src/it/web-resources-filtering-delimiter/pom.xml
@@ -28,10 +28,9 @@ under the License.
<relativePath>parent/pom.xml</relativePath>
</parent>
-
<artifactId>example</artifactId>
<packaging>pom</packaging>
-
+
<name>Example Maven Multi-module project For Filtering with Delimiters</name>
<url>http://maven.apache.org</url>
@@ -39,6 +38,4 @@ under the License.
<module>parent</module>
<module>web</module>
</modules>
-
-
</project>
diff --git a/src/it/web-resources-filtering/pom.xml b/src/it/web-resources-filtering/pom.xml
index 8412bae..1db8bb5 100644
--- a/src/it/web-resources-filtering/pom.xml
+++ b/src/it/web-resources-filtering/pom.xml
@@ -28,10 +28,9 @@ under the License.
<relativePath>parent/pom.xml</relativePath>
</parent>
-
<artifactId>example</artifactId>
<packaging>pom</packaging>
-
+
<name>Example Maven Multi-module project</name>
<url>http://maven.apache.org</url>
@@ -39,6 +38,4 @@ under the License.
<module>parent</module>
<module>web</module>
</modules>
-
-
</project>