svn commit: r21331 - in /release/cxf/fediz: 1.2.4/ 1.4.0/ 1.4.1/ 1.4.1/fediz-1.4.1-source-release.zip 1.4.1/fediz-1.4.1-source-release.zip.asc 1.4.1/fediz-1.4.1-source-release.zip.md5 1.4.1/fediz-1.4.

2017-08-28 Thread coheigea
Author: coheigea
Date: Mon Aug 28 17:19:30 2017
New Revision: 21331

Log:
Adding 1.4.1 release

Added:
release/cxf/fediz/1.4.1/
release/cxf/fediz/1.4.1/fediz-1.4.1-source-release.zip   (with props)
release/cxf/fediz/1.4.1/fediz-1.4.1-source-release.zip.asc
release/cxf/fediz/1.4.1/fediz-1.4.1-source-release.zip.md5
release/cxf/fediz/1.4.1/fediz-1.4.1-source-release.zip.sha1
Removed:
release/cxf/fediz/1.2.4/
release/cxf/fediz/1.4.0/

Added: release/cxf/fediz/1.4.1/fediz-1.4.1-source-release.zip
==
Binary file - no diff available.

Propchange: release/cxf/fediz/1.4.1/fediz-1.4.1-source-release.zip
--
svn:mime-type = application/octet-stream

Added: release/cxf/fediz/1.4.1/fediz-1.4.1-source-release.zip.asc
==
--- release/cxf/fediz/1.4.1/fediz-1.4.1-source-release.zip.asc (added)
+++ release/cxf/fediz/1.4.1/fediz-1.4.1-source-release.zip.asc Mon Aug 28 
17:19:30 2017
@@ -0,0 +1,10 @@
+-BEGIN PGP SIGNATURE-
+
+iQEcBAABCAAGBQJZkcn7AAoJEGe/gLEK1TmDRRYH/0+/M7D6ihnQaHugmxFWsZIy
+gDVbIVlcBrOM4xhSq9qrDoPNGspZWw1EELSOZJS1t3kKDSFmDaohUH3swHED7GKK
+0v6oV8nO/a08UktLwX/JhJUj/G+NvGlEjTadEwfVjV1M9//jqIYZFln6Jxac5sb0
+Ym2tn0G2uQ2Ty4KLiIQn03iFXXT93b6i7ZQtm/8xRwPu9SB0hHxZ24YCSR8SxUEQ
+LcoLdIBX01pjUd+XgRsUIVM3NR9KLKExO58CNG2f2UgUW+wv5EnPqliNopDZMpR6
+FseEtJZlSFRtDGby/v/DeL8W9LW0pIMbqtQ582yGrHDCeaj+9hpyDMhQS8FLfug=
+=F2W8
+-END PGP SIGNATURE-

Added: release/cxf/fediz/1.4.1/fediz-1.4.1-source-release.zip.md5
==
--- release/cxf/fediz/1.4.1/fediz-1.4.1-source-release.zip.md5 (added)
+++ release/cxf/fediz/1.4.1/fediz-1.4.1-source-release.zip.md5 Mon Aug 28 
17:19:30 2017
@@ -0,0 +1 @@
+a3547c252d2abbafdd621104213e2d7e
\ No newline at end of file

Added: release/cxf/fediz/1.4.1/fediz-1.4.1-source-release.zip.sha1
==
--- release/cxf/fediz/1.4.1/fediz-1.4.1-source-release.zip.sha1 (added)
+++ release/cxf/fediz/1.4.1/fediz-1.4.1-source-release.zip.sha1 Mon Aug 28 
17:19:30 2017
@@ -0,0 +1 @@
+008bb8bec0d6034fa4aee8d044dc086b9f2ae748
\ No newline at end of file




[2/2] cxf git commit: Picking up Santuario release

2017-08-28 Thread coheigea
Picking up Santuario release

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

Branch: refs/heads/3.0.x-fixes
Commit: 1633ef1ca44d6f3e24911056d94da1440181c2b7
Parents: c091b35
Author: Colm O hEigeartaigh 
Authored: Mon Aug 28 17:55:22 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Aug 28 17:57:17 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/1633ef1c/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 30c44e3..f84c534 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -197,7 +197,7 @@
 1.3.23_2
 1.7.6
 1.6.3_1
-2.0.8
+2.0.9
 1.7R2_3
 1.2_5
 2.11.0_1



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

2017-08-28 Thread coheigea
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes c091b35b1 -> 0d43e2347


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

Branch: refs/heads/3.0.x-fixes
Commit: 0d43e2347ccab27ae99219338ea86b7f19a8073d
Parents: 1633ef1
Author: Colm O hEigeartaigh 
Authored: Mon Aug 28 17:57:17 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Aug 28 17:57:17 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/0d43e234/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 6d2f538..7abb4a9 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1366,6 +1366,7 @@ B b4e7dffbaeae4fdf1a20d70cef51e2e44e8960bc
 B b510792d63c135c2392bd10ac68f1bee7f21edb0
 B b52157a330d9ef4daab8d2826579cb68ca171c69
 B b54fe0dfdf3c3d76df1e07fb3686d5d8a1061d48
+B b5ed22d7069bfc8f5b082f9fb61c83619f4e3845
 B b5fc90f09c6b039a54564e0825a264310453c550
 B b6018a47e19bf98ad405baf51e363eae9972f4dd
 B b60702df6f4f8a651395999ee7cc583bb89589e3



[2/2] cxf git commit: Picking up Santuario release

2017-08-28 Thread coheigea
Picking up Santuario release

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

Branch: refs/heads/3.1.x-fixes
Commit: 7cee8bc55d530276aedb185bdd38d244f0cd
Parents: 056806d
Author: Colm O hEigeartaigh 
Authored: Mon Aug 28 17:55:22 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Aug 28 17:56:26 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/7cee8bc5/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 12e6660..eee16a6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -203,7 +203,7 @@
 1.3.23_2
 1.7.6
 1.6.3_1
-2.0.8
+2.0.9
 1.7R2_3
 1.2_5
 2.11.0_1



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

2017-08-28 Thread coheigea
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 056806d5e -> b5ed22d70


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

Branch: refs/heads/3.1.x-fixes
Commit: b5ed22d7069bfc8f5b082f9fb61c83619f4e3845
Parents: 7cee8bc
Author: Colm O hEigeartaigh 
Authored: Mon Aug 28 17:56:26 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Aug 28 17:56:26 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/b5ed22d7/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 036ed61..9275107 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -678,6 +678,7 @@ M a42362e397b84d335015f7f9aa07b4f0bfb49260
 M a61b4b82bea43ce695c4f51eb7cb3e9866dfae9d
 M a644c5d06c0bae321e2c669efa0cecf3abdd944d
 M a6d18c83af6584cd9b5ec1215c9b3ef77906cd19
+M a6eb7eb7597d7f24246f8cde2fa7c0ad1ed33d1d
 M a71508214a7682c6a569075b1395f387c31be63b
 M a719adccae8500f2d7e7140a9f4cd26e20775818
 M a7d5d525c05cf10a6ae12c25645c248d92dfac1c



cxf git commit: Picking up Santuario release

2017-08-28 Thread coheigea
Repository: cxf
Updated Branches:
  refs/heads/master 0c5d4032d -> a6eb7eb75


Picking up Santuario release


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

Branch: refs/heads/master
Commit: a6eb7eb7597d7f24246f8cde2fa7c0ad1ed33d1d
Parents: 0c5d403
Author: Colm O hEigeartaigh 
Authored: Mon Aug 28 17:55:22 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Aug 28 17:55:36 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/a6eb7eb7/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 8d8e77b..223e02d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -207,7 +207,7 @@
 1.3.23_2
 1.7.6
 1.6.3_1
-2.1.0-SNAPSHOT
+2.1.0
 1.7R2_3
 1.2_5
 2.11.0_1



cxf git commit: [CXF-7487] Basic RxJava2 Observable support, Flowable to follow later

2017-08-28 Thread sergeyb
Repository: cxf
Updated Branches:
  refs/heads/master a55635031 -> 0c5d4032d


[CXF-7487] Basic RxJava2 Observable support, Flowable to follow later


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

Branch: refs/heads/master
Commit: 0c5d4032d3ba7837e662abc192a27ae2814b21c9
Parents: a556350
Author: Sergey Beryozkin 
Authored: Mon Aug 28 17:36:37 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Aug 28 17:36:37 2017 +0100

--
 parent/pom.xml  |  10 +-
 rt/rs/extensions/rx/pom.xml |   6 +
 .../jaxrs/rx2/client/ObservableRxInvoker.java   | 107 +++
 .../rx2/client/ObservableRxInvokerImpl.java | 180 +++
 .../rx2/client/ObservableRxInvokerProvider.java |  45 +
 .../cxf/jaxrs/rx2/server/ObservableInvoker.java |  43 +
 systests/jaxrs/pom.xml  |   7 +-
 .../jaxrs/reactive/JAXRSObservableTest.java | 141 ---
 .../jaxrs/reactive/JAXRSRxJava2Test.java|  68 +++
 .../systest/jaxrs/reactive/JAXRSRxJavaTest.java | 141 +++
 .../jaxrs/reactive/ObservableServer.java|  79 
 .../jaxrs/reactive/ObservableService.java   | 122 -
 .../reactive/RxJava2ObservableService.java  |  43 +
 .../systest/jaxrs/reactive/RxJava2Server.java   |  73 
 .../jaxrs/reactive/RxJavaObservableService.java | 122 +
 .../systest/jaxrs/reactive/RxJavaServer.java|  79 
 16 files changed, 921 insertions(+), 345 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0c5d4032/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 424e28a..8d8e77b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -101,7 +101,8 @@
 1.2.17
 4.9.0
 2.0.14
-1.2.7
+1.3.0
+2.1.3
 
1.3
 1.0.0
 1.1.1
@@ -819,7 +820,12 @@
 
 io.reactivex
 rxjava
-${cxf.rx.java.version}
+${cxf.rxjava.version}
+
+
+io.reactivex.rxjava2
+rxjava
+${cxf.rxjava2.version}
 
 
 io.netty

http://git-wip-us.apache.org/repos/asf/cxf/blob/0c5d4032/rt/rs/extensions/rx/pom.xml
--
diff --git a/rt/rs/extensions/rx/pom.xml b/rt/rs/extensions/rx/pom.xml
index 13bf166..d6b0360 100644
--- a/rt/rs/extensions/rx/pom.xml
+++ b/rt/rs/extensions/rx/pom.xml
@@ -48,6 +48,12 @@
   true
 
 
+  io.reactivex.rxjava2
+  rxjava
+  provided
+  true
+
+
 junit
 junit
 test

http://git-wip-us.apache.org/repos/asf/cxf/blob/0c5d4032/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx2/client/ObservableRxInvoker.java
--
diff --git 
a/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx2/client/ObservableRxInvoker.java
 
b/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx2/client/ObservableRxInvoker.java
new file mode 100644
index 000..41d1ec9
--- /dev/null
+++ 
b/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx2/client/ObservableRxInvoker.java
@@ -0,0 +1,107 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.jaxrs.rx2.client;
+
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.RxInvoker;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.Response;
+
+import io.reactivex.Observable;
+
+
+@SuppressWarnings("rawtypes")
+public interface ObservableRxInvoker extends RxInvoker {
+
+@Override
+Observable get();
+
+   

[2/5] cxf git commit: Update to release jaxrs api bundle

2017-08-28 Thread dkulp
Update to release jaxrs api bundle


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

Branch: refs/heads/master
Commit: ef5812bdd9fcc7a54ce6d54824f4350fa62f099b
Parents: b54a182
Author: Daniel Kulp 
Authored: Mon Aug 28 10:23:51 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Aug 28 10:28:28 2017 -0400

--
 osgi/karaf/features/src/main/resources/features.xml | 4 ++--
 osgi/repository/pom.xml | 2 +-
 parent/pom.xml  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ef5812bd/osgi/karaf/features/src/main/resources/features.xml
--
diff --git a/osgi/karaf/features/src/main/resources/features.xml 
b/osgi/karaf/features/src/main/resources/features.xml
index 01f9487..8f815c3 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -28,7 +28,7 @@
 mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${cxf.servicemix.specs.version}
 mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${cxf.servicemix.specs.version}
 mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${cxf.servicemix.specs.version}
-mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr370-api-m5/${cxf.servicemix.specs.version}
+mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/${cxf.servicemix.specs.version}
 mvn:javax.mail/mail/${cxf.javax.mail.version}
 mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}
 mvn:com.fasterxml.woodstox/woodstox-core/${cxf.woodstox.core.version}
@@ -272,7 +272,7 @@
 
 
 
-mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr370-api-m5/${cxf.servicemix.specs.version}
+mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/${cxf.servicemix.specs.version}
 mvn:javax.annotation/javax.annotation-api/${cxf.javax.annotation-api.version}
 mvn:org.yaml/snakeyaml/1.17
 mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.version}

http://git-wip-us.apache.org/repos/asf/cxf/blob/ef5812bd/osgi/repository/pom.xml
--
diff --git a/osgi/repository/pom.xml b/osgi/repository/pom.xml
index 6a45582..45e5474 100644
--- a/osgi/repository/pom.xml
+++ b/osgi/repository/pom.xml
@@ -255,7 +255,7 @@


org.apache.servicemix.specs
-   
org.apache.servicemix.specs.jsr370-api-m1
+   
org.apache.servicemix.specs.jaxrs-api-2.1
${cxf.servicemix.specs.version}



http://git-wip-us.apache.org/repos/asf/cxf/blob/ef5812bd/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 2d2f74c..cef73a0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -199,7 +199,7 @@
 3.2.0_1
 
2.3_1
 1.5.2_2
-
2.8-SNAPSHOT
+2.9.0
 1.4.4
 2.2.11_1
 1.3.23_2



[4/5] cxf git commit: Remove jetty6 container integration that hasn't been used/built since 2.4.0

2017-08-28 Thread dkulp
Remove jetty6 container integration that hasn't been used/built since 2.4.0


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

Branch: refs/heads/master
Commit: e663a0d2d0f9d3bc391afdd9b46b6ffd6be60d47
Parents: 293dbe4
Author: Daniel Kulp 
Authored: Mon Aug 28 10:38:55 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Aug 28 10:38:55 2017 -0400

--
 systests/container-integration/jetty6/pom.xml | 127 -
 1 file changed, 127 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e663a0d2/systests/container-integration/jetty6/pom.xml
--
diff --git a/systests/container-integration/jetty6/pom.xml 
b/systests/container-integration/jetty6/pom.xml
deleted file mode 100644
index 4e3d184..000
--- a/systests/container-integration/jetty6/pom.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-4.0.0
-
-org.apache.cxf.systests
-cxf-systests-container-integration
-2.4.0-SNAPSHOT
-../pom.xml
-
-org.apache.cxf.systests
-cxf-systests-ci-jetty6
-Apache CXF Container Integration Test Jetty6
-Apache CXF Container Integration Test Jetty6
-2.4.0-SNAPSHOT
-
-
-
-org.apache.maven.plugins
-maven-surefire-plugin
-
-
-
-**/**
-
-
-
-
-org.apache.maven.plugins
-maven-dependency-plugin
-
-
-copy-war
-compile
-
-copy
-
-
-
-
-org.apache.cxf.systests
-
cxf-systests-ci-webapp
-${project.version}
-war
-true
-
${project.build.directory}
-hello.war
-
-
-
${project.build.directory}/wars
-false
-true
-
-
-
-
-
-org.apache.maven.plugins
-maven-failsafe-plugin
-2.20
-
-
-integration-test
-
-integration-test
-
-
-
-verify
-
-verify
-
-
-
-
-
-org.mortbay.jetty
-maven-jetty-plugin
-6.1.24
-
-10
-8005
-STOP
-/
-
-
-
-start-jetty
-pre-integration-test
-
-run-war
-
-
-
${project.build.directory}/hello.war
-0
-true
-
-
-
-stop-jetty
-post-integration-test
-
-stop
-
-
-
-
-
-
-



[1/5] cxf git commit: UPdate to released versions

2017-08-28 Thread dkulp
Repository: cxf
Updated Branches:
  refs/heads/master 15f904ac8 -> a55635031


UPdate to released versions


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

Branch: refs/heads/master
Commit: b54a182a6a4f720346c17813e99d47300a08812b
Parents: 15f904a
Author: Daniel Kulp 
Authored: Mon Aug 28 10:19:26 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Aug 28 10:19:26 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/b54a182a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index a979be1..214cef0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,8 +40,8 @@
 
 
 false
-3.2.2-SNAPSHOT
-3.2.0-SNAPSHOT
+3.3.0
+3.2.0
 1.8
 UTF-8
 
scp://people.apache.org/www/cxf.apache.org/maven-site



[5/5] cxf git commit: Use snapshot temporarily

2017-08-28 Thread dkulp
Use snapshot temporarily


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

Branch: refs/heads/master
Commit: a55635031f4e86124269df880bd3182b1b2dd78d
Parents: e663a0d
Author: Daniel Kulp 
Authored: Mon Aug 28 11:01:02 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Aug 28 11:01:02 2017 -0400

--
 osgi/karaf/features/src/main/resources/features.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a5563503/osgi/karaf/features/src/main/resources/features.xml
--
diff --git a/osgi/karaf/features/src/main/resources/features.xml 
b/osgi/karaf/features/src/main/resources/features.xml
index c64c1fa..9840ccd 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -28,7 +28,7 @@
 mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${cxf.servicemix.specs.version}
 mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${cxf.servicemix.specs.version}
 mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${cxf.servicemix.specs.version}
-mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/${cxf.servicemix.specs.version}
+mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/2.10-SNAPSHOT
 mvn:javax.mail/mail/${cxf.javax.mail.version}
 mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}
 mvn:com.fasterxml.woodstox/woodstox-core/${cxf.woodstox.core.version}
@@ -272,7 +272,7 @@
 
 
 
-mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/${cxf.servicemix.specs.version}
+mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/2.10-SNAPSHOT
 mvn:javax.annotation/javax.annotation-api/${cxf.javax.annotation-api.version}
 mvn:org.yaml/snakeyaml/${cxf.snakeyaml.version}
 mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.version}



[3/5] cxf git commit: Move some version numbers out of features.xml into parent pom and align with build

2017-08-28 Thread dkulp
Move some version numbers out of features.xml into parent pom and align with 
build


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

Branch: refs/heads/master
Commit: 293dbe4f76b14ecb294d58d0cba6fca85b5536c0
Parents: ef5812b
Author: Daniel Kulp 
Authored: Mon Aug 28 10:38:13 2017 -0400
Committer: Daniel Kulp 
Committed: Mon Aug 28 10:38:13 2017 -0400

--
 osgi/karaf/features/src/main/resources/features.xml | 10 +-
 parent/pom.xml  |  8 +++-
 systests/jaxrs/pom.xml  |  1 -
 3 files changed, 12 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/293dbe4f/osgi/karaf/features/src/main/resources/features.xml
--
diff --git a/osgi/karaf/features/src/main/resources/features.xml 
b/osgi/karaf/features/src/main/resources/features.xml
index 8f815c3..c64c1fa 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -169,7 +169,7 @@
 
 
 cxf-http
-jetty
+jetty
 mvn:org.apache.cxf/cxf-rt-transports-http-jetty/${project.version}
 
 cxf.http.provider;name=jetty
@@ -274,7 +274,7 @@
 
 mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/${cxf.servicemix.specs.version}
 mvn:javax.annotation/javax.annotation-api/${cxf.javax.annotation-api.version}
-mvn:org.yaml/snakeyaml/1.17
+mvn:org.yaml/snakeyaml/${cxf.snakeyaml.version}
 mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.version}
 mvn:com.fasterxml.jackson.core/jackson-annotations/${cxf.jackson.version}
 mvn:com.fasterxml.jackson.core/jackson-databind/${cxf.jackson.version}
@@ -476,9 +476,9 @@
 cxf-wsn-api
 cxf-http-provider
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_6
-mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1
-mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1
-mvn:org.apache.activemq/activemq-osgi/5.14.0
+mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${cxf.geronimo.jms.version}
+mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/${cxf.geronimo.j2ee.management.version}
+mvn:org.apache.activemq/activemq-osgi/${cxf.activemq.version}
 
mvn:org.apache.cxf.services.wsn/cxf-services-wsn-core/${project.version}
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/293dbe4f/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index cef73a0..424e28a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -147,6 +147,7 @@
 javax.servlet
 javax.servlet-api
 3.1.0
+1.17
 1.2
 
geronimo-servlet_2.5_spec
 1.2
@@ -1565,6 +1566,11 @@
 ${cxf.jackson.version}
 
 
+org.yaml
+snakeyaml
+${cxf.snakeyaml.version}
+
+
 ${cxf.asm.groupId}
 ${cxf.asm.artifactId}
 ${cxf.asm.version}
@@ -1637,7 +1643,7 @@
 
 org.apache.geronimo.specs
 geronimo-j2ee-management_1.1_spec
-1.0.1
+${cxf.geronimo.j2ee.management.version}
 
 
 org.apache.geronimo.specs

http://git-wip-us.apache.org/repos/asf/cxf/blob/293dbe4f/systests/jaxrs/pom.xml
--
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index 635cba7..b515011 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -516,7 +516,6 @@
 
org.yaml
snakeyaml
-   1.15
test
 
 



Nexus: Promotion Completed

2017-08-28 Thread Nexus Repository Manager
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.3.9 (Java 1.8.0_112; Mac OS X 10.13)""userId" = "dkulp""ip" = "71.192.49.47"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/cxf/cxf-xjc-plugin/3.2.0/cxf-xjc-plugin-3.2.0-javadoc.jar.asc(SHA1: 30c1a6084601434bfbfe68de56344b546a0907ed)/org/apache/cxf/cxf-xjc-plugin/3.2.0/cxf-xjc-plugin-3.2.0.jar.asc(SHA1: db7374423aff1c96ea495aac01eec7e57aab251e)/org/apache/cxf/cxf-xjc-plugin/3.2.0/cxf-xjc-plugin-3.2.0.jar(SHA1: 744b4b5ae9a6920b9d098f0593de889b91c17548)/org/apache/cxf/cxf-xjc-plugin/3.2.0/cxf-xjc-plugin-3.2.0-javadoc.jar(SHA1: 49e562edd1fef30fccec0abbcd23f6e606c196c8)/org/apache/cxf/cxf-xjc-plugin/3.2.0/cxf-xjc-plugin-3.2.0-sources.jar(SHA1: 20b2e79a2faec5b54276b5fb3177b8bf4a063f28)/org/apache/cxf/cxf-xjc-plugin/3.2.0/cxf-xjc-plugin-3.2.0.pom(SHA1: 90822d11cb05c0aeec805b92942e8373a8086b08)/org/apache/cxf/cxf-xjc-plugin/3.2.0/cxf-xjc-plugin-3.2.0.pom.asc(SHA1: 13a51110050929359391fd4473bf6359aea00967)/org/apache/cxf/cxf-xjc-plugin/3.2.0/cxf-xjc-plugin-3.2.0-sources.jar.asc(SHA1: b9c9b97fecab5a1423836dfb0aec6a9c80c31bf8)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.2.0/cxf-xjc-bug986-3.2.0-sources.jar(SHA1: 1ef4661c9387352f9e9a082a8d2b919e0554d47b)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.2.0/cxf-xjc-bug986-3.2.0-javadoc.jar.asc(SHA1: 23862c40a67d08058ec3bef4b9d7db4f1bb845a3)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.2.0/cxf-xjc-bug986-3.2.0.pom.asc(SHA1: a7f15a54ae3853e947a0f2d7cb5fb421b9bad19a)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.2.0/cxf-xjc-bug986-3.2.0.jar(SHA1: 6c729fd7171ed6eea7d74154881c5118a3fe9c00)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.2.0/cxf-xjc-bug986-3.2.0-sources.jar.asc(SHA1: 93b6a51af9457e75012abf0dc44bdf0a288167d8)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.2.0/cxf-xjc-bug986-3.2.0.pom(SHA1: c791d59dc4d0574ed4285b1707d297ab9029a62b)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.2.0/cxf-xjc-bug986-3.2.0-javadoc.jar(SHA1: bcca4777d720cf5c4ee06ac29258fb8466529c78)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.2.0/cxf-xjc-bug986-3.2.0.jar.asc(SHA1: 34352c452fae90cf51c53ba04fe78b849c9a99fd)/org/apache/cxf/xjcplugins/cxf-xjc-pl/3.2.0/cxf-xjc-pl-3.2.0.pom(SHA1: 8defc4a3af6f5afac3633e71a1cf4ec89d442f5a)/org/apache/cxf/xjcplugins/cxf-xjc-pl/3.2.0/cxf-xjc-pl-3.2.0-javadoc.jar.asc(SHA1: 8b437b2333b21707d39f4d68dd6f542a8353c593)/org/apache/cxf/xjcplugins/cxf-xjc-pl/3.2.0/cxf-xjc-pl-3.2.0.jar(SHA1: 5ca90d366bd3aa192c0ad1efb2ae632d3f0417f9)/org/apache/cxf/xjcplugins/cxf-xjc-pl/3.2.0/cxf-xjc-pl-3.2.0-sources.jar.asc(SHA1: ea20e1c1eb8fa76838d8c8d4d2d8d4866b403ef8)/org/apache/cxf/xjcplugins/cxf-xjc-pl/3.2.0/cxf-xjc-pl-3.2.0.jar.asc(SHA1: 401dd46695bc5e105c0a3eac1cda3ecc79d56ac8)/org/apache/cxf/xjcplugins/cxf-xjc-pl/3.2.0/cxf-xjc-pl-3.2.0-sources.jar(SHA1: 89afb0b0ead4a55f9a684405da11024fee827d2d)/org/apache/cxf/xjcplugins/cxf-xjc-pl/3.2.0/cxf-xjc-pl-3.2.0.pom.asc(SHA1: fc756eb65f4e0d93579d19a37efd4da4a2d07aa2)/org/apache/cxf/xjcplugins/cxf-xjc-pl/3.2.0/cxf-xjc-pl-3.2.0-javadoc.jar(SHA1: b6e6eb9c4ba1e243236ae22b550dda992affc924)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.2.0/cxf-xjc-bug671-3.2.0-sources.jar.asc(SHA1: 313c05a1c6fc7143b2f6780636fd3b3373d92a8f)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.2.0/cxf-xjc-bug671-3.2.0-javadoc.jar.asc(SHA1: 159c9d85a1766cc5b0f3f587419a13d56afc1bfa)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.2.0/cxf-xjc-bug671-3.2.0.jar.asc(SHA1: 90012133d81439157eb82e3cde2ecdb5d40f3f24)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.2.0/cxf-xjc-bug671-3.2.0.jar(SHA1: 545360ced83b8c32588699a4543152c64863031a)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.2.0/cxf-xjc-bug671-3.2.0.pom(SHA1: 6403ac0451af75a0db618d5ba366e38656d497aa)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.2.0/cxf-xjc-bug671-3.2.0-javadoc.jar(SHA1: 7f0d9b46bba39b06456b20936faf8f049bceee9e)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.2.0/cxf-xjc-bug671-3.2.0.pom.asc(SHA1: 1d95b12f9089ea56fbf845712aa959790af454e4)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.2.0/cxf-xjc-bug671-3.2.0-sources.jar(SHA1: dca854c95b6f186942171248a96fce719f48d095)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.2.0/cxf-xjc-boolean-3.2.0.jar.asc(SHA1: 5eb92f733592c11da304a9c9aa6d03bb7a038ccd)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.2.0/cxf-xjc-boolean-3.2.0.pom(SHA1: c7583eb34de2daa4752caf0f517ac62c2faf7dc3)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.2.0/cxf-xjc-boolean-3.2.0-javadoc.jar(SHA1: 95267db4d6531c8a70c355cf80b16b2bb14cef06)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.2.0/cxf-xjc-boolean-3.2.0.jar(SHA1: 7d61ac23ecefd343389c24eae4b7146c160f8b1d)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.2.0/cxf-xjc-boolean-3.2.0-javadoc.jar.asc(SHA1: b589b916b13ad811eefa4ef9408ad47f800d226d)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.2.0/cxf-xjc-boolean-3.2.0-sources.jar(SHA1: 4bfaf3155a67c8e9201f8d1a4aa744820dcfe352)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.2.0/cxf-xjc-boolean-3.2.0-sources.jar.asc(SHA1: 

Nexus: Promotion Completed

2017-08-28 Thread Nexus Repository Manager
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.3.9 (Java 1.8.0_112; Mac OS X 10.13)""userId" = "dkulp""ip" = "71.192.49.47"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/cxf/build-utils/cxf-xml2fastinfoset-test/3.3.0/cxf-xml2fastinfoset-test-3.3.0.pom(SHA1: 316cc0ffc8915105f164c5b92bc460ed22872e85)/org/apache/cxf/build-utils/cxf-xml2fastinfoset-test/3.3.0/cxf-xml2fastinfoset-test-3.3.0-sources.jar.asc(SHA1: e9b2613cb63ef5769259a18ed5fb08f7c0bddd97)/org/apache/cxf/build-utils/cxf-xml2fastinfoset-test/3.3.0/cxf-xml2fastinfoset-test-3.3.0-sources.jar(SHA1: d4fafb060e0eb796acdf845bfc344db54bef2bb3)/org/apache/cxf/build-utils/cxf-xml2fastinfoset-test/3.3.0/cxf-xml2fastinfoset-test-3.3.0.jar(SHA1: 3d8563191cb29a2de1e7eb5cc22f4c7c1a8f52c8)/org/apache/cxf/build-utils/cxf-xml2fastinfoset-test/3.3.0/cxf-xml2fastinfoset-test-3.3.0.pom.asc(SHA1: 5e7aef4e82a4e415947f54d294430aa4f83c96cb)/org/apache/cxf/build-utils/cxf-xml2fastinfoset-test/3.3.0/cxf-xml2fastinfoset-test-3.3.0.jar.asc(SHA1: 88cf60e794528abb5c7bbdc83c93a6ba9d52307b)/org/apache/cxf/build-utils/cxf-buildtools/3.3.0/cxf-buildtools-3.3.0.jar(SHA1: 104b963defe1960224b23967e5deabd1a58a150b)/org/apache/cxf/build-utils/cxf-buildtools/3.3.0/cxf-buildtools-3.3.0.pom(SHA1: a58edbc9710e937f3e18687e2e8d68f663a7fa07)/org/apache/cxf/build-utils/cxf-buildtools/3.3.0/cxf-buildtools-3.3.0-sources.jar(SHA1: e04c08762be740158720e993dacd78c633bf03b3)/org/apache/cxf/build-utils/cxf-buildtools/3.3.0/cxf-buildtools-3.3.0-javadoc.jar.asc(SHA1: da9637e2d0d23d6c5bb76166019b86c7b0bbb17d)/org/apache/cxf/build-utils/cxf-buildtools/3.3.0/cxf-buildtools-3.3.0.pom.asc(SHA1: 660147b7a8503d246ba274725d1fbe5280fda003)/org/apache/cxf/build-utils/cxf-buildtools/3.3.0/cxf-buildtools-3.3.0-sources.jar.asc(SHA1: ce01f6038ba79706e009a353faab058defe72525)/org/apache/cxf/build-utils/cxf-buildtools/3.3.0/cxf-buildtools-3.3.0.jar.asc(SHA1: d31e477d32a3985f3d89bf10269225204c3774de)/org/apache/cxf/build-utils/cxf-buildtools/3.3.0/cxf-buildtools-3.3.0-javadoc.jar(SHA1: 63cd32294606b6297eb8a2a292c08c15a85f1760)/org/apache/cxf/build-utils/cxf-build-utils/3.3.0/cxf-build-utils-3.3.0-source-release.zip(SHA1: 081e504cbc95ef9398d0c150068e02ed0a340caf)/org/apache/cxf/build-utils/cxf-build-utils/3.3.0/cxf-build-utils-3.3.0.pom(SHA1: 296f0c6416a86ff7de7d088bd397e0f918b40335)/org/apache/cxf/build-utils/cxf-build-utils/3.3.0/cxf-build-utils-3.3.0.pom.asc(SHA1: 75a871c82ea9fcfd2fd808bf1a82bc6f1e0482be)/org/apache/cxf/build-utils/cxf-build-utils/3.3.0/cxf-build-utils-3.3.0-source-release.zip.asc(SHA1: 9652febf52ce26094868b65b25222fc51c6edac4)/org/apache/cxf/build-utils/cxf-xml2fastinfoset-plugin/3.3.0/cxf-xml2fastinfoset-plugin-3.3.0-sources.jar(SHA1: e45e3636b057ecdfca46833c13a3d069c51fd0c4)/org/apache/cxf/build-utils/cxf-xml2fastinfoset-plugin/3.3.0/cxf-xml2fastinfoset-plugin-3.3.0.jar(SHA1: a08c4f210531cc0ef757da0b9a80244ca95f9c1c)/org/apache/cxf/build-utils/cxf-xml2fastinfoset-plugin/3.3.0/cxf-xml2fastinfoset-plugin-3.3.0-javadoc.jar.asc(SHA1: ffe37816ac6cb49954bb27bf3ac3244796f2b57b)/org/apache/cxf/build-utils/cxf-xml2fastinfoset-plugin/3.3.0/cxf-xml2fastinfoset-plugin-3.3.0.jar.asc(SHA1: 3f9bdce35b41981305defb23fb277bee351d2257)/org/apache/cxf/build-utils/cxf-xml2fastinfoset-plugin/3.3.0/cxf-xml2fastinfoset-plugin-3.3.0-javadoc.jar(SHA1: 77c4119dbf77aee6584801f35b0688d02b0b5a55)/org/apache/cxf/build-utils/cxf-xml2fastinfoset-plugin/3.3.0/cxf-xml2fastinfoset-plugin-3.3.0.pom.asc(SHA1: cd97fec37d5a10b92c3213e0be4df6d6b6f27dcb)/org/apache/cxf/build-utils/cxf-xml2fastinfoset-plugin/3.3.0/cxf-xml2fastinfoset-plugin-3.3.0.pom(SHA1: 249f3f5d01ab93e3e4e0ad0561bb78c903694aea)/org/apache/cxf/build-utils/cxf-xml2fastinfoset-plugin/3.3.0/cxf-xml2fastinfoset-plugin-3.3.0-sources.jar.asc(SHA1: 04b958e9764bb4df27ab302b1f39ecb8fddca788)Action performed by Daniel Kulp (dkulp)

cxf-fediz git commit: Adding a name claim hint to the logout token

2017-08-28 Thread sergeyb
Repository: cxf-fediz
Updated Branches:
  refs/heads/master bac2ff680 -> 8bd1906e4


Adding a name claim hint to the logout token


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

Branch: refs/heads/master
Commit: 8bd1906e4d0f5a5a457c14e7f29ee8f533527d89
Parents: bac2ff6
Author: Sergey Beryozkin 
Authored: Mon Aug 28 11:44:22 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Aug 28 11:45:38 2017 +0100

--
 .../fediz/service/oidc/logout/BackChannelLogoutHandler.java| 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/8bd1906e/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
--
diff --git 
a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
 
b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
index e64610f..2283bc8 100644
--- 
a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
+++ 
b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
@@ -88,8 +88,12 @@ public class BackChannelLogoutHandler extends 
JoseJwtProducer {
 claims.setAudience(client.getClientId());
 claims.setIssuedAt(System.currentTimeMillis() / 1000);
 
claims.setTokenId(Base64UrlUtility.encode(CryptoUtils.generateSecureRandomBytes(16)));
-claims.setProperty(EVENTS_PROPERTY, 
+claims.setClaim(EVENTS_PROPERTY, 
 Collections.singletonMap(BACK_CHANNEL_LOGOUT_EVENT, 
Collections.emptyMap()));
+if (idToken.getName() != null) {
+claims.setClaim(IdToken.NAME_CLAIM, idToken.getName());
+}
+
 final String logoutToken = super.processJwt(new JwtToken(claims));
 executorService.submit(new Runnable() {
 



cxf-fediz git commit: Adding a name claim hint to the logout token

2017-08-28 Thread sergeyb
Repository: cxf-fediz
Updated Branches:
  refs/heads/1.4.x-fixes e6a60ff60 -> d2f889c17


Adding a name claim hint to the logout token


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

Branch: refs/heads/1.4.x-fixes
Commit: d2f889c177204165d834dbcbc36f70910c55ce8f
Parents: e6a60ff
Author: Sergey Beryozkin 
Authored: Mon Aug 28 11:44:22 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Aug 28 11:44:22 2017 +0100

--
 .../fediz/service/oidc/logout/BackChannelLogoutHandler.java| 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d2f889c1/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
--
diff --git 
a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
 
b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
index e64610f..2283bc8 100644
--- 
a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
+++ 
b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/BackChannelLogoutHandler.java
@@ -88,8 +88,12 @@ public class BackChannelLogoutHandler extends 
JoseJwtProducer {
 claims.setAudience(client.getClientId());
 claims.setIssuedAt(System.currentTimeMillis() / 1000);
 
claims.setTokenId(Base64UrlUtility.encode(CryptoUtils.generateSecureRandomBytes(16)));
-claims.setProperty(EVENTS_PROPERTY, 
+claims.setClaim(EVENTS_PROPERTY, 
 Collections.singletonMap(BACK_CHANNEL_LOGOUT_EVENT, 
Collections.emptyMap()));
+if (idToken.getName() != null) {
+claims.setClaim(IdToken.NAME_CLAIM, idToken.getName());
+}
+
 final String logoutToken = super.processJwt(new JwtToken(claims));
 executorService.submit(new Runnable() {