Skip to content
This repository was archived by the owner on Jan 18, 2024. It is now read-only.

Commit bb5e425

Browse files
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents 8811a4c + 07b1823 commit bb5e425

9 files changed

Lines changed: 51 additions & 44 deletions

File tree

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto

.github/workflows/checkBuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
distribution: zulu
2828

2929
steps:
30-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
3131

3232
- name: Set up JDK
3333
uses: actions/setup-java@v3

.github/workflows/release.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
check_code: # Validates the code (see checkBuild.yml)
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616

1717
- name: Set up JDK
1818
uses: actions/setup-java@v3
@@ -49,7 +49,7 @@ jobs:
4949
outputs:
5050
upload_url: ${{ steps.create_draft.outputs.upload_url }}
5151
steps:
52-
- uses: actions/checkout@v3
52+
- uses: actions/checkout@v4
5353

5454
- name: Configure Git
5555
run: |
@@ -108,7 +108,7 @@ jobs:
108108
java-package: jdk+fx
109109
distribution: zulu
110110
steps:
111-
- uses: actions/checkout@v3
111+
- uses: actions/checkout@v4
112112

113113
- name: Init Git and pull
114114
run: |
@@ -140,7 +140,7 @@ jobs:
140140
runs-on: ubuntu-latest
141141
needs: [prepare_release]
142142
steps:
143-
- uses: actions/checkout@v3
143+
- uses: actions/checkout@v4
144144

145145
- name: Init Git and pull
146146
run: |
@@ -193,7 +193,7 @@ jobs:
193193
runs-on: ubuntu-latest
194194
needs: [publish_central]
195195
steps:
196-
- uses: actions/checkout@v3
196+
- uses: actions/checkout@v4
197197

198198
- name: Init Git and pull
199199
run: |
@@ -224,8 +224,12 @@ jobs:
224224
git push origin
225225
226226
- name: pull-request
227-
uses: repo-sync/pull-request@v2
228-
with:
229-
destination_branch: "develop"
230-
pr_title: "Sync back"
231-
pr_body: "An automated PR to sync changes back"
227+
env:
228+
GH_TOKEN: ${{ github.token }}
229+
run: |
230+
gh_pr_up() {
231+
gh pr create "$@" || gh pr edit "$@"
232+
}
233+
gh_pr_up -B "develop" \
234+
--title "Sync back" \
235+
--body "An automated PR to sync changes back"

.github/workflows/test-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
distribution: zulu
1919

2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222

2323
- name: Set up JDK OSSRH
2424
uses: actions/setup-java@v3

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

Lines changed: 11 additions & 9 deletions
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
@@ -81,12 +81,14 @@ jobs:
8181
echo "abort=0" >> $GITHUB_OUTPUT
8282
8383
- name: pull-request
84-
uses: repo-sync/pull-request@v2
8584
if: steps.main.outputs.abort == 0
86-
with:
87-
github_token: ${{ secrets.GITHUB_TOKEN }}
88-
source_branch: ${{ env.UPDATE_BRANCH }}
89-
destination_branch: ${{ steps.main.outputs.current_branch }}
90-
pr_title: "Update from template"
91-
pr_body: "An automated PR to sync changes from the template into this repo"
92-
85+
env:
86+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
87+
run: |
88+
gh_pr_up() {
89+
gh pr create "$@" || gh pr edit "$@"
90+
}
91+
gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \
92+
-H "${{ env.UPDATE_BRANCH }}" \
93+
--title "Update from template" \
94+
--body "An automated PR to sync changes from the template into this repo"

.idea/checkstyle-idea.xml

Lines changed: 3 additions & 3 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.

CONTRIBUTING.md

Lines changed: 12 additions & 13 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-
Mail: opensource@xdev-software.de
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
@@ -42,4 +41,4 @@ Before releasing:
4241
If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes.
4342

4443
When the release is finished do the following:
45-
* Merge the auto-generated PR (with the incremented version number) back into the ``develop``
44+
* Merge the auto-generated PR (with the incremented version number) back into the ``develop``

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<plugin>
9696
<groupId>com.mycila</groupId>
9797
<artifactId>license-maven-plugin</artifactId>
98-
<version>4.1</version>
98+
<version>4.3</version>
9999
<configuration>
100100
<properties>
101101
<email>${project.organization.url}</email>
@@ -124,7 +124,7 @@
124124
<plugin>
125125
<groupId>org.apache.maven.plugins</groupId>
126126
<artifactId>maven-compiler-plugin</artifactId>
127-
<version>3.10.1</version>
127+
<version>3.11.0</version>
128128
<configuration>
129129
<source>${maven.compiler.source}</source>
130130
<target>${maven.compiler.target}</target>
@@ -136,7 +136,7 @@
136136
<plugin>
137137
<groupId>org.apache.maven.plugins</groupId>
138138
<artifactId>maven-javadoc-plugin</artifactId>
139-
<version>3.4.1</version>
139+
<version>3.6.0</version>
140140
<executions>
141141
<execution>
142142
<id>attach-javadocs</id>
@@ -154,7 +154,7 @@
154154
<plugin>
155155
<groupId>org.apache.maven.plugins</groupId>
156156
<artifactId>maven-source-plugin</artifactId>
157-
<version>3.2.1</version>
157+
<version>3.3.0</version>
158158
<executions>
159159
<execution>
160160
<id>attach-sources</id>
@@ -290,7 +290,7 @@
290290
<plugin>
291291
<groupId>org.apache.maven.plugins</groupId>
292292
<artifactId>maven-gpg-plugin</artifactId>
293-
<version>3.0.1</version>
293+
<version>3.1.0</version>
294294
<executions>
295295
<execution>
296296
<id>sign-artifacts</id>

0 commit comments

Comments
 (0)