Skip to content

Commit ffb40f9

Browse files
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents 695c81c + 2a54876 commit ffb40f9

File tree

5 files changed

+33
-26
lines changed

5 files changed

+33
-26
lines changed

.github/workflows/release.yml

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66

77
env:
88
PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
9-
DEMO_MAVEN_MODULE: ${{ github.event.repository.name }}-demo
109

1110
permissions:
1211
contents: write
@@ -58,17 +57,16 @@ jobs:
5857
run: |
5958
git config --global user.email "[email protected]"
6059
git config --global user.name "GitHub Actions"
61-
62-
- name: Un-SNAP root
63-
run: mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false
64-
65-
- name: Un-SNAP demo
66-
run: mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false
67-
working-directory: ${{ env.DEMO_MAVEN_MODULE }}
6860
6961
- name: Un-SNAP
70-
run: mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false
71-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
62+
run: |
63+
modules=("") # root
64+
modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
65+
for i in "${modules[@]}"
66+
do
67+
echo "Processing $i/pom.xml"
68+
(cd "$i" && mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false)
69+
done
7270
7371
- name: Get version
7472
id: version
@@ -207,17 +205,16 @@ jobs:
207205
git config --global user.email "[email protected]"
208206
git config --global user.name "GitHub Actions"
209207
git pull
210-
211-
- name: Inc Version and SNAP root
212-
run: mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true
213-
214-
- name: Inc Version and SNAP demo
215-
run: mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true
216-
working-directory: ${{ env.DEMO_MAVEN_MODULE }}
217-
208+
218209
- name: Inc Version and SNAP
219-
run: mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true
220-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
210+
run: |
211+
modules=("") # root
212+
modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
213+
for i in "${modules[@]}"
214+
do
215+
echo "Processing $i/pom.xml"
216+
(cd "$i" && mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true)
217+
done
221218
222219
- name: Git Commit and Push
223220
run: |

.github/workflows/sonar.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,12 @@ jobs:
5353
restore-keys: ${{ runner.os }}-m2
5454

5555
- name: Build with Maven
56-
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=${{ env.SONARCLOUD_ORG }}_${{ github.event.repository.name }} -Dsonar.organization=${{ env.SONARCLOUD_ORG }} -Dsonar.host.url=${{ env.SONARCLOUD_HOST }}
56+
run: |
57+
mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
58+
-DskipTests \
59+
-Dsonar.projectKey=${{ env.SONARCLOUD_ORG }}_${{ github.event.repository.name }} \
60+
-Dsonar.organization=${{ env.SONARCLOUD_ORG }} \
61+
-Dsonar.host.url=${{ env.SONARCLOUD_HOST }}
5762
env:
5863
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
5964
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.idea/codeStyles/Project.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 3 additions & 3 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.3.3</vaadin.version>
29+
<vaadin.version>24.3.5</vaadin.version>
3030

31-
<org.springframework.boot.version>3.2.1</org.springframework.boot.version>
31+
<org.springframework.boot.version>3.2.2</org.springframework.boot.version>
3232
</properties>
3333

3434
<dependencyManagement>
@@ -191,7 +191,7 @@
191191
<dependency>
192192
<groupId>com.puppycrawl.tools</groupId>
193193
<artifactId>checkstyle</artifactId>
194-
<version>10.12.7</version>
194+
<version>10.13.0</version>
195195
</dependency>
196196
</dependencies>
197197
<configuration>

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

5555
<dependencyManagement>
@@ -296,7 +296,7 @@
296296
<dependency>
297297
<groupId>com.puppycrawl.tools</groupId>
298298
<artifactId>checkstyle</artifactId>
299-
<version>10.12.7</version>
299+
<version>10.13.0</version>
300300
</dependency>
301301
</dependencies>
302302
<configuration>

0 commit comments

Comments
 (0)