Merge branch 'develop' of https://github.com/xdev-software/vaadin-grid-filter into develop

Author: AB-xdev

pom.xml

@@ -82,12 +82,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.5.0</version>
+								<version>7.6.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.5.0</version>
+								<version>7.6.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

vaadin-grid-filter-demo/pom.xml

@@ -61,6 +61,12 @@
 		<dependency>
 			<groupId>com.vaadin</groupId>
 			<artifactId>vaadin-core</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>com.vaadin</groupId>
+					<artifactId>hilla-dev</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>software.xdev</groupId>
@@ -72,6 +78,12 @@
 		<dependency>
 			<groupId>com.vaadin</groupId>
 			<artifactId>vaadin-spring-boot-starter</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>com.vaadin</groupId>
+					<artifactId>hilla</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<!-- Temporarily excluded by Vaadin due to "security vulnerability" -->
 		<dependency>

vaadin-grid-filter/pom.xml

@@ -130,7 +130,7 @@
 			<plugin>
 				<groupId>com.mycila</groupId>
 				<artifactId>license-maven-plugin</artifactId>
-				<version>4.5</version>
+				<version>4.6</version>
 				<configuration>
 					<properties>
 						<email>${project.organization.url}</email>
@@ -350,12 +350,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.5.0</version>
+								<version>7.6.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.5.0</version>
+								<version>7.6.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>