Skip to content

Commit 27245bd

Browse files
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents 9aae004 + cfc0913 commit 27245bd

File tree

6 files changed

+30
-25
lines changed

6 files changed

+30
-25
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: 14 additions & 11 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: |
@@ -223,9 +223,12 @@ jobs:
223223
git push origin
224224
225225
- name: pull-request
226-
uses: repo-sync/pull-request@v2
227-
with:
228-
destination_branch: "develop"
229-
pr_title: "Sync back"
230-
pr_body: "An automated PR to sync changes back"
231-
226+
env:
227+
GH_TOKEN: ${{ github.token }}
228+
run: |
229+
gh_pr_up() {
230+
gh pr create "$@" || gh pr edit "$@"
231+
}
232+
gh_pr_up -B "develop" \
233+
--title "Sync back" \
234+
--body "An automated PR to sync changes back"

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

chartjs-java-model/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
<plugin>
168168
<groupId>com.mycila</groupId>
169169
<artifactId>license-maven-plugin</artifactId>
170-
<version>4.2</version>
170+
<version>4.3</version>
171171
<configuration>
172172
<properties>
173173
<email>${project.organization.url}</email>
@@ -207,7 +207,7 @@
207207
<plugin>
208208
<groupId>org.apache.maven.plugins</groupId>
209209
<artifactId>maven-javadoc-plugin</artifactId>
210-
<version>3.5.0</version>
210+
<version>3.6.0</version>
211211
<executions>
212212
<execution>
213213
<id>attach-javadocs</id>

0 commit comments

Comments
 (0)