cxf-fediz git commit: Updating Spring Security

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.3.x-fixes 0600a27e8 -> 926f13d53


Updating Spring Security


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/926f13d5
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/926f13d5
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/926f13d5

Branch: refs/heads/1.3.x-fixes
Commit: 926f13d534d51546e0aaa9833747c0b83bce8244
Parents: 0600a27
Author: Colm O hEigeartaigh 
Authored: Mon Jan 16 16:00:35 2017 +
Committer: Colm O hEigeartaigh 
Committed: Mon Jan 16 17:10:33 2017 +

--
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/926f13d5/pom.xml
--
diff --git a/pom.xml b/pom.xml
index cac7626..a1c451f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,8 +65,8 @@
 2.4.2
 2.5
 1.7.21
-4.3.4.RELEASE
-3.2.9.RELEASE
+4.3.5.RELEASE
+3.2.10.RELEASE
 7.0.73
 8.0.39
 2.1.8

cxf-fediz git commit: Updating Spring Security

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 1840f7d86 -> 9e96beb02


Updating Spring Security


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/9e96beb0
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/9e96beb0
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/9e96beb0

Branch: refs/heads/master
Commit: 9e96beb02e067f451cf0899b434bbb451e78a0cb
Parents: 1840f7d
Author: Colm O hEigeartaigh 
Authored: Mon Jan 16 16:00:35 2017 +
Committer: Colm O hEigeartaigh 
Committed: Mon Jan 16 16:00:35 2017 +

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9e96beb0/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 502181d..bd9a948 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
 2.5
 1.7.21
 4.3.5.RELEASE
-3.2.9.RELEASE
+3.2.10.RELEASE
 7.0.73
 8.0.39
 2.1.8

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 80d2c4f77 -> ca343e15d


Recording .gitmergeinfo Changes


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ca343e15
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ca343e15
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ca343e15

Branch: refs/heads/3.0.x-fixes
Commit: ca343e15de6ef5f48059f3db4ac6f22faf7c4648
Parents: 80d2c4f
Author: Colm O hEigeartaigh 
Authored: Mon Jan 16 16:56:01 2017 +
Committer: Colm O hEigeartaigh 
Committed: Mon Jan 16 16:56:01 2017 +

--
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ca343e15/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 249be7d..28f57c5 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -254,6 +254,7 @@ B 2e7338a15df3b313997be4700cccba9ac6294d02
 B 2e7e04b546c73daf61cf5b841db3a104d4fec2eb
 B 2e89c38ccfddf8097dbcb874b64c5b2ed8805d72
 B 2ec875978a50cd34d07bd7d3bbfc8583fd30250b
+B 2ee2e3fad61942c3058e729a9520c4bfb541cb0b
 B 2f0b3e38212674883d610cfcfbd76b901bd3d997
 B 2f164ec218a1e850d8cc4a6a9ffdb6dba248895f
 B 2f3ba6e5c524e764cef966c185b437380a1d624d

cxf git commit: Updating Spring Sec

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes a33be7490 -> 2ee2e3fad


Updating Spring Sec


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2ee2e3fa
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2ee2e3fa
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2ee2e3fa

Branch: refs/heads/3.1.x-fixes
Commit: 2ee2e3fad61942c3058e729a9520c4bfb541cb0b
Parents: a33be74
Author: Colm O hEigeartaigh 
Authored: Mon Jan 16 16:55:30 2017 +
Committer: Colm O hEigeartaigh 
Committed: Mon Jan 16 16:55:30 2017 +

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2ee2e3fa/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index a91900a..27ea846 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -146,7 +146,7 @@
 1.2
 4.1.9.RELEASE
 1.3.6.RELEASE
-
3.2.9.RELEASE
+
3.2.10.RELEASE
 1.2.1
 2.2.0.RELEASE
 spring-test

cxf git commit: Add @Override annotation for ContainerRequestFilter#filter implementations, patch from Valentin Aitken applied, This closes #222

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 3d1e4197c -> a33be7490


Add @Override annotation for ContainerRequestFilter#filter implementations, 
patch from Valentin Aitken applied, This closes #222


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a33be749
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a33be749
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a33be749

Branch: refs/heads/3.1.x-fixes
Commit: a33be74905bf5eb5c78d8a308248ec6f502a2d16
Parents: 3d1e419
Author: Sergey Beryozkin 
Authored: Mon Jan 16 12:49:32 2017 +
Committer: Sergey Beryozkin 
Committed: Mon Jan 16 12:50:48 2017 +

--
 .../org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java   | 3 ++-
 .../apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java   | 1 +
 .../org/apache/cxf/jaxrs/security/SimpleAuthorizingFilter.java| 3 ++-
 .../apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java| 1 +
 .../org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java| 2 +-
 .../cxf/rs/security/cors/CrossOriginResourceSharingFilter.java| 2 ++
 .../apache/cxf/rs/security/oauth/filters/OAuthRequestFilter.java  | 1 +
 .../cxf/rs/security/oauth2/auth/saml/Saml2BearerAuthHandler.java  | 3 ++-
 .../apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java | 2 ++
 .../apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java| 1 +
 .../cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java   | 1 +
 .../org/apache/cxf/rs/security/saml/SamlEnvelopedInHandler.java   | 1 +
 .../java/org/apache/cxf/rs/security/saml/SamlFormInHandler.java   | 3 ++-
 .../java/org/apache/cxf/rs/security/saml/SamlHeaderInHandler.java | 1 +
 .../rs/security/saml/authorization/ClaimsAuthorizingFilter.java   | 1 +
 .../main/java/org/apache/cxf/rs/security/xml/XmlEncInHandler.java | 1 +
 .../main/java/org/apache/cxf/rs/security/xml/XmlSigInHandler.java | 1 +
 .../java/org/apache/cxf/systest/jaxrs/FaultyRequestHandler.java   | 1 +
 18 files changed, 24 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a33be749/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
index 7992242..9730f45 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
@@ -104,7 +104,8 @@ public class JAASAuthenticationFilter implements 
ContainerRequestFilter {
 protected CallbackHandler getCallbackHandler(String name, String password) 
{
 return new NamePasswordCallbackHandler(name, password);
 }
-
+
+@Override
 public void filter(ContainerRequestContext context) {
 Message m = JAXRSUtils.getCurrentMessage();
 try {

http://git-wip-us.apache.org/repos/asf/cxf/blob/a33be749/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
index 455083c..3390104 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
@@ -69,6 +69,7 @@ public class KerberosAuthenticationFilter implements 
ContainerRequestFilter {
 private String servicePrincipalName;
 private String realm;
 
+@Override
 public void filter(ContainerRequestContext context) {
 
 List authHeaders = messageContext.getHttpHeaders()

http://git-wip-us.apache.org/repos/asf/cxf/blob/a33be749/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/SimpleAuthorizingFilter.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/SimpleAuthorizingFilter.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/SimpleAuthorizingFilter.java
index 22c2475..50e7f0d 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/SimpleAuthorizingFilter.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/SimpleAuthorizingFilter.java
@@ -32,7 +32,8 @@ import 

cxf git commit: Add @Override annotation for ContainerRequestFilter#filter implementations, patch from Valentin Aitken applied, This closes #222

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 4d57c0c29 -> 9852bcd56


Add @Override annotation for ContainerRequestFilter#filter implementations, 
patch from Valentin Aitken applied, This closes #222


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9852bcd5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9852bcd5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9852bcd5

Branch: refs/heads/master
Commit: 9852bcd56ab8f792f0ae09abcf62d65dde0364a7
Parents: 4d57c0c
Author: Sergey Beryozkin 
Authored: Mon Jan 16 12:49:32 2017 +
Committer: Sergey Beryozkin 
Committed: Mon Jan 16 12:49:32 2017 +

--
 .../org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java   | 3 ++-
 .../apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java   | 1 +
 .../org/apache/cxf/jaxrs/security/SimpleAuthorizingFilter.java| 3 ++-
 .../apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java| 1 +
 .../org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java| 2 +-
 .../cxf/rs/security/cors/CrossOriginResourceSharingFilter.java| 2 ++
 .../apache/cxf/rs/security/oauth/filters/OAuthRequestFilter.java  | 1 +
 .../cxf/rs/security/oauth2/auth/saml/Saml2BearerAuthHandler.java  | 3 ++-
 .../apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java | 2 ++
 .../apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java| 1 +
 .../cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java   | 1 +
 .../org/apache/cxf/rs/security/saml/SamlEnvelopedInHandler.java   | 1 +
 .../java/org/apache/cxf/rs/security/saml/SamlFormInHandler.java   | 3 ++-
 .../java/org/apache/cxf/rs/security/saml/SamlHeaderInHandler.java | 1 +
 .../rs/security/saml/authorization/ClaimsAuthorizingFilter.java   | 1 +
 .../main/java/org/apache/cxf/rs/security/xml/XmlEncInHandler.java | 1 +
 .../main/java/org/apache/cxf/rs/security/xml/XmlSigInHandler.java | 1 +
 .../java/org/apache/cxf/systest/jaxrs/FaultyRequestHandler.java   | 1 +
 18 files changed, 24 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9852bcd5/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
index 7992242..9730f45 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
@@ -104,7 +104,8 @@ public class JAASAuthenticationFilter implements 
ContainerRequestFilter {
 protected CallbackHandler getCallbackHandler(String name, String password) 
{
 return new NamePasswordCallbackHandler(name, password);
 }
-
+
+@Override
 public void filter(ContainerRequestContext context) {
 Message m = JAXRSUtils.getCurrentMessage();
 try {

http://git-wip-us.apache.org/repos/asf/cxf/blob/9852bcd5/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
index 455083c..3390104 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
@@ -69,6 +69,7 @@ public class KerberosAuthenticationFilter implements 
ContainerRequestFilter {
 private String servicePrincipalName;
 private String realm;
 
+@Override
 public void filter(ContainerRequestContext context) {
 
 List authHeaders = messageContext.getHttpHeaders()

http://git-wip-us.apache.org/repos/asf/cxf/blob/9852bcd5/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/SimpleAuthorizingFilter.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/SimpleAuthorizingFilter.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/SimpleAuthorizingFilter.java
index 22c2475..50e7f0d 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/SimpleAuthorizingFilter.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/SimpleAuthorizingFilter.java
@@ -32,7 +32,8 @@ import 

[1/2] cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 1b06c1efa -> 30fa26453


Recording .gitmergeinfo Changes


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c936c75c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c936c75c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c936c75c

Branch: refs/heads/3.0.x-fixes
Commit: c936c75c75f068d000a986a6e856e3ecdd3b26ee
Parents: 1b06c1e
Author: Colm O hEigeartaigh 
Authored: Mon Jan 16 10:52:55 2017 +
Committer: Colm O hEigeartaigh 
Committed: Mon Jan 16 10:52:55 2017 +

--
 .gitmergeinfo | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c936c75c/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 649f7a8..66767ca 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -195,6 +195,7 @@ B 26762a780f4dd498d9304f70072f1bd339223d8a
 B 267dc2107ed7e79f167bceaf3d228ea808a20dec
 B 2680d111e54c90b9dca63df479f68e82716c0eb2
 B 26aba8ecb5c4c461e0feac9b1c60e83b3b6a81f8
+B 27025e07f6803905e0e0ccaa7ad90d828e2ad610
 B 27151209eb440ac03876368d443d8df24488cde5
 B 2728bb512a58c6337b30d64087f0ee9d00805091
 B 27917f3accef78556fa7ed8e79f1746052bfd4d9
@@ -221,6 +222,7 @@ B 2a02f9729130c0ff6a151418dae5f671fee751bf
 B 2a2ed67576b525f9708fcb8bd9e8387a277a1f4f
 B 2a5d201be1b85344585094d0f044e9bf1b605fac
 B 2ac03fe8d2831fdfbb983bba7a7b26901210f8df
+B 2ac0b9a91ee830249c45cacca4e2bb4134921de1
 B 2ac7e372ebbb7d27f12c838fc01a2b62faf8e202
 B 2adcc64ec3263e494f2ac5520a219b2d3bd9186f
 B 2afb9d3cacb299bea854d1ff4824e4c981a41d6a
@@ -1352,6 +1354,7 @@ B f8b1ac80551017ad71aab5dffac4c9098d32254c
 B f8b434f9705e5f45bcf8b64e5aa9dd320bd04263
 B f8b8025bcf1b4b74712782db73dc2715aeae70fe
 B f8df21ed3d17539a81c9cdfdc4222d13ffbe62cd
+B f9144a9fb6002c7ef71be549f3a4078f49441b85
 B f9272b565c61ea255a88f12ee2ffa66305233d4f
 B f942e1e15d6c4fa83e305eb7452dca8fc80cbdcf
 B f94861bd6745e92bc1f69acaa907761f3bcc0613

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 30fa26453 -> 80d2c4f77


Recording .gitmergeinfo Changes


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/80d2c4f7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/80d2c4f7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/80d2c4f7

Branch: refs/heads/3.0.x-fixes
Commit: 80d2c4f77dd74bcb51fed52a9457c055ba6289b2
Parents: 30fa264
Author: Colm O hEigeartaigh 
Authored: Mon Jan 16 11:31:25 2017 +
Committer: Colm O hEigeartaigh 
Committed: Mon Jan 16 11:31:25 2017 +

--
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/80d2c4f7/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 66767ca..249be7d 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -198,6 +198,7 @@ B 26aba8ecb5c4c461e0feac9b1c60e83b3b6a81f8
 B 27025e07f6803905e0e0ccaa7ad90d828e2ad610
 B 27151209eb440ac03876368d443d8df24488cde5
 B 2728bb512a58c6337b30d64087f0ee9d00805091
+B 2741e4a4d763617df2149736a716e589fffcc8b8
 B 27917f3accef78556fa7ed8e79f1746052bfd4d9
 B 27a95f050bfdbeb9d3e63af11fc2e8c4370ae549
 B 27c2c25dc3c2c3019543e31afdca7b166911f278

[2/2] cxf git commit: Updating Netty4

[coheigea]

Updating Netty4


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/30fa2645
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/30fa2645
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/30fa2645

Branch: refs/heads/3.0.x-fixes
Commit: 30fa26453bfac7503049c710bf419e3a1a426a56
Parents: c936c75
Author: Colm O hEigeartaigh 
Authored: Mon Jan 16 10:53:09 2017 +
Committer: Colm O hEigeartaigh 
Committed: Mon Jan 16 10:53:09 2017 +

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/30fa2645/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index c3d1b8d..dc94e95 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -134,7 +134,7 @@
 2.2.1
 2011.1
 3.0.3
-4.0.19.Final
+4.0.43.Final
 3.9.1.Final
 [4,5)
 20100527_1

cxf git commit: Fixing JoseSessionTokenProvider, with thanks to Romain

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 2741e4a4d -> 3d1e4197c


Fixing JoseSessionTokenProvider, with thanks to Romain


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3d1e4197
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3d1e4197
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3d1e4197

Branch: refs/heads/3.1.x-fixes
Commit: 3d1e4197cc73ef8d16b6b21a48fc5f1ceecaeb14
Parents: 2741e4a
Author: Sergey Beryozkin 
Authored: Mon Jan 16 11:14:27 2017 +
Committer: Sergey Beryozkin 
Committed: Mon Jan 16 11:15:49 2017 +

--
 .../cxf/rs/security/oauth2/provider/JoseSessionTokenProvider.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3d1e4197/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JoseSessionTokenProvider.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JoseSessionTokenProvider.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JoseSessionTokenProvider.java
index edd14a6..5901652 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JoseSessionTokenProvider.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JoseSessionTokenProvider.java
@@ -124,7 +124,7 @@ public class JoseSessionTokenProvider implements 
SessionAuthenticityTokenProvide
 String stateString = jwe.decrypt(sessionToken).getContentText();
 JwsSignatureVerifier jws = getInitializedSigVerifier();
 if (jws != null) {
-stateString = JwsUtils.verify(jws, 
stateString).getUnsignedEncodedSequence();
+stateString = JwsUtils.verify(jws, 
stateString).getDecodedJwsPayload();
 }
 return stateString;
 }

cxf git commit: Fixing JoseSessionTokenProvider, with thanks to Romain

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master ee8b85711 -> 4d57c0c29


Fixing JoseSessionTokenProvider, with thanks to Romain


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4d57c0c2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4d57c0c2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4d57c0c2

Branch: refs/heads/master
Commit: 4d57c0c29d1f93e0fa1c400a3e798495317dd893
Parents: ee8b857
Author: Sergey Beryozkin 
Authored: Mon Jan 16 11:14:27 2017 +
Committer: Sergey Beryozkin 
Committed: Mon Jan 16 11:14:27 2017 +

--
 .../cxf/rs/security/oauth2/provider/JoseSessionTokenProvider.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4d57c0c2/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JoseSessionTokenProvider.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JoseSessionTokenProvider.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JoseSessionTokenProvider.java
index edd14a6..5901652 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JoseSessionTokenProvider.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JoseSessionTokenProvider.java
@@ -124,7 +124,7 @@ public class JoseSessionTokenProvider implements 
SessionAuthenticityTokenProvide
 String stateString = jwe.decrypt(sessionToken).getContentText();
 JwsSignatureVerifier jws = getInitializedSigVerifier();
 if (jws != null) {
-stateString = JwsUtils.verify(jws, 
stateString).getUnsignedEncodedSequence();
+stateString = JwsUtils.verify(jws, 
stateString).getDecodedJwsPayload();
 }
 return stateString;
 }

[2/3] cxf git commit: Fixing merge

[coheigea]

Fixing merge


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/27025e07
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/27025e07
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/27025e07

Branch: refs/heads/3.1.x-fixes
Commit: 27025e07f6803905e0e0ccaa7ad90d828e2ad610
Parents: f9144a9
Author: Colm O hEigeartaigh 
Authored: Mon Jan 16 10:14:17 2017 +
Committer: Colm O hEigeartaigh 
Committed: Mon Jan 16 10:14:17 2017 +

--
 parent/pom.xml | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/27025e07/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index afca817..a91900a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -103,13 +103,9 @@
 1.1.1
 
1.0.1
 1.0
-<<< HEAD
 2.4.1
 1.0
 1.2
-===
-2.4.2
->>> c55034d... OpenJpa upgrade to 2.4.2
 
1.1.1
 1.9.0_1
 3.19.0-GA

[1/3] cxf git commit: OpenJpa upgrade to 2.4.2

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes dd566ccce -> 2741e4a4d


OpenJpa upgrade to 2.4.2

# Conflicts:
#   parent/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f9144a9f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f9144a9f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f9144a9f

Branch: refs/heads/3.1.x-fixes
Commit: f9144a9fb6002c7ef71be549f3a4078f49441b85
Parents: dd566cc
Author: Colm O hEigeartaigh 
Authored: Mon Jan 16 09:36:19 2017 +
Committer: Colm O hEigeartaigh 
Committed: Mon Jan 16 10:13:39 2017 +

--
 parent/pom.xml | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f9144a9f/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index a91900a..afca817 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -103,9 +103,13 @@
 1.1.1
 
1.0.1
 1.0
+<<< HEAD
 2.4.1
 1.0
 1.2
+===
+2.4.2
+>>> c55034d... OpenJpa upgrade to 2.4.2
 
1.1.1
 1.9.0_1
 3.19.0-GA

[3/3] cxf git commit: Fixing PMD error

[coheigea]

Fixing PMD error


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2741e4a4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2741e4a4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2741e4a4

Branch: refs/heads/3.1.x-fixes
Commit: 2741e4a4d763617df2149736a716e589fffcc8b8
Parents: 27025e0
Author: Colm O hEigeartaigh 
Authored: Mon Jan 16 10:52:11 2017 +
Committer: Colm O hEigeartaigh 
Committed: Mon Jan 16 10:52:11 2017 +

--
 .../java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2741e4a4/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
index 465d570..f4060b3 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
@@ -116,7 +116,7 @@ public class JAXRSAsyncClientTest extends 
AbstractBusClientServerTestBase {
 clientPolicy.setReceiveTimeout(2000);
 clientPolicy.setConnectionTimeout(2000);
 try {
-Book book = wc.invoke("PATCH", new Book("Timeout", 123L), 
Book.class);
+wc.invoke("PATCH", new Book("Timeout", 123L), Book.class);
 fail("should throw an exception due to timeout");
 } catch (javax.ws.rs.ProcessingException e) {
 //expected!!!

[1/2] cxf git commit: OpenJpa upgrade to 2.4.2

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 06bfa1334 -> ee8b85711


OpenJpa upgrade to 2.4.2


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c55034d9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c55034d9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c55034d9

Branch: refs/heads/master
Commit: c55034d9621bc904634017b552057474afb93ac2
Parents: 06bfa13
Author: Colm O hEigeartaigh 
Authored: Mon Jan 16 09:36:19 2017 +
Committer: Colm O hEigeartaigh 
Committed: Mon Jan 16 09:36:19 2017 +

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c55034d9/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index cdf770f..ca6187e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -102,7 +102,7 @@
 1.1.1
 
1.0.1
 1.0
-2.4.1
+2.4.2
 
1.1.1
 1.9.0_1
 3.19.0-GA

[2/2] cxf git commit: Updating Netty4

[coheigea]

Updating Netty4


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ee8b8571
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ee8b8571
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ee8b8571

Branch: refs/heads/master
Commit: ee8b85711d597a7b6ea85d766ebb82e8f9069b1c
Parents: c55034d
Author: Colm O hEigeartaigh 
Authored: Mon Jan 16 09:37:52 2017 +
Committer: Colm O hEigeartaigh 
Committed: Mon Jan 16 09:37:52 2017 +

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ee8b8571/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index ca6187e..9288b52 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -125,7 +125,7 @@
 3.0.5
 2013.6.1
 3.0.3
-4.0.19.Final
+4.0.43.Final
 3.9.2.Final
 [4,5)
 20100527_1

cxf-fediz git commit: Updating OpenJpa

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.2.x-fixes 9908207f2 -> ab46e26cf


Updating OpenJpa


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/ab46e26c
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/ab46e26c
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/ab46e26c

Branch: refs/heads/1.2.x-fixes
Commit: ab46e26cfc5c2b15512ab9427763d0668505de38
Parents: 9908207
Author: Colm O hEigeartaigh 
Authored: Mon Jan 16 09:32:56 2017 +
Committer: Colm O hEigeartaigh 
Committed: Mon Jan 16 09:53:25 2017 +

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ab46e26c/pom.xml
--
diff --git a/pom.xml b/pom.xml
index b1eb3b8..ca22a1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
 4.12
 1.2.17
 3.1.11
-2.4.1
+2.4.2
 2.5
 1.7.21
 3.2.17.RELEASE

cxf-fediz git commit: Updating OpenJpa

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.3.x-fixes 11c3bd821 -> 0600a27e8


Updating OpenJpa


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/0600a27e
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/0600a27e
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/0600a27e

Branch: refs/heads/1.3.x-fixes
Commit: 0600a27e88533072976b5b7efa6ba9a813651b40
Parents: 11c3bd8
Author: Colm O hEigeartaigh 
Authored: Mon Jan 16 09:32:56 2017 +
Committer: Colm O hEigeartaigh 
Committed: Mon Jan 16 09:33:39 2017 +

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/0600a27e/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 23a94d1..cac7626 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
 4.12
 1.2.17
 3.1.11
-2.4.1
+2.4.2
 2.5
 1.7.21
 4.3.4.RELEASE

cxf-fediz git commit: Updating OpenJpa

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 4dd6bf81d -> 1840f7d86


Updating OpenJpa


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/1840f7d8
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/1840f7d8
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/1840f7d8

Branch: refs/heads/master
Commit: 1840f7d86a6bff7f6a513a098fa7f1f9921d394c
Parents: 4dd6bf8
Author: Colm O hEigeartaigh 
Authored: Mon Jan 16 09:32:56 2017 +
Committer: Colm O hEigeartaigh 
Committed: Mon Jan 16 09:32:56 2017 +

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/1840f7d8/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e8eadb0..502181d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
 9.3.9.v20160517
 4.12
 1.2.17
-2.4.1
+2.4.2
 2.5
 1.7.21
 4.3.5.RELEASE