You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bi...@apache.org on 2015/12/15 19:56:03 UTC
[1/2] cxf git commit: Fix another bad import version for
javax.validation.
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 015d7a6dd -> 601c0060e
Fix another bad import version for javax.validation.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e3edee61
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e3edee61
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e3edee61
Branch: refs/heads/3.1.x-fixes
Commit: e3edee617edfef541385cd0043ca88ab2e6456d7
Parents: 9f746c9
Author: Benson Margulies <be...@basistech.com>
Authored: Tue Dec 15 20:55:34 2015 +0200
Committer: Benson Margulies <be...@basistech.com>
Committed: Tue Dec 15 20:55:34 2015 +0200
----------------------------------------------------------------------
rt/frontend/jaxrs/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/e3edee61/rt/frontend/jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/pom.xml b/rt/frontend/jaxrs/pom.xml
index 4d78cd6..bbca8a4 100644
--- a/rt/frontend/jaxrs/pom.xml
+++ b/rt/frontend/jaxrs/pom.xml
@@ -35,7 +35,7 @@
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
- javax.validation*;resolution:=optional;version="${cxf.validation.api.version}",
+ javax.validation*;resolution:=optional;version="${cxf.validation.api.package.version}",
javax.ws.rs.client;version="[2.0,3)",
javax.ws.rs*;version="[1.0,3)",
</cxf.osgi.import>
[2/2] cxf git commit: Merge branch '3.1.x-fixes' of
https://git-wip-us.apache.org/repos/asf/cxf into 3.1.x-fixes
Posted by bi...@apache.org.
Merge branch '3.1.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.1.x-fixes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/601c0060
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/601c0060
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/601c0060
Branch: refs/heads/3.1.x-fixes
Commit: 601c0060eef8c5792133c0c5a6561eb399fb28d0
Parents: e3edee6 015d7a6
Author: Benson Margulies <be...@basistech.com>
Authored: Tue Dec 15 20:55:50 2015 +0200
Committer: Benson Margulies <be...@basistech.com>
Committed: Tue Dec 15 20:55:50 2015 +0200
----------------------------------------------------------------------
.../oidc/rp/AbstractTokenValidator.java | 34 ++++++++++++++------
.../cxf/rs/security/oidc/rp/UserInfoClient.java | 3 +-
.../cxf/rs/security/oidc/utils/OidcUtils.java | 5 +--
3 files changed, 30 insertions(+), 12 deletions(-)
----------------------------------------------------------------------