From ae377d62c27be8e8744a0d1dac2f7392a3891787 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 25 Jun 2025 14:15:35 +0200 Subject: [PATCH 1/3] Revert "[maven-release-plugin] prepare for next development iteration" This reverts commit 9ab47f18366f711d1f0b4c18cbc15ce25c2cb552. --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 09a74ee..b21c4a0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.keycloak keycloak-event-metrics - 2.0.1-SNAPSHOT + 2.0.0 Keycloak Metrics Provides metrics for Keycloak user/admin events @@ -36,7 +36,7 @@ https://git.kokuwa.io/keycloak/keycloak-event-metrics scm:git:https://git.kokuwa.io/keycloak/keycloak-event-metrics.git scm:git:https://git.kokuwa.io/keycloak/keycloak-event-metrics.git - HEAD + 2.0.0 forgejo @@ -59,7 +59,7 @@ - 2025-06-25T11:45:45Z + 2025-06-25T11:45:18Z UTF-8 ISO-8859-1 From 2ff690d180c9828e34d221bc4fa2f3629a19f0aa Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 25 Jun 2025 14:15:43 +0200 Subject: [PATCH 2/3] Revert "[maven-release-plugin] prepare release 2.0.0 [CI SKIP]" This reverts commit 19be033dd2c393a349129dfb0c8b41ad30f01f49. --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b21c4a0..ac146cd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.keycloak keycloak-event-metrics - 2.0.0 + 2.0.0-SNAPSHOT Keycloak Metrics Provides metrics for Keycloak user/admin events @@ -36,7 +36,7 @@ https://git.kokuwa.io/keycloak/keycloak-event-metrics scm:git:https://git.kokuwa.io/keycloak/keycloak-event-metrics.git scm:git:https://git.kokuwa.io/keycloak/keycloak-event-metrics.git - 2.0.0 + HEAD forgejo @@ -59,7 +59,7 @@ - 2025-06-25T11:45:18Z + 2025-04-28T12:25:49Z UTF-8 ISO-8859-1 From c16e6137fd137c5338dde0213ea5f34f3172eca5 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 25 Jun 2025 14:18:24 +0200 Subject: [PATCH 3/3] faster --- .woodpecker/dockerhub.yaml | 17 ----------------- .woodpecker/lint.yaml | 26 -------------------------- .woodpecker/release.yaml | 21 --------------------- .woodpecker/verify.yaml | 24 ------------------------ .woodpecker/versions.yaml | 26 -------------------------- pom.xml | 7 +++---- 6 files changed, 3 insertions(+), 118 deletions(-) delete mode 100644 .woodpecker/dockerhub.yaml delete mode 100644 .woodpecker/lint.yaml delete mode 100644 .woodpecker/verify.yaml delete mode 100644 .woodpecker/versions.yaml diff --git a/.woodpecker/dockerhub.yaml b/.woodpecker/dockerhub.yaml deleted file mode 100644 index a443560..0000000 --- a/.woodpecker/dockerhub.yaml +++ /dev/null @@ -1,17 +0,0 @@ -when: - instance: ci.kokuwa.io - repo: keycloak/keycloak-event-metrics - event: [manual, push] - branch: main - path: [.woodpecker/dockerhub.yaml, README.md] - -steps: - - metadata: - image: kokuwaio/dockerhub-metadata - settings: - repository: kokuwaio/keycloak-event-metrics - description-short: Provides metrics for Keycloak user/admin events and user/client/session count. - categories: monitoring-and-observability - username: {from_secret: dockerhub_username} - password: {from_secret: dockerhub_password} diff --git a/.woodpecker/lint.yaml b/.woodpecker/lint.yaml deleted file mode 100644 index 7de51db..0000000 --- a/.woodpecker/lint.yaml +++ /dev/null @@ -1,26 +0,0 @@ -when: - event: [manual, pull_request, push] - branch: main - path: [.woodpecker/lint.yaml, renovate.json, Dockerfile, "**/*.y*ml", "**/*.md"] - -steps: - - renovate: - image: kokuwaio/renovate-config-validator - depends_on: [] - when: [path: [.woodpecker/lint.yaml, renovate.json]] - - yaml: - image: kokuwaio/yamllint - depends_on: [] - when: [path: [.woodpecker/lint.yaml, .yamllint.yaml, "**/*.y*ml"]] - - markdown: - image: kokuwaio/markdownlint - depends_on: [] - when: [path: [.woodpecker/lint.yaml, .markdownlint.yaml, "**/*.md"]] - - dockerfile: - image: kokuwaio/hadolint - depends_on: [] - when: [path: [.woodpecker/lint.yaml, Dockerfile]] diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 9e41181..f4d8a94 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -6,27 +6,6 @@ when: steps: - maven: - image: maven:3.9.10-eclipse-temurin-17 - commands: - # setup git - - git config user.email "$GIT_USER_EMAIL" - - git config user.name "$GIT_USER_NAME" - - git config gpg.format ssh - - git config user.signingkey /run/secrets/sign.key - - echo $GIT_SIGN_KEY > /run/secrets/sign.key - # release & write version to env file for image - - mvn release:prepare release:perform - - echo "VERSION=$(grep "scm.tag=" release.properties | cut -d= -f2)" > maven.env - environment: - MAVEN_ARGS: --batch-mode --color=always --no-transfer-progress --settings=.woodpecker/maven/settings.xml - MAVEN_GPG_KEY: {from_secret: woodpecker_gpg_key} - GIT_SIGN_KEY: {from_secret: woodpecker_sign_key} - FORGEJO_USERNAME: {from_secret: woodpecker_username} - FORGEJO_PASSWORD: {from_secret: woodpecker_password} - SONATYPE_ORG_USERNAME: {from_secret: sonatype_org_username} - SONATYPE_ORG_PASSWORD: {from_secret: sonatype_org_password} - image: image: kokuwaio/buildctl settings: diff --git a/.woodpecker/verify.yaml b/.woodpecker/verify.yaml deleted file mode 100644 index 5d9002b..0000000 --- a/.woodpecker/verify.yaml +++ /dev/null @@ -1,24 +0,0 @@ -when: - event: [manual, pull_request] - path: [.woodpecker/verify.yaml, pom.xml, src/**] - -services: - - name: dockerd - image: kokuwaio/dockerd - privileged: true - ports: [2375, 8080] - -steps: - - test: - image: maven:3.9.10-eclipse-temurin-17 - commands: mvn verify -P-deploy - environment: - MAVEN_ARGS: --batch-mode --color=always --no-transfer-progress --settings=.woodpecker/maven/settings.xml - - image: - image: kokuwaio/buildctl - settings: - platform: [linux/amd64, linux/arm64] - when: - instance: ci.kokuwa.io diff --git a/.woodpecker/versions.yaml b/.woodpecker/versions.yaml deleted file mode 100644 index 47a286e..0000000 --- a/.woodpecker/versions.yaml +++ /dev/null @@ -1,26 +0,0 @@ -when: - event: [manual, pull_request] - path: [.woodpecker/versions.yaml, pom.xml, src/**] - -depends_on: [verify] -matrix: - KEYCLOAK_VERSION: - - 22.0.5 - - 23.0.7 - - 24.0.5 - - 25.0.6 - - 26.2.5 - -services: - - name: dockerd - image: kokuwaio/dockerd - privileged: true - ports: [2375, 8080] - -steps: - - test: - image: maven:3.9.10-eclipse-temurin-17 - commands: mvn verify -Dversion.org.keycloak.test="$KEYCLOAK_VERSION" -P-deploy,-check - environment: - MAVEN_ARGS: --batch-mode --color=always --no-transfer-progress --settings=.woodpecker/maven/settings.xml diff --git a/pom.xml b/pom.xml index ac146cd..919f2b2 100644 --- a/pom.xml +++ b/pom.xml @@ -257,13 +257,12 @@ maven-release-plugin 3.1.1 - test - check - deploy -DskipITs - deploy,release + clean + clean true @{prefix} prepare release @{releaseLabel} [CI SKIP] @{project.version} + false