diff --git a/.github/scripts/start-local-server.sh b/.github/scripts/start-local-server.sh index 934977610..1e0236c16 100755 --- a/.github/scripts/start-local-server.sh +++ b/.github/scripts/start-local-server.sh @@ -33,6 +33,6 @@ if [ "$1" = "extension" ]; then fi fi -eval exec "$dist/bin/kc.sh start-dev --http-port=8180 $SERVER_ARGS > keycloak.log 2>&1 &" +eval exec "$dist/bin/kc.sh start-dev --http-port=8180 $SERVER_ARGS" | tee keycloak.log & -wget --retry-connrefused --waitretry=3 --read-timeout=20 --timeout=15 -t 30 http://localhost:8180 \ No newline at end of file +wget --retry-connrefused --waitretry=3 --read-timeout=20 --timeout=15 -t 30 http://localhost:8180 --quiet \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b4279b74..5f44d20ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,10 @@ on: pull_request: workflow_dispatch: +env: + DEFAULT_JDK_VERSION: 17 + DEFAULT_JDK_DIST: temurin + jobs: tests: @@ -12,9 +16,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v3 with: - java-version: 17 + distribution: ${{ env.DEFAULT_JDK_DIST }} + java-version: ${{ env.DEFAULT_JDK_VERSION }} - name: Update maven settings run: mkdir -p ~/.m2 ; cp .github/maven-settings.xml ~/.m2/ @@ -41,9 +46,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v3 with: - java-version: 17 + distribution: ${{ env.DEFAULT_JDK_DIST }} + java-version: ${{ env.DEFAULT_JDK_VERSION }} - name: Update maven settings run: mkdir -p ~/.m2 ; cp .github/maven-settings.xml ~/.m2/ @@ -73,6 +79,10 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 18 + - uses: actions/setup-java@v3 + with: + distribution: ${{ env.DEFAULT_JDK_DIST }} + java-version: ${{ env.DEFAULT_JDK_VERSION }} - name: Get Keycloak run: .github/scripts/prepare-local-server.sh @@ -91,6 +101,10 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 18 + - uses: actions/setup-java@v3 + with: + distribution: ${{ env.DEFAULT_JDK_DIST }} + java-version: ${{ env.DEFAULT_JDK_VERSION }} - name: Get Keycloak run: .github/scripts/prepare-local-server.sh @@ -106,9 +120,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v3 with: - java-version: 17 + distribution: ${{ env.DEFAULT_JDK_DIST }} + java-version: ${{ env.DEFAULT_JDK_VERSION }} - name: Update maven settings run: mkdir -p ~/.m2 ; cp .github/maven-settings.xml ~/.m2/ diff --git a/extension/action-token-authenticator/pom.xml b/extension/action-token-authenticator/pom.xml index 7a066865e..65a94391a 100755 --- a/extension/action-token-authenticator/pom.xml +++ b/extension/action-token-authenticator/pom.xml @@ -20,7 +20,7 @@ keycloak-quickstart-parent org.keycloak.quickstarts - 999.0.0-SNAPSHOT + 22.0.4 ../../pom.xml diff --git a/extension/action-token-required-action/pom.xml b/extension/action-token-required-action/pom.xml index 43761e15d..174911447 100755 --- a/extension/action-token-required-action/pom.xml +++ b/extension/action-token-required-action/pom.xml @@ -20,7 +20,7 @@ keycloak-quickstart-parent org.keycloak.quickstarts - 999.0.0-SNAPSHOT + 22.0.4 ../../pom.xml diff --git a/extension/event-listener-sysout/pom.xml b/extension/event-listener-sysout/pom.xml index 7a1dbdbc7..b0211babf 100755 --- a/extension/event-listener-sysout/pom.xml +++ b/extension/event-listener-sysout/pom.xml @@ -20,7 +20,7 @@ keycloak-quickstart-parent org.keycloak.quickstarts - 999.0.0-SNAPSHOT + 22.0.4 ../../pom.xml diff --git a/extension/event-store-mem/pom.xml b/extension/event-store-mem/pom.xml index c8d8a7096..69cc57322 100755 --- a/extension/event-store-mem/pom.xml +++ b/extension/event-store-mem/pom.xml @@ -20,7 +20,7 @@ keycloak-quickstart-parent org.keycloak.quickstarts - 999.0.0-SNAPSHOT + 22.0.4 ../../pom.xml diff --git a/extension/extend-account-console/pom.xml b/extension/extend-account-console/pom.xml index 58256447b..67955e7c5 100644 --- a/extension/extend-account-console/pom.xml +++ b/extension/extend-account-console/pom.xml @@ -5,7 +5,7 @@ org.keycloak.quickstarts keycloak-quickstart-parent - 999.0.0-SNAPSHOT + 22.0.4 ../../pom.xml diff --git a/extension/user-storage-jpa/pom.xml b/extension/user-storage-jpa/pom.xml index 857ec5ea1..525b6a871 100755 --- a/extension/user-storage-jpa/pom.xml +++ b/extension/user-storage-jpa/pom.xml @@ -20,7 +20,7 @@ org.keycloak.quickstarts keycloak-quickstart-parent - 999.0.0-SNAPSHOT + 22.0.4 ../../pom.xml 4.0.0 diff --git a/extension/user-storage-simple/pom.xml b/extension/user-storage-simple/pom.xml index f07b5f7a8..40e2bb94d 100755 --- a/extension/user-storage-simple/pom.xml +++ b/extension/user-storage-simple/pom.xml @@ -20,7 +20,7 @@ org.keycloak.quickstarts keycloak-quickstart-parent - 999.0.0-SNAPSHOT + 22.0.4 ../../pom.xml 4.0.0 diff --git a/jakarta/jaxrs-resource-server/pom.xml b/jakarta/jaxrs-resource-server/pom.xml index 52b98c4a8..00e130f41 100755 --- a/jakarta/jaxrs-resource-server/pom.xml +++ b/jakarta/jaxrs-resource-server/pom.xml @@ -19,7 +19,7 @@ org.keycloak.quickstarts keycloak-quickstart-parent - 999.0.0-SNAPSHOT + 22.0.4 ../../pom.xml 4.0.0 diff --git a/jakarta/servlet-authz-client/pom.xml b/jakarta/servlet-authz-client/pom.xml index 304e4487c..1c863de76 100644 --- a/jakarta/servlet-authz-client/pom.xml +++ b/jakarta/servlet-authz-client/pom.xml @@ -20,7 +20,7 @@ org.keycloak.quickstarts keycloak-quickstart-parent - 999.0.0-SNAPSHOT + 22.0.4 ../../pom.xml jakarta-servlet-authz-client diff --git a/jakarta/servlet-saml-service-provider/pom.xml b/jakarta/servlet-saml-service-provider/pom.xml index 8911361e4..585b64a85 100644 --- a/jakarta/servlet-saml-service-provider/pom.xml +++ b/jakarta/servlet-saml-service-provider/pom.xml @@ -20,7 +20,7 @@ org.keycloak.quickstarts keycloak-quickstart-parent - 999.0.0-SNAPSHOT + 22.0.4 ../../pom.xml 4.0.0 diff --git a/kubernetes/keycloak.yaml b/kubernetes/keycloak.yaml index 146f432ce..8035bc3c5 100644 --- a/kubernetes/keycloak.yaml +++ b/kubernetes/keycloak.yaml @@ -31,7 +31,7 @@ spec: spec: containers: - name: keycloak - image: quay.io/keycloak/keycloak:21.1.1 + image: quay.io/keycloak/keycloak:$$VERSION$$ args: ["start-dev"] env: - name: KEYCLOAK_ADMIN diff --git a/nodejs/resource-server/package-lock.json b/nodejs/resource-server/package-lock.json index 5f9139ea7..517056e6b 100644 --- a/nodejs/resource-server/package-lock.json +++ b/nodejs/resource-server/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "keycloak-resource-server", "dependencies": { - "@keycloak/keycloak-admin-client": "^21.1.1", + "@keycloak/keycloak-admin-client": "^22.0.4", "express": "^4.18.2", "keycloak-connect": "^21.1.1" }, @@ -15,17 +15,17 @@ } }, "node_modules/@keycloak/keycloak-admin-client": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/@keycloak/keycloak-admin-client/-/keycloak-admin-client-21.1.1.tgz", - "integrity": "sha512-pXlcS+QU7wzcVG04jVoJieb+/j3W+UgIajd6bqoPPWGIdV1vlVnvKZw0fK8VGbhc80TSqg/9hJbxy02tfg8i5w==", + "version": "22.0.4", + "resolved": "https://registry.npmjs.org/@keycloak/keycloak-admin-client/-/keycloak-admin-client-22.0.4.tgz", + "integrity": "sha512-332STkH1mIpBw3ZaGseNM/5cPIrau66vKgn3si51TtHYOO8HqLgsTR6nEvxDiLosteWakLhybxhS4/beP4pW7A==", "dependencies": { - "camelize-ts": "^2.5.0", + "camelize-ts": "^3.0.0", "lodash-es": "^4.17.21", "url-join": "^5.0.0", "url-template": "^3.1.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=18" } }, "node_modules/@testim/chrome-version": { @@ -192,9 +192,9 @@ } }, "node_modules/camelize-ts": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/camelize-ts/-/camelize-ts-2.5.0.tgz", - "integrity": "sha512-ERaOJadw+ID9MuKGeTOF1kQOb/zZIv6Vkt44kFYZraiAFiZU6E3TwnJebp8jofsW/hDxME/U63lFdNKIkSqijw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelize-ts/-/camelize-ts-3.0.0.tgz", + "integrity": "sha512-cgRwKKavoDKLTjO4FQTs3dRBePZp/2Y9Xpud0FhuCOTE86M2cniKN4CCXgRnsyXNMmQMifVHcv6SPaMtTx6ofQ==", "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" } diff --git a/nodejs/resource-server/package.json b/nodejs/resource-server/package.json index f7fd5d627..3a38cf811 100644 --- a/nodejs/resource-server/package.json +++ b/nodejs/resource-server/package.json @@ -8,7 +8,7 @@ "delete-realm": "node scripts/delete-realm.js" }, "dependencies": { - "@keycloak/keycloak-admin-client": "^21.1.1", + "@keycloak/keycloak-admin-client": "^22.0.4", "express": "^4.18.2", "keycloak-connect": "^21.1.1" }, diff --git a/openshift/keycloak.yaml b/openshift/keycloak.yaml index f6f341d43..9519df766 100644 --- a/openshift/keycloak.yaml +++ b/openshift/keycloak.yaml @@ -7,7 +7,7 @@ metadata: iconClass: icon-sso openshift.io/display-name: Keycloak tags: keycloak - version: 17.0.0-SNAPSHOT + version: $$VERSION$$ objects: - apiVersion: v1 kind: Service diff --git a/pom.xml b/pom.xml index 0db199a9e..4f091e734 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.keycloak.quickstarts keycloak-quickstart-parent - 999.0.0-SNAPSHOT + 22.0.4 pom Keycloak Quickstart: parent Parent diff --git a/set-version.sh b/set-version.sh new file mode 100755 index 000000000..834cdfb13 --- /dev/null +++ b/set-version.sh @@ -0,0 +1,8 @@ +#!/bin/bash -e + +NEW_VERSION=$1 + +mvn versions:set -Dversion.keycloak=$NEW_VERSION -DnewVersion=$NEW_VERSION -DgenerateBackupPoms=false -DgroupId=org.keycloak* -DartifactId=* + +sed -i "s|$$VERSION$$|$NEW_VERSION|g" kubernetes/keycloak.yaml +sed -i "s|$$VERSION$$|$NEW_VERSION|g" openshift/keycloak.yaml diff --git a/spring/rest-authz-resource-server/pom.xml b/spring/rest-authz-resource-server/pom.xml index 098416b22..b8feea8aa 100644 --- a/spring/rest-authz-resource-server/pom.xml +++ b/spring/rest-authz-resource-server/pom.xml @@ -20,7 +20,7 @@ org.keycloak.quickstarts keycloak-quickstart-parent - 999.0.0-SNAPSHOT + 22.0.4 ../../pom.xml