cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 8d4a0c8bf -> 5b914ea31


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/5b914ea3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5b914ea3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5b914ea3

Branch: refs/heads/3.1.x-fixes
Commit: 5b914ea310f00475a608b64ea14d9bc92e3bebf1
Parents: 8d4a0c8
Author: Colm O hEigeartaigh 
Authored: Fri May 12 19:39:06 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 19:39:06 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/5b914ea3/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 64d181c..59b4585 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -302,6 +302,7 @@ B ced98c6e937bd93f92dac9043fa0406c696bfd84
 B cf3f537d210c979dc3b3f49e08ebad5f0c02993c
 B cf9ab27a843df4532d9bd78209aebcafee2c
 B d017d3cf4165e9d8fa849e29669cece562f55253
+B d05916a301a0b1fd80085cea9e74ea82ca2845be
 B d0dd55e901a83c1a4a014552a7da58f3899cd638
 B d15130de948dea0539d5077354c988db80fb
 B d226c07d4db15fa9244a2f011df801839a880f68

cxf git commit: Remove jaxen from parent pom

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 3d783a5a1 -> d05916a30


Remove jaxen from parent pom


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

Branch: refs/heads/master
Commit: d05916a301a0b1fd80085cea9e74ea82ca2845be
Parents: 3d783a5
Author: Colm O hEigeartaigh 
Authored: Fri May 12 19:38:47 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 19:38:47 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/d05916a3/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index f83a6f4..54fef14 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1886,41 +1886,6 @@
 
 
 
-jaxen
-jaxen
-1.1.4
-
-
-jdom
-jdom
-
-
-dom4j
-dom4j
-
-
-xmlParserAPIs
-xerces
-
-
-xercesImpl
-xerces
-
-
-xom
-xom
-
-
-xalan
-xalan
-
-
-xml-apis
-xml-apis
-
-
-
-
 xerces
 xercesImpl
 ${cxf.xerces.version}

[1/3] cxf git commit: Add equals/hashCode to work with next version of Neethi

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 2984a7f4b -> 8d4a0c8bf


Add equals/hashCode to work with next version of Neethi


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

Branch: refs/heads/3.1.x-fixes
Commit: c4cb32f6a7b888308fd0f026bd38ca709e3ad15b
Parents: 2984a7f4
Author: Daniel Kulp 
Authored: Fri May 5 20:33:47 2017 -0400
Committer: Daniel Kulp 
Committed: Fri May 12 14:32:28 2017 -0400

--
 .../cxf/ws/policy/builder/jaxb/JaxbAssertion.java  | 17 +
 1 file changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c4cb32f6/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java
--
diff --git 
a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java
 
b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java
index d334636..f8108fd 100644
--- 
a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java
+++ 
b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java
@@ -64,6 +64,23 @@ public class JaxbAssertion extends PrimitiveAssertion {
 JaxbAssertion a = (JaxbAssertion)policyComponent;
 return data.equals(a.getData());
 }
+
+@Override
+public boolean equals(Object o) {
+if (o instanceof JaxbAssertion) {
+return super.equals(o) && equal((PolicyComponent)o);
+}
+return false;
+}
+
+@Override
+public int hashCode() {
+int i = super.hashCode();
+if (data != null) {
+i ^= data.hashCode();
+}
+return i;
+}
 
 public void setData(T d) {
 data = d;

[3/3] cxf git commit: Recording .gitmergeinfo Changes

[dkulp]

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/8d4a0c8b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8d4a0c8b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8d4a0c8b

Branch: refs/heads/3.1.x-fixes
Commit: 8d4a0c8bfcc5185a94d15594f31b287c5112161d
Parents: 6afc3ef
Author: Daniel Kulp 
Authored: Fri May 12 14:33:07 2017 -0400
Committer: Daniel Kulp 
Committed: Fri May 12 14:33:07 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/8d4a0c8b/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 0f76f6c..64d181c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -5,9 +5,11 @@ B 00503840e6cbda974411968d094cc622f28829f5
 B 0234c09c11c0f89bd17f9b82695daa12af1fad09
 B 02d826d7ad223c75ad706c7b5443bd06ee6e2589
 B 02e822fa5a3c550f7cb963be5abc0b57a78c5571
+B 02fd70cd617803bb3beba7f7df3e9b121a344735
 B 0336a2399b1980e04372c651368f8718f75a4f14
 B 03cdee74d8f41079bf0a1e06eecc6a993109fba4
 B 042d1dbe5f236125c77db8348bf66d4a3d4d2385
+B 048051f3987838eb9fc7e6b50bc80e3e750b6980
 B 04d072e8494cb223c8f7b288776640dea68339d6
 B 04d160cad1a27bb4cc694077125c6ea742647d3d
 B 052582d56a99d96773dffcc8d83e96c26030e7c3
@@ -18,6 +20,7 @@ B 08e8316aa5c575d6117d20c4054405e1ea0e2887
 B 09121b3abf54697f576d4d067190ce696f2f0338
 B 09893c1747d823b3456a28fc49468ed91e456f2d
 B 09a3b58100c04cacf755509a0160ba01bbce769a
+B 0a4d26766122177fe1a919ae1e00bb1d93712c6f
 B 0af65a4ab3ef2c31b9e88d34ddfbb05c79f0f50c
 B 0d4cd0bbcaa6a4f80552d6b38f2a5e721ab20de9
 B 0d5577ab87f324205565c4534b59e69049505356
@@ -25,6 +28,7 @@ B 0dfaf8d72574511ad9027c663707f9e30b945fbc
 B 0e1d4826cab2975b437219f740381574536d4ff3
 B 0f74af5ed7561838e1950c758a7a05e588badd10
 B 101e9a0a43f2d819057d995adbb6e6776d5c7f40
+B 108dcd6099e86cd2070b5f9bae2b0feb7d5a7524
 B 1116dff4ec9f06e2e69b040f5aa03779c0424c23
 B 111d52fd4b92d0222af9bf1c22156145ea01ed01
 B 1224d5cc9f646aa3a4924ce9cb045366d2f4cdff
@@ -50,8 +54,10 @@ B 1d2ff721ef4d63b86035238516afdf1a82855bd9
 B 1d4c40d0f87ccaa09b22d0b0da2db2801f69a00b
 B 1e49510ea71551e543b22f6693307b1436e81db0
 B 1f68d848874bc2be86d3e77e408f0b9879c1e93c
+B 1f7241ba6017f1496e9b8aadec5c807ed05e63b4
 B 203b5433bc44aa831bdd9b1dd4ab474d192dea6c
 B 20951aeac115e7ae95f4d4cc04da288d2f47e4b2
+B 20b73a780e54f3815ab6b8c5f41d052f75745ee1
 B 2103bc5951b0905b134a7bafddd6cc07822132ff
 B 219628c58badaf308817a410d61ec704b2246899
 B 22755d26ec2f6255004f57deec711ee68ce11d6c
@@ -74,6 +80,7 @@ B 3450d3854e97dbd67eeaa862d09d39cce9846de9
 B 38919f57bfb2b880691950fc5f992b5649ea579e
 B 39851b83af116611ce0efe70c4b9a32ee8491523
 B 39a5690d7d50d8481739c290f49128be4d55f8ad
+B 3a46e586b405c79a98e37d33a30b2fa22905f853
 B 3b2f2ed2db01f05fa9b648693ce33978ccc8ede8
 B 3be1cef6d16405b7e046c822c27dc7223f24
 B 3bebf6b49283d9a9c36365c030533a3508f836c7
@@ -83,9 +90,11 @@ B 3fbedf1397714824b9700cd4d49569087936fe1a
 B 3fc02937bd8ba0bb500a2cdfd8afa863b9cf6aec
 B 3fe8e92229ba50dbc6758e6420b44ac16751281e
 B 40380d8e57cdea0d909f3a9ee207628831c202fa
+B 40cb28fbcc2e3d0805f0d3ea90797c1310c3cba5
 B 40dd6d61c5e6e276df9437e5f000e103ee6101d6
 B 41262ee0264445ad7fe288c0f0bf640c8b9dbbc5
 B 4149e50e39a8d4ffb71924d42def376b634ef64a
+B 41a97e477318914fd938ef0f3d6a9f263abfa7cc
 B 428bbe90e4189e70df9a6a450a10320c8be6d42f
 B 4301392fae084db72886290091ea5745144d97f5
 B 440538282e39c9da528101968cade1e7dcb32e0e
@@ -93,6 +102,7 @@ B 4427f7790e522144baa325e5b5c051885e9dc706
 B 443fe6b1b69eacb6fe03e6e523ddf11ee38b7472
 B 4446dbb0796fc214a6e070d46650f5ef1e860293
 B 447f2dac6e160b5cd495558ca8855ed481396c63
+B 44b4f1b51b569ddd7d49cf48d7ab825b7dc798e4
 B 44c608c205fd2fdac2f2fed9557c2c39730a44d6
 B 45bc2219b761e671973acf297e0f37a1b8934c6c
 B 46438c487115889c4cadd86f70fd4109a0daa2b8
@@ -100,8 +110,10 @@ B 46bd4b3e9b8365b5afe2310ba6225eb6c2abad12
 B 4786e832573f1fcc07ed190ab21fdb2820348e4d
 B 47a431412dbd7669d89a70d6fed49053e70dfed1
 B 4a30203a08ea11f96b52b454220ed5ce9419e3be
+B 4a714ebe08842ad898343c55203f6cde4ccebf45
 B 4a72362668b14f92f1a0252b723436fc86b681bf
 B 4b37844e9c15812d1855d0babded79880d2cd6fb
+B 4b96a222aea61f9fe80083c4c4bb1519955890ab
 B 4bf780105271e91451446a2d96032249486b32de
 B 4bfd87f8d3d07161606428463934cc4a95ea5ce9
 B 4dd4e1cf0d517021fd65ffe219a9be6c9f75c84a
@@ -109,6 +121,7 @@ B 4ddf74b1acd8f65b685c8e11b809a06807799f84
 B 4ea19d64741fbb5fddf7b7e09fab3b33f72f88c7
 B 4f1afbf76d3e525163663b71104ce2adb9cb7a85
 B 502db47a7c520767da2977376be5cf2fce3f56af
+B 514c06899fc56b622ec2a1117e857f0d5a8f45a6
 B 517ef67f1a69d386de44153e5e09d51cb47bf4d7
 B 519a67dfa240471bb585929f263cd85051a9eb06
 B 52ccbfa5e9fe59662eb8e534c79d4cd48a370703
@@ -134,6 

[2/3] cxf git commit: Update xmlschema version

[dkulp]

Update xmlschema version


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

Branch: refs/heads/3.1.x-fixes
Commit: 6afc3efc0a47baabb2df660abd61f203ae570a9d
Parents: c4cb32f
Author: Daniel Kulp 
Authored: Fri May 12 12:15:17 2017 -0400
Committer: Daniel Kulp 
Committed: Fri May 12 14:33:07 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/6afc3efc/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 4421b3f..93a9be6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -164,7 +164,7 @@
 2.1.9
 2.11.0
 2.6.0
-2.2.1
+2.2.2
 1.1.4c_6
 1.1.0.Final
 

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

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 0643b5aa2 -> 2984a7f4b


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/2984a7f4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2984a7f4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2984a7f4

Branch: refs/heads/3.1.x-fixes
Commit: 2984a7f4b4ffbfb64e08b04d1706436c05ea6aaf
Parents: 08d7390
Author: Colm O hEigeartaigh 
Authored: Fri May 12 18:13:57 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 18:13:57 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/2984a7f4/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index faa0409..0f76f6c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -410,6 +410,7 @@ M 3b7587395586f59d0fe9427038dd2d891fbe223d
 M 3b967cf6d9c67bebb6e0705a3fdede4d2a6b1015
 M 3bbfc22e182ffea8c98ba8f84b4f55abfce353e7
 M 3be9aac26a003ef43995054da875ffd5fa5a2eb4
+M 3d783a5a17c03348da031865fb5278fe777f0fc9
 M 3e30d8892a723adcf04268efd7d407e164607065
 M 408fe3384925122c4e68b7d020de5ff9d1376096
 M 417fb946eec38f403d915e90f405594675a7f7e0

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 53227dde7 -> 10fc21137


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/10fc2113
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/10fc2113
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/10fc2113

Branch: refs/heads/3.0.x-fixes
Commit: 10fc2113789b77c096a69c47d4ab1d39fc627267
Parents: 53227dd
Author: Colm O hEigeartaigh 
Authored: Fri May 12 18:14:10 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 18:14:10 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/10fc2113/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 18acb9d..a5a8a7c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -48,6 +48,7 @@ B 0848bdb305b5d6e542da417ff5fd9e7c9ace5381
 B 084ad67a648c736e911fa0a419d6e5cca345c1b2
 B 087f7390c71a8a1b07b0a30e9091d290ac75811e
 B 088dcdf8c7a3626adf650e80b98a9efd51d48653
+B 08d7390ff065b91b88442805c36febcb5a5bd2f4
 B 08d98fbb13440de2da3b19915d8dfe21531cb284
 B 08e90abaabf4bbd1f3abfa3f1825dab68c86210e
 B 091f8bef03e671f151e21a890159e5033b1c5d86
@@ -282,6 +283,7 @@ B 29129d880455fcd535fdb9004a7677fcd1f51906
 B 292fe2541e32bb31a59955975972cd6adfa1a9dc
 B 294218f53fb5580fd2173363168c9aede7fc5028
 B 29638f6c26ef72693f22fd7a3d689a46888c416d
+B 2984a7f4b4ffbfb64e08b04d1706436c05ea6aaf
 B 29a9b9e96582602565286099ac3965424372370d
 B 29dbad4a995ba09d97b131807585b46cb02c43af
 B 29f0620a9a025afcd2057cdf97c7d93caf6c179f

[2/2] cxf git commit: Removing Jaxen + JDOM licenses

[coheigea]

Removing Jaxen + JDOM licenses


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

Branch: refs/heads/3.1.x-fixes
Commit: 08d7390ff065b91b88442805c36febcb5a5bd2f4
Parents: 0643b5a
Author: Colm O hEigeartaigh 
Authored: Fri May 12 18:13:29 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 18:13:57 2017 +0100

--
 .../src/main/release/licenses/jaxen.txt | 33 
 distribution/src/main/release/licenses/jdom.txt | 56 
 2 files changed, 89 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/08d7390f/distribution/src/main/release/licenses/jaxen.txt
--
diff --git a/distribution/src/main/release/licenses/jaxen.txt 
b/distribution/src/main/release/licenses/jaxen.txt
deleted file mode 100644
index a0ca747..000
--- a/distribution/src/main/release/licenses/jaxen.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- $Id: LICENSE.txt,v 1.5 2006/02/05 21:49:04 elharo Exp $
-
- Copyright 2003-2006 The Werken Company. All Rights Reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
-  * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-  * Neither the name of the Jaxen Project nor the names of its
-contributors may be used to endorse or promote products derived 
-from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- */

http://git-wip-us.apache.org/repos/asf/cxf/blob/08d7390f/distribution/src/main/release/licenses/jdom.txt
--
diff --git a/distribution/src/main/release/licenses/jdom.txt 
b/distribution/src/main/release/licenses/jdom.txt
deleted file mode 100644
index 5a75e93..000
--- a/distribution/src/main/release/licenses/jdom.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-- 
-
- $Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $
-
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 
- 1. Redistributions of source code must retain the above copyright
-notice, this list of conditions, and the following disclaimer.
- 
- 2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions, and the disclaimer that follows 
-these conditions in the documentation and/or other materials 
-provided with the distribution.
-
- 3. The name "JDOM" must not be used to endorse or promote products
-derived from this software without prior written permission.  For
-written permission, please contact .
- 
- 4. Products derived from this software may not be called "JDOM", nor
-may "JDOM" appear in their name, without prior written permission
-from the JDOM Project Management .
- 
- In addition, we request (but do not require) that you include in the 
- end-user documentation provided with the redistribution and/or in the 
- software itself an acknowledgement equivalent to the following:
- "This product includes software developed by the
-  JDOM Project (http://www.jdom.org/)."
- Alternatively, the acknowledgment may be graphical using the logos 
- available at http://www.jdom.org/images/logos.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF 

cxf git commit: Removing Jaxen + JDOM licenses

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 43e19de6c -> 3d783a5a1


Removing Jaxen + JDOM licenses


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

Branch: refs/heads/master
Commit: 3d783a5a17c03348da031865fb5278fe777f0fc9
Parents: 43e19de
Author: Colm O hEigeartaigh 
Authored: Fri May 12 18:13:29 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 18:13:39 2017 +0100

--
 .../src/main/release/licenses/jaxen.txt | 33 
 distribution/src/main/release/licenses/jdom.txt | 56 
 2 files changed, 89 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3d783a5a/distribution/src/main/release/licenses/jaxen.txt
--
diff --git a/distribution/src/main/release/licenses/jaxen.txt 
b/distribution/src/main/release/licenses/jaxen.txt
deleted file mode 100644
index a0ca747..000
--- a/distribution/src/main/release/licenses/jaxen.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- $Id: LICENSE.txt,v 1.5 2006/02/05 21:49:04 elharo Exp $
-
- Copyright 2003-2006 The Werken Company. All Rights Reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
-  * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-  * Neither the name of the Jaxen Project nor the names of its
-contributors may be used to endorse or promote products derived 
-from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- */

http://git-wip-us.apache.org/repos/asf/cxf/blob/3d783a5a/distribution/src/main/release/licenses/jdom.txt
--
diff --git a/distribution/src/main/release/licenses/jdom.txt 
b/distribution/src/main/release/licenses/jdom.txt
deleted file mode 100644
index 5a75e93..000
--- a/distribution/src/main/release/licenses/jdom.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-- 
-
- $Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $
-
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 
- 1. Redistributions of source code must retain the above copyright
-notice, this list of conditions, and the following disclaimer.
- 
- 2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions, and the disclaimer that follows 
-these conditions in the documentation and/or other materials 
-provided with the distribution.
-
- 3. The name "JDOM" must not be used to endorse or promote products
-derived from this software without prior written permission.  For
-written permission, please contact .
- 
- 4. Products derived from this software may not be called "JDOM", nor
-may "JDOM" appear in their name, without prior written permission
-from the JDOM Project Management .
- 
- In addition, we request (but do not require) that you include in the 
- end-user documentation provided with the redistribution and/or in the 
- software itself an acknowledgement equivalent to the following:
- "This product includes software developed by the
-  JDOM Project (http://www.jdom.org/)."
- Alternatively, the acknowledgment may be graphical using the logos 
- available at http://www.jdom.org/images/logos.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- 

cxf-build-utils git commit: Removed the supplements that are no longer shipped in the CXF distibution, or that have since added license information in the pom

[coheigea]

Repository: cxf-build-utils
Updated Branches:
  refs/heads/master 90c56f01b -> 060801ca1


Removed the supplements that are no longer shipped in the CXF distibution, or 
that have since added license information in the pom


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

Branch: refs/heads/master
Commit: 060801ca137f65e2f6a4ebee4f40f4665444f003
Parents: 90c56f0
Author: Colm O hEigeartaigh 
Authored: Fri May 12 18:10:56 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 18:10:56 2017 +0100

--
 .../src/main/resources/notice-supplements.xml   | 404 ---
 1 file changed, 404 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-build-utils/blob/060801ca/buildtools/src/main/resources/notice-supplements.xml
--
diff --git a/buildtools/src/main/resources/notice-supplements.xml 
b/buildtools/src/main/resources/notice-supplements.xml
index e06e939..50ff129 100644
--- a/buildtools/src/main/resources/notice-supplements.xml
+++ b/buildtools/src/main/resources/notice-supplements.xml
@@ -2,24 +2,6 @@
 
 
 
-javax.ws.rs
-jsr311-api
-JSR 311 API
-https://jsr311.java.net/
-
-Sun Microsystems
-http://www.sun.com/
-
-
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) 
Version 1.0
-https://opensource.org/licenses/cddl1.php
-
-
-
-
-
-
 com.sun.xml.bind
 jaxb-impl
 Sun JAXB Reference Implementation Runtime
@@ -56,60 +38,6 @@
 
 
 
-com.sun.xml.fastinfoset
-FastInfoset
-Sun FastInfoset Implementation
-https://fi.java.net/
-
-Sun Microsystems
-http://www.sun.com/
-
-
-
-The Apache Software License, Version 2.0
-http://www.apache.org/licenses/LICENSE-2.0.txt
-
-
-
-
-
-
-com.sun.xml.messaging.saaj
-saaj-impl
-Sun SAAJ Reference Implementation
-https://saaj.java.net/
-
-Sun Microsystems
-http://www.sun.com/
-
-
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) 
Version 1.1 and GPL v2
-
https://glassfish.java.net/public/CDDL+GPL_1_1.html
-
-
-
-
-
-
-javax.xml.soap
-saaj-api
-Sun SAAJ API
-https://saaj.java.net/
-
-Sun Microsystems
-http://www.sun.com/
-
-
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) 
Version 1.1 and GPL v2
-
https://glassfish.java.net/public/CDDL+GPL_1_1.html
-
-
-
-
-
-
 javax.xml.bind
 jaxb-api
 Java Architecture for XML Binding (JAXB API)
@@ -128,23 +56,6 @@
 
 
 
-xalan
-xalan
-Apache Xalan-Java
-
-The Apache Software Foundation
-http://www.apache.org
-
-
-
-The Apache Software License, Version 2.0
-http://www.apache.org/licenses/LICENSE-2.0.txt
-
-
-
-
-
-
 org.slf4j
 slf4j-api
 Simple Logging Facade for Java - API
@@ -171,19 +82,6 @@
 
 
 
-jaxen
-jaxen
-Jaxen
-
-
-BSD
-http://jaxen.codehaus.org/license.html
-
-
-
-
-
-
 asm
 asm
 ASM
@@ -216,99 +114,6 @@
 
 
 
-net.java.dev.stax-utils
-stax-utils
-StAX Utilities
-https://java.net/projects/stax-utils
-
-
-
-
-jdom
-jdom
-JDOM
-
-jdom.org
-http://www.jdom.org
-
-
-
- 

[2/2] cxf git commit: Update xmlschema version

[dkulp]

Update xmlschema version


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

Branch: refs/heads/master
Commit: 43e19de6c7409070aa4c7c52158ec33f5a4651b9
Parents: f34a814
Author: Daniel Kulp 
Authored: Fri May 12 12:15:17 2017 -0400
Committer: Daniel Kulp 
Committed: Fri May 12 12:15:17 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/43e19de6/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 8c2993b..f83a6f4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -166,7 +166,7 @@
 3.5
 2.11.0
 2.6.0
-2.2.1
+2.2.2
 1.1.4c_6
 1.1.0.Final
 

[1/2] cxf git commit: Update neethi version

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master a71508214 -> 43e19de6c


Update neethi version


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

Branch: refs/heads/master
Commit: f34a8146bbfd1d5fdc80adb373f56c9862f3e159
Parents: a715082
Author: Daniel Kulp 
Authored: Fri May 12 12:14:39 2017 -0400
Committer: Daniel Kulp 
Committed: Fri May 12 12:14:39 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/f34a8146/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 6dd0909..8c2993b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -131,7 +131,7 @@
 1.1.2
 3.0.5
 2013.6.1
-3.0.3
+3.1.0
 4.0.43.Final
 3.9.2.Final
 [4,5)

cxf-build-utils git commit: Updating licenses for a few components

[coheigea]

Repository: cxf-build-utils
Updated Branches:
  refs/heads/master 42e8ac216 -> 90c56f01b


Updating licenses for a few components


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

Branch: refs/heads/master
Commit: 90c56f01b34e1720c8832d8ac1d5ec4b5579afff
Parents: 42e8ac2
Author: Colm O hEigeartaigh 
Authored: Fri May 12 17:02:06 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 17:02:06 2017 +0100

--
 .../src/main/resources/notice-supplements.xml   | 32 
 1 file changed, 19 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-build-utils/blob/90c56f01/buildtools/src/main/resources/notice-supplements.xml
--
diff --git a/buildtools/src/main/resources/notice-supplements.xml 
b/buildtools/src/main/resources/notice-supplements.xml
index 06caf61..e06e939 100644
--- a/buildtools/src/main/resources/notice-supplements.xml
+++ b/buildtools/src/main/resources/notice-supplements.xml
@@ -5,7 +5,7 @@
 javax.ws.rs
 jsr311-api
 JSR 311 API
-https://jsr311.dev.java.net/
+https://jsr311.java.net/
 
 Sun Microsystems
 http://www.sun.com/
@@ -13,7 +13,7 @@
 
 
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) 
Version 1.0
-http://www.sun.com/cddl/cddl.html
+https://opensource.org/licenses/cddl1.php
 
 
 
@@ -23,14 +23,15 @@
 com.sun.xml.bind
 jaxb-impl
 Sun JAXB Reference Implementation Runtime
+https://jaxb.java.net/
 
 Sun Microsystems
 http://www.sun.com/
 
 
 
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) 
Version 1.0
-http://www.sun.com/cddl/cddl.html
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) 
Version 1.1 and GPL v2
+
https://glassfish.java.net/public/CDDL+GPL_1_1.html
 
 
 
@@ -40,14 +41,15 @@
 com.sun.xml.bind
 jaxb-xjc
 Sun JAXB Reference Implementation Tools
+https://jaxb.java.net/
 
 Sun Microsystems
 http://www.sun.com/
 
 
 
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) 
Version 1.0
-http://www.sun.com/cddl/cddl.html
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) 
Version 1.1 and GPL v2
+
https://glassfish.java.net/public/CDDL+GPL_1_1.html
 
 
 
@@ -57,6 +59,7 @@
 com.sun.xml.fastinfoset
 FastInfoset
 Sun FastInfoset Implementation
+https://fi.java.net/
 
 Sun Microsystems
 http://www.sun.com/
@@ -74,14 +77,15 @@
 com.sun.xml.messaging.saaj
 saaj-impl
 Sun SAAJ Reference Implementation
+https://saaj.java.net/
 
 Sun Microsystems
 http://www.sun.com/
 
 
 
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) 
Version 1.0
-http://www.sun.com/cddl/cddl.html
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) 
Version 1.1 and GPL v2
+
https://glassfish.java.net/public/CDDL+GPL_1_1.html
 
 
 
@@ -91,14 +95,15 @@
 javax.xml.soap
 saaj-api
 Sun SAAJ API
+https://saaj.java.net/
 
 Sun Microsystems
 http://www.sun.com/
 
 
 
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) 
Version 1.0
-http://www.sun.com/cddl/cddl.html
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) 
Version 1.1 and GPL v2
+
https://glassfish.java.net/public/CDDL+GPL_1_1.html
 
 
 
@@ -108,14 +113,15 @@
 javax.xml.bind
 jaxb-api
 Java Architecture for XML Binding (JAXB API)
+https://jaxb.java.net/
 
 Sun 

cxf-fediz git commit: Removing redundant ldap bit in pom

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.3.x-fixes 7bd40fece -> ed9345cb1


Removing redundant ldap bit in pom


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

Branch: refs/heads/1.3.x-fixes
Commit: ed9345cb1b1fb4dc857f376198c2b1ff62c457de
Parents: 7bd40fe
Author: Colm O hEigeartaigh 
Authored: Fri May 12 13:16:47 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 14:24:10 2017 +0100

--
 services/sts/pom.xml | 17 -
 1 file changed, 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ed9345cb/services/sts/pom.xml
--
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index 748a425..3975b41 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -305,23 +305,6 @@
 
 ldap
 
-
-
-
-
-org.springframework
-spring-tx
-${spring.version}
-
-
-
-
-
-org.springframework.ldap
-spring-ldap-core
-1.3.1.RELEASE
-
-
 
 
 kerberos

cxf-fediz git commit: Removing redundant ldap bit in pom

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 76652433d -> cb5612bb1


Removing redundant ldap bit in pom


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

Branch: refs/heads/master
Commit: cb5612bb17b7fd0a0cfa7ab683b535a5f0ea15f3
Parents: 7665243
Author: Colm O hEigeartaigh 
Authored: Fri May 12 13:16:47 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 13:16:47 2017 +0100

--
 services/sts/pom.xml | 17 -
 1 file changed, 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/cb5612bb/services/sts/pom.xml
--
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index 31360db..8814595 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -305,23 +305,6 @@
 
 ldap
 
-
-
-
-
-org.springframework
-spring-tx
-${spring.version}
-
-
-
-
-
-org.springframework.ldap
-spring-ldap-core
-1.3.1.RELEASE
-
-
 
 
 kerberos

svn commit: r1012128 - in /websites/production/cxf/content: cache/docs.pageCache docs/jax-rs-jose.html

[buildbot]

Author: buildbot
Date: Fri May 12 12:47:44 2017
New Revision: 1012128

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/jax-rs-jose.html

Modified: websites/production/cxf/content/cache/docs.pageCache
==
Binary files - no diff available.

Modified: websites/production/cxf/content/docs/jax-rs-jose.html
==
--- websites/production/cxf/content/docs/jax-rs-jose.html (original)
+++ websites/production/cxf/content/docs/jax-rs-jose.html Fri May 12 12:47:44 
2017
@@ -119,11 +119,11 @@ Apache CXF -- JAX-RS JOSE


 /**/
+/*]]>*/
 IntroductionMaven DependenciesJava and JCE 
PolicyJOSE Overview and 
Implementation
 JWA AlgorithmsJWK KeysJWS Signature
 Signature and Verification 
ProvidersJWS 
CompactJWS 
JSONJWS 
with Detached ContentJWS with Unencoded 
Payload
@@ -131,13 +131,13 @@ div.rbtoc1490280432451 li {margin-left:
 Key and Content Encryption 
ProvidersJWE 
CompactJWE 
JSON
 JSON Web 
TokenJWS and 
JWE Combined
 JOSE JAX-RS 
Filters
-JWSJWELinking JWT 
authentications to JWS or JWE content
+JWSSigning and 
Verification of HTTP AttachmentsJWELinking JWT 
authentications to JWS or JWE contentOptional protection of HTTP 
headers
 Configuration
 Configuration Property 
Containers
 SignatureEncryption
 Configuration
 that applies to both encryption and signatureConfiguration that 
applies to signature onlyConfiguration that 
applies to encryption onlyConfiguration that 
applies to JWT tokens only
 InteroperabilityThird-Party 
Libraries
-Introductionhttps://datatracker.ietf.org/wg/jose/documents/; 
rel="nofollow">JOSEis a set of high quality specifications that 
specify how data payloads can be signed/validated and/or encrypted/decrypted 
with the cryptographic properties set in the JSON-formatted metadata (headers). 
The data to be secured can be in JSON or other formats (plain text, XML, binary 
data).https://datatracker.ietf.org/wg/jose/documents/; 
rel="nofollow">JOSEis a key piece of advanced OAuth2 and OpenId 
Connect applications but can also be successfully used for securing the regular 
HTTP web service communications.CXF 3.0.x, 3.1.x and 3.2.0 provide a 
complete implementation of https://datatracker.ietf.org/wg/jose/documents/; rel="nofollow">JOSE 
and offer a comprehensive utility and filter support f
 or protecting JAX-RS services and clients with the help of https://datatracker.ietf.org/wg/jose/documents/; 
rel="nofollow">JOSE.CXF http://cxf.apache.org/docs/jax-rs-oauth2.html;>OAuth2 and http://cxf.apache.org/docs/jax-rs-oidc.html;>OIDC 
modules are also depending on it.Maven DependenciesHaving 
the following dependency will let developers write JOSE JWS or JWE 
code:
+Introductionhttps://datatracker.ietf.org/wg/jose/documents/; 
rel="nofollow">JOSEis a set of high quality specifications that 
specify how data payloads can be signed/validated and/or encrypted/decrypted 
with the cryptographic properties set in the JSON-formatted metadata (headers). 
The data to be secured can be in JSON or other formats (plain text, XML, binary 
data).https://datatracker.ietf.org/wg/jose/documents/; 
rel="nofollow">JOSEis a key piece of advanced OAuth2 and OpenId 
Connect applications but can also be successfully used for securing the regular 
HTTP web service communications.CXF 3.0.x, 3.1.x and 3.2.0 provide a 
complete implementation of https://datatracker.ietf.org/wg/jose/documents/; rel="nofollow">JOSE 
and offer a comprehensive utility and filter support f
 or protecting JAX-RS services and clients with the help of https://datatracker.ietf.org/wg/jose/documents/; 
rel="nofollow">JOSE.CXF http://cxf.apache.org/docs/jax-rs-oauth2.html;>OAuth2 and http://cxf.apache.org/docs/jax-rs-oidc.html;>OIDC 
modules are also depending on it.New: Signature and 
Verification support for multiparts using JWS Detached Content 
mode.New: Optional HTTP Header protection.Maven DependenciesHaving 
the following dependency will let developers write JOSE JWS or JWE 
code:
 dependency
   groupIdorg.apache.cxf/groupId
   artifactIdcxf-rt-rs-security-jose/artifactId
@@ -271,13 +271,13 @@ String nextJwsJson = consumer.validateAn
 // use WebClient to post nextJwsJson to the next consumer, with nextJwsJson 
being nearly identical to the original
 // double-signed JWS JSON signature, minus the signature which was already 
validated, in this case nextJwsJson will 
 // only have a single signature 
-The above code produces 

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 87de3b013 -> 53227dde7


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/53227dde
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/53227dde
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/53227dde

Branch: refs/heads/3.0.x-fixes
Commit: 53227dde78432f3ad221b060d30904d6e2b4c125
Parents: 87de3b0
Author: Colm O hEigeartaigh 
Authored: Fri May 12 13:25:00 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 13:25:00 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/53227dde/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index c12e59f..18acb9d 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -35,6 +35,7 @@ B 05e838902732c879e6a9415f11624d1581b5271e
 B 061e54769df276424cca4eca8b1daed693e7c555
 B 062c8ac92d8a52d2913a4f128ad56cb742edd3b3
 B 0642440cd3114db0ca86ca99987617d98634697f
+B 0643b5aa2293cbc68e16c90ac9484ac63ff81aaf
 B 06d2a32adda4cb32580ca25c83e6b67dfb143ae9
 B 06e74f175c476c82c773c4ac31cf656ef593d424
 B 06fbd75b77597a6b413c72ab845578ba03bf3a21
@@ -296,6 +297,7 @@ B 2b16a75d07fe32bf9604186b873e729cd6992fe9
 B 2b1766a22b17beb4cd462c728d3234be04dfaeee
 B 2b24f8986897add53c9c7b76c4e5bd10dc5646d7
 B 2b5904f6d8b529e7ae18719b5bfab0560abb1e95
+B 2b7d42009eebfdf3005540e5621746f95786c151
 B 2ba77327488a8446e6a92af137f644eaf3b06e2e
 B 2ba96091771fd8a15852b39373a22b4973d26ca1
 B 2be69493d3e4f5f2815ffcf5ce7e8a1e81fa8d67
@@ -1033,6 +1035,7 @@ B 9787e41fdd0f4cbb85895769ac266a32ef14e336
 B 979fe8e6504f57eef54934159aeec6b488402abd
 B 97eb4f3e2db0678af3c2ae6cac999ce821574b10
 B 97ec59a8527a450dbc6b5b8a6f2d5c5967eeb81d
+B 97f9a50b457cd8aaa8c256d2a4481e4240fab39f
 B 985b824e0997d65aeb969330cd71b7f8b8b02f9d
 B 988caadb6f2eed12456dc576704d4b118c98995f
 B 9896b920035a1d1be1aef28a1d1a5eb876445c82

[2/3] cxf git commit: Only map principals when both realms are non-null

[coheigea]

Only map principals when both realms are non-null

# Conflicts:
#   
services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java


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

Branch: refs/heads/3.1.x-fixes
Commit: 2b7d42009eebfdf3005540e5621746f95786c151
Parents: 8b74995
Author: Colm O hEigeartaigh 
Authored: Fri May 12 13:23:54 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 13:24:25 2017 +0100

--
 .../java/org/apache/cxf/sts/operation/AbstractOperation.java  | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2b7d4200/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
index 0b48b5c..8e853d1 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
@@ -583,8 +583,13 @@ public abstract class AbstractOperation {
 if (responsePrincipal != null) {
 String targetRealm = providerParameters.getRealm();
 String sourceRealm = tokenResponse.getTokenRealm();
+<<< HEAD
 
 if (sourceRealm != null && !sourceRealm.equals(targetRealm)) {
+===
+
+if (sourceRealm != null && targetRealm != null && 
!sourceRealm.equals(targetRealm)) {
+>>> a71508214a... Only map principals when both realms are non-null
 RelationshipResolver relRes = 
stsProperties.getRelationshipResolver();
 Relationship relationship = null;
 if (relRes != null) {
@@ -618,7 +623,7 @@ public abstract class AbstractOperation {
 // principal remains unchanged
 
 } else  {
-LOG.log(Level.SEVERE, "Unkown federation type: " + 
relationship.getType());
+LOG.log(Level.SEVERE, "Unknown federation type: " + 
relationship.getType());
 throw new STSException("Error in providing a token", 
STSException.BAD_REQUEST);
 }
 }

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

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 8b749956b -> 0643b5aa2


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/97f9a50b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/97f9a50b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/97f9a50b

Branch: refs/heads/3.1.x-fixes
Commit: 97f9a50b457cd8aaa8c256d2a4481e4240fab39f
Parents: 2b7d420
Author: Colm O hEigeartaigh 
Authored: Fri May 12 13:24:25 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 13:24:25 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/97f9a50b/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 1d12f5b..faa0409 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -507,6 +507,7 @@ M a2efc18eff09700eded186478a7c2ae8fa543eef
 M a304f27b8ad9da04dde3610932266c64baa3aa7e
 M a42362e397b84d335015f7f9aa07b4f0bfb49260
 M a644c5d06c0bae321e2c669efa0cecf3abdd944d
+M a71508214a7682c6a569075b1395f387c31be63b
 M a719adccae8500f2d7e7140a9f4cd26e20775818
 M a7d5d525c05cf10a6ae12c25645c248d92dfac1c
 M a89ca98653b95bcd2ab5cadbe9a419a4cec4893a

[3/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/0643b5aa
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0643b5aa
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0643b5aa

Branch: refs/heads/3.1.x-fixes
Commit: 0643b5aa2293cbc68e16c90ac9484ac63ff81aaf
Parents: 97f9a50
Author: Colm O hEigeartaigh 
Authored: Fri May 12 13:24:40 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 13:24:40 2017 +0100

--
 .../java/org/apache/cxf/sts/operation/AbstractOperation.java| 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0643b5aa/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
index 8e853d1..733d909 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
@@ -583,13 +583,8 @@ public abstract class AbstractOperation {
 if (responsePrincipal != null) {
 String targetRealm = providerParameters.getRealm();
 String sourceRealm = tokenResponse.getTokenRealm();
-<<< HEAD
-
-if (sourceRealm != null && !sourceRealm.equals(targetRealm)) {
-===
 
 if (sourceRealm != null && targetRealm != null && 
!sourceRealm.equals(targetRealm)) {
->>> a71508214a... Only map principals when both realms are non-null
 RelationshipResolver relRes = 
stsProperties.getRelationshipResolver();
 Relationship relationship = null;
 if (relRes != null) {

cxf git commit: Only map principals when both realms are non-null

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master de11ac7d5 -> a71508214


Only map principals when both realms are non-null


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

Branch: refs/heads/master
Commit: a71508214a7682c6a569075b1395f387c31be63b
Parents: de11ac7
Author: Colm O hEigeartaigh 
Authored: Fri May 12 13:23:54 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 13:24:11 2017 +0100

--
 .../java/org/apache/cxf/sts/operation/AbstractOperation.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a7150821/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
--
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
index b38c9eb..69b6316 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
@@ -585,7 +585,7 @@ public abstract class AbstractOperation {
 String targetRealm = providerParameters.getRealm();
 String sourceRealm = tokenResponse.getTokenRealm();
 
-if (sourceRealm != null && !sourceRealm.equals(targetRealm)) {
+if (sourceRealm != null && targetRealm != null && 
!sourceRealm.equals(targetRealm)) {
 RelationshipResolver relRes = 
stsProperties.getRelationshipResolver();
 Relationship relationship = null;
 if (relRes != null) {
@@ -619,7 +619,7 @@ public abstract class AbstractOperation {
 // principal remains unchanged
 
 } else  {
-LOG.log(Level.SEVERE, "Unkown federation type: " + 
relationship.getType());
+LOG.log(Level.SEVERE, "Unknown federation type: " + 
relationship.getType());
 throw new STSException("Error in providing a token", 
STSException.BAD_REQUEST);
 }
 }

svn commit: r1012119 - in /websites/production/cxf/content: cache/docs.pageCache docs/jax-rs-multiparts.html

[buildbot]

Author: buildbot
Date: Fri May 12 11:47:47 2017
New Revision: 1012119

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/jax-rs-multiparts.html

Modified: websites/production/cxf/content/cache/docs.pageCache
==
Binary files - no diff available.

Modified: websites/production/cxf/content/docs/jax-rs-multiparts.html
==
--- websites/production/cxf/content/docs/jax-rs-multiparts.html (original)
+++ websites/production/cxf/content/docs/jax-rs-multiparts.html Fri May 12 
11:47:47 2017
@@ -121,11 +121,11 @@ Apache CXF -- JAX-RS Multiparts
 
 
 /**/
+/*]]>*/
 Reading attachments
 Multipart 
annotation and Optional attachments
 Writing 
attachmentsUploading files with 
Client APIReading large attachments
@@ -308,7 +308,7 @@ public Response addBookJaxbJsonForm(@Mul
 public Response addBookFilesForm(@Multipart("owner") String name,
  @Multipart("files") ListBook books) 
{} 
 
-If you need to know the names of the individual file parts 
embedded in a "files" outer part (such as "book1" and "book2"), then please use 
ListAttachment instead. It is currently not possible to use a Multipart 
annotation to refer to such inner parts but you can easily get the names from 
the individual Attachment instances representing these inner parts.Note 
that it is only the last request which has been structured according to the 
recommendation on how to upload multiple files but it is more complex than the 
other simpler requests linked to in this section.Please note that using 
JAX-RS FormParams is recommended for dealing with plain 
application/www-url-encoded submissions consisting of name/value pairs 
only.Content-Disposition 
UTF-8 file namesStarting from CXF 3.0.4 it is possible to specify a 
Content-Disposition file names in a UTF-8 format, using a "filename*" Content-Di
 sposition extension parameter as opposed to the "filename" one.Please 
see https://tools.ietf.org/html/rfc6266; rel="nofollow">RFC 6266 and https://git-wip-us.apache.org/repos/asf?p=cxf.git;a=blob;f=core/src/test/java/org/apache/cxf/attachment/AttachmentUtilTest.java;h=6eeedd42e965f4df8390ee6077222b34e1520732;hb=HEAD;>this
 unit test for more information.XOP supportCXF JAXRS clients and 
endpoints can support http://www.w3.org/TR/xop10/; rel="nofollow">XML-binary Optimized 
Packaging (XOP). What it means at a practical level is 
that a JAXB bean containing binary data is serialized using a multipart 
packaging, with the root part containing non-binary data only but also linking 
to co-located parts containing the actual binary payloads. Next it is 
deserialized into a JAX
 B bean on the server side.If you'd like to experiment with XOP then you 
need to set an "mtom-enabled" property on CXF jaxrs endpoints and clients. Please see http://svn.apache.org/repos/asf/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java;>JAXRSMultipartTest
 (testXopWebClient) and http://svn.apache.org/repos/asf/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java;>MultipartStore
 (addBookXop) for more details.Multipart FiltersIt 
is possible to intercept the attachment write or read process starting from CXF 
3.1.12.https://github.com/apache/cxf/blob/master/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartInputFilter.java;
 rel="nofollow">Multipart
 InputFilter and https://github.com/apache/cxf/blob/master/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartOutputFilter.java;
 rel="nofollow">MultipartOutputFilter have been introduced. These filters 
can be used to modify the list of the attachments parts or customize some of 
the individual part's properties, example, replace the part input stream, 
etc.These filters can be registered from JAX-RS 2.0 client or container 
request/response filters. https://github.com/apache/cxf/blob/master/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartInputFilter.java;
 rel="nofollow">MultipartInputFilter can be added to the list of the input 
filters which is identified by a "multipart.input.filters" property on the 
current CXF message. Likewise,https://github.com/apache/cxf/blob/master/rt/front
 
end/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartOutputFilter.java"
 rel="nofollow">MultipartOutputFilter can be added to the list of the 
output filters 

cxf git commit: Minor update to the attachment utils

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes e6d575029 -> 8b749956b


Minor update to the attachment utils


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

Branch: refs/heads/3.1.x-fixes
Commit: 8b749956b70f8e22146b089afed3df269fad10c3
Parents: e6d5750
Author: Sergey Beryozkin 
Authored: Fri May 12 11:54:18 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri May 12 11:57:15 2017 +0100

--
 .../org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8b749956/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
index b0708d4..cb2038c 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
@@ -63,9 +63,9 @@ public final class AttachmentUtils {
 List outFilters = 
CastUtils.cast((List)m.get(OUT_FILTERS));
 if (outFilters == null) {
 outFilters = new ArrayList();
+m.put(OUT_FILTERS, outFilters);
 }
 outFilters.add(filter);
-m.put(OUT_FILTERS, outFilters);
 }
 
 public static void addMultipartInFilter(MultipartInputFilter filter) {
@@ -73,9 +73,9 @@ public final class AttachmentUtils {
 List inFilters = 
CastUtils.cast((List)m.get(IN_FILTERS));
 if (inFilters == null) {
 inFilters = new ArrayList();
+m.put(IN_FILTERS, inFilters);
 }
 inFilters.add(filter);
-m.put(IN_FILTERS, inFilters);
 }
 
 

cxf git commit: Minor update to the attachment utils

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 54aedd70f -> de11ac7d5


Minor update to the attachment utils


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

Branch: refs/heads/master
Commit: de11ac7d568ec69dccd103dd3222a0341a3a235d
Parents: 54aedd7
Author: Sergey Beryozkin 
Authored: Fri May 12 11:54:18 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri May 12 11:54:18 2017 +0100

--
 .../org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/de11ac7d/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
index e2f9f6b..68793fe 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
@@ -63,9 +63,9 @@ public final class AttachmentUtils {
 List outFilters = 
CastUtils.cast((List)m.get(OUT_FILTERS));
 if (outFilters == null) {
 outFilters = new ArrayList();
+m.put(OUT_FILTERS, outFilters);
 }
 outFilters.add(filter);
-m.put(OUT_FILTERS, outFilters);
 }
 
 public static void addMultipartInFilter(MultipartInputFilter filter) {
@@ -73,9 +73,9 @@ public final class AttachmentUtils {
 List inFilters = 
CastUtils.cast((List)m.get(IN_FILTERS));
 if (inFilters == null) {
 inFilters = new ArrayList();
+m.put(IN_FILTERS, inFilters);
 }
 inFilters.add(filter);
-m.put(IN_FILTERS, inFilters);
 }
 
 

svn commit: r1012117 - in /websites/production/cxf/content: cache/docs.pageCache docs/jax-rs-multiparts.html

[buildbot]

Author: buildbot
Date: Fri May 12 10:47:37 2017
New Revision: 1012117

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/jax-rs-multiparts.html

Modified: websites/production/cxf/content/cache/docs.pageCache
==
Binary files - no diff available.

Modified: websites/production/cxf/content/docs/jax-rs-multiparts.html
==
--- websites/production/cxf/content/docs/jax-rs-multiparts.html (original)
+++ websites/production/cxf/content/docs/jax-rs-multiparts.html Fri May 12 
10:47:37 2017
@@ -117,17 +117,20 @@ Apache CXF -- JAX-RS Multiparts
  


-JAX-RS : Support 
for 
Multiparts/*
 
 
 
 
 JAX-RS : Support for Multiparts
 
-/*]]>*/
+
+/**/
 Reading attachments
 Multipart 
annotation and Optional attachments
 Writing 
attachmentsUploading files with 
Client APIReading large attachments
 Forms and multipartsContent-Disposition 
UTF-8 file names
-XOP 
supportNote about Struts
+XOP 
supportMultipart FiltersNote about 
Struts
 Reading 
attachmentsIndividual parts can be mapped to StreamSource, InputStream, 
DataSource or custom Java types for which message body readers are 
available.For example:
 @POST
 @Path("/books/jaxbjson")
@@ -305,7 +308,7 @@ public Response addBookJaxbJsonForm(@Mul
 public Response addBookFilesForm(@Multipart("owner") String name,
  @Multipart("files") ListBook books) 
{} 
 
-If you need to know the names of the individual file parts 
embedded in a "files" outer part (such as "book1" and "book2"), then please use 
ListAttachment instead. It is currently not possible to use a Multipart 
annotation to refer to such inner parts but you can easily get the names from 
the individual Attachment instances representing these inner parts.Note 
that it is only the last request which has been structured according to the 
recommendation on how to upload multiple files but it is more complex than the 
other simpler requests linked to in this section.Please note that using 
JAX-RS FormParams is recommended for dealing with plain 
application/www-url-encoded submissions consisting of name/value pairs 
only.Content-Disposition 
UTF-8 file namesStarting from CXF 3.0.4 it is possible to specify a 
Content-Disposition file names in a UTF-8 format, using a "filename*" Content-Di
 sposition extension parameter as opposed to the "filename" one.Please 
see https://tools.ietf.org/html/rfc6266; rel="nofollow">RFC 6266 and https://git-wip-us.apache.org/repos/asf?p=cxf.git;a=blob;f=core/src/test/java/org/apache/cxf/attachment/AttachmentUtilTest.java;h=6eeedd42e965f4df8390ee6077222b34e1520732;hb=HEAD;>this
 unit test for more information.XOP supportCXF JAXRS clients and 
endpoints can support http://www.w3.org/TR/xop10/; rel="nofollow">XML-binary Optimized 
Packaging (XOP). What it means at a practical level is 
that a JAXB bean containing binary data is serialized using a multipart 
packaging, with the root part containing non-binary data only but also linking 
to co-located parts containing the actual binary payloads. Next it is 
deserialized into a JAX
 B bean on the server side.If you'd like to experiment with XOP then you 
need to set an "mtom-enabled" property on CXF jaxrs endpoints and clients. Please see http://svn.apache.org/repos/asf/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java;>JAXRSMultipartTest
 (testXopWebClient) and http://svn.apache.org/repos/asf/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java;>MultipartStore
 (addBookXop) for more details.Note about StrutsIf you are using 
CXF and http://struts.apache.org/2.2.1/index.html;>Struts2 within the same 
application and expecting CXF to process multipart/form-data payloads then you 
need to make sure Struts2 dispatcher is not consuming the request input 
stream.One option
  is to let Struts2 handle URIs matching some specific patterns only, for 
example:
+If you need to know the names of the individual file parts 
embedded in a "files" outer part (such as "book1" and "book2"), then please use 
ListAttachment instead. It is currently not possible to use a Multipart 
annotation to refer to such inner parts but you can easily get the names from 
the individual Attachment 

cxf git commit: [CXF-7368] Ignoring some well known types

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 6c0621385 -> 87de3b013


[CXF-7368] Ignoring some well known types


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

Branch: refs/heads/3.0.x-fixes
Commit: 87de3b01377060f5a11575b44c78e5a08c736d93
Parents: 6c06213
Author: Sergey Beryozkin 
Authored: Fri May 12 10:59:09 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri May 12 11:06:37 2017 +0100

--
 .../apache/cxf/jaxrs/provider/AbstractJAXBProvider.java  | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/87de3b01/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
index 64a1e07..144682d 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
@@ -39,6 +39,7 @@ import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.StreamingOutput;
 import javax.ws.rs.ext.ContextResolver;
 import javax.ws.rs.ext.MessageBodyReader;
 import javax.ws.rs.ext.MessageBodyWriter;
@@ -89,8 +90,10 @@ public abstract class AbstractJAXBProvider extends 
AbstractConfigurableProvid
 protected static final String NS_MAPPER_PROPERTY_RI_INT = 
"com.sun.xml.internal.bind.namespacePrefixMapper";
 private static final String JAXB_DEFAULT_NAMESPACE = "##default";
 private static final String JAXB_DEFAULT_NAME = "##default";
-
-
+private static final Set UNSUPPORTED_CLASSES = 
+new HashSet(Arrays.asList(InputStream.class,
+OutputStream.class,
+StreamingOutput.class));
 protected Set collectionContextClasses = new HashSet();
 
 protected Map jaxbElementClassMap = Collections.emptyMap();
@@ -331,7 +334,6 @@ public abstract class AbstractJAXBProvider extends 
AbstractConfigurableProvid
 return false;
 }
 }
-
 return marshalAsJaxbElement && (!xmlTypeAsJaxbElementOnly || 
isXmlType(type)) 
 || isSupported(type, genericType, anns);
 }
@@ -562,6 +564,9 @@ public abstract class AbstractJAXBProvider extends 
AbstractConfigurableProvid
 || isSkipJaxbChecks()) {
 return true;
 }
+if (UNSUPPORTED_CLASSES.contains(type)) {
+return false;
+}
 return isXmlRoot(type)
 || JAXBElement.class.isAssignableFrom(type)
 || objectFactoryOrIndexAvailable(type)

cxf git commit: [CXF-7368] Ignoring some well known types

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes e684317c7 -> e6d575029


[CXF-7368] Ignoring some well known types


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

Branch: refs/heads/3.1.x-fixes
Commit: e6d5750290c6748e6f878fb0891fa8be54a556ed
Parents: e684317
Author: Sergey Beryozkin 
Authored: Fri May 12 10:59:09 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri May 12 11:05:43 2017 +0100

--
 .../apache/cxf/jaxrs/provider/AbstractJAXBProvider.java  | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e6d57502/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
index 9fe46dd..1402609 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
@@ -39,6 +39,7 @@ import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.StreamingOutput;
 import javax.ws.rs.ext.ContextResolver;
 import javax.ws.rs.ext.MessageBodyReader;
 import javax.ws.rs.ext.MessageBodyWriter;
@@ -89,8 +90,10 @@ public abstract class AbstractJAXBProvider extends 
AbstractConfigurableProvid
 protected static final String NS_MAPPER_PROPERTY_RI_INT = 
"com.sun.xml.internal.bind.namespacePrefixMapper";
 private static final String JAXB_DEFAULT_NAMESPACE = "##default";
 private static final String JAXB_DEFAULT_NAME = "##default";
-
-
+private static final Set UNSUPPORTED_CLASSES = 
+new HashSet(Arrays.asList(InputStream.class,
+OutputStream.class,
+StreamingOutput.class));
 protected Set collectionContextClasses = new HashSet();
 
 protected Map jaxbElementClassMap = Collections.emptyMap();
@@ -331,7 +334,6 @@ public abstract class AbstractJAXBProvider extends 
AbstractConfigurableProvid
 return false;
 }
 }
-
 return marshalAsJaxbElement && (!xmlTypeAsJaxbElementOnly || 
isXmlType(type)) 
 || isSupported(type, genericType, anns);
 }
@@ -562,6 +564,9 @@ public abstract class AbstractJAXBProvider extends 
AbstractConfigurableProvid
 || isSkipJaxbChecks()) {
 return true;
 }
+if (UNSUPPORTED_CLASSES.contains(type)) {
+return false;
+}
 return isXmlRoot(type)
 || JAXBElement.class.isAssignableFrom(type)
 || objectFactoryOrIndexAvailable(type)

cxf git commit: [CXF-7368] Ignoring some well known types

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 8a0212895 -> 54aedd70f


[CXF-7368] Ignoring some well known types


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

Branch: refs/heads/master
Commit: 54aedd70f2e81702acab2682c520fe04c3ad1dc3
Parents: 8a02128
Author: Sergey Beryozkin 
Authored: Fri May 12 10:59:09 2017 +0100
Committer: Sergey Beryozkin 
Committed: Fri May 12 10:59:09 2017 +0100

--
 .../apache/cxf/jaxrs/provider/AbstractJAXBProvider.java  | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/54aedd70/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
index 5871cd2..5edc28d 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
@@ -39,6 +39,7 @@ import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.StreamingOutput;
 import javax.ws.rs.ext.ContextResolver;
 import javax.ws.rs.ext.MessageBodyReader;
 import javax.ws.rs.ext.MessageBodyWriter;
@@ -89,8 +90,10 @@ public abstract class AbstractJAXBProvider extends 
AbstractConfigurableProvid
 protected static final String NS_MAPPER_PROPERTY_RI_INT = 
"com.sun.xml.internal.bind.namespacePrefixMapper";
 private static final String JAXB_DEFAULT_NAMESPACE = "##default";
 private static final String JAXB_DEFAULT_NAME = "##default";
-
-
+private static final Set UNSUPPORTED_CLASSES = 
+new HashSet(Arrays.asList(InputStream.class,
+OutputStream.class,
+StreamingOutput.class));
 protected Set collectionContextClasses = new HashSet();
 
 protected Map jaxbElementClassMap = Collections.emptyMap();
@@ -331,7 +334,6 @@ public abstract class AbstractJAXBProvider extends 
AbstractConfigurableProvid
 return false;
 }
 }
-
 return marshalAsJaxbElement && (!xmlTypeAsJaxbElementOnly || 
isXmlType(type))
 || isSupported(type, genericType, anns);
 }
@@ -562,6 +564,9 @@ public abstract class AbstractJAXBProvider extends 
AbstractConfigurableProvid
 || isSkipJaxbChecks()) {
 return true;
 }
+if (UNSUPPORTED_CLASSES.contains(type)) {
+return false;
+}
 return isXmlRoot(type)
 || JAXBElement.class.isAssignableFrom(type)
 || objectFactoryOrIndexAvailable(type)

cxf-fediz git commit: Adding commons lang NOTICE part

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.2.x-fixes 60ba0f409 -> f0745d674


Adding commons lang NOTICE part


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

Branch: refs/heads/1.2.x-fixes
Commit: f0745d674e2cefec73da4c9ce53423f2cddd69cb
Parents: 60ba0f4
Author: Colm O hEigeartaigh 
Authored: Fri May 12 10:50:37 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 10:51:12 2017 +0100

--
 apache-fediz/src/main/release/NOTICE | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/f0745d67/apache-fediz/src/main/release/NOTICE
--
diff --git a/apache-fediz/src/main/release/NOTICE 
b/apache-fediz/src/main/release/NOTICE
index bf3e438..6801038 100644
--- a/apache-fediz/src/main/release/NOTICE
+++ b/apache-fediz/src/main/release/NOTICE
@@ -11,8 +11,10 @@ Project (http://www.springframework.org/security).
 This product includes software developed by the Spring LDAP
 Project (http://www.springframework.org/ldap).
 
+This product includes software from the Spring Framework, under the Apache
+License 2.0
+
 Portions of the included XmlSchema library are Copyright 2006 International 
Business Machines Corp.
 
 Portions of the included XmlSchema library are Copyright (C) World Wide Web
 Consortium 2006, 2007 and licensed under the three-part BSD license.
-

cxf-fediz git commit: Adding commons lang NOTICE part

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.3.x-fixes 4f0e7bbd8 -> 7bd40fece


Adding commons lang NOTICE part


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

Branch: refs/heads/1.3.x-fixes
Commit: 7bd40fece030f7c8884578beb1d6ae72f9742885
Parents: 4f0e7bb
Author: Colm O hEigeartaigh 
Authored: Fri May 12 10:50:37 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 10:51:00 2017 +0100

--
 apache-fediz/src/main/release/NOTICE | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7bd40fec/apache-fediz/src/main/release/NOTICE
--
diff --git a/apache-fediz/src/main/release/NOTICE 
b/apache-fediz/src/main/release/NOTICE
index bf3e438..6801038 100644
--- a/apache-fediz/src/main/release/NOTICE
+++ b/apache-fediz/src/main/release/NOTICE
@@ -11,8 +11,10 @@ Project (http://www.springframework.org/security).
 This product includes software developed by the Spring LDAP
 Project (http://www.springframework.org/ldap).
 
+This product includes software from the Spring Framework, under the Apache
+License 2.0
+
 Portions of the included XmlSchema library are Copyright 2006 International 
Business Machines Corp.
 
 Portions of the included XmlSchema library are Copyright (C) World Wide Web
 Consortium 2006, 2007 and licensed under the three-part BSD license.
-

cxf-fediz git commit: Adding commons lang NOTICE part

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/master c39d03451 -> 76652433d


Adding commons lang NOTICE part


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

Branch: refs/heads/master
Commit: 76652433d35bdd4bc7490f2861de24c962e7cc7a
Parents: c39d034
Author: Colm O hEigeartaigh 
Authored: Fri May 12 10:50:37 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 10:50:37 2017 +0100

--
 apache-fediz/src/main/release/NOTICE | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/76652433/apache-fediz/src/main/release/NOTICE
--
diff --git a/apache-fediz/src/main/release/NOTICE 
b/apache-fediz/src/main/release/NOTICE
index bf3e438..6801038 100644
--- a/apache-fediz/src/main/release/NOTICE
+++ b/apache-fediz/src/main/release/NOTICE
@@ -11,8 +11,10 @@ Project (http://www.springframework.org/security).
 This product includes software developed by the Spring LDAP
 Project (http://www.springframework.org/ldap).
 
+This product includes software from the Spring Framework, under the Apache
+License 2.0
+
 Portions of the included XmlSchema library are Copyright 2006 International 
Business Machines Corp.
 
 Portions of the included XmlSchema library are Copyright (C) World Wide Web
 Consortium 2006, 2007 and licensed under the three-part BSD license.
-

cxf git commit: Updating asm copyright notice

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 82bb06eec -> 6c0621385


Updating asm copyright notice


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

Branch: refs/heads/3.0.x-fixes
Commit: 6c0621385e3117b3aae288c8611312685c1f11e9
Parents: 82bb06e
Author: Colm O hEigeartaigh 
Authored: Fri May 12 10:36:11 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 10:37:37 2017 +0100

--
 distribution/src/main/release/licenses/asm.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6c062138/distribution/src/main/release/licenses/asm.txt
--
diff --git a/distribution/src/main/release/licenses/asm.txt 
b/distribution/src/main/release/licenses/asm.txt
index 6eff43a..d551444 100644
--- a/distribution/src/main/release/licenses/asm.txt
+++ b/distribution/src/main/release/licenses/asm.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2000-2005 INRIA, France Telecom
+Copyright (c) 2000-2011 INRIA, France Telecom
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

cxf git commit: Updating asm copyright notice

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master f5b26b191 -> 8a0212895


Updating asm copyright notice


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

Branch: refs/heads/master
Commit: 8a02128950eefb6c23713e49240f74831aa9f8b3
Parents: f5b26b1
Author: Colm O hEigeartaigh 
Authored: Fri May 12 10:36:11 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 10:36:11 2017 +0100

--
 distribution/src/main/release/licenses/asm.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8a021289/distribution/src/main/release/licenses/asm.txt
--
diff --git a/distribution/src/main/release/licenses/asm.txt 
b/distribution/src/main/release/licenses/asm.txt
index 6eff43a..d551444 100644
--- a/distribution/src/main/release/licenses/asm.txt
+++ b/distribution/src/main/release/licenses/asm.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2000-2005 INRIA, France Telecom
+Copyright (c) 2000-2011 INRIA, France Telecom
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

cxf-fediz git commit: Adding more licenses

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.2.x-fixes 25e29260c -> 60ba0f409


Adding more licenses


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

Branch: refs/heads/1.2.x-fixes
Commit: 60ba0f40986ed2052524eafdc878ed7f656bd069
Parents: 25e2926
Author: Colm O hEigeartaigh 
Authored: Fri May 12 10:35:20 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 10:35:53 2017 +0100

--
 apache-fediz/src/main/release/LICENSE   |  12 ++
 .../src/main/release/licenses/LICENSE-asm.txt   |  30 +++
 .../main/release/licenses/LICENSE-wsdl4j.txt| 213 +++
 3 files changed, 255 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/60ba0f40/apache-fediz/src/main/release/LICENSE
--
diff --git a/apache-fediz/src/main/release/LICENSE 
b/apache-fediz/src/main/release/LICENSE
index 71ad807..ec402f0 100644
--- a/apache-fediz/src/main/release/LICENSE
+++ b/apache-fediz/src/main/release/LICENSE
@@ -222,3 +222,15 @@ This project bundles the javax.annotation API (CDDL 1.0 + 
GPLv2 with classpath e
 This project bundles the javax.ws.rs-api (CDDL 1.1 + GPLv2 with classpath 
exception license)
  - See licenses/LICENSE-cddl-gpl-11.txt
 
+This project bundles ASM core (BSD license):
+ - See licenses/LICENSE-asm.txt
+
+This project bundles WSDL4J (CPL license):
+ - See licenses/LICENSE-wsdl4j.txt
+
+This project bundles JAXB core (CDDL 1.1 + GPLv2 with classpath exception 
license)
+ - See licenses/LICENSE-cddl-gpl-11.txt
+
+This project bundles the Sun JAXB Reference Implementation Runtime (CDDL 1.1 + 
GPLv2 with classpath exception license)
+ - See licenses/LICENSE-cddl-gpl-11.txt
+

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/60ba0f40/apache-fediz/src/main/release/licenses/LICENSE-asm.txt
--
diff --git a/apache-fediz/src/main/release/licenses/LICENSE-asm.txt 
b/apache-fediz/src/main/release/licenses/LICENSE-asm.txt
new file mode 100644
index 000..d551444
--- /dev/null
+++ b/apache-fediz/src/main/release/licenses/LICENSE-asm.txt
@@ -0,0 +1,30 @@
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/60ba0f40/apache-fediz/src/main/release/licenses/LICENSE-wsdl4j.txt
--
diff --git a/apache-fediz/src/main/release/licenses/LICENSE-wsdl4j.txt 
b/apache-fediz/src/main/release/licenses/LICENSE-wsdl4j.txt
new file mode 100644
index 000..c9990a7
--- /dev/null
+++ b/apache-fediz/src/main/release/licenses/LICENSE-wsdl4j.txt
@@ -0,0 +1,213 @@
+Common Public License Version 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and
+documentation distributed under this Agreement, and
+
+   

cxf-fediz git commit: Adding more licenses

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.3.x-fixes e66340ea5 -> 4f0e7bbd8


Adding more licenses


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

Branch: refs/heads/1.3.x-fixes
Commit: 4f0e7bbd8106597344f270f9c84ecad639bdd2bf
Parents: e66340e
Author: Colm O hEigeartaigh 
Authored: Fri May 12 10:35:20 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 10:35:40 2017 +0100

--
 apache-fediz/src/main/release/LICENSE   |  12 ++
 .../src/main/release/licenses/LICENSE-asm.txt   |  30 +++
 .../main/release/licenses/LICENSE-wsdl4j.txt| 213 +++
 3 files changed, 255 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/4f0e7bbd/apache-fediz/src/main/release/LICENSE
--
diff --git a/apache-fediz/src/main/release/LICENSE 
b/apache-fediz/src/main/release/LICENSE
index 71ad807..ec402f0 100644
--- a/apache-fediz/src/main/release/LICENSE
+++ b/apache-fediz/src/main/release/LICENSE
@@ -222,3 +222,15 @@ This project bundles the javax.annotation API (CDDL 1.0 + 
GPLv2 with classpath e
 This project bundles the javax.ws.rs-api (CDDL 1.1 + GPLv2 with classpath 
exception license)
  - See licenses/LICENSE-cddl-gpl-11.txt
 
+This project bundles ASM core (BSD license):
+ - See licenses/LICENSE-asm.txt
+
+This project bundles WSDL4J (CPL license):
+ - See licenses/LICENSE-wsdl4j.txt
+
+This project bundles JAXB core (CDDL 1.1 + GPLv2 with classpath exception 
license)
+ - See licenses/LICENSE-cddl-gpl-11.txt
+
+This project bundles the Sun JAXB Reference Implementation Runtime (CDDL 1.1 + 
GPLv2 with classpath exception license)
+ - See licenses/LICENSE-cddl-gpl-11.txt
+

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/4f0e7bbd/apache-fediz/src/main/release/licenses/LICENSE-asm.txt
--
diff --git a/apache-fediz/src/main/release/licenses/LICENSE-asm.txt 
b/apache-fediz/src/main/release/licenses/LICENSE-asm.txt
new file mode 100644
index 000..d551444
--- /dev/null
+++ b/apache-fediz/src/main/release/licenses/LICENSE-asm.txt
@@ -0,0 +1,30 @@
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/4f0e7bbd/apache-fediz/src/main/release/licenses/LICENSE-wsdl4j.txt
--
diff --git a/apache-fediz/src/main/release/licenses/LICENSE-wsdl4j.txt 
b/apache-fediz/src/main/release/licenses/LICENSE-wsdl4j.txt
new file mode 100644
index 000..c9990a7
--- /dev/null
+++ b/apache-fediz/src/main/release/licenses/LICENSE-wsdl4j.txt
@@ -0,0 +1,213 @@
+Common Public License Version 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and
+documentation distributed under this Agreement, and
+
+   

cxf-fediz git commit: Adding more licenses

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 83699efd4 -> c39d03451


Adding more licenses


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

Branch: refs/heads/master
Commit: c39d0345162d85a04a26066fcc7e8e98e9c299c6
Parents: 83699ef
Author: Colm O hEigeartaigh 
Authored: Fri May 12 10:35:20 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri May 12 10:35:20 2017 +0100

--
 apache-fediz/src/main/release/LICENSE   |  12 ++
 .../src/main/release/licenses/LICENSE-asm.txt   |  30 +++
 .../main/release/licenses/LICENSE-wsdl4j.txt| 213 +++
 3 files changed, 255 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c39d0345/apache-fediz/src/main/release/LICENSE
--
diff --git a/apache-fediz/src/main/release/LICENSE 
b/apache-fediz/src/main/release/LICENSE
index 71ad807..ec402f0 100644
--- a/apache-fediz/src/main/release/LICENSE
+++ b/apache-fediz/src/main/release/LICENSE
@@ -222,3 +222,15 @@ This project bundles the javax.annotation API (CDDL 1.0 + 
GPLv2 with classpath e
 This project bundles the javax.ws.rs-api (CDDL 1.1 + GPLv2 with classpath 
exception license)
  - See licenses/LICENSE-cddl-gpl-11.txt
 
+This project bundles ASM core (BSD license):
+ - See licenses/LICENSE-asm.txt
+
+This project bundles WSDL4J (CPL license):
+ - See licenses/LICENSE-wsdl4j.txt
+
+This project bundles JAXB core (CDDL 1.1 + GPLv2 with classpath exception 
license)
+ - See licenses/LICENSE-cddl-gpl-11.txt
+
+This project bundles the Sun JAXB Reference Implementation Runtime (CDDL 1.1 + 
GPLv2 with classpath exception license)
+ - See licenses/LICENSE-cddl-gpl-11.txt
+

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c39d0345/apache-fediz/src/main/release/licenses/LICENSE-asm.txt
--
diff --git a/apache-fediz/src/main/release/licenses/LICENSE-asm.txt 
b/apache-fediz/src/main/release/licenses/LICENSE-asm.txt
new file mode 100644
index 000..d551444
--- /dev/null
+++ b/apache-fediz/src/main/release/licenses/LICENSE-asm.txt
@@ -0,0 +1,30 @@
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c39d0345/apache-fediz/src/main/release/licenses/LICENSE-wsdl4j.txt
--
diff --git a/apache-fediz/src/main/release/licenses/LICENSE-wsdl4j.txt 
b/apache-fediz/src/main/release/licenses/LICENSE-wsdl4j.txt
new file mode 100644
index 000..c9990a7
--- /dev/null
+++ b/apache-fediz/src/main/release/licenses/LICENSE-wsdl4j.txt
@@ -0,0 +1,213 @@
+Common Public License Version 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and
+documentation distributed under this Agreement, and
+
+b) in 

cxf git commit: [CXF-7316] Avoid NPE when not using swagger2Serializers (swagger-jaxrs 1.5.13)

[ilgrosso]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes df56ca9fa -> b510792d6


[CXF-7316] Avoid NPE when not using swagger2Serializers (swagger-jaxrs 1.5.13)


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

Branch: refs/heads/3.1.x-fixes
Commit: b510792d63c135c2392bd10ac68f1bee7f21edb0
Parents: df56ca9
Author: Francesco Chicchiriccò 
Authored: Fri May 12 08:20:43 2017 +0200
Committer: Francesco Chicchiriccò 
Committed: Fri May 12 08:20:43 2017 +0200

--
 .../main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java| 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b510792d/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index d5813b0..350e28f 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -209,8 +209,6 @@ public class Swagger2Feature extends AbstractSwaggerFeature 
{
 swagger.setSecurityDefinitions(securityDefinitions);
 }
 
-swagger2Serializers.setBeanConfig(beanConfig);
-
 if (customizer == null) {
 swagger2Serializers.setBeanConfig(beanConfig);
 } else {