Update war.plugin to work with jdk 21 Signed-off-by: jansupol <jan.supol@oracle.com>
diff --git a/archetypes/jersey-example-java8-webapp/src/main/resources/archetype-resources/pom.xml b/archetypes/jersey-example-java8-webapp/src/main/resources/archetype-resources/pom.xml index c06e210..dc88fe1 100644 --- a/archetypes/jersey-example-java8-webapp/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/jersey-example-java8-webapp/src/main/resources/archetype-resources/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2015, 2023 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -98,6 +98,11 @@ <war>${project.build.directory}/${project.build.finalName}.war</war> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>${war.mvn.plugin.version}</version> + </plugin> </plugins> </build> @@ -122,5 +127,6 @@ <properties> <java.version>1.8</java.version> <jersey.config.test.container.port>8080</jersey.config.test.container.port> + <war.mvn.plugin.version>3.4.0</war.mvn.plugin.version> </properties> </project>
diff --git a/archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml b/archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml index 42ff220..6d2d752 100644 --- a/archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml
@@ -106,6 +106,11 @@ <artifactId>maven-surefire-plugin</artifactId> <version>${surefire.mvn.plugin.version}</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>${war.mvn.plugin.version}</version> + </plugin> </plugins> </build> @@ -114,5 +119,6 @@ <jetty.version>9.4.51.v20230217</jetty.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <surefire.mvn.plugin.version>3.1.2</surefire.mvn.plugin.version> + <war.mvn.plugin.version>3.4.0</war.mvn.plugin.version> </properties> </project>
diff --git a/archetypes/jersey-quickstart-webapp/src/main/resources/archetype-resources/pom.xml b/archetypes/jersey-quickstart-webapp/src/main/resources/archetype-resources/pom.xml index bddb095..fc70d51 100644 --- a/archetypes/jersey-quickstart-webapp/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/jersey-quickstart-webapp/src/main/resources/archetype-resources/pom.xml
@@ -22,6 +22,11 @@ <target>1.8</target> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>${war.mvn.plugin.version}</version> + </plugin> </plugins> </build> @@ -58,5 +63,6 @@ <properties> <jersey.version>${project.version}</jersey.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <war.mvn.plugin.version>3.4.0</war.mvn.plugin.version> </properties> </project>
diff --git a/pom.xml b/pom.xml index 662e4bf..f50b38c 100644 --- a/pom.xml +++ b/pom.xml
@@ -2193,7 +2193,7 @@ <site.mvn.plugin.version>3.9.1</site.mvn.plugin.version> <source.mvn.plugin.version>3.3.0</source.mvn.plugin.version> <surefire.mvn.plugin.version>3.1.2</surefire.mvn.plugin.version> - <war.mvn.plugin.version>3.3.2</war.mvn.plugin.version> + <war.mvn.plugin.version>3.4.0</war.mvn.plugin.version> <wiremock.mvn.plugin.version>2.11.0</wiremock.mvn.plugin.version> <xml.mvn.plugin.version>1.0.2</xml.mvn.plugin.version> <!-- END of Versions of Maven plugins -->