Merge branch 'update-from-template' into develop

xdev-software · Nov 7, 2023 · 1254787 · 1254787
2 parents b686fad + eccee27
commit 1254787
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -105,6 +105,9 @@ jobs:
              <artifactId>${{ env.PRIMARY_MAVEN_MODULE }}</artifactId>
              <version>${{ steps.version.outputs.release }}</version>
           </dependency>
+
+          ### Additional notes
+          * [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)
           ```
 
   publish_central: # Publish the code to central

diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml
@@ -86,7 +86,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh_pr_up() { 
-            gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" ||  git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@" 
+            gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || (git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@")
           }
           gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \
             --title "Update from template" \

diff --git a/vaadin-date-range-picker-demo/pom.xml b/vaadin-date-range-picker-demo/pom.xml
@@ -26,7 +26,7 @@
 		<mainClass>software.xdev.vaadin.Application</mainClass>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.2.0</vaadin.version>
+		<vaadin.version>24.2.2</vaadin.version>
 
 		<org.springframework.boot.version>3.1.5</org.springframework.boot.version>
 	</properties>

diff --git a/vaadin-date-range-picker/pom.xml b/vaadin-date-range-picker/pom.xml
@@ -49,7 +49,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.2.0</vaadin.version>
+		<vaadin.version>24.2.2</vaadin.version>
 	</properties>
 
 	<dependencyManagement>
@@ -166,7 +166,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.6.0</version>
+				<version>3.6.2</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>