This is an automated email from the ASF dual-hosted git repository.
gtully pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new aa8102d50f ARTEMIS-4179 Upgrade keycloak version to 21.0.0
aa8102d50f is described below
commit aa8102d50ff67efd46c3d46a781d8dd1b1d3ed67
Author: Domenico Francesco Bruscino <[email protected]>
AuthorDate: Thu Feb 23 13:07:55 2023 +0100
ARTEMIS-4179 Upgrade keycloak version to 21.0.0
---
.../features/standard/security-keycloak/pom.xml | 22 ++++------------------
.../features/standard/security-keycloak/readme.md | 2 +-
.../activemq/server0/keycloak-bearer-token.json | 2 +-
.../activemq/server0/keycloak-direct-access.json | 2 +-
.../activemq/server0/keycloak-js-client.json | 4 ++--
5 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/examples/features/standard/security-keycloak/pom.xml
b/examples/features/standard/security-keycloak/pom.xml
index 034991dcb0..2abce6ddac 100644
--- a/examples/features/standard/security-keycloak/pom.xml
+++ b/examples/features/standard/security-keycloak/pom.xml
@@ -33,7 +33,7 @@ under the License.
<properties>
<activemq.basedir>${project.basedir}/../../../..</activemq.basedir>
- <version.org.keycloak>19.0.2</version.org.keycloak>
+ <version.org.keycloak>21.0.0</version.org.keycloak>
<version.jboss.logging>3.5.0.Final</version.jboss.logging>
</properties>
@@ -59,7 +59,7 @@ under the License.
<goal>wget</goal>
</goals>
<configuration>
-
<url>https://github.com/keycloak/keycloak/releases/download/${version.org.keycloak}/keycloak-legacy-${version.org.keycloak}.tar.gz</url>
+
<url>https://github.com/keycloak/keycloak/releases/download/${version.org.keycloak}/keycloak-${version.org.keycloak}.tar.gz</url>
<unpack>true</unpack>
<overwrite>false</overwrite>
<skip>${noServer}</skip>
@@ -168,29 +168,15 @@ under the License.
<configuration>
<skip>${noServer}</skip>
<async>true</async>
-
<executable>./target/keycloak-${version.org.keycloak}/bin/standalone.sh</executable>
+
<executable>./target/keycloak-${version.org.keycloak}/bin/kc.sh</executable>
<arguments>
+ <argument>start-dev</argument>
<argument>-Dkeycloak.migration.action=import</argument>
<argument>-Dkeycloak.migration.provider=singleFile</argument>
<argument>-Dkeycloak.migration.file=./src/main/resources/artemis-keycloak-demo-realm.json</argument>
</arguments>
</configuration>
</execution>
- <execution>
- <id>stop-keycloak</id>
- <phase>verify</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <skip>${noServer}</skip>
-
<executable>./target/keycloak-${version.org.keycloak}/bin/jboss-cli.sh</executable>
- <arguments>
- <argument>--connect</argument>
- <argument>command=:shutdown</argument>
- </arguments>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
diff --git a/examples/features/standard/security-keycloak/readme.md
b/examples/features/standard/security-keycloak/readme.md
index 8d931380e2..9b7d6a6d0a 100644
--- a/examples/features/standard/security-keycloak/readme.md
+++ b/examples/features/standard/security-keycloak/readme.md
@@ -6,7 +6,7 @@ In this example, broker authentication is delegated to
keycloak. A keycloak serv
a demo realm called "artemis-keycloak-demo".
_NOTE_: The keycloak admin user is admin:admin
-The keycloak admin console is at:
http://localhost:8080/auth/admin/master/console/#/realms/artemis-keycloak-demo
+The keycloak admin console is at:
http://localhost:8080/admin/master/console/#/realms/artemis-keycloak-demo
Artemis uses JAAS for authentication and authorization, when authentication is
delegated to keycloak, JAAS needs a
way to query keycloak and resolve tokens or authenticate directly.
diff --git
a/examples/features/standard/security-keycloak/src/main/resources/activemq/server0/keycloak-bearer-token.json
b/examples/features/standard/security-keycloak/src/main/resources/activemq/server0/keycloak-bearer-token.json
index 31fcd5bc1b..4d6147a97b 100644
---
a/examples/features/standard/security-keycloak/src/main/resources/activemq/server0/keycloak-bearer-token.json
+++
b/examples/features/standard/security-keycloak/src/main/resources/activemq/server0/keycloak-bearer-token.json
@@ -1,7 +1,7 @@
{
"realm": "artemis-keycloak-demo",
"resource": "artemis-console",
- "auth-server-url": "http://localhost:8080/auth";,
+ "auth-server-url": "http://localhost:8080";,
"principal-attribute": "preferred_username",
"use-resource-role-mappings": true,
"ssl-required": "external",
diff --git
a/examples/features/standard/security-keycloak/src/main/resources/activemq/server0/keycloak-direct-access.json
b/examples/features/standard/security-keycloak/src/main/resources/activemq/server0/keycloak-direct-access.json
index bd58966d87..ed9de87b88 100644
---
a/examples/features/standard/security-keycloak/src/main/resources/activemq/server0/keycloak-direct-access.json
+++
b/examples/features/standard/security-keycloak/src/main/resources/activemq/server0/keycloak-direct-access.json
@@ -1,7 +1,7 @@
{
"realm": "artemis-keycloak-demo",
"resource": "artemis-broker",
- "auth-server-url": "http://localhost:8080/auth";,
+ "auth-server-url": "http://localhost:8080";,
"use-resource-role-mappings": true,
"principal-attribute": "preferred_username",
"ssl-required": "external",
diff --git
a/examples/features/standard/security-keycloak/src/main/resources/activemq/server0/keycloak-js-client.json
b/examples/features/standard/security-keycloak/src/main/resources/activemq/server0/keycloak-js-client.json
index 3d407967ed..dda45f84d0 100644
---
a/examples/features/standard/security-keycloak/src/main/resources/activemq/server0/keycloak-js-client.json
+++
b/examples/features/standard/security-keycloak/src/main/resources/activemq/server0/keycloak-js-client.json
@@ -1,5 +1,5 @@
{
"realm" : "artemis-keycloak-demo",
"clientId" : "artemis-console",
- "url" : "http://localhost:8080/auth";
-}
\ No newline at end of file
+ "url" : "http://localhost:8080";
+}
