Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
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
3442223
Merge pull request #8 from xdev-software/update-from-template
AB-xdev Oct 2, 2023
cfc0913
Replace outdated repo-sync/pull-request
AB-xdev Oct 2, 2023
220d29f
Merge pull request #8 from xdev-software/update-from-template
AB-xdev Oct 2, 2023
a616603
Bump com.fasterxml.jackson:jackson-bom from 2.15.2 to 2.15.3
dependabot[bot] Oct 13, 2023
85ef39f
Bump log4j2-version from 2.20.0 to 2.21.0
dependabot[bot] Oct 17, 2023
dbd2353
Merge pull request #10 from xdev-software/dependabot/maven/log4j2-ver…
AB-xdev Oct 17, 2023
67dbf5e
Merge pull request #9 from xdev-software/dependabot/maven/com.fasterx…
AB-xdev Oct 17, 2023
1c4f077
Bump log4j2-version from 2.21.0 to 2.21.1
dependabot[bot] Oct 25, 2023
6cb43b9
Fix syntax for edit
AB-xdev Oct 25, 2023
7f6fd29
Update update-from-template.yml
AB-xdev Oct 25, 2023
4a9626f
Merge pull request #9 from xdev-software/update-from-template
AB-xdev Oct 25, 2023
e2521c2
Merge pull request #12 from xdev-software/update-from-template
AB-xdev Oct 25, 2023
b92c8a8
Merge pull request #11 from xdev-software/dependabot/maven/log4j2-ver…
AB-xdev Oct 25, 2023
6c3628b
Compile with Java 21
AB-xdev Oct 26, 2023
36b201e
Recommend Java 21 for development
AB-xdev Oct 26, 2023
4670912
Merge pull request #13 from xdev-software/update-from-template
AB-xdev Oct 26, 2023
9a7e5a4
Bump org.apache.maven.plugins:maven-clean-plugin from 3.3.1 to 3.3.2
dependabot[bot] Oct 27, 2023
77bcbb3
Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.0 to 3.6.2
dependabot[bot] Nov 7, 2023
863ce33
Merge pull request #10 from xdev-software/dependabot/maven/org.apache…
AB-xdev Nov 7, 2023
90b6050
Merge pull request #14 from xdev-software/dependabot/maven/org.apache…
AB-xdev Nov 7, 2023
4f4e0fd
Rename
AB-xdev Nov 7, 2023
7ef55fd
Merge branch 'update-from-template'
AB-xdev Nov 7, 2023
0cf81c0
Place bracket correctly
AB-xdev Nov 7, 2023
aeccd61
Merge pull request #11 from xdev-software/update-from-template
AB-xdev Nov 7, 2023
f624865
Merge pull request #17 from xdev-software/update-from-template
AB-xdev Nov 7, 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: 1 addition & 1 deletion .github/workflows/checkBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

strategy:
matrix:
java: [17]
java: [17, 21]
distribution: [temurin]

steps:
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,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"
17 changes: 9 additions & 8 deletions .github/workflows/update-from-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,13 @@ 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 -H "${{ env.UPDATE_BRANCH }}" "$@" || (git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@")
}
gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \
--title "Update from template" \
--body "An automated PR to sync changes from the template into this repo"
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ We also encourage you to read the [contribution instructions by GitHub](https://
### Software Requirements
You should have the following things installed:
* Git
* Java 17 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
* Java 21 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
* Maven

### Recommended setup
Expand Down
2 changes: 1 addition & 1 deletion openapi-client-maven-template-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<mainClass>software.xdev.Application</mainClass>

<log4j2-version>2.20.0</log4j2-version>
<log4j2-version>2.21.1</log4j2-version>
</properties>

<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions openapi-client-maven-template/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.15.2</version>
<version>2.15.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -188,7 +188,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.2</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down Expand Up @@ -299,7 +299,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
<executions>
<execution>
<id>pre-generation-clean</id>
Expand Down