diff --git a/.config/pmd/java/ruleset.xml b/.config/pmd/java/ruleset.xml
index aed3c83..a0fff54 100644
--- a/.config/pmd/java/ruleset.xml
+++ b/.config/pmd/java/ruleset.xml
@@ -42,6 +42,7 @@
 	<rule ref="category/java/codestyle.xml/NoPackage"/>
 	<rule ref="category/java/codestyle.xml/PrematureDeclaration"/>
 	<rule ref="category/java/codestyle.xml/UnnecessarySemicolon"/>
+	<rule ref="category/java/codestyle.xml/VariableCanBeInlined"/>
 
 	<rule ref="category/java/design.xml">
 		<!-- Sometimes abstract classes have just fields -->
@@ -138,6 +139,7 @@
 	<rule ref="category/java/errorprone.xml/AvoidMultipleUnaryOperators"/>
 	<rule ref="category/java/errorprone.xml/AvoidUsingOctalValues"/>
 	<rule ref="category/java/errorprone.xml/BrokenNullCheck"/>
+	<rule ref="category/java/errorprone.xml/CollectionTypeMismatch"/>
 	<rule ref="category/java/errorprone.xml/ComparisonWithNaN"/>
 	<rule ref="category/java/errorprone.xml/DoNotCallGarbageCollectionExplicitly"/>
 	<rule ref="category/java/errorprone.xml/DontImportSun"/>
@@ -155,7 +157,7 @@
 	<rule ref="category/java/errorprone.xml/SingletonClassReturningNewInstance"/>
 	<rule ref="category/java/errorprone.xml/UnconditionalIfStatement"/>
 	<rule ref="category/java/errorprone.xml/UnnecessaryCaseChange"/>
-	<rule ref="category/java/errorprone.xml/UselessOperationOnImmutable"/>
+	<rule ref="category/java/errorprone.xml/UselessPureMethodCall"/>
 
 
 	<rule ref="category/java/multithreading.xml">
diff --git a/pom.xml b/pom.xml
index a7d9335..4562c9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,12 +83,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.16.0</version>
+								<version>7.17.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.16.0</version>
+								<version>7.17.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
diff --git a/vaadin-chartjs-wrapper-demo/pom.xml b/vaadin-chartjs-wrapper-demo/pom.xml
index f5b1382..fc12f24 100644
--- a/vaadin-chartjs-wrapper-demo/pom.xml
+++ b/vaadin-chartjs-wrapper-demo/pom.xml
@@ -29,7 +29,7 @@
 		<mainClass>software.xdev.vaadin.Application</mainClass>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.8.7</vaadin.version>
+		<vaadin.version>24.8.8</vaadin.version>
 
 		<org.springframework.boot.version>3.5.5</org.springframework.boot.version>
 	</properties>
@@ -143,6 +143,40 @@
 		</pluginManagement>
 		
 		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<version>3.5.1</version>
+				<executions>
+					<execution>
+						<id>patch-package-json-overrides</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>java</goal>
+						</goals>
+						<configuration>
+							<mainClass>software.xdev.vaadin.vpjo.Launcher</mainClass>
+							<arguments>
+								<argument>${project.basedir}</argument>
+								<argument>${project.build.directory}</argument>
+							</arguments>
+							<includeProjectDependencies>false</includeProjectDependencies>
+							<includePluginDependencies>true</includePluginDependencies>
+							<executableDependency>
+								<groupId>software.xdev</groupId>
+								<artifactId>vaadin-package-json-optimizer</artifactId>
+							</executableDependency>
+						</configuration>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>software.xdev</groupId>
+						<artifactId>vaadin-package-json-optimizer</artifactId>
+						<version>1.0.0</version>
+					</dependency>
+				</dependencies>
+			</plugin>
 			<plugin>
 				<groupId>com.vaadin</groupId>
 				<artifactId>vaadin-maven-plugin</artifactId>
@@ -194,6 +228,19 @@
 	</build>
 
 	<profiles>
+		<profile>
+			<id>dev</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>software.xdev</groupId>
+					<artifactId>vaadin-package-json-optimizer</artifactId>
+					<version>1.0.0</version>
+				</dependency>
+			</dependencies>
+		</profile>
 		<profile>
 			<id>production</id>
 			<dependencies>
diff --git a/vaadin-chartjs-wrapper/pom.xml b/vaadin-chartjs-wrapper/pom.xml
index 00d0ff1..3f13e1c 100644
--- a/vaadin-chartjs-wrapper/pom.xml
+++ b/vaadin-chartjs-wrapper/pom.xml
@@ -49,7 +49,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.8.7</vaadin.version>
+		<vaadin.version>24.8.8</vaadin.version>
 	</properties>
 
 	<dependencyManagement>
@@ -299,12 +299,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.16.0</version>
+								<version>7.17.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.16.0</version>
+								<version>7.17.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>