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

Update from template #3

Merged
merged 30 commits into from
Oct 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
fd432f9
Formatter: Remove useless empty lines
AB-xdev Feb 2, 2023
e3eca3a
Bump maven-javadoc-plugin from 3.4.1 to 3.5.0
dependabot[bot] Feb 16, 2023
06eda35
Bump maven-compiler-plugin from 3.10.1 to 3.11.0
dependabot[bot] Feb 28, 2023
25ce2ee
Merge pull request #14 from xdev-software/dependabot/maven/org.apache…
AB-xdev Mar 14, 2023
c373077
Merge pull request #15 from xdev-software/dependabot/maven/org.apache…
AB-xdev Mar 14, 2023
05cd2f7
Initial commit
AB-xdev Mar 14, 2023
2fe78a2
Merge remote-tracking branch 'origin/update-from-template'
AB-xdev Mar 14, 2023
552af79
Fix url
AB-xdev Mar 14, 2023
096adbc
Merge remote-tracking branch 'origin/update-from-template'
AB-xdev Mar 14, 2023
6bd011f
Bump license-maven-plugin from 4.1 to 4.2
dependabot[bot] Mar 24, 2023
b7e300c
Merge pull request #17 from xdev-software/dependabot/maven/com.mycila…
AB-xdev Apr 20, 2023
affa579
Bump maven-gpg-plugin from 3.0.1 to 3.1.0
dependabot[bot] May 8, 2023
9a3f8c1
Merge pull request #18 from xdev-software/dependabot/maven/org.apache…
AB-xdev May 8, 2023
b36b11b
Bump maven-source-plugin from 3.2.1 to 3.3.0
dependabot[bot] May 22, 2023
a9b2594
Merge pull request #19 from xdev-software/dependabot/maven/org.apache…
AB-xdev May 26, 2023
8faa43f
Replace deprecated save actions plugin with XDEV fork
AB-xdev Jun 26, 2023
21af937
Rework CONTRIBUTING.md
AB-xdev Jul 7, 2023
4883a90
Bump actions/checkout from 3 to 4
dependabot[bot] Sep 5, 2023
bca34c3
Merge pull request #3 from xdev-software/dependabot/github_actions/ac…
AB-xdev Sep 7, 2023
cb58dbe
Merge pull request #21 from xdev-software/update-from-template
AB-xdev Sep 7, 2023
19fc859
Bump actions/checkout from 3 to 4
dependabot[bot] Sep 7, 2023
b9070fe
Merge pull request #20 from xdev-software/dependabot/github_actions/a…
AB-xdev Sep 7, 2023
226acf0
Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.5.0 to 3.6.0
dependabot[bot] Sep 18, 2023
7ee60ea
Bump com.mycila:license-maven-plugin from 4.2 to 4.3
dependabot[bot] Sep 28, 2023
8980688
Update update-from-template.yml
AB-xdev Oct 2, 2023
747b92f
Merge pull request #4 from xdev-software/replace-repo-sync-pull-request
AB-xdev Oct 2, 2023
d998dd1
Merge pull request #23 from xdev-software/dependabot/maven/com.mycila…
AB-xdev Oct 2, 2023
217af70
Merge pull request #22 from xdev-software/dependabot/maven/org.apache…
AB-xdev Oct 2, 2023
c8f59e0
Merge pull request #24 from xdev-software/update-from-template
AB-xdev Oct 2, 2023
07b1823
Replace outdated repo-sync/pull-request
AB-xdev Oct 2, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Auto detect text files and perform LF normalization
* text=auto
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ updates:
interval: daily
# Run it at a specific time so that we don't get emails all day long
time: "00:00"
open-pull-requests-limit: 10
open-pull-requests-limit: 10
2 changes: 1 addition & 1 deletion .github/workflows/checkBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
distribution: [temurin]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v3
Expand Down
24 changes: 14 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
check_code: # Validates the code (see checkBuild.yml)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v3
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
outputs:
upload_url: ${{ steps.create_draft.outputs.upload_url }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Configure Git
run: |
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
runs-on: ubuntu-latest
needs: [prepare_release]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Init Git and pull
run: |
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
runs-on: ubuntu-latest
needs: [prepare_release]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Init Git and pull
run: |
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
runs-on: ubuntu-latest
needs: [publish_central]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Init Git and pull
run: |
Expand All @@ -198,8 +198,12 @@ jobs:
git push origin

- name: pull-request
uses: repo-sync/pull-request@v2
with:
destination_branch: "develop"
pr_title: "Sync back"
pr_body: "An automated PR to sync changes back"
env:
GH_TOKEN: ${{ github.token }}
run: |
gh_pr_up() {
gh pr create "$@" || gh pr edit "$@"
}
gh_pr_up -B "develop" \
--title "Sync back" \
--body "An automated PR to sync changes back"
2 changes: 1 addition & 1 deletion .github/workflows/test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
publish_central: # Publish the code to central
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up JDK OSSRH
uses: actions/setup-java@v3
Expand Down
20 changes: 11 additions & 9 deletions .github/workflows/update-from-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# Required because otherwise there are always changes detected when executing diff/rev-list
fetch-depth: 0
Expand Down Expand Up @@ -81,12 +81,14 @@ jobs:
echo "abort=0" >> $GITHUB_OUTPUT

- name: pull-request
uses: repo-sync/pull-request@v2
if: steps.main.outputs.abort == 0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
source_branch: ${{ env.UPDATE_BRANCH }}
destination_branch: ${{ steps.main.outputs.current_branch }}
pr_title: "Update from template"
pr_body: "An automated PR to sync changes from the template into this repo"

env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
gh_pr_up() {
gh pr create "$@" || gh pr edit "$@"
}
gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \
-H "${{ env.UPDATE_BRANCH }}" \
--title "Update from template" \
--body "An automated PR to sync changes from the template into this repo"
6 changes: 3 additions & 3 deletions .idea/checkstyle-idea.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 12 additions & 13 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
## Contributing

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.
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.

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

Twitter: https://twitter.com/xdevsoftware
<br/>
Mail: [email protected]
### Ways to help
* **Report bugs**<br/>Create an issue or send a pull request
* **Send pull requests**<br/>If you want to contribute code, check out the development instructions below.
* 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.

### Some ways to help:

- **Report bugs**: File issues on GitHub.
- **Send pull requests**: If you want to contribute code, check out the development instructions below.

We encourage you to read the [contribution instructions by GitHub](https://guides.github.com/activities/contributing-to-open-source/#contributing) also.
We also encourage you to read the [contribution instructions by GitHub](https://docs.github.com/en/get-started/quickstart/contributing-to-projects).

## Developing

Expand All @@ -26,7 +25,7 @@ You should have the following things installed:
### Recommended setup
* Install ``IntelliJ`` (Community Edition is sufficient)
* Install the following plugins:
* [Save Actions](https://plugins.jetbrains.com/plugin/7642-save-actions) - Provides save actions, like running the formatter or adding ``final`` to fields
* [Save Actions](https://plugins.jetbrains.com/plugin/22113) - Provides save actions, like running the formatter or adding ``final`` to fields
* [SonarLint](https://plugins.jetbrains.com/plugin/7973-sonarlint) - CodeStyle/CodeAnalysis
* [Checkstyle-IDEA](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea) - CodeStyle/CodeAnalysis
* Import the project
Expand All @@ -42,4 +41,4 @@ Before releasing:
If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes.

When the release is finished do the following:
* Merge the auto-generated PR (with the incremented version number) back into the ``develop``
* Merge the auto-generated PR (with the incremented version number) back into the ``develop``
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>4.1</version>
<version>4.3</version>
<configuration>
<properties>
<email>${project.organization.url}</email>
Expand Down Expand Up @@ -124,7 +124,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<version>3.11.0</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
Expand All @@ -136,7 +136,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.1</version>
<version>3.6.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -154,7 +154,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -175,7 +175,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down