Skip to content

Commit f9b5e99

Browse files
committed
Merge branch 'develop' into update-from-template-merged
2 parents 5feba19 + 11ba354 commit f9b5e99

File tree

163 files changed

+13837
-60
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+13837
-60
lines changed

.github/FUNDING.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github: Leaflet
2+
open_collective: leafletjs

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ body:
1515
attributes:
1616
label: "Checklist"
1717
options:
18-
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/template-placeholder/releases/latest)"
18+
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/vaadin-maps-leaflet-flow/releases/latest)"
1919
required: true
20-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
20+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/vaadin-maps-leaflet-flow/issues) or [closed](https://github.com/xdev-software/vaadin-maps-leaflet-flow/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
2121
required: true
2222
- label: "I have taken the time to fill in all the required details. I understand that the bug report will be dismissed otherwise."
2323
required: true

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
contact_links:
2+
- name: 🍃 Leaflet docs
3+
url: https://leafletjs.com/reference.html
4+
about: "Consolidate this when you have questions about Leaflet itself (and not our Vaadin component)"
25
- name: 💬 Contact support
36
url: https://xdev.software/en/services/support
47
about: "If you need support as soon as possible or/and you can't wait for any pull request"

.github/ISSUE_TEMPLATE/enhancement.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ body:
1313
attributes:
1414
label: "Checklist"
1515
options:
16-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
16+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/vaadin-maps-leaflet-flow/issues) or [closed](https://github.com/xdev-software/vaadin-maps-leaflet-flow/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
1717
required: true
1818
- label: "I have taken the time to fill in all the required details. I understand that the feature request will be dismissed otherwise."
1919
required: true

.github/ISSUE_TEMPLATE/question.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ body:
1212
attributes:
1313
label: "Checklist"
1414
options:
15-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
15+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/vaadin-maps-leaflet-flow/issues) or [closed](https://github.com/xdev-software/vaadin-maps-leaflet-flow/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
1616
required: true
1717
- label: "I have taken the time to fill in all the required details. I understand that the question will be dismissed otherwise."
1818
required: true

.github/workflows/check-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
- 'assets/**'
2121

2222
env:
23-
DEMO_MAVEN_MODULE: ${{ github.event.repository.name }}-demo
23+
DEMO_MAVEN_MODULE: flow-demo
2424

2525
jobs:
2626
build:

.github/workflows/no-response.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: No Response
2+
3+
on:
4+
workflow_dispatch:
5+
issue_comment:
6+
types: [created]
7+
schedule:
8+
- cron: '5 5 * * *'
9+
10+
jobs:
11+
noResponse:
12+
runs-on: ubuntu-latest
13+
permissions:
14+
issues: write
15+
steps:
16+
- uses: actions/stale@v10
17+
with:
18+
days-before-issue-stale: 7
19+
days-before-issue-close: 3
20+
stale-issue-label: "stale"
21+
only-labels: "waiting-for-response"
22+
labels-to-remove-when-unstale: "waiting-for-response"
23+
stale-issue-message: "This issue will be closed soon because there has been no further activity."
24+
days-before-pr-stale: -1
25+
days-before-pr-close: -1
26+
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

Lines changed: 42 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ on:
44
push:
55
branches: [ master ]
66

7-
env:
8-
PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
9-
107
permissions:
118
contents: write
129
pull-requests: write
@@ -76,10 +73,9 @@ jobs:
7673
- name: Get version
7774
id: version
7875
run: |
79-
version=$(../mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
76+
version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
8077
echo "release=$version" >> $GITHUB_OUTPUT
8178
echo "releasenumber=${version//[!0-9]/}" >> $GITHUB_OUTPUT
82-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
8379
8480
- name: Commit and Push
8581
run: |
@@ -104,8 +100,21 @@ jobs:
104100
Add the following lines to your pom:
105101
```XML
106102
<dependency>
107-
<groupId>software.xdev</groupId>
108-
<artifactId>${{ env.PRIMARY_MAVEN_MODULE }}</artifactId>
103+
<groupId>software.xdev.vaadin.maps-leaflet</groupId>
104+
<artifactId>flow</artifactId>
105+
<version>${{ steps.version.outputs.release }}</version>
106+
</dependency>
107+
```
108+
109+
You can also use the [BOM](https://github.com/${{ github.repository }}/tree/develop/bom) for easier dependency management.
110+
111+
### Plugins
112+
113+
You can also install [predefined plugins](https://github.com/${{ github.repository }}/tree/develop/plugins) using:
114+
```XML
115+
<dependency>
116+
<groupId>software.xdev.vaadin.maps-leaflet.plugins</groupId>
117+
<artifactId>...</artifactId>
109118
<version>${{ steps.version.outputs.release }}</version>
110119
</dependency>
111120
```
@@ -136,13 +145,17 @@ jobs:
136145
gpg-passphrase: MAVEN_GPG_PASSPHRASE
137146
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Only import once
138147

139-
- name: Publish to GitHub Packages Central
140-
run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central
141-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
148+
- name: Publish to GitHub Packages
149+
run: |
150+
modules_block=$(grep -ozP '<modules>(\r|\n|.)*<\/modules>' 'pom.xml' | tr -d '\0')
151+
modules=($(echo $modules_block | grep -oP '(?<=<module>)[^<]+' | grep -v demo))
152+
printf -v modules_joined '%s,' "${modules[@]}"
153+
modules_arg=$(echo "${modules_joined%,}")
154+
./mvnw -B deploy -pl "$modules_arg" -am -T2C -P publish -DskipTests -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central
142155
env:
143156
PACKAGES_CENTRAL_TOKEN: ${{ secrets.PACKAGES_CENTRAL_TOKEN }}
144157
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
145-
158+
146159
- name: Set up JDK
147160
uses: actions/setup-java@v5
148161
with: # running setup-java again overwrites the settings.xml
@@ -154,12 +167,16 @@ jobs:
154167
gpg-passphrase: MAVEN_GPG_PASSPHRASE
155168

156169
- name: Publish to Central Portal
157-
run: ../mvnw -B deploy -P publish,publish-sonatype-central-portal -DskipTests
170+
run: |
171+
modules_block=$(grep -ozP '<modules>(\r|\n|.)*<\/modules>' 'pom.xml' | tr -d '\0')
172+
modules=($(echo $modules_block | grep -oP '(?<=<module>)[^<]+' | grep -v demo))
173+
printf -v modules_joined '%s,' "${modules[@]}"
174+
modules_arg=$(echo "${modules_joined%,}")
175+
./mvnw -B deploy -pl "$modules_arg" -am -T2C -P publish,publish-sonatype-central-portal -DskipTests
158176
env:
159177
MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }}
160178
MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }}
161179
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
162-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
163180

164181
publish-pages:
165182
runs-on: ubuntu-latest
@@ -190,14 +207,23 @@ jobs:
190207
${{ runner.os }}-mvn-build-
191208
192209
- name: Build site
193-
run: ../mvnw -B compile site -DskipTests -T2C
194-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
210+
run: ./mvnw -B compile site -DskipTests -T2C
211+
212+
- name: Aggregate site
213+
run: |
214+
modules=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
215+
for m in "${modules[@]}"
216+
do
217+
echo "$m/target/site -> ./target/site/$m"
218+
mkdir -p ./target/site/$m
219+
cp -r $m/target/site ./target/site/$m
220+
done
195221
196222
- name: Deploy to Github pages
197223
uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
198224
with:
199225
github_token: ${{ secrets.GITHUB_TOKEN }}
200-
publish_dir: ./${{ env.PRIMARY_MAVEN_MODULE }}/target/site
226+
publish_dir: ./target/site
201227
force_orphan: true
202228

203229
after-release:

.github/workflows/test-deploy.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,13 @@ jobs:
2323
gpg-passphrase: MAVEN_GPG_PASSPHRASE
2424
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Only import once
2525

26-
- name: Publish to GitHub Packages Central
27-
run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central
28-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
26+
- name: Publish to GitHub Packages
27+
run: |
28+
modules_block=$(grep -ozP '<modules>(\r|\n|.)*<\/modules>' 'pom.xml' | tr -d '\0')
29+
modules=($(echo $modules_block | grep -oP '(?<=<module>)[^<]+' | grep -v demo))
30+
printf -v modules_joined '%s,' "${modules[@]}"
31+
modules_arg=$(echo "${modules_joined%,}")
32+
./mvnw -B deploy -pl "$modules_arg" -am -T2C -P publish -DskipTests -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central
2933
env:
3034
PACKAGES_CENTRAL_TOKEN: ${{ secrets.PACKAGES_CENTRAL_TOKEN }}
3135
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
@@ -41,8 +45,12 @@ jobs:
4145
gpg-passphrase: MAVEN_GPG_PASSPHRASE
4246

4347
- name: Publish to Central Portal
44-
run: ../mvnw -B deploy -P publish,publish-sonatype-central-portal -DskipTests
45-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
48+
run: |
49+
modules_block=$(grep -ozP '<modules>(\r|\n|.)*<\/modules>' 'pom.xml' | tr -d '\0')
50+
modules=($(echo $modules_block | grep -oP '(?<=<module>)[^<]+' | grep -v demo))
51+
printf -v modules_joined '%s,' "${modules[@]}"
52+
modules_arg=$(echo "${modules_joined%,}")
53+
./mvnw -B deploy -pl "$modules_arg" -am -T2C -P publish,publish-sonatype-central-portal -DskipTests
4654
env:
4755
MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }}
4856
MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }}

.run/Run Demo.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run Demo" type="Application" factoryName="Application">
33
<option name="MAIN_CLASS_NAME" value="software.xdev.vaadin.Application" />
4-
<module name="template-placeholder-demo" />
4+
<module name="flow-demo" />
55
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
66
<extension name="coverage">
77
<pattern>

0 commit comments

Comments
 (0)