Skip to content

Commit 1200e42

Browse files
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents bd752e7 + 03b49d4 commit 1200e42

File tree

8 files changed

+25
-26
lines changed

8 files changed

+25
-26
lines changed

.github/workflows/checkBuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
distribution: [temurin]
2626

2727
steps:
28-
- uses: actions/checkout@v3
28+
- uses: actions/checkout@v4
2929

3030
- name: Set up JDK
3131
uses: actions/setup-java@v3

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
check_code: # Validates the code
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020

2121
- name: Set up JDK
2222
uses: actions/setup-java@v3
@@ -52,7 +52,7 @@ jobs:
5252
outputs:
5353
upload_url: ${{ steps.create_release.outputs.upload_url }}
5454
steps:
55-
- uses: actions/checkout@v3
55+
- uses: actions/checkout@v4
5656

5757
- name: Configure Git
5858
run: |
@@ -111,7 +111,7 @@ jobs:
111111
runs-on: ubuntu-latest
112112
needs: [prepare_release]
113113
steps:
114-
- uses: actions/checkout@v3
114+
- uses: actions/checkout@v4
115115

116116
- name: Init Git and pull
117117
run: |
@@ -143,7 +143,7 @@ jobs:
143143
runs-on: ubuntu-latest
144144
needs: [prepare_release]
145145
steps:
146-
- uses: actions/checkout@v3
146+
- uses: actions/checkout@v4
147147

148148
- name: Init Git and pull
149149
run: |
@@ -197,7 +197,7 @@ jobs:
197197
runs-on: ubuntu-latest
198198
needs: [publish_central]
199199
steps:
200-
- uses: actions/checkout@v3
200+
- uses: actions/checkout@v4
201201

202202
- name: Init Git and pull
203203
run: |

.github/workflows/sonar.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
# Dependabot PRs have no access to secrets (SONAR_TOKEN) -> Ignore them
2727
if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'dependabot/') }}
2828
steps:
29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
3030
with:
3131
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
3232

.github/workflows/test-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
publish_central: # Publish the code to central
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414

1515
- name: Set up JDK OSSRH
1616
uses: actions/setup-java@v3

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727

2828
steps:
29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
3030
with:
3131
# Required because otherwise there are always changes detected when executing diff/rev-list
3232
fetch-depth: 0

CONTRIBUTING.md

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
## Contributing
22

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.
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 and anything that you build and share using our components.
44

5-
### Get in touch with the team
5+
### Communication channels
6+
* Communication is primarily done using issues.
7+
* 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).
8+
* As a last resort measure or on otherwise important matter you may also [contact us directly](https://xdev.software/en/about-us/contact).
69

7-
Twitter: https://twitter.com/xdevsoftware
8-
<br/>
9-
10+
### Ways to help
11+
* **Report bugs**<br/>Create an issue or send a pull request
12+
* **Send pull requests**<br/>If you want to contribute code, check out the development instructions below.
13+
* However when contributing new features, please first discuss the change you wish to make via issue with the owners of this repository before making a change. Otherwise your work might be rejected and your effort was pointless.
1014

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.
15+
We also encourage you to read the [contribution instructions by GitHub](https://docs.github.com/en/get-started/quickstart/contributing-to-projects).
1716

1817
## Developing
1918

@@ -26,7 +25,7 @@ You should have the following things installed:
2625
### Recommended setup
2726
* Install ``IntelliJ`` (Community Edition is sufficient)
2827
* 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
28+
* [Save Actions](https://plugins.jetbrains.com/plugin/22113) - Provides save actions, like running the formatter or adding ``final`` to fields
3029
* [SonarLint](https://plugins.jetbrains.com/plugin/7973-sonarlint) - CodeStyle/CodeAnalysis
3130
* [Checkstyle-IDEA](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea) - CodeStyle/CodeAnalysis
3231
* Import the project

vaadin-editable-label-demo/pom.xml

Lines changed: 2 additions & 2 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.1.0</vaadin.version>
29+
<vaadin.version>24.1.10</vaadin.version>
3030

31-
<org.springframework.boot.version>3.1.0</org.springframework.boot.version>
31+
<org.springframework.boot.version>3.1.4</org.springframework.boot.version>
3232
</properties>
3333

3434
<dependencyManagement>

vaadin-editable-label/pom.xml

Lines changed: 3 additions & 3 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.1.0</vaadin.version>
52+
<vaadin.version>24.1.10</vaadin.version>
5353
</properties>
5454

5555
<dependencyManagement>
@@ -112,7 +112,7 @@
112112
<plugin>
113113
<groupId>com.mycila</groupId>
114114
<artifactId>license-maven-plugin</artifactId>
115-
<version>4.2</version>
115+
<version>4.3</version>
116116
<configuration>
117117
<properties>
118118
<email>${project.organization.url}</email>
@@ -167,7 +167,7 @@
167167
<plugin>
168168
<groupId>org.apache.maven.plugins</groupId>
169169
<artifactId>maven-javadoc-plugin</artifactId>
170-
<version>3.5.0</version>
170+
<version>3.6.0</version>
171171
<executions>
172172
<execution>
173173
<id>attach-javadocs</id>

0 commit comments

Comments
 (0)