Merge pull request #222 from xdev-software/develop

Rlease
xdev-software · Jun 28, 2024 · 89d3fea · 89d3fea
2 parents fdb1a2a + f6f8486
commit 89d3fea
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -74,8 +74,8 @@ tsconfig.json
 types.d.ts
 vite.config.ts
 vite.generated.ts
-/*/frontend/generated/
-/*/frontend/index.html
+/*/src/main/frontend/generated/
+/*/src/main/frontend/index.html
 /*/src/main/dev-bundle/
 /*/src/main/bundles/
 *.lock

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 3.2.0
+* Updated to Vaadin 24.4
+
 ## 3.1.0
 * Update to [JasperReports 7](https://github.com/xdev-software/dynamicreports-core-for-grid-exporter/blob/develop/CHANGELOG.md#200)
 * Updated dependencies

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>vaadin-grid-exporter-root</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>
@@ -82,12 +82,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.2.0</version>
+								<version>7.3.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.2.0</version>
+								<version>7.3.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

diff --git a/vaadin-grid-exporter-demo/pom.xml b/vaadin-grid-exporter-demo/pom.xml
@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>vaadin-grid-exporter-root</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>vaadin-grid-exporter-demo</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.2.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<organization>
@@ -29,7 +29,7 @@
 		<mainClass>software.xdev.vaadin.Application</mainClass>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.3.13</vaadin.version>
+		<vaadin.version>24.4.4</vaadin.version>
 
 		<org.springframework.boot.version>3.3.1</org.springframework.boot.version>
 	</properties>
@@ -61,13 +61,6 @@
 		<dependency>
 			<groupId>com.vaadin</groupId>
 			<artifactId>vaadin-core</artifactId>
-			<exclusions>
-				<!-- https://github.com/vaadin/flow/issues/18449 -->
-				<exclusion>
-					<groupId>com.vaadin</groupId>
-					<artifactId>copilot</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>software.xdev</groupId>

diff --git a/vaadin-grid-exporter/pom.xml b/vaadin-grid-exporter/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>vaadin-grid-exporter</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.2.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>vaadin-grid-exporter</name>
@@ -50,7 +50,7 @@
 		<failOnMissingWebXml>false</failOnMissingWebXml>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.3.13</vaadin.version>
+		<vaadin.version>24.4.4</vaadin.version>
 	</properties>
 
 	<dependencyManagement>
@@ -104,13 +104,6 @@
 		<dependency>
 			<groupId>com.vaadin</groupId>
 			<artifactId>vaadin-core</artifactId>
-			<exclusions>
-				<!-- https://github.com/vaadin/flow/issues/18449 -->
-				<exclusion>
-					<groupId>com.vaadin</groupId>
-					<artifactId>copilot</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>software.xdev</groupId>
@@ -121,7 +114,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.10.2</version>
+			<version>5.10.3</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -369,12 +362,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.2.0</version>
+								<version>7.3.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.2.0</version>
+								<version>7.3.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>