From 8980688df58baa1717d5326f56e58d9a28a0546e Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Mon, 2 Oct 2023 12:46:22 +0200 Subject: [PATCH 01/13] Update update-from-template.yml --- .github/workflows/update-from-template.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml index ab0b49e..2b41fdd 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -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" From cfc09139877497ff163fd490910467131c614a1b Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Mon, 2 Oct 2023 12:55:20 +0200 Subject: [PATCH 02/13] Replace outdated repo-sync/pull-request --- .github/workflows/release.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 53d1c12..b2ae4d2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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" From a61660312961e3b4df75eb48b16de162bf7ba77c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 01:01:43 +0000 Subject: [PATCH 03/13] Bump com.fasterxml.jackson:jackson-bom from 2.15.2 to 2.15.3 Bumps [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.15.2 to 2.15.3. - [Commits](https://github.com/FasterXML/jackson-bom/compare/jackson-bom-2.15.2...jackson-bom-2.15.3) --- updated-dependencies: - dependency-name: com.fasterxml.jackson:jackson-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- openapi-client-maven-template/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openapi-client-maven-template/pom.xml b/openapi-client-maven-template/pom.xml index 1d7d4d8..8d0a575 100644 --- a/openapi-client-maven-template/pom.xml +++ b/openapi-client-maven-template/pom.xml @@ -94,7 +94,7 @@ com.fasterxml.jackson jackson-bom - 2.15.2 + 2.15.3 pom import From 85ef39f86038564a95242b9ba0f7cb88cdcaba4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 00:12:38 +0000 Subject: [PATCH 04/13] Bump log4j2-version from 2.20.0 to 2.21.0 Bumps `log4j2-version` from 2.20.0 to 2.21.0. Updates `org.apache.logging.log4j:log4j-core` from 2.20.0 to 2.21.0 Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.20.0 to 2.21.0 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-slf4j-impl dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- openapi-client-maven-template-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openapi-client-maven-template-demo/pom.xml b/openapi-client-maven-template-demo/pom.xml index 90822c5..ab973ae 100644 --- a/openapi-client-maven-template-demo/pom.xml +++ b/openapi-client-maven-template-demo/pom.xml @@ -25,7 +25,7 @@ software.xdev.Application - 2.20.0 + 2.21.0 From 1c4f077042f3a6fae92820737d57eb297be819da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 00:52:45 +0000 Subject: [PATCH 05/13] Bump log4j2-version from 2.21.0 to 2.21.1 Bumps `log4j2-version` from 2.21.0 to 2.21.1. Updates `org.apache.logging.log4j:log4j-core` from 2.21.0 to 2.21.1 Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.21.0 to 2.21.1 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.logging.log4j:log4j-slf4j-impl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- openapi-client-maven-template-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openapi-client-maven-template-demo/pom.xml b/openapi-client-maven-template-demo/pom.xml index ab973ae..e88be99 100644 --- a/openapi-client-maven-template-demo/pom.xml +++ b/openapi-client-maven-template-demo/pom.xml @@ -25,7 +25,7 @@ software.xdev.Application - 2.21.0 + 2.21.1 From 6cb43b927722a904127680e8730d17769fa6960a Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Wed, 25 Oct 2023 08:28:08 +0200 Subject: [PATCH 06/13] Fix syntax for edit --- .github/workflows/update-from-template.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml index 2b41fdd..26814a6 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -86,9 +86,8 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | gh_pr_up() { - gh pr create "$@" || gh pr edit "$@" + gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || 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" From 7f6fd295c5bc7c91ff015dbe0d540aa4159c7ad5 Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Wed, 25 Oct 2023 08:46:46 +0200 Subject: [PATCH 07/13] Update update-from-template.yml --- .github/workflows/update-from-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml index 26814a6..a02a834 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -86,7 +86,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | gh_pr_up() { - gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || gh pr edit "$@" + 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" \ From 6c3628b57cbc523a5128b54d8cd207912410d363 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 26 Oct 2023 16:18:21 +0200 Subject: [PATCH 08/13] Compile with Java 21 --- .github/workflows/checkBuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml index c23ac42..2e93229 100644 --- a/.github/workflows/checkBuild.yml +++ b/.github/workflows/checkBuild.yml @@ -21,7 +21,7 @@ jobs: strategy: matrix: - java: [17] + java: [17, 21] distribution: [temurin] steps: From 36b201e9c37a935cc1d209d8427b847a6f81da1f Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 26 Oct 2023 16:18:36 +0200 Subject: [PATCH 09/13] Recommend Java 21 for development --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8468781..2f8dd90 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 From 9a7e5a40935a9e7ad0e2f65a9d5396a1a303ce5e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Oct 2023 00:26:25 +0000 Subject: [PATCH 10/13] Bump org.apache.maven.plugins:maven-clean-plugin from 3.3.1 to 3.3.2 Bumps [org.apache.maven.plugins:maven-clean-plugin](https://github.com/apache/maven-clean-plugin) from 3.3.1 to 3.3.2. - [Release notes](https://github.com/apache/maven-clean-plugin/releases) - [Commits](https://github.com/apache/maven-clean-plugin/compare/maven-clean-plugin-3.3.1...maven-clean-plugin-3.3.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-clean-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- openapi-client-maven-template/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openapi-client-maven-template/pom.xml b/openapi-client-maven-template/pom.xml index 8d0a575..0a28d06 100644 --- a/openapi-client-maven-template/pom.xml +++ b/openapi-client-maven-template/pom.xml @@ -299,7 +299,7 @@ org.apache.maven.plugins maven-clean-plugin - 3.3.1 + 3.3.2 pre-generation-clean From 77bcbb30915b41cb0597d05c960ac185c9a2c8b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 00:54:24 +0000 Subject: [PATCH 11/13] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.0 to 3.6.2 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.0 to 3.6.2. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.6.0...maven-javadoc-plugin-3.6.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- standard-maven-template/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml index 4cf308c..7884169 100644 --- a/standard-maven-template/pom.xml +++ b/standard-maven-template/pom.xml @@ -129,7 +129,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.0 + 3.6.2 attach-javadocs From 4f4e0fda78c1cf22a7c79978001234140623dfd3 Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 7 Nov 2023 08:59:51 +0100 Subject: [PATCH 12/13] Rename --- .../pom.xml | 0 .../pom.xml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {standard-maven-template-demo => openapi-client-maven-template-demo}/pom.xml (100%) rename {standard-maven-template => openapi-client-maven-template}/pom.xml (100%) diff --git a/standard-maven-template-demo/pom.xml b/openapi-client-maven-template-demo/pom.xml similarity index 100% rename from standard-maven-template-demo/pom.xml rename to openapi-client-maven-template-demo/pom.xml diff --git a/standard-maven-template/pom.xml b/openapi-client-maven-template/pom.xml similarity index 100% rename from standard-maven-template/pom.xml rename to openapi-client-maven-template/pom.xml From 0cf81c0b1532c36ec5ea25e391858617f33c463d Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Tue, 7 Nov 2023 09:24:28 +0100 Subject: [PATCH 13/13] Place bracket correctly --- .github/workflows/update-from-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml index a02a834..3d35a5c 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -86,7 +86,7 @@ jobs: 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 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" \