Skip to content

Commit 9b23bbb

Browse files
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents ee46937 + 81ae43b commit 9b23bbb

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

.github/workflows/checkBuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
strategy:
2323
matrix:
24-
java: [17]
24+
java: [17, 21]
2525
distribution: [temurin]
2626

2727
steps:

.github/workflows/update-from-template.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,8 @@ jobs:
8686
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8787
run: |
8888
gh_pr_up() {
89-
gh pr create "$@" || gh pr edit "$@"
89+
gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@"
9090
}
9191
gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \
92-
-H "${{ env.UPDATE_BRANCH }}" \
9392
--title "Update from template" \
9493
--body "An automated PR to sync changes from the template into this repo"

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ We also encourage you to read the [contribution instructions by GitHub](https://
1919
### Software Requirements
2020
You should have the following things installed:
2121
* Git
22-
* Java 17 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
22+
* Java 21 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
2323
* Maven
2424

2525
### Recommended setup

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.1.12</vaadin.version>
29+
<vaadin.version>24.2.0</vaadin.version>
3030

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

3434
<dependencyManagement>

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>24.1.12</vaadin.version>
52+
<vaadin.version>24.2.0</vaadin.version>
5353
</properties>
5454

5555
<dependencyManagement>

0 commit comments

Comments
 (0)