From 3ff8d0fd1f7fd3366a6bb48575d5346f477d7872 Mon Sep 17 00:00:00 2001 From: Bill Burke Date: Wed, 12 Mar 2014 16:48:12 -0400 Subject: [PATCH 1/2] bump version --- admin-ui-styles/pom.xml | 2 +- admin-ui/pom.xml | 2 +- core-jaxrs/pom.xml | 2 +- core/pom.xml | 2 +- distribution/appliance-dist/pom.xml | 2 +- distribution/as7-adapter-zip/pom.xml | 2 +- distribution/eap6-adapter-zip/pom.xml | 2 +- distribution/examples-docs-zip/pom.xml | 2 +- distribution/modules/pom.xml | 2 +- distribution/pom.xml | 2 +- distribution/src-dist/pom.xml | 2 +- distribution/theme-template-zip/pom.xml | 2 +- distribution/war-dist/pom.xml | 2 +- distribution/war-zip/pom.xml | 2 +- distribution/wildfly-adapter-zip/pom.xml | 2 +- examples/demo-template/customer-app-cli/pom.xml | 2 +- examples/demo-template/customer-app-js/pom.xml | 2 +- examples/demo-template/customer-app/pom.xml | 2 +- examples/demo-template/database-service/pom.xml | 2 +- examples/demo-template/pom.xml | 2 +- examples/demo-template/product-app/pom.xml | 2 +- examples/demo-template/third-party-cdi/pom.xml | 2 +- examples/demo-template/third-party/pom.xml | 2 +- examples/pom.xml | 2 +- forms/account-api/pom.xml | 2 +- forms/account-freemarker/pom.xml | 2 +- forms/common-freemarker/pom.xml | 2 +- forms/common-themes/pom.xml | 2 +- forms/login-api/pom.xml | 2 +- forms/login-freemarker/pom.xml | 2 +- forms/pom.xml | 2 +- integration/adapter-core/pom.xml | 2 +- integration/as7-eap-subsystem/pom.xml | 4 ++-- integration/as7-eap6/adapter/pom.xml | 2 +- integration/jaxrs-oauth-client/pom.xml | 2 +- integration/jboss-adapter-core/pom.xml | 2 +- integration/js/pom.xml | 2 +- integration/pom.xml | 2 +- integration/servlet-oauth-client/pom.xml | 2 +- integration/undertow/pom.xml | 2 +- integration/wildfly-adapter/pom.xml | 2 +- integration/wildfly-subsystem/pom.xml | 4 ++-- model/api/pom.xml | 2 +- model/jpa/pom.xml | 2 +- model/mongo/pom.xml | 2 +- model/picketlink/pom.xml | 2 +- model/pom.xml | 2 +- model/tests/pom.xml | 2 +- pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 2 +- social/core/pom.xml | 2 +- social/facebook/pom.xml | 2 +- social/github/pom.xml | 2 +- social/google/pom.xml | 2 +- social/pom.xml | 2 +- social/twitter/pom.xml | 2 +- testsuite/integration/pom.xml | 2 +- testsuite/performance/pom.xml | 2 +- testsuite/pom.xml | 2 +- 60 files changed, 62 insertions(+), 62 deletions(-) diff --git a/admin-ui-styles/pom.xml b/admin-ui-styles/pom.xml index e9df595ce6..bd3e53bda2 100755 --- a/admin-ui-styles/pom.xml +++ b/admin-ui-styles/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml 4.0.0 diff --git a/admin-ui/pom.xml b/admin-ui/pom.xml index 20dd99203e..3f32a3262e 100755 --- a/admin-ui/pom.xml +++ b/admin-ui/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml 4.0.0 diff --git a/core-jaxrs/pom.xml b/core-jaxrs/pom.xml index dc7fd8ab74..bbef3b43de 100755 --- a/core-jaxrs/pom.xml +++ b/core-jaxrs/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml 4.0.0 diff --git a/core/pom.xml b/core/pom.xml index 1f781f399b..a42cc3adb1 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml 4.0.0 diff --git a/distribution/appliance-dist/pom.xml b/distribution/appliance-dist/pom.xml index f6792e8ab0..873e8deafd 100755 --- a/distribution/appliance-dist/pom.xml +++ b/distribution/appliance-dist/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml diff --git a/distribution/as7-adapter-zip/pom.xml b/distribution/as7-adapter-zip/pom.xml index aa1d1a5ea5..fe435ec1b2 100755 --- a/distribution/as7-adapter-zip/pom.xml +++ b/distribution/as7-adapter-zip/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml diff --git a/distribution/eap6-adapter-zip/pom.xml b/distribution/eap6-adapter-zip/pom.xml index 1bd95269d5..8a656c01e4 100755 --- a/distribution/eap6-adapter-zip/pom.xml +++ b/distribution/eap6-adapter-zip/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml diff --git a/distribution/examples-docs-zip/pom.xml b/distribution/examples-docs-zip/pom.xml index 4403959815..16af841edb 100755 --- a/distribution/examples-docs-zip/pom.xml +++ b/distribution/examples-docs-zip/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml diff --git a/distribution/modules/pom.xml b/distribution/modules/pom.xml index 107a06d7d5..55d7ca3c17 100755 --- a/distribution/modules/pom.xml +++ b/distribution/modules/pom.xml @@ -30,7 +30,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index 8871424370..7c15bcf27e 100755 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml Distribution diff --git a/distribution/src-dist/pom.xml b/distribution/src-dist/pom.xml index 21457b226c..ec4d1b53b3 100755 --- a/distribution/src-dist/pom.xml +++ b/distribution/src-dist/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml diff --git a/distribution/theme-template-zip/pom.xml b/distribution/theme-template-zip/pom.xml index 1f55e12a88..b8055c610c 100755 --- a/distribution/theme-template-zip/pom.xml +++ b/distribution/theme-template-zip/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml diff --git a/distribution/war-dist/pom.xml b/distribution/war-dist/pom.xml index 00e0b6efeb..847307d113 100755 --- a/distribution/war-dist/pom.xml +++ b/distribution/war-dist/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml diff --git a/distribution/war-zip/pom.xml b/distribution/war-zip/pom.xml index b4758f97f4..5b83a1e0c9 100755 --- a/distribution/war-zip/pom.xml +++ b/distribution/war-zip/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml diff --git a/distribution/wildfly-adapter-zip/pom.xml b/distribution/wildfly-adapter-zip/pom.xml index 5c042bbbf3..3e24e85761 100755 --- a/distribution/wildfly-adapter-zip/pom.xml +++ b/distribution/wildfly-adapter-zip/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml diff --git a/examples/demo-template/customer-app-cli/pom.xml b/examples/demo-template/customer-app-cli/pom.xml index 0daed0f998..14511d69d9 100755 --- a/examples/demo-template/customer-app-cli/pom.xml +++ b/examples/demo-template/customer-app-cli/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../../pom.xml 4.0.0 diff --git a/examples/demo-template/customer-app-js/pom.xml b/examples/demo-template/customer-app-js/pom.xml index 6060f400e3..3e18a8a0bc 100755 --- a/examples/demo-template/customer-app-js/pom.xml +++ b/examples/demo-template/customer-app-js/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../../pom.xml 4.0.0 diff --git a/examples/demo-template/customer-app/pom.xml b/examples/demo-template/customer-app/pom.xml index c0a42eb6d5..56df89da8e 100755 --- a/examples/demo-template/customer-app/pom.xml +++ b/examples/demo-template/customer-app/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../../pom.xml 4.0.0 diff --git a/examples/demo-template/database-service/pom.xml b/examples/demo-template/database-service/pom.xml index 1cd421fa55..9e7a7711c5 100755 --- a/examples/demo-template/database-service/pom.xml +++ b/examples/demo-template/database-service/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../../pom.xml 4.0.0 diff --git a/examples/demo-template/pom.xml b/examples/demo-template/pom.xml index 20ec866d55..5c88d678d5 100755 --- a/examples/demo-template/pom.xml +++ b/examples/demo-template/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml Examples diff --git a/examples/demo-template/product-app/pom.xml b/examples/demo-template/product-app/pom.xml index 1f69efcc49..0a8fb484df 100755 --- a/examples/demo-template/product-app/pom.xml +++ b/examples/demo-template/product-app/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../../pom.xml 4.0.0 diff --git a/examples/demo-template/third-party-cdi/pom.xml b/examples/demo-template/third-party-cdi/pom.xml index 90c83dd4fa..ffb06c1670 100755 --- a/examples/demo-template/third-party-cdi/pom.xml +++ b/examples/demo-template/third-party-cdi/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../../pom.xml 4.0.0 diff --git a/examples/demo-template/third-party/pom.xml b/examples/demo-template/third-party/pom.xml index 0f7e397f61..0f8105cf47 100755 --- a/examples/demo-template/third-party/pom.xml +++ b/examples/demo-template/third-party/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../../pom.xml 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index 532789677c..a78ca928ba 100755 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml Examples diff --git a/forms/account-api/pom.xml b/forms/account-api/pom.xml index 0e5a8ba7f0..926ce209bd 100755 --- a/forms/account-api/pom.xml +++ b/forms/account-api/pom.xml @@ -3,7 +3,7 @@ keycloak-forms org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml 4.0.0 diff --git a/forms/account-freemarker/pom.xml b/forms/account-freemarker/pom.xml index 697827d913..6457df93c1 100755 --- a/forms/account-freemarker/pom.xml +++ b/forms/account-freemarker/pom.xml @@ -3,7 +3,7 @@ keycloak-forms org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml 4.0.0 diff --git a/forms/common-freemarker/pom.xml b/forms/common-freemarker/pom.xml index 385176f9ce..8f5466010a 100755 --- a/forms/common-freemarker/pom.xml +++ b/forms/common-freemarker/pom.xml @@ -3,7 +3,7 @@ keycloak-forms org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml 4.0.0 diff --git a/forms/common-themes/pom.xml b/forms/common-themes/pom.xml index 90bbd0edd7..d899e5a7ee 100755 --- a/forms/common-themes/pom.xml +++ b/forms/common-themes/pom.xml @@ -3,7 +3,7 @@ keycloak-forms org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml 4.0.0 diff --git a/forms/login-api/pom.xml b/forms/login-api/pom.xml index 9c4af13ccc..83aa63d296 100755 --- a/forms/login-api/pom.xml +++ b/forms/login-api/pom.xml @@ -3,7 +3,7 @@ keycloak-forms org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml 4.0.0 diff --git a/forms/login-freemarker/pom.xml b/forms/login-freemarker/pom.xml index 6fcb56db94..a892646672 100755 --- a/forms/login-freemarker/pom.xml +++ b/forms/login-freemarker/pom.xml @@ -3,7 +3,7 @@ keycloak-forms org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml 4.0.0 diff --git a/forms/pom.xml b/forms/pom.xml index 826bc4ee09..5eb13cf63d 100755 --- a/forms/pom.xml +++ b/forms/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml 4.0.0 diff --git a/integration/adapter-core/pom.xml b/integration/adapter-core/pom.xml index ae0fc816bc..092ad641a4 100755 --- a/integration/adapter-core/pom.xml +++ b/integration/adapter-core/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml 4.0.0 diff --git a/integration/as7-eap-subsystem/pom.xml b/integration/as7-eap-subsystem/pom.xml index 5b7f71e48b..5aa027ad99 100755 --- a/integration/as7-eap-subsystem/pom.xml +++ b/integration/as7-eap-subsystem/pom.xml @@ -20,13 +20,13 @@ org.keycloak keycloak-parent - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml org.keycloak keycloak-as7-subsystem - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 Keycloak Wildfly Subsystem diff --git a/integration/as7-eap6/adapter/pom.xml b/integration/as7-eap6/adapter/pom.xml index 07dc6e35b1..90fec81210 100755 --- a/integration/as7-eap6/adapter/pom.xml +++ b/integration/as7-eap6/adapter/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../../pom.xml 4.0.0 diff --git a/integration/jaxrs-oauth-client/pom.xml b/integration/jaxrs-oauth-client/pom.xml index d9d03b2e03..d86c75962e 100755 --- a/integration/jaxrs-oauth-client/pom.xml +++ b/integration/jaxrs-oauth-client/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml 4.0.0 diff --git a/integration/jboss-adapter-core/pom.xml b/integration/jboss-adapter-core/pom.xml index 0d599a555a..da0d54b306 100755 --- a/integration/jboss-adapter-core/pom.xml +++ b/integration/jboss-adapter-core/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml 4.0.0 diff --git a/integration/js/pom.xml b/integration/js/pom.xml index 64115dabdf..ac338a8ccf 100755 --- a/integration/js/pom.xml +++ b/integration/js/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml 4.0.0 diff --git a/integration/pom.xml b/integration/pom.xml index d07f29b174..b94b92be79 100755 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml Keycloak Integration diff --git a/integration/servlet-oauth-client/pom.xml b/integration/servlet-oauth-client/pom.xml index 9db95f9444..53f9225890 100755 --- a/integration/servlet-oauth-client/pom.xml +++ b/integration/servlet-oauth-client/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml 4.0.0 diff --git a/integration/undertow/pom.xml b/integration/undertow/pom.xml index 377e80370f..c5cf621405 100755 --- a/integration/undertow/pom.xml +++ b/integration/undertow/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml 4.0.0 diff --git a/integration/wildfly-adapter/pom.xml b/integration/wildfly-adapter/pom.xml index 7ed0602da9..acce9b9f6d 100755 --- a/integration/wildfly-adapter/pom.xml +++ b/integration/wildfly-adapter/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml 4.0.0 diff --git a/integration/wildfly-subsystem/pom.xml b/integration/wildfly-subsystem/pom.xml index dac98472e2..ef9098b524 100755 --- a/integration/wildfly-subsystem/pom.xml +++ b/integration/wildfly-subsystem/pom.xml @@ -20,13 +20,13 @@ org.keycloak keycloak-parent - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml org.keycloak keycloak-wildfly-subsystem - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 Keycloak Wildfly Subsystem diff --git a/model/api/pom.xml b/model/api/pom.xml index fe7b06da03..cac7e3aa07 100755 --- a/model/api/pom.xml +++ b/model/api/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml 4.0.0 diff --git a/model/jpa/pom.xml b/model/jpa/pom.xml index cf2ae56552..a97fd7ce35 100755 --- a/model/jpa/pom.xml +++ b/model/jpa/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml 4.0.0 diff --git a/model/mongo/pom.xml b/model/mongo/pom.xml index 2ed8d457f5..930ebea842 100755 --- a/model/mongo/pom.xml +++ b/model/mongo/pom.xml @@ -5,7 +5,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml 4.0.0 diff --git a/model/picketlink/pom.xml b/model/picketlink/pom.xml index 3d4982a394..7a68c6c26c 100755 --- a/model/picketlink/pom.xml +++ b/model/picketlink/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml 4.0.0 diff --git a/model/pom.xml b/model/pom.xml index 9d1c82f453..9304d44ca4 100755 --- a/model/pom.xml +++ b/model/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml Examples diff --git a/model/tests/pom.xml b/model/tests/pom.xml index c56a0751f6..3fa855372b 100755 --- a/model/tests/pom.xml +++ b/model/tests/pom.xml @@ -5,7 +5,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 2c71aa2144..4c649714a7 100755 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.keycloak keycloak-parent - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 pom diff --git a/server/pom.xml b/server/pom.xml index e18dca4d7a..f2fdaa9187 100755 --- a/server/pom.xml +++ b/server/pom.xml @@ -4,7 +4,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 4.0.0 diff --git a/services/pom.xml b/services/pom.xml index e5e037e88b..e8e970b0d0 100755 --- a/services/pom.xml +++ b/services/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml 4.0.0 diff --git a/social/core/pom.xml b/social/core/pom.xml index 82aa142a2f..4570493416 100755 --- a/social/core/pom.xml +++ b/social/core/pom.xml @@ -3,7 +3,7 @@ keycloak-social-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml 4.0.0 diff --git a/social/facebook/pom.xml b/social/facebook/pom.xml index 33d4fdfc5c..19083b688a 100755 --- a/social/facebook/pom.xml +++ b/social/facebook/pom.xml @@ -3,7 +3,7 @@ keycloak-social-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml 4.0.0 diff --git a/social/github/pom.xml b/social/github/pom.xml index aa2de8c3ba..4c21de5906 100755 --- a/social/github/pom.xml +++ b/social/github/pom.xml @@ -3,7 +3,7 @@ keycloak-social-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml 4.0.0 diff --git a/social/google/pom.xml b/social/google/pom.xml index 6130423c6f..e574768b8e 100755 --- a/social/google/pom.xml +++ b/social/google/pom.xml @@ -3,7 +3,7 @@ keycloak-social-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml 4.0.0 diff --git a/social/pom.xml b/social/pom.xml index f7879d3252..2b0f528750 100755 --- a/social/pom.xml +++ b/social/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml 4.0.0 diff --git a/social/twitter/pom.xml b/social/twitter/pom.xml index 320bc11889..a07912c25e 100755 --- a/social/twitter/pom.xml +++ b/social/twitter/pom.xml @@ -3,7 +3,7 @@ keycloak-social-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml 4.0.0 diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml index b17ac5b960..53b6688870 100755 --- a/testsuite/integration/pom.xml +++ b/testsuite/integration/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml 4.0.0 diff --git a/testsuite/performance/pom.xml b/testsuite/performance/pom.xml index fee9ba79e0..7d337af5bf 100755 --- a/testsuite/performance/pom.xml +++ b/testsuite/performance/pom.xml @@ -5,7 +5,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../../pom.xml 4.0.0 diff --git a/testsuite/pom.xml b/testsuite/pom.xml index 336449b31e..08f5fdc433 100755 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -3,7 +3,7 @@ keycloak-parent org.keycloak - 1.0-alpha-3-SNAPSHOT + 1.0-alpha-3 ../pom.xml 4.0.0 From 9528dbc4dc6dffc6d21757a0cd67226d506fe8af Mon Sep 17 00:00:00 2001 From: Bill Burke Date: Wed, 12 Mar 2014 17:05:57 -0400 Subject: [PATCH 2/2] realm name in OTP --- .../keycloak/login/freemarker/FreeMarkerLoginForms.java | 2 +- .../java/org/keycloak/login/freemarker/model/TotpBean.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginForms.java b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginForms.java index a91aaec3b6..b8be174259 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginForms.java +++ b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginForms.java @@ -169,7 +169,7 @@ public class FreeMarkerLoginForms implements LoginForms { switch (page) { case LOGIN_CONFIG_TOTP: - attributes.put("totp", new TotpBean(user, baseUri)); + attributes.put("totp", new TotpBean(realm, user, baseUri)); break; case LOGIN_UPDATE_PROFILE: attributes.put("user", new ProfileBean(user)); diff --git a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/TotpBean.java b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/TotpBean.java index bfc8d86cd6..497e75a7cf 100755 --- a/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/TotpBean.java +++ b/forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/model/TotpBean.java @@ -21,6 +21,7 @@ */ package org.keycloak.login.freemarker.model; +import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.utils.Base32; @@ -38,8 +39,10 @@ public class TotpBean { private String totpSecretEncoded; private boolean enabled; private String contextUrl; + private String realmName; - public TotpBean(UserModel user, URI baseUri) { + public TotpBean(RealmModel realm, UserModel user, URI baseUri) { + this.realmName = realm.getName(); this.enabled = user.isTotp(); this.contextUrl = baseUri.getPath(); @@ -78,7 +81,7 @@ public class TotpBean { } public String getTotpSecretQrCodeUrl() throws UnsupportedEncodingException { - String contents = URLEncoder.encode("otpauth://totp/keycloak?secret=" + totpSecretEncoded, "utf-8"); + String contents = URLEncoder.encode("otpauth://totp/" + realmName + "?secret=" + totpSecretEncoded, "utf-8"); return contextUrl + "qrcode" + "?size=246x246&contents=" + contents; }