Skip to content

Commit

Permalink
Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@michael-o
michael-o committed Jun 11, 2023
1 parent 7053021 commit 31ed4e9
Show file tree
Hide file tree
Showing 7 changed files with 101 additions and 107 deletions.
44 changes: 22 additions & 22 deletions src/it/MWAR-306/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
60 changes: 30 additions & 30 deletions src/it/MWAR-311/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
40 changes: 20 additions & 20 deletions src/it/MWAR-314/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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>
<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>
52 changes: 26 additions & 26 deletions src/it/MWAR-371/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

<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>
2 changes: 1 addition & 1 deletion src/it/MWAR-96/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 1 addition & 4 deletions src/it/web-resources-filtering-delimiter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,14 @@ 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>

<modules>
<module>parent</module>
<module>web</module>
</modules>


</project>
5 changes: 1 addition & 4 deletions src/it/web-resources-filtering/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,14 @@ 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>

<modules>
<module>parent</module>
<module>web</module>
</modules>


</project>

0 comments on commit 31ed4e9

Please sign in to comment.