Skip to content

Commit 5d5f2a7

Browse files
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents a943e30 + 621031c commit 5d5f2a7

File tree

4 files changed

+24
-19
lines changed

4 files changed

+24
-19
lines changed

.github/workflows/release.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,12 @@ jobs:
223223
git push origin
224224
225225
- name: pull-request
226-
uses: repo-sync/pull-request@v2
227-
with:
228-
destination_branch: "develop"
229-
pr_title: "Sync back"
230-
pr_body: "An automated PR to sync changes back"
231-
226+
env:
227+
GH_TOKEN: ${{ github.token }}
228+
run: |
229+
gh_pr_up() {
230+
gh pr create "$@" || gh pr edit "$@"
231+
}
232+
gh_pr_up -B "develop" \
233+
--title "Sync back" \
234+
--body "An automated PR to sync changes back"

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,14 @@ jobs:
8181
echo "abort=0" >> $GITHUB_OUTPUT
8282
8383
- name: pull-request
84-
uses: repo-sync/pull-request@v2
8584
if: steps.main.outputs.abort == 0
86-
with:
87-
github_token: ${{ secrets.GITHUB_TOKEN }}
88-
source_branch: ${{ env.UPDATE_BRANCH }}
89-
destination_branch: ${{ steps.main.outputs.current_branch }}
90-
pr_title: "Update from template"
91-
pr_body: "An automated PR to sync changes from the template into this repo"
92-
85+
env:
86+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
87+
run: |
88+
gh_pr_up() {
89+
gh pr create "$@" || gh pr edit "$@"
90+
}
91+
gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \
92+
-H "${{ env.UPDATE_BRANCH }}" \
93+
--title "Update from template" \
94+
--body "An automated PR to sync changes from the template into this repo"

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.8</vaadin.version>
29+
<vaadin.version>24.1.11</vaadin.version>
3030

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

3434
<dependencyManagement>

vaadin-maps-leaflet-flow/pom.xml

Lines changed: 3 additions & 3 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.1.8</vaadin.version>
52+
<vaadin.version>24.1.11</vaadin.version>
5353
</properties>
5454

5555
<dependencyManagement>
@@ -123,7 +123,7 @@
123123
<plugin>
124124
<groupId>com.mycila</groupId>
125125
<artifactId>license-maven-plugin</artifactId>
126-
<version>4.2</version>
126+
<version>4.3</version>
127127
<configuration>
128128
<properties>
129129
<email>${project.organization.url}</email>
@@ -178,7 +178,7 @@
178178
<plugin>
179179
<groupId>org.apache.maven.plugins</groupId>
180180
<artifactId>maven-javadoc-plugin</artifactId>
181-
<version>3.5.0</version>
181+
<version>3.6.0</version>
182182
<executions>
183183
<execution>
184184
<id>attach-javadocs</id>

0 commit comments

Comments
 (0)