From 171ac31a41196e29145e0f55e9275cb2eecb91a9 Mon Sep 17 00:00:00 2001
From: Zhe Sun <zhe@vaadin.com>
Date: Wed, 10 Jun 2026 15:03:23 +0300
Subject: [PATCH 1/2] chore: declaration war plugin version

---
 pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pom.xml b/pom.xml
index 4b53e3b..989bb12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
         <maven.javadoc.version>3.4.1</maven.javadoc.version>
         <maven.surefire.version>3.2.5</maven.surefire.version>
         <maven.failsafe.version>3.2.5</maven.failsafe.version>
+        <maven.war.version>3.4.0</maven.war.version>
         <spotless.plugin.version>3.5.1</spotless.plugin.version>
         <spotless.license-header>${maven.multiModuleProjectDirectory}/eclipse/vaadin-commercial-license-header.txt</spotless.license-header>
         <spotless.ratchetFrom/>
@@ -181,6 +182,15 @@
                     <artifactId>maven-failsafe-plugin</artifactId>
                     <version>${maven.failsafe.version}</version>
                 </plugin>
+                <plugin>
+                    <!-- vaadin-parent pins maven-war-plugin to 2.2, whose old
+                         Plexus runtime fails on Java 17+ ("Cannot access
+                         defaults field of Properties"). Override with a
+                         current version. -->
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>${maven.war.version}</version>
+                </plugin>
                 <plugin>
                     <groupId>com.diffplug.spotless</groupId>
                     <artifactId>spotless-maven-plugin</artifactId>

From b9a07d1e5f8b9aa11ba099b0a0b10b37d613efc5 Mon Sep 17 00:00:00 2001
From: Zhe Sun <31067185+ZheSun88@users.noreply.github.com>
Date: Wed, 10 Jun 2026 15:06:36 +0300
Subject: [PATCH 2/2] use latest 3.5.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 989bb12..84d8b1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
         <maven.javadoc.version>3.4.1</maven.javadoc.version>
         <maven.surefire.version>3.2.5</maven.surefire.version>
         <maven.failsafe.version>3.2.5</maven.failsafe.version>
-        <maven.war.version>3.4.0</maven.war.version>
+        <maven.war.version>3.5.1</maven.war.version>
         <spotless.plugin.version>3.5.1</spotless.plugin.version>
         <spotless.license-header>${maven.multiModuleProjectDirectory}/eclipse/vaadin-commercial-license-header.txt</spotless.license-header>
         <spotless.ratchetFrom/>