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
This commit is contained in:
Kasra Madadipouya 2023-05-11 07:35:28 +02:00 committed by GitHub
parent 4192bf3bdc
commit 167a3f53ed
3 changed files with 6 additions and 3 deletions

View File

@ -65,4 +65,4 @@
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
</properties>
</project>
</project>

View File

@ -19,8 +19,8 @@
</properties>
<modules>
<module>dummy-surefire-junit47</module>
<module>core-java-exclusions</module>
<module>dummy-surefire-junit47</module>
</modules>
<build>

View File

@ -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>