Skip to content

Commit a4afa9a

Browse files
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents 17259f8 + eccee27 commit a4afa9a

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@ jobs:
105105
<artifactId>${{ env.PRIMARY_MAVEN_MODULE }}</artifactId>
106106
<version>${{ steps.version.outputs.release }}</version>
107107
</dependency>
108+
109+
### Additional notes
110+
* [Spring-Boot] You may have to include ``software/xdev`` inside [``vaadin.whitelisted-packages``](https://vaadin.com/docs/latest/integrations/spring/configuration#configure-the-scanning-of-packages)
108111
```
109112
110113
publish_central: # Publish the code to central

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8787
run: |
8888
gh_pr_up() {
89-
gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || git checkout "${{ env.UPDATE_BRANCH }}" && 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 }}" \
9292
--title "Update from template" \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<mainClass>software.xdev.vaadin.Application</mainClass>
2727

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

3131
<org.springframework.boot.version>3.1.5</org.springframework.boot.version>
3232
</properties>

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.0</vaadin.version>
52+
<vaadin.version>24.2.2</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.0</version>
181+
<version>3.6.2</version>
182182
<executions>
183183
<execution>
184184
<id>attach-javadocs</id>

0 commit comments

Comments
 (0)