Skip to content

Commit c25a336

Browse files
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents 6aaa915 + 28b1893 commit c25a336

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

.github/workflows/checkBuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- uses: actions/checkout@v4
2929

3030
- name: Set up JDK
31-
uses: actions/setup-java@v3
31+
uses: actions/setup-java@v4
3232
with:
3333
distribution: ${{ matrix.distribution }}
3434
java-version: ${{ matrix.java }}

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@v4
2020

2121
- name: Set up JDK
22-
uses: actions/setup-java@v3
22+
uses: actions/setup-java@v4
2323
with:
2424
java-version: '17'
2525
distribution: 'temurin'
@@ -123,7 +123,7 @@ jobs:
123123
git pull
124124
125125
- name: Set up JDK Apache Maven Central
126-
uses: actions/setup-java@v3
126+
uses: actions/setup-java@v4
127127
with: # running setup-java again overwrites the settings.xml
128128
java-version: '17'
129129
distribution: 'temurin'
@@ -155,7 +155,7 @@ jobs:
155155
git pull
156156
157157
- name: Setup - Java
158-
uses: actions/setup-java@v3
158+
uses: actions/setup-java@v4
159159
with:
160160
java-version: '17'
161161
distribution: 'temurin'

.github/workflows/sonar.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
3232

3333
- name: Set up JDK
34-
uses: actions/setup-java@v3
34+
uses: actions/setup-java@v4
3535
with:
3636
distribution: 'temurin'
3737
java-version: 17

.github/workflows/test-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v4
1414

1515
- name: Set up JDK OSSRH
16-
uses: actions/setup-java@v3
16+
uses: actions/setup-java@v4
1717
with: # running setup-java again overwrites the settings.xml
1818
distribution: 'temurin'
1919
java-version: '17'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
<mainClass>software.xdev.vaadin.Application</mainClass>
2727

2828
<!-- Dependency-Versions -->
29-
<vaadin.version>24.2.2</vaadin.version>
29+
<vaadin.version>24.2.5</vaadin.version>
3030

31-
<org.springframework.boot.version>3.1.5</org.springframework.boot.version>
31+
<org.springframework.boot.version>3.2.0</org.springframework.boot.version>
3232
</properties>
3333

3434
<dependencyManagement>

vaadin-maps-leaflet-flow/pom.xml

Lines changed: 2 additions & 2 deletions
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>24.2.2</vaadin.version>
52+
<vaadin.version>24.2.5</vaadin.version>
5353
</properties>
5454

5555
<dependencyManagement>
@@ -178,7 +178,7 @@
178178
<plugin>
179179
<groupId>org.apache.maven.plugins</groupId>
180180
<artifactId>maven-javadoc-plugin</artifactId>
181-
<version>3.6.2</version>
181+
<version>3.6.3</version>
182182
<executions>
183183
<execution>
184184
<id>attach-javadocs</id>

0 commit comments

Comments
 (0)