Skip to content

Commit 84f01e3

Browse files
authored
Merge pull request #41 from xdev-software/develop
Release 1.1.1
2 parents 9d0a820 + d0d1410 commit 84f01e3

File tree

7 files changed

+28
-21
lines changed

7 files changed

+28
-21
lines changed

.github/workflows/checkBuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
strategy:
2323
matrix:
24-
java: [17]
24+
java: [17, 21]
2525
distribution: [temurin]
2626

2727
steps:

.github/workflows/release.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -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/update-from-template.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,13 @@ 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 -H "${{ env.UPDATE_BRANCH }}" "$@" || (git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@")
90+
}
91+
gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \
92+
--title "Update from template" \
93+
--body "An automated PR to sync changes from the template into this repo"

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 1.1.1
2+
* Update dependencies
3+
14
# 1.1.0
25
* Added new endpoint:
36
* ``/view/SpeakerEmails`` (undocumented)

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ We also encourage you to read the [contribution instructions by GitHub](https://
1919
### Software Requirements
2020
You should have the following things installed:
2121
* Git
22-
* Java 17 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
22+
* Java 21 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
2323
* Maven
2424

2525
### Recommended setup

sessionize-java-client-demo/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

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

28-
<log4j2-version>2.20.0</log4j2-version>
28+
<log4j2-version>2.22.0</log4j2-version>
2929
</properties>
3030

3131
<dependencies>

sessionize-java-client/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<dependency>
9595
<groupId>com.fasterxml.jackson</groupId>
9696
<artifactId>jackson-bom</artifactId>
97-
<version>2.15.2</version>
97+
<version>2.16.0</version>
9898
<type>pom</type>
9999
<scope>import</scope>
100100
</dependency>
@@ -188,7 +188,7 @@
188188
<plugin>
189189
<groupId>org.apache.maven.plugins</groupId>
190190
<artifactId>maven-javadoc-plugin</artifactId>
191-
<version>3.6.0</version>
191+
<version>3.6.2</version>
192192
<executions>
193193
<execution>
194194
<id>attach-javadocs</id>
@@ -298,7 +298,7 @@
298298
<plugin>
299299
<groupId>org.apache.maven.plugins</groupId>
300300
<artifactId>maven-clean-plugin</artifactId>
301-
<version>3.3.1</version>
301+
<version>3.3.2</version>
302302
<executions>
303303
<execution>
304304
<id>pre-generation-clean</id>
@@ -327,7 +327,7 @@
327327
<plugin>
328328
<groupId>org.openapitools</groupId>
329329
<artifactId>openapi-generator-maven-plugin</artifactId>
330-
<version>7.0.1</version>
330+
<version>7.1.0</version>
331331
<executions>
332332
<execution>
333333
<goals>

0 commit comments

Comments
 (0)