Skip to content

Commit 4165b00

Browse files
authored
Merge pull request #217 from xdev-software/develop
Release
2 parents 3695b37 + 1f5d1f3 commit 4165b00

File tree

31 files changed

+239
-246
lines changed

31 files changed

+239
-246
lines changed

.github/dependabot.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ updates:
2121
time: "00:00"
2222
open-pull-requests-limit: 10
2323
ignore:
24-
- dependency-name: "org.eclipse.jetty:jetty-maven-plugin"
25-
# Version 11+ requires jakarta.* instead of javax.* (see https://www.eclipse.org/jetty/download.php#what-jetty-version)
26-
versions: ">=11.0.0"
24+
- dependency-name: "org.springframework.boot:*"
25+
# Version 3+ requires Vaadin 24
26+
versions: ">=3.0.0"

.github/workflows/checkBuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,5 @@ jobs:
5959
uses: actions/upload-artifact@v3
6060
with:
6161
name: demo-files-java-${{ matrix.java }}
62-
path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.war
62+
path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar
6363
if-no-files-found: error

.github/workflows/release.yml

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -137,49 +137,6 @@ jobs:
137137
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
138138
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
139139
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
140-
141-
build_directory: # Build a ZIP that can be uploaded to Vaadin Directory
142-
runs-on: ubuntu-latest
143-
needs: [prepare_release]
144-
steps:
145-
- uses: actions/checkout@v3
146-
147-
- name: Init Git and pull
148-
run: |
149-
git config --global user.email "[email protected]"
150-
git config --global user.name "GitHub Actions"
151-
git pull
152-
153-
- name: Set up JDK
154-
uses: actions/setup-java@v3
155-
with:
156-
java-version: '11'
157-
distribution: 'temurin'
158-
159-
- name: Build for Vaadin Directory
160-
run: mvn -B install -Pdirectory
161-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
162-
163-
- name: Upload asset
164-
uses: actions/upload-artifact@v3
165-
with:
166-
name: vaadin-directory-files
167-
path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/${{ env.PRIMARY_MAVEN_MODULE }}-*.zip
168-
if-no-files-found: error
169-
170-
- name: Get version
171-
id: version
172-
run: |
173-
echo "release=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_OUTPUT
174-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
175-
176-
- name: Upload Release Asset
177-
uses: shogo82148/actions-upload-release-asset@v1
178-
with:
179-
upload_url: ${{ needs.prepare_release.outputs.upload_url }}
180-
asset_path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/${{ env.PRIMARY_MAVEN_MODULE }}-${{ steps.version.outputs.release }}.zip
181-
asset_name: ${{ env.PRIMARY_MAVEN_MODULE }}-${{ steps.version.outputs.release }}.zip
182-
asset_content_type: application/zip
183140

184141
publish-pages:
185142
name: Publish dependencies and licenses to github pages
@@ -238,7 +195,7 @@ jobs:
238195

239196
after_release:
240197
runs-on: ubuntu-latest
241-
needs: [publish_central, build_directory]
198+
needs: [publish_central]
242199
steps:
243200
- uses: actions/checkout@v3
244201

.idea/checkstyle-idea.xml

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

.idea/codeStyles/Project.xml

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

.run/Run Demo.run.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run Demo" type="Application" factoryName="Application">
3+
<option name="MAIN_CLASS_NAME" value="software.xdev.vaadin.Application" />
4+
<module name="vaadin-maps-leaflet-flow-demo" />
5+
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
6+
<extension name="coverage">
7+
<pattern>
8+
<option name="PATTERN" value="software.xdev.vaadin.*" />
9+
<option name="ENABLED" value="true" />
10+
</pattern>
11+
</extension>
12+
<method v="2">
13+
<option name="Make" enabled="true" />
14+
</method>
15+
</configuration>
16+
</component>

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 2.0.4
2+
* Added method ``centerAndZoom`` in ``LMap``
3+
* Fixed a problem where an invalid ``iconSize`` was transferred to leaflet which caused a client side exception (#199)
4+
* Updated various dependencies
5+
16
## 2.0.3
27
* Updated dependencies
38
* Fixed problem with setting lon/lan in LMarker

CONTRIBUTING.md

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
## Contributing
2+
3+
We would absolutely love to get the community involved, and we welcome any form of contributions – comments and questions on different communication channels, issues and pull request in the repositories, and anything that you build and share using our components.
4+
5+
### Get in touch with the team
6+
7+
Twitter: https://twitter.com/xdevsoftware
8+
<br/>
9+
10+
11+
### Some ways to help:
12+
13+
- **Report bugs**: File issues on GitHub.
14+
- **Send pull requests**: If you want to contribute code, check out the development instructions below.
15+
16+
We encourage you to read the [contribution instructions by GitHub](https://guides.github.com/activities/contributing-to-open-source/#contributing) also.
17+
18+
## Developing
19+
20+
### Software Requirements
21+
You should have the following things installed:
22+
* Git
23+
* Java 11 or 17 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
24+
* Maven
25+
26+
### Recommended setup
27+
* Install ``IntelliJ`` (Community Edition is sufficient)
28+
* Install the following plugins:
29+
* [Save Actions](https://plugins.jetbrains.com/plugin/7642-save-actions) - Provides save actions, like running the formatter or adding ``final`` to fields
30+
* [SonarLint](https://plugins.jetbrains.com/plugin/7973-sonarlint) - CodeStyle/CodeAnalysis
31+
* [Checkstyle-IDEA](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea) - CodeStyle/CodeAnalysis
32+
* Import the project
33+
* Ensure that everything is encoded in ``UTF-8``
34+
* Ensure that the JDK/Java-Version is correct
35+
* To enable AUTOMATIC reloading/restarting while developing and running the app do this (further information in "
36+
SpringBoot-Devtools" section below; [Source](https://stackoverflow.com/q/33349456)):
37+
* ``Settings > Build, Execution, Deployment > Compiler``:<br/>
38+
Enable [``Build project automatically``](https://www.jetbrains.com/help/idea/compiling-applications.html#auto-build)
39+
* ``Settings > Advanced Settings``:<br/>
40+
Enable [``Allow auto-make to start even if developed application is currently running``](https://www.jetbrains.com/help/idea/advanced-settings.html#advanced_compiler)
41+
* To launch the Demo execute the predefined (launch) configuration ``Run Demo``
42+
43+
#### [SpringBoot-Developer-Tools](https://docs.spring.io/spring-boot/docs/current/reference/html/using.html#using.devtools)
44+
... should automatically be enabled.<br/>
45+
If you are changing a file and build the project, parts of the app get restarted.<br/>
46+
Bigger changes may require a complete restart.
47+
* [Vaadin automatically reloads the UI on each restart](https://vaadin.com/docs/latest/configuration/live-reload/spring-boot).<br/>
48+
You can control this behavior with the ``vaadin.devmode.liveReload.enabled`` property (default: ``true``).
49+
50+
## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/vaadin-maps-leaflet-flow/release.yml?branch=master)](https://github.com/xdev-software/vaadin-maps-leaflet-flow/actions/workflows/release.yml)
51+
52+
Before releasing:
53+
* Consider doing a [test-deployment](https://github.com/xdev-software/vaadin-maps-leaflet-flow/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
54+
* Check the [changelog](CHANGELOG.md)
55+
56+
If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes
57+
58+
When the release is finished do the following:
59+
* Merge the auto-generated PR (with the incremented version number) back into the ``develop``
60+
* Ensure that [Vaadin Directory](https://vaadin.com/directory) syncs the update and maybe update the component / version there

README.md

Lines changed: 6 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ Vaadin Flow Java API for [Leaflet Maps](https://leafletjs.com/) Component
2323

2424
## Run the Demo
2525
* Checkout the repo
26-
* Run ``mvn clean install``
27-
* Navigate into ``vaadin-maps-leaflet-flow-demo``
28-
* Run ``mvn jetty:run``
26+
* Run ``mvn install && mvn -f vaadin-maps-leaflet-flow-demo spring-boot:run``
2927
* Open http://localhost:8080
3028

3129

@@ -35,38 +33,11 @@ Vaadin Flow Java API for [Leaflet Maps](https://leafletjs.com/) Component
3533
![demo](assets/demo.gif)
3634
</details>
3735

36+
## Support
37+
If you need support as soon as possible and you can't wait for any pull request, feel free to use [our support](https://xdev.software/en/services/support).
38+
39+
## Contributing
40+
See the [contributing guide](./CONTRIBUTING.md) for detailed instructions on how to get started with our project.
3841

3942
## Dependencies and Licenses
4043
View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/vaadin-maps-leaflet-flow/dependencies/)
41-
42-
43-
## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/vaadin-maps-leaflet-flow/release.yml?branch=master)](https://github.com/xdev-software/vaadin-maps-leaflet-flow/actions/workflows/release.yml)
44-
45-
Before releasing:
46-
* Consider doing a [test-deployment](https://github.com/xdev-software/vaadin-maps-leaflet-flow/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
47-
* Check the [changelog](CHANGELOG.md)
48-
49-
If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes
50-
51-
When the release is finished do the following:
52-
* Merge the auto-generated PR (with the incremented version number) back into the ``develop``
53-
* Upload the generated release asset zip into the [Vaadin Directory](https://vaadin.com/directory) and update the component there
54-
55-
56-
## Developing
57-
58-
### Software Requirements
59-
You should have the following things installed:
60-
* Git
61-
* Java 11 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
62-
* Maven
63-
64-
### Recommended setup
65-
* Install ``IntelliJ`` (Community Edition is sufficient)
66-
* Install the following plugins:
67-
* [Save Actions](https://plugins.jetbrains.com/plugin/7642-save-actions) - Provides save actions, like running the formatter or adding ``final`` to fields
68-
* [SonarLint](https://plugins.jetbrains.com/plugin/7973-sonarlint) - CodeStyle/CodeAnalysis
69-
* [Checkstyle-IDEA](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea) - CodeStyle/CodeAnalysis
70-
* Import the project
71-
* Ensure that everything is encoded in ``UTF-8``
72-
* Ensure that the JDK/Java-Version is correct

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<organization>
1313
<name>XDEV Software</name>
14-
<url>https://xdev.software/en</url>
14+
<url>https://xdev.software</url>
1515
</organization>
1616

1717
<modules>

0 commit comments

Comments
 (0)