From 167a3f53ed09464c79c070cff015d20016b80354 Mon Sep 17 00:00:00 2001
From: Kasra Madadipouya <kasra_mp@yahoo.com>
Date: Thu, 11 May 2023 07:35:28 +0200
Subject: [PATCH] JAVA-20630 upgrade maven war plugin to be compatible with JDK
 11 and 17 (#13945)

* JAVA-20630 upgrade maven war plugin to be compatible with JDK 11 and 17

* JAVA-20630 code format

* JAVA-20630 don't fail if there's no web.xml and using Java based configuration while building a war file

* JAVA-20630 avoid unneeded formatting

* JAVA-20630 change order of modules to solve flaky tests
---
 jws/pom.xml                                | 2 +-
 maven-modules/dependency-exclusion/pom.xml | 2 +-
 pom.xml                                    | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/jws/pom.xml b/jws/pom.xml
index 8c14a16cff..2f01f90721 100644
--- a/jws/pom.xml
+++ b/jws/pom.xml
@@ -65,4 +65,4 @@
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-modules/dependency-exclusion/pom.xml b/maven-modules/dependency-exclusion/pom.xml
index 13de16a57c..1e0afe28b8 100644
--- a/maven-modules/dependency-exclusion/pom.xml
+++ b/maven-modules/dependency-exclusion/pom.xml
@@ -19,8 +19,8 @@
     </properties>
 
     <modules>
-        <module>dummy-surefire-junit47</module>
         <module>core-java-exclusions</module>
+        <module>dummy-surefire-junit47</module>
     </modules>
 
     <build>
diff --git a/pom.xml b/pom.xml
index 7bca64c424..483955fcee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -222,6 +222,9 @@
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <version>${maven-war-plugin.version}</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
             </plugin>
         </plugins>
 
@@ -1258,7 +1261,7 @@
         <commons-lang.version>2.6</commons-lang.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <commons-cli.version>1.5.0</commons-cli.version>
-        <maven-war-plugin.version>3.0.0</maven-war-plugin.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
         <jstl-api.version>1.2</jstl-api.version>
         <javax.servlet.jsp-api.version>2.3.3</javax.servlet.jsp-api.version>