Skip to content

Commit dfe9ba9

Browse files
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents c90c945 + 57d19b4 commit dfe9ba9

File tree

4 files changed

+21
-2
lines changed

4 files changed

+21
-2
lines changed

.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ updates:
2121
time: "00:00"
2222
open-pull-requests-limit: 10
2323
ignore:
24+
- dependency-name: "org.yaml:snakeyaml"
25+
# Version 2+ requires Spring Boot 3
26+
versions: ">=2.0.0"
2427
- dependency-name: "org.springframework.boot:*"
2528
# Version 3+ requires Vaadin 24
2629
versions: ">=3.0.0"
30+
- dependency-name: "com.vaadin:*"
31+
versions: ">=24.0.0"
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
vaadin:
2+
whitelisted-packages: software/xdev,com/vaadin/flow
3+
4+
spring:
5+
devtools:
6+
restart:
7+
poll-interval: 2s
8+
quiet-period: 1s

vaadin-maps-leaflet-flow-demo/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<mainClass>software.xdev.vaadin.Application</mainClass>
3636

3737
<!-- Dependency-Versions -->
38-
<vaadin.version>23.3.6</vaadin.version>
38+
<vaadin.version>23.3.7</vaadin.version>
3939

4040
<org.springframework.boot.version>2.7.9</org.springframework.boot.version>
4141
</properties>
@@ -79,6 +79,12 @@
7979
<groupId>com.vaadin</groupId>
8080
<artifactId>vaadin-spring-boot-starter</artifactId>
8181
</dependency>
82+
<!-- Temporarily excluded by Vaadin due to "security vulnerability" -->
83+
<dependency>
84+
<groupId>org.yaml</groupId>
85+
<artifactId>snakeyaml</artifactId>
86+
<version>1.33</version>
87+
</dependency>
8288
<dependency>
8389
<groupId>org.springframework.boot</groupId>
8490
<artifactId>spring-boot-devtools</artifactId>

vaadin-maps-leaflet-flow/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5050

5151
<!-- Dependency-Versions -->
52-
<vaadin.version>23.3.6</vaadin.version>
52+
<vaadin.version>23.3.7</vaadin.version>
5353
</properties>
5454

5555
<dependencyManagement>

0 commit comments

Comments
 (0)