libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions
14509 commits 4 branches 9 tags 483 MiB
Commit graph

796 commits

Author SHA1 Message Date
Stian Thorgersen
bd8e435164 KEYCLOAK-3625 Fix url 2016-10-19 17:07:01 +02:00
Alexander Schwartz
c2692cc0ac KEYCLOAK-2977: fix re-binding problem with spring-cloud 2016-10-19 16:07:28 +02:00
Stian Thorgersen
1b24d2edd8 KEYCLOAK-3625 More work on the issue 2016-10-19 14:21:50 +02:00
sebastien blanc
32df5225cf add check on list size 2016-10-19 14:21:41 +02:00
sebastien blanc
116f5f5795 KEYCLOAK-3625: conform to oidc specs 2016-10-19 14:21:41 +02:00
emilienbondu
0d3a50411e Move licence at the top of the file. 2016-10-19 09:57:07 +02:00
Stian Thorgersen
9193142bb9 Merge pull request #3305 from sebastienblanc/KEYCLOAK-3683 
KEYCLOAK-3683: Remove trustore and trustore-password check
 2016-10-17 19:39:02 +02:00
Stian Thorgersen
144898c0d2 Merge pull request #3262 from vramik/KEYCLOAK-3615 
KEYCLOAK-3615 Resolve warnings while building the effective model
 2016-10-17 19:09:30 +02:00
emilienbondu
3bed84d712 fix bug https://issues.jboss.org/browse/KEYCLOAK-3474 2016-10-17 14:42:46 +02:00
Hynek Mlnarik
4a19d4cdc1 KEYCLOAK-3664 Fix for NPE in subsystem when secure-deployment is undefined for a particular deployment 2016-10-17 09:19:44 +02:00
Stian Thorgersen
d2cae0f8c3 KEYCLOAK-905 
Realm key rotation for OIDC
 2016-10-13 11:19:52 +02:00
sebastienblanc
f5a5fc3458 KEYCLOAK-3683: Remove trustore and trustore-password check 2016-10-11 15:19:31 +02:00
Cherian Mathew
ac245d3c4b Fix entitlement function call in authorization 2016-10-09 11:19:02 +02:00
mposolda
a60dd48300 KEYCLOAK-3646 Missing attributes in AS7 adapter subsystem 2016-10-04 08:30:35 +02:00
mposolda
d71fadabeb KEYCLOAK-3634 Allow adapter subsystem to just inject dependencies 2016-10-03 17:38:41 +02:00
mposolda
7447ca7b58 KEYCLOAK-3564 Added token-minimum-time-to-live and min-time-between-jwks-requests to adapter subsystem 2016-10-03 16:06:45 +02:00
Bill Burke
d4c3fae546 merge conflicts 2016-09-30 19:19:12 -04:00
mposolda
f9a0abcfc4 KEYCLOAK-3493 KEYCLOAK-3532 Added KeyStorageProvider. Support key rotation for OIDC clients and identity providers with JWKS url. 2016-09-30 21:28:23 +02:00
Bill Burke
8967ca4066 refactor mongo entities, optimize imports 2016-09-28 15:25:39 -04:00
Bill Burke
ecc104719d bump pom version 2016-09-26 11:01:18 -04:00
Vlasta Ramik
103fa975a1 Resolve warnings while building the effective model 2016-09-26 12:34:46 +02:00
Stian Thorgersen
06c48a2830 KEYCLOAK-3586 
Token is not refreshed in updateToken
 2016-09-21 09:13:05 +02:00
gautric
affc62460c KEYCLOAK-3602 - NPE into SAML DeploymentBuilder build 2016-09-20 18:39:49 +02:00
gautric
cd3cd4f506 KEYCLOAK-3602 - NPE into SAML DeploymentBuilder build 2016-09-20 18:36:54 +02:00
mwcz
bd2f220736 always resolve keycloak.init's promise 2016-09-15 17:25:29 -04:00
mposolda
bf6246f5c1 KEYCLOAK-905 Realm keys rotation support on adapters 2016-09-12 21:24:04 +02:00
Stian Thorgersen
6d40e0dd07 Merge pull request #3212 from didiez/master 
KEYCLOAK-3513 Prevent clearing all registered sessions when invalidating some by sessionId
 2016-09-08 13:50:14 +02:00
didiez
df3079852e Prevent clearing all registered sessions when invalidating some by sessionId 2016-09-08 09:19:30 +02:00
Stian Thorgersen
5d20651c66 KEYCLOAK-3475 Fixes for on token expired event 2016-09-06 13:00:37 +02:00
Stian Thorgersen
7a66b055be KEYCLOAK-3475 Call event handlers when initialized with tokens 2016-09-06 09:00:29 +02:00
Stian Thorgersen
d9e95455a2 Merge pull request #3172 from mwcz/js-updateToken-withCredentials 
send cookies along with keycloak.updateToken()
 2016-09-05 09:37:00 +02:00
Pedro Igor
ce78cc1d1c [KEYCLOAK-3472] - Multiple paths with the same name and tests 2016-08-31 21:04:36 -03:00
mwcz
ec5289b5c8 send cookies along with keycloak.updateToken() 2016-08-26 11:23:44 -04:00
mposolda
a8fb988e31 KEYCLOAK-3406 OIDC dynamic client registrations specs fixes 2016-08-11 15:54:51 +02:00
mposolda
d52e043322 Set version to 2.2.0-SNAPSHOT 2016-08-10 08:57:18 +02:00
Bill Burke
1e7cf9fb3f Merge pull request #3088 from thomasdarimont/issue/KEYCLOAK-3380-allow-ignore-pattern-in-filter 
KEYCLOAK-3380 Allow to configure paths to skip in KeycloakOIDCFilter
 2016-08-03 21:30:20 -04:00
mposolda
3b3368eead KEYCLOAK-3237 Add scope=openid to KeycloakInstalled 2016-08-02 05:45:55 +02:00
Pedro Igor
ae1a7542d8 [KEYCLOAK-3385] - Improvements to evaluation tool UI and result 2016-08-01 18:01:24 -03:00
Thomas Darimont
79c7203fe8 KEYCLOAK-3380 Allow to configure paths to skip in KeycloakOIDCFilter 
We now allow configuration of path patterns which should not
be handled by the `KeycloakOIDCFilter` than can be specified via
the new init-parameter `keycloak.config.skipPattern` of
the `KeycloakOIDCFilter`.
Patterns are matched against the requestURI without the context-path.
A request for `/myapp/index.html` would be matched with `/index.html`
against the skip pattern.
This allows for for more flexible path handling when using the
`KeycloakOIDCFilter` in combination with existing applications.

Signed-off-by: Thomas Darimont <thomas.darimont@gmail.com>
 2016-08-01 11:43:49 +02:00
Marek Posolda
59f228be2b Merge pull request #3076 from Smartling/KEYCLOAK-3097 
KEYCLOAK-3097: Fix JBoss Logging scope
 2016-08-01 09:30:02 +02:00
Pedro Igor
3c8ed8e3d8 [KEYCLOAK-3372] - Code cleanup 2016-07-29 05:18:38 -03:00
Scott Rossillo
322597b420 KEYCLOAK-3097: Fix JBoss Logging scope 
JBoss Logging Framework required by Keycloak Core.
 2016-07-27 12:35:21 -04:00
mposolda
56e011dce4 KEYCLOAK-3318 Adapter support for prompt and max_age. Refactoring to not hardcode OIDC specifics to CookieAuthenticator 2016-07-21 18:19:53 +02:00
mposolda
7571dc07f9 KEYCLOAK-1733 added verifySSL checks for 'basic' and 'query' authentication 2016-07-20 11:04:31 +02:00
Marek Posolda
e03bf6eef6 Merge pull request #2990 from trex667/feat/keycloak-1733 
[KEYCLOAK-1733]: introduce token as query paramter
 2016-07-20 10:46:11 +02:00
Thomas Darimont
f574173ed3 KEYCLOAK-3301 Add support for Undertow in Spring Boot Adapter 
We now support using Undertow in combination with the Spring Boot Adapter.
 2016-07-18 10:07:07 +02:00
Stian Thorgersen
a42e4af78d Merge pull request #3018 from thomasdarimont/issue/KEYCLOAK-3300-support-jetty-in-spring-boot-adapter 
KEYCLOAK-3300 Add support for jetty in spring-boot-adapter
 2016-07-15 13:29:16 +02:00
mposolda
13a21e5fda KEYCLOAK-3220 Improve error handling on adapters 2016-07-14 23:56:46 +02:00
mposolda
dcc4ea3aea KEYCLOAK-3237 Change OIDC adapters to use scope=openid as required per specs 2016-07-14 23:56:46 +02:00
Stian Thorgersen
9ddec7d1eb Merge pull request #3019 from ssilvert/KEYCLOAK-3273-ear 
KEYCLOAK-3273: Prefer module name for secure-deployment in Keycloak
 2016-07-14 12:06:44 +02:00
Thomas Darimont
be5468a7cf KEYCLOAK-3300 Add support for jetty in spring-boot-adapter 
This adds support for using Jetty together with the Keycloak
spring-boot-adapter. Sadly the KeycloakSpringBootProperties.SecurityCollection
definition is mostly inspired by Tomcats SecurityConstraint/SecurityCollection
which doesn't provide a good fit for jettys structures.
In cases where jetty only allows one setting, we use the first value.

We only initialize KeycloakJettyServerCustomizer if jetty is used, same
applies for tomcat.
Revised configuration and extracted serverCustomizer code into
dedicated classes.
Prepared infrastructure for Undertow support.
 2016-07-12 23:19:30 +02:00
Stan Silvert
1d4e76117c KEYCLOAK-3273: Prefer module name for secure-deployment name. 2016-07-12 12:42:24 -04:00
Peter Donald
c283f9803c Return -1 from getDateHeader() when request is restored. 
Other certain container will attempt to access date (such as when
checking If-Modified-Since header)  and fail when accessing restored
request. The javax.servlet.http.HttpServletRequest#getDateHeader()
javadocs indicate that -1 should be returned when date is not available
 2016-07-12 16:28:45 +10:00
Stan Silvert
73cbf857c1 KEYCLOAK-3273: Prefer module name for secure-deployment in Keycloak 
adapter subsystem
 2016-07-11 20:58:31 -04:00
mposolda
629390dd4a KEYCLOAK-2986 Require either expiration or issuedAt for client authentication with signed JWT 2016-07-08 16:16:38 +02:00
Bill Burke
bd2887aa77 Merge pull request #2982 from ahus1/jetty_9_3 
KEYCLOAK-2684: jetty 9.3 implementation (oidc/saml)
 2016-07-07 14:59:29 -04:00
awpwb
159b371973 [KEYCLOAK-1733]: introduce token as query paramter 
add functional tests for access token as query paramter
 2016-07-06 14:12:23 +02:00
Stian Thorgersen
948f37b01a Merge pull request #2997 from pedroigor/KEYCLOAK-3246 
[KEYCLOAK-3246] - Authz client missing from tomcat 8 OpenID adapter
 2016-07-06 09:24:19 +02:00
Stian Thorgersen
f52504ac41 KEYCLOAK-3262 Add support to save multiple state in keycloak.js 2016-07-05 08:45:12 +02:00
Pedro Igor
6bb59b7f63 [KEYCLOAK-3246] - Authz client missing from tomcat 8 OpenID adapter 2016-07-04 13:27:14 -03:00
Stian Thorgersen
f3a780cc2d KEYCLOAK-2617 Ignore postmessages if not initiated by keycloak.js 2016-07-04 13:07:17 +02:00
Alexander Schwartz
9384aa1398 KEYCLOAK-2684: jetty 9.3 implementation 2016-07-01 12:26:59 +02:00
Bill Burke
b224917fc5 bump version 2016-06-30 17:17:53 -04:00
Pedro Igor
2db41ef052 [KEYCLOAK-2999] - Changes to authz examples for integration test 2016-06-30 10:26:05 -03:00
Pedro Igor
afa9471c7c [KEYCLOAK-3128] - Admin Client Authorization Endpoints 2016-06-30 10:26:05 -03:00
Pedro Igor
f48288865b [KEYCLOAK-3156] - Missing CORS when responding with denies 2016-06-22 14:39:07 -03:00
Pedro Igor
905421a292 [KEYCLOAK-3152] - Keycloak Authorization JS Adapter 2016-06-22 14:28:02 -03:00
Stian Thorgersen
3c0f7e2ee2 Merge pull request #2617 from pedroigor/KEYCLOAK-2753 
[KEYCLOAK-2753] - Fine-grained Authorization Services
 2016-06-17 13:40:15 +02:00
Pedro Igor
086c29112a [KEYCLOAK-2753] - Fine-grained Authorization Services 2016-06-17 02:07:34 -03:00
Michaël van de Giessen
55910f5f70 KEYCLOAK-3050 - fix npe on deployment 2016-06-13 20:15:41 +02:00
mposolda
72736e5e47 KEYCLOAK-2028 Add test for token-minimum-time-to-live adapter option 2016-06-09 19:22:15 +02:00
Ben Loy
ec180db39f KEYCLOAK-2028: Add preemptive access token refresh support 
Add a new keycloak.json property and mechanism to automatically
refresh access tokens if they are going to expire in less than a configurable
amount of time.
 2016-06-09 19:22:15 +02:00
Pedro Igor
60f954a497 [KEYCLOAK-2894] - Fixing saml signature validation 2016-05-26 10:48:30 -03:00
Thomas Raehalme
babe94c50d KEYCLOAK-3016: BasicAuthRequestAuthenticator now consumes HttpEntity also on errors. 2016-05-19 08:47:51 +03:00
Vaclav Muzikar
e6f0da99e6 KEYCLOAK-2995 Revert changes from KEYCLOAK-2989 in JWTClientCredentialsProvider 2016-05-12 10:45:45 +02:00
Vaclav Muzikar
9ad584b34d KEYCLOAK-2989 Extend ClientAuthSignedJWTTest 2016-05-10 13:30:55 +02:00
Paolo Antinori
87a7879e71 KEYCLOAK-2777 - Added PathBasedKeycloakConfigResolver for OSGi + examples 2016-05-05 15:23:35 +02:00
Paolo Antinori
53799297b3 KEYCLOAK-2805 - Moved cxf.version up to the main pom 2016-05-05 15:22:03 +02:00
Paolo Antinori
f5f36545f3 KEYCLOAK-2805 - Support for JBoss Fuse 6.3 
Upgrade of CXF, Jetty and Pax-Web required to rewrite part of the integration.
 2016-05-05 15:21:51 +02:00
Maximilian Szengel
c3c3b90fb9 KEYCLOAK-2838: Add cookie storage fallback to keycloak.js 2016-04-21 11:07:41 +02:00
mposolda
6baa2228e7 KEYCLOAK-2852 Moved JAAS classes back to package org.keycloak.adapters.jaas 2016-04-19 22:19:10 +02:00
Bill Burke
58b5c3d75d KEYCLOAK-2584 2016-04-15 15:15:04 -04:00
Jonathan Masmejean
b4ce19c231 fix formating issue. 2016-04-14 12:00:41 +02:00
Jonathan Masmejean
93b54ce13a KEYCLOAK-2821 : Add the adapter option 
You just can add an 'adapter' option to the kc.init() function like :

kc.init({adapter: "default | cordova"});

This will allow the users to choose the adapter they want. They can force the use of the default adapter even if they are using cordova or use the cordova adapter even if they are using a regular desktop.

If you omit this parameter, it just fallback to the old way. So, if you are under cordova it will run the cordova adapter and if you are under a desktop, it will load the default adapter instead.

Hope this can help.
 2016-04-14 11:59:34 +02:00
Bill Burke
b080e1e782 merge adapter-spi adapter-spi-public 2016-04-13 22:25:30 -04:00
Bill Burke
515ed226be Merge remote-tracking branch 'upstream/master' 2016-04-12 15:19:58 -04:00
Bill Burke
cca91dd175 public/private 2016-04-12 15:19:46 -04:00
Stian Thorgersen
2a9304eb79 KEYCLOAK-2646 Admin console shows 'Page not found' after password reset 2016-04-07 16:26:20 +02:00
Thomas Darimont
bccc5fa7b1 KEYCLOAK-2054 - Allow to configure proxy for auth-server requests in adapters. 
Previously the adapter configuration did not support specifying a proxy
for auth-server requests issued via the Apache HTTP Client by Keycloak.
This made it very difficult to connect an Application with Keycloak
that was required to use a proxy.

Introduced new `proxy-url` attribute to the adapter configuration
which makes it possible to configure a proxy to be used for auth-server
requests. Proxy-Host, Proxy-Port and Proxy-Scheme are taken from the
configured proxy URL.
Note that proxies that require authentication are currently not supported.
 2016-04-07 11:09:40 +02:00
mposolda
784b724fe0 Removed docker-cluster as integration-arquillian has support for clustering tests now 2016-04-05 11:45:34 +02:00
mposolda
65dc7ddb44 KEYCLOAK-2623 Remove auth-server-url-for-backend-requests from adapters 2016-04-05 11:43:41 +02:00
Bill Burke
f21cede378 KEYCLOAK-2662 2016-04-01 16:43:38 -04:00
Bill Burke
7c9dbdfc91 KEYCLOAK-2516 2016-03-31 13:56:46 -04:00
Bill Burke
e497eb0950 KEYCLOAK-2584 2016-03-24 21:26:09 -04:00
mposolda
95a1fc32eb KEYCLOAK-2681 JS adapter init function with initOptions argument doesn't call success callback 2016-03-18 12:06:46 +01:00
Stian Thorgersen
28fe13a800 Next is 2.0.0.CR1 2016-03-10 08:13:00 +01:00
Stian Thorgersen
d722e53108 Next is 1.9.2.Final 2016-03-10 07:28:27 +01:00
Stian Thorgersen
bf38ec040f KEYCLOAK-2592 Set http-only on OAuth_Token_Request_State cookie 2016-03-04 13:43:00 +01:00
Bill Burke
64daa568b9 KEYCLOAK-2536 2016-02-29 16:05:43 -05:00
Bill Burke
37584a24e0 unsecure url has principal 
KEYCLOAK-2550
Typo in userguide

KEYCLOAK-1928 Kerberos working with IBM JDK

KEYCLOAK-1928 Remove sun.jdk.jgss module

KEYCLOAK-1928 Fix kerberos with adapter on JDK7

KPR-147 - Initial login scenarios around admin password - test

KEYCLOAK-2561 Fix issues with blank password

KEYCLOAK-2559 Missing add/remove button for 'Valid Redirect URIs' in a client settings form

Added simple test for JPA performance (with many users).

Fixed "re-import" operation logging.

Fixed for Timer.saveData()

Fixed for Timer.saveData()

ManyUsersTest: ArrayList --> LinkedList

Fix AbstractUserTest

Fix parentheses in login page object

Add tests for IDP initiated login

KEYCLOAK-1040
Allow import of realm keys (like we do for SAML)

KEYCLOAK-2556 Remove required for client create root url and saml endpoint

KEYCLOAK-2555 ForbiddenException when importing test realm or creating test user

KEYCLOAK-2553
Unexpected form behavior while creating a client

KEYCLOAK-2551
Broken navigation links while creating/editing a Client Mapper
 2016-02-29 09:30:28 -05:00
Stian Thorgersen
023b558f43 KEYCLOAK-2527 
Cordova not working
 2016-02-23 13:32:00 +01:00
Stian Thorgersen
a1d9753ec2 Next is 1.9.1.Final-SNAPSHOT 2016-02-23 08:48:26 +01:00
Stian Thorgersen
4fd97091ff Version bump to 2.0.0.CR1-SNAPSHOT 2016-02-22 11:36:56 +01:00
Stian Thorgersen
38ce5e069c Merge pull request #2237 from lkubik/restructurizeParents 
Update parent poms structure
 2016-02-22 08:01:58 +00:00
Marko Strukelj
cb2aa547f9 KEYCLOAK-2485 local description is missing in jboss as7/eap adapter 2016-02-18 16:51:40 +01:00
Lukas Kubik
d22f4cb08c Update parent poms 2016-02-17 16:35:29 +00:00
Stian Thorgersen
a4ce389bf5 Merge pull request #2217 from stianst/master 
Revert back to servlet 3.0
 2016-02-11 10:02:54 +01:00
Stian Thorgersen
4ea586ebe6 Revert back to servlet 3.0 2016-02-11 09:09:39 +01:00
Marko Strukelj
94da1dfc13 KEYCLOAK-2461 NPE when deploying an .ear 2016-02-10 16:13:46 +01:00
Stian Thorgersen
8ed1677249 Merge pull request #2188 from ahus1/logout_should_keep_fragement_KEYCLOAK-2323 
Don't encode URL fragment for logout URL / KEYCLOAK-2323
 2016-02-10 13:16:51 +01:00
Stian Thorgersen
bb77c717c9 KEYCLOAK-2303 
Update dependency versions to align with WildFly 10
 2016-02-10 09:07:06 +01:00
Stian Thorgersen
528e3127e6 KEYCLOAK-2434 
BasicAuthRequestAuthenticator ignores HttpClientBuilder configuration
 2016-02-09 08:41:35 +01:00
Alexander Schwartz
01083d21d0 Don't encode URL fragment for logout URL / KEYCLOAK-2323 2016-02-06 17:43:38 +01:00
mhajas
8a8552822a KEYCLOAK-2428 Log also other accesses 2016-02-05 11:56:05 +01:00
Stian Thorgersen
579ab56a5a Bump version to 1.9.0.Final-SNAPSHOT 2016-02-04 15:55:11 +01:00
Stian Thorgersen
040b32ead7 KEYCLOAK-2446 
Cordova not working
 2016-02-04 09:47:25 +01:00
Bill Burke
c4c99d5f81 KEYCLOAK-2443 2016-02-03 17:31:50 -05:00
Bill Burke
a899d86ac0 KEYCLOAK-2444 2016-02-03 16:43:29 -05:00
Marko Strukelj
683487aafe KEYCLOAK-2439 Client adapter fails to set SNI field during TLS handshake 2016-02-03 14:47:19 +01:00
Stian Thorgersen
c7a8742a36 KEYCLOAK-1524 
Source code headers
 2016-02-03 11:20:22 +01:00
Bill Burke
ec9b9879e8 filter examples, subsystem dependencies 2016-02-02 19:15:05 -05:00
Bill Burke
d0b17a0aea KEYCLOAK-2297 2016-02-02 12:28:50 -05:00
Bill Burke
0f63a5063b KEYCLOAK-2220 2016-02-02 09:46:28 -05:00
Bill Burke
9bc5a4592c fix 2016-02-01 10:39:00 -05:00
Bill Burke
4ba77a15a0 Merge remote-tracking branch 'upstream/master' 2016-02-01 10:36:45 -05:00
Bill Burke
66f4921227 saml subsystem as7 backport 2016-02-01 10:36:25 -05:00
Stian Thorgersen
77a7b5a130 Merge pull request #2116 from mstruk/KEYCLOAK-2315 
KEYCLOAK-2315 Remove jboss-earlyaccess-repository repository
 2016-02-01 15:26:26 +01:00
Bill Burke
db78ea76b8 Merge pull request #2142 from patriot1burke/master 
saml subsystem model changes
 2016-01-30 08:40:10 -05:00
Bill Burke
6c020661e8 saml subsystem model changes 2016-01-30 07:13:13 -05:00
Bill Burke
8cffbdd581 Merge pull request #2131 from patriot1burke/master 
saml adapter needs endpoint
 2016-01-29 09:30:04 -05:00
Marek Posolda
41551e08b0 Merge pull request #2129 from georgekankava/staging/literal-boolean-values-should-not-be-used-in-condition-expressions-fix-1 
squid:S1125 - Literal boolean values should not be used in condition expressions
 2016-01-29 13:23:20 +01:00
Bill Burke
a068d83dd8 saml adapter endpoint changes 2016-01-28 22:56:14 -05:00
George Kankava
92a494359d squid:S1125 - Literal boolean values should not be used in condition expressions 2016-01-29 00:22:47 +04:00
Marko Strukelj
5826c034eb KEYCLOAK-2315 Remove jboss-earlyaccess-repository repository 2016-01-27 14:17:25 +01:00
Marko Strukelj
5c46f0603d Fix typo bug introduced during modules refactoring 2016-01-26 16:45:22 +01:00
Stian Thorgersen
06caa8e67e KEYCLOAK-2391 
View history of access to Resource Server
 2016-01-26 08:50:28 +01:00
Bill Burke
d3cab2be93 Merge pull request #2094 from bdecoste/master 
KeyStore element in subsystem not required
 2016-01-22 18:34:55 -05:00
root
ae6dde9cda KeyStore element in sunsystem not required 2016-01-22 15:05:24 -08:00
Bill Burke
f3ea2ab8d0 fix errant pom 2016-01-22 17:03:31 -05:00
Bill Burke
742f162cfc Merge remote-tracking branch 'upstream/master' 2016-01-22 17:01:14 -05:00
Bill Burke
fedf3d0e52 KEYCLOAK-2377 2016-01-22 17:00:51 -05:00
Bill Burke
e0af79e66b Merge pull request #2087 from patriot1burke/master 
KEYCLOAK-2373 KEYCLOAK-2376
 2016-01-21 21:30:01 -05:00
Bill Burke
1ee76a126f KEYCLOAK-2373 KEYCLOAK-2376 2016-01-21 20:18:07 -05:00
Stan Silvert
fa2055c896 KEYCLOAK-1280: pom should not override version from dependency management 2016-01-21 11:55:38 -05:00
Bill Burke
efd8317259 final re-org work 2016-01-20 17:26:26 -05:00
Bill Burke
d9487a8745 social broker reorg 2016-01-20 16:46:38 -05:00