You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by de...@apache.org on 2018/06/19 13:13:32 UTC

[cxf] 03/03: Merge remote-tracking branch 'origin/spring-5-boot-2' into spring-5-boot-2

This is an automated email from the ASF dual-hosted git repository.

deki pushed a commit to branch spring-5-boot-2
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 0d1621479357ee2d5fc4739c881a9396451a7c24
Merge: e875e09 118f596
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Tue Jun 19 15:12:25 2018 +0200

    Merge remote-tracking branch 'origin/spring-5-boot-2' into spring-5-boot-2

 rt/rs/security/oauth-parent/oauth2/pom.xml           |  6 ++++++
 rt/rs/security/sso/oidc/pom.xml                      | 20 +++++++++++++-------
 .../test/resources/jaxrs_security/WEB-INF/beans.xml  |  2 ++
 .../resources/jaxrs_security_cglib/WEB-INF/beans.xml |  7 +++++++
 .../jaxrs_security_no_annotations/WEB-INF/beans.xml  |  2 ++
 5 files changed, 30 insertions(+), 7 deletions(-)