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

[deki]

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

Branch: refs/heads/3.1.x-fixes
Commit: af13152a74a53e115ee06a8bf1e5b2243a9543ed
Parents: 740a762
Author: Dennis Kieselhorst 
Authored: Mon Jul 10 20:44:08 2017 +0200
Committer: Dennis Kieselhorst 
Committed: Mon Jul 10 20:44:08 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/af13152a/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 56f8d4d..4a0c27f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -458,6 +458,7 @@ M 19121e3da243bb1516d605fd1498087efedd387c
 M 19a4d72a32f1e18bec621af403ecdf21d97453af
 M 19c72e2049bf4cd98bd9e3e09a21e555226f1e60
 M 19d8da7f0672b86dbf88a08b54a72297d0ca2d20
+M 1a45914bca678b4be3c52a8c2f2a479aae7b8347
 M 1a7411c270810507626a15d4a4cdc574d6ff62c3
 M 1afeea8bdc0ef96df1d52ea343957dc396723f8c
 M 1e57d379863d01b9330fff797c14d81a56b0b0f2
@@ -481,6 +482,7 @@ M 2f981e098ea265ab504496fbf9ce4564c894bc19
 M 3088952a6e3385ee628cf8c91340908ed3a67aa3
 M 315a6dc119f7bf0ad1f8f8ee74093327852dc365
 M 33b810d817d064fa60070fb3152b2ceb906c
+M 33eb378e47cee7d9c2ce0f7cb04cf0d5bcce4ad7
 M 34fd320f91d933233aeb364120456f4fa0f220ac
 M 366a556210a1a7b047c4b4dd8da4fc74af6bd301
 M 37ae9f2b6ed0b2f54705734122182eb2e50f36cc
@@ -514,6 +516,7 @@ M 4aaa6cc53f694e61eede9c3ef90484fe8f4f3770
 M 4b0868a8ee6f53d8543860a458821c35ec2a79a2
 M 4b23cab79851b073d9902e504081c13db31145cb
 M 4d493d461f70864aa1b5cab7bcbfbc31a31cdc01
+M 4e46cb7d8d4ccb47aeff85b5b2804728ea4b736d
 M 4e5119b3d1d807fb6885ec67ce28180beb55c360
 M 4f4ce80ba2de80219e13943cbd6edbf47234
 M 5022be0c15d90800ee983fe94b07a10a54814991
@@ -670,6 +673,7 @@ M da8ed20b1b9ade37a35ab6e62b7ae3be90b09b35
 M db1e5146e6312a4be35b0ca2644a691cb1d41a0f
 M dba09f00804cc05d943fd95d34882d6368c28edb
 M dc47b8e0dd28eece00bf87dcb8ce2efdde9441aa
+M dcb4070248666908113395b0f1c689dc1c30b493
 M dd3cb8eb84f1f17ebadb4104873faa4f17377a96
 M dd421381bcf61ead2a66311f1caf9ebdfcbf06c4
 M ded06c40ba057981e003903faa93beb94cbe11fa

[1/3] cxf git commit: [CXF-7441] Type from extended XmlAdapter isn't resolved correctly

[deki]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 7bfb4fd35 -> af13152a7


[CXF-7441] Type from extended XmlAdapter isn't resolved correctly


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

Branch: refs/heads/3.1.x-fixes
Commit: a0ce7bae7656ce3b595404ff3c93160f72bc1c26
Parents: 7bfb4fd
Author: Dennis Kieselhorst 
Authored: Mon Jul 10 20:24:17 2017 +0200
Committer: Dennis Kieselhorst 
Committed: Mon Jul 10 20:42:17 2017 +0200

--
 .../main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java  | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a0ce7bae/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java
index aba95d2..4cc91ec 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java
@@ -89,7 +89,16 @@ public final class JAXBUtils {
 if (adapter.type() != XmlJavaTypeAdapter.DEFAULT.class) {
 theType = adapter.type();
 } else {
-Type[] types = 
InjectionUtils.getActualTypes(adapter.value().getGenericSuperclass());
+Type topAdapterType = adapter.value().getGenericSuperclass();
+Class superClass = adapter.value().getSuperclass();
+while (superClass != null) {
+Class nextSuperClass = superClass.getSuperclass();
+if (nextSuperClass != null && 
!Object.class.equals(nextSuperClass)) {
+topAdapterType = superClass.getGenericSuperclass();
+}
+superClass = nextSuperClass;
+}
+Type[] types = InjectionUtils.getActualTypes(topAdapterType);
 if (types != null && types.length == 2) {
 int index = boundType ? 1 : 0;
 theType = InjectionUtils.getActualType(types[index]);

[2/3] cxf git commit: javadoc fix

[deki]

javadoc fix


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

Branch: refs/heads/3.1.x-fixes
Commit: 740a762ed1a0528ad36c443f5c897f7fd6f4c747
Parents: a0ce7ba
Author: Dennis Kieselhorst 
Authored: Mon Jul 10 20:31:38 2017 +0200
Committer: Dennis Kieselhorst 
Committed: Mon Jul 10 20:44:07 2017 +0200

--
 .../apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/740a762e/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java
--
diff --git 
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java
 
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java
index 5d2a2fd..73f39f9 100644
--- 
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java
+++ 
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java
@@ -36,7 +36,7 @@ import org.apache.http.nio.util.ExpandableBuffer;
  * an I/O reactor and a worker thread.
  * 
  * The I/O dispatch thread is expected to transfer data from the buffer to
- *   {@link ContentEncoder} by calling {@link #produceContent(ContentEncoder)}.
+ *   {@link ContentEncoder} by calling {@link #produceContent(ContentEncoder, 
IOControl)}.
  * 
  * The worker thread is expected to write data to the buffer by calling
  * {@link #write(int)}, {@link #write(byte[], int, int)} or {@link 
#writeCompleted()}

cxf git commit: javadoc fix

[deki]

Repository: cxf
Updated Branches:
  refs/heads/master 1a45914bc -> 14e35b914


javadoc fix


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

Branch: refs/heads/master
Commit: 14e35b9141378d4141f0f458e8f8d9aaf455404b
Parents: 1a45914
Author: Dennis Kieselhorst 
Authored: Mon Jul 10 20:31:38 2017 +0200
Committer: Dennis Kieselhorst 
Committed: Mon Jul 10 20:31:38 2017 +0200

--
 .../apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/14e35b91/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java
--
diff --git 
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java
 
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java
index 8f94fe8..e927fa7 100644
--- 
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java
+++ 
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/SharedOutputBuffer.java
@@ -36,7 +36,7 @@ import org.apache.http.nio.util.ExpandableBuffer;
  * an I/O reactor and a worker thread.
  * 
  * The I/O dispatch thread is expected to transfer data from the buffer to
- *   {@link ContentEncoder} by calling {@link #produceContent(ContentEncoder)}.
+ *   {@link ContentEncoder} by calling {@link #produceContent(ContentEncoder, 
IOControl)}.
  * 
  * The worker thread is expected to write data to the buffer by calling
  * {@link #write(int)}, {@link #write(byte[], int, int)} or {@link 
#writeCompleted()}

cxf git commit: [CXF-7441] Type from extended XmlAdapter isn't resolved correctly

[deki]

Repository: cxf
Updated Branches:
  refs/heads/master 7fa9a0a0a -> 1a45914bc


[CXF-7441] Type from extended XmlAdapter isn't resolved correctly


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

Branch: refs/heads/master
Commit: 1a45914bca678b4be3c52a8c2f2a479aae7b8347
Parents: 7fa9a0a
Author: Dennis Kieselhorst 
Authored: Mon Jul 10 20:24:17 2017 +0200
Committer: Dennis Kieselhorst 
Committed: Mon Jul 10 20:24:17 2017 +0200

--
 rt/frontend/jaxrs/pom.xml   |  8 +-
 .../org/apache/cxf/jaxrs/utils/JAXBUtils.java   | 11 ++-
 .../apache/cxf/jaxrs/utils/JAXBUtilsTest.java   | 96 
 3 files changed, 113 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1a45914b/rt/frontend/jaxrs/pom.xml
--
diff --git a/rt/frontend/jaxrs/pom.xml b/rt/frontend/jaxrs/pom.xml
index acdb52a..d24e003 100644
--- a/rt/frontend/jaxrs/pom.xml
+++ b/rt/frontend/jaxrs/pom.xml
@@ -173,7 +173,13 @@
 cxf-rt-frontend-simple
 
 
- 
+
+
+com.migesok
+jaxb-java-time-adapters
+1.1.3
+test
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/1a45914b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java
index 8e29a32..e505d27 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java
@@ -89,7 +89,16 @@ public final class JAXBUtils {
 if (adapter.type() != XmlJavaTypeAdapter.DEFAULT.class) {
 theType = adapter.type();
 } else {
-Type[] types = 
InjectionUtils.getActualTypes(adapter.value().getGenericSuperclass());
+Type topAdapterType = adapter.value().getGenericSuperclass();
+Class superClass = adapter.value().getSuperclass();
+while (superClass != null) {
+Class nextSuperClass = superClass.getSuperclass();
+if (nextSuperClass != null && 
!Object.class.equals(nextSuperClass)) {
+topAdapterType = superClass.getGenericSuperclass();
+}
+superClass = nextSuperClass;
+}
+Type[] types = InjectionUtils.getActualTypes(topAdapterType);
 if (types != null && types.length == 2) {
 int index = boundType ? 1 : 0;
 theType = InjectionUtils.getActualType(types[index]);

http://git-wip-us.apache.org/repos/asf/cxf/blob/1a45914b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java
--
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java
new file mode 100644
index 000..61a5aef
--- /dev/null
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java
@@ -0,0 +1,96 @@
+/**
+ * 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.utils;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.QueryParam;
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+import 

cxf git commit: [CXF-6889] Removing the commented code

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 18720623e -> 7fa9a0a0a


[CXF-6889] Removing the commented code


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

Branch: refs/heads/master
Commit: 7fa9a0a0acf9b395590a2bd03853cc55dc79036d
Parents: 1872062
Author: Sergey Beryozkin 
Authored: Mon Jul 10 16:29:39 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Jul 10 16:29:39 2017 +0100

--
 .../apache/cxf/jaxrs/client/CompletionStageRxInvokerImpl.java   | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7fa9a0a0/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/CompletionStageRxInvokerImpl.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/CompletionStageRxInvokerImpl.java
 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/CompletionStageRxInvokerImpl.java
index 381966c..d9aaf6d 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/CompletionStageRxInvokerImpl.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/CompletionStageRxInvokerImpl.java
@@ -148,8 +148,6 @@ public class CompletionStageRxInvokerImpl implements 
CompletionStageRxInvoker {
 } else {
 return CompletableFuture.supplyAsync(() -> wc.sync().method(name, 
entity, responseType), ex);
 }
-
-//return wc.doInvokeAsyncStage(name, entity, responseType, 
responseType, ex);
 }
 
 @Override
@@ -159,7 +157,6 @@ public class CompletionStageRxInvokerImpl implements 
CompletionStageRxInvoker {
 } else {
 return CompletableFuture.supplyAsync(() -> wc.sync().method(name, 
entity, responseType), ex);
 }
-//return wc.doInvokeAsyncStage(name, entity, 
responseType.getRawType(), responseType.getType(), ex);
 }
 
 @Override
@@ -169,7 +166,6 @@ public class CompletionStageRxInvokerImpl implements 
CompletionStageRxInvoker {
 } else {
 return CompletableFuture.supplyAsync(() -> wc.sync().method(name, 
responseType), ex);
 }
-//return wc.doInvokeAsyncStage(name, null, responseType, responseType, 
ex);
 }
 
 @Override
@@ -179,7 +175,6 @@ public class CompletionStageRxInvokerImpl implements 
CompletionStageRxInvoker {
 } else {
 return CompletableFuture.supplyAsync(() -> wc.sync().method(name, 
responseType), ex);
 }
-//return wc.doInvokeAsyncStage(name, null, responseType.getRawType(), 
responseType.getType(), ex);
 }
 
 }

cxf git commit: [CXF-6889] Simplifying the rx client code

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master bd6852d25 -> 18720623e


[CXF-6889] Simplifying the rx client code


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

Branch: refs/heads/master
Commit: 18720623e9d86e68566346981cebaefc7995d910
Parents: bd6852d
Author: Sergey Beryozkin 
Authored: Mon Jul 10 16:22:26 2017 +0100
Committer: Sergey Beryozkin 
Committed: Mon Jul 10 16:22:26 2017 +0100

--
 .../apache/cxf/jaxrs/client/AsyncClient.java| 32 ---
 .../client/CompletionStageRxInvokerImpl.java| 30 ++-
 .../jaxrs/client/JaxrsClientStageCallback.java  | 89 
 .../org/apache/cxf/jaxrs/client/WebClient.java  | 16 +---
 .../client/JaxrsClientObservableCallback.java   | 47 ---
 .../rx/client/ObservableRxInvokerImpl.java  | 46 +-
 6 files changed, 55 insertions(+), 205 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/18720623/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AsyncClient.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AsyncClient.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AsyncClient.java
deleted file mode 100644
index 2e1075e..000
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AsyncClient.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 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.client;
-
-import java.lang.reflect.Type;
-
-//Work in progress. May be removed once the Rx client work is finalized
-public interface AsyncClient {
-void prepareAsyncClient(String httpMethod,
-Object body,
-Class requestClass,
-Type inType,
-Class respClass,
-Type outType,
-JaxrsClientCallback cb);
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/18720623/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/CompletionStageRxInvokerImpl.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/CompletionStageRxInvokerImpl.java
 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/CompletionStageRxInvokerImpl.java
index 528d840..381966c 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/CompletionStageRxInvokerImpl.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/CompletionStageRxInvokerImpl.java
@@ -18,6 +18,7 @@
  */
 package org.apache.cxf.jaxrs.client;
 
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutorService;
 
@@ -142,22 +143,43 @@ public class CompletionStageRxInvokerImpl implements 
CompletionStageRxInvoker {
 
 @Override
 public  CompletionStage method(String name, Entity entity, 
Class responseType) {
-return wc.doInvokeAsyncStage(name, entity, responseType, responseType, 
ex);
+if (ex == null) {
+return CompletableFuture.supplyAsync(() -> wc.sync().method(name, 
entity, responseType));
+} else {
+return CompletableFuture.supplyAsync(() -> wc.sync().method(name, 
entity, responseType), ex);
+}
+
+//return wc.doInvokeAsyncStage(name, entity, responseType, 
responseType, ex);
 }
 
 @Override
 public  CompletionStage method(String name, Entity entity, 
GenericType responseType) {
-return wc.doInvokeAsyncStage(name, entity, responseType.getRawType(), 
responseType.getType(), ex);
+if (ex == null) {
+return CompletableFuture.supplyAsync(() -> wc.sync().method(name, 
entity, responseType));
+} else {
+return 

Nexus: Staging Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDescription:CXF-DOSGi 2.2.0Deployer properties:"userAgent" = "Apache-Maven/3.3.9 (Java 1.8.0_131; Linux 4.10.0-26-generic)""userId" = "cschneider""ip" = "46.223.224.135"Details:The following artifacts have been staged/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-parent/2.2.0/cxf-dosgi-samples-rest-parent-2.2.0.pom(SHA1: 8ee58002c910655ec3a3e7186adcdabe2dac1cd1)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-parent/2.2.0/cxf-dosgi-samples-rest-parent-2.2.0.pom.asc(SHA1: 9a33ab3ea7a02621f952815fe8b579517910e848)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-api/2.2.0/cxf-dosgi-samples-soap-api-2.2.0-sources.jar(SHA1: 93da998d5d8fc3398e1aabdd522097bf55f17b52)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-api/2.2.0/cxf-dosgi-samples-soap-api-2.2.0.jar(SHA1: 26d0daff2ed7fdd9b3c23023159f5fe3041803ab)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-api/2.2.0/cxf-dosgi-samples-soap-api-2.2.0-javadoc.jar.asc(SHA1: b1b74a2d9c579e38108edf766e6f1dd4a832c2fe)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-api/2.2.0/cxf-dosgi-samples-soap-api-2.2.0-javadoc.jar(SHA1: 645609778822b13cd1e63f66df6959d6f7dc5a13)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-api/2.2.0/cxf-dosgi-samples-soap-api-2.2.0-sources.jar.asc(SHA1: 71164b79d5961de91baefbdf10a3c000b9a20394)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-api/2.2.0/cxf-dosgi-samples-soap-api-2.2.0.pom.asc(SHA1: 4ff0c744b0c21fc0a66ab99c968d9e82fa429d0c)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-api/2.2.0/cxf-dosgi-samples-soap-api-2.2.0.pom(SHA1: 49a9f4d9fe572f4b2cb5759bba812f2098838194)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-soap-api/2.2.0/cxf-dosgi-samples-soap-api-2.2.0.jar.asc(SHA1: 86e7bc1b99a0666e359911dacff17772646b7db0)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-impl/2.2.0/cxf-dosgi-samples-rest-impl-2.2.0.pom.asc(SHA1: 0996df52c682e4e70a16e8594b5de46b00e0373f)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-impl/2.2.0/cxf-dosgi-samples-rest-impl-2.2.0.jar(SHA1: cad2944bc5e1c17c9306a343ec943ead9d5c911a)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-impl/2.2.0/cxf-dosgi-samples-rest-impl-2.2.0-javadoc.jar.asc(SHA1: 2247dacd918b701d3b549603597cfacd61ac11fa)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-impl/2.2.0/cxf-dosgi-samples-rest-impl-2.2.0-sources.jar.asc(SHA1: 0842731247a544ea7f15fdb7b22e3a21af7cf5ad)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-impl/2.2.0/cxf-dosgi-samples-rest-impl-2.2.0.jar.asc(SHA1: c75d20c38e8febb8144ca06561e591c7a7b33f4e)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-impl/2.2.0/cxf-dosgi-samples-rest-impl-2.2.0.pom(SHA1: 8c0f5cdf010504d1887750ad85a027f5181f9b7d)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-impl/2.2.0/cxf-dosgi-samples-rest-impl-2.2.0-javadoc.jar(SHA1: 4f1898b9d15a335eabf139f0631f8ebf492648af)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-rest-impl/2.2.0/cxf-dosgi-samples-rest-impl-2.2.0-sources.jar(SHA1: 57a914a298f97a3bd961e22813d2b5e7c46d328e)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-security-filter/2.2.0/cxf-dosgi-samples-security-filter-2.2.0-javadoc.jar.asc(SHA1: cd3aa041e3f44e0f242590612b98c42c769a9da8)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-security-filter/2.2.0/cxf-dosgi-samples-security-filter-2.2.0-javadoc.jar(SHA1: 12db063a735960ff63f572cbfb44bbeab3b18ec4)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-security-filter/2.2.0/cxf-dosgi-samples-security-filter-2.2.0.pom(SHA1: 1e77f63a64859fc22e493a145fb44c8f884e2605)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-security-filter/2.2.0/cxf-dosgi-samples-security-filter-2.2.0.pom.asc(SHA1: 066e8fad7e5fc349b89b9e1abae24109752999e7)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-security-filter/2.2.0/cxf-dosgi-samples-security-filter-2.2.0-sources.jar.asc(SHA1: 9076cdfb6200cf359b68a48e64dfd7982605a8dd)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-security-filter/2.2.0/cxf-dosgi-samples-security-filter-2.2.0.jar(SHA1: a8a11b5b42a528c4b2df275725d7fdb6d4898626)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-security-filter/2.2.0/cxf-dosgi-samples-security-filter-2.2.0.jar.asc(SHA1: 33a38ef8fb98f580e4aec1605e024c2406f50550)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-security-filter/2.2.0/cxf-dosgi-samples-security-filter-2.2.0-sources.jar(SHA1: 7e88eceee9cd371254918308a1c45f76bbaca7c1)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-ssl-intent/2.2.0/cxf-dosgi-samples-ssl-intent-2.2.0.jar.asc(SHA1: 16f584afdf8e52af7bf0959431234c5e4ccf506e)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-ssl-intent/2.2.0/cxf-dosgi-samples-ssl-intent-2.2.0.jar(SHA1: f9547822a069455daa9b93680d74f76f7adef191)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-ssl-intent/2.2.0/cxf-dosgi-samples-ssl-intent-2.2.0.pom(SHA1: 99a8ef01996047cfce14aebab0710b2d406481aa)/org/apache/cxf/dosgi/samples/cxf-dosgi-samples-ssl-intent/2.2.0/cxf-dosgi-samples-ssl-intent-2.2.0-sources.jar(SHA1: 

[1/2] cxf-dosgi git commit: Update javadoc for java 8

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 584283f3b -> 24b298134


Update javadoc for java 8


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

Branch: refs/heads/master
Commit: 82dc00f345a84488a6cd17033502f0867d76ff6d
Parents: 584283f
Author: Christian Schneider 
Authored: Mon Jul 10 15:28:27 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jul 10 15:28:27 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/82dc00f3/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 2fd7989..09c25a6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -255,6 +255,17 @@
 
 
 
+
+org.apache.maven.plugins
+maven-javadoc-plugin
+2.10.3
+
+true
+true
+UTF-8
+-Xdoclint:none
+
+
 
 
 

[2/2] cxf-dosgi git commit: [maven-release-plugin] prepare release cxf-dosgi-2.2.0

[cschneider]

[maven-release-plugin] prepare release cxf-dosgi-2.2.0


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

Branch: refs/heads/master
Commit: 24b29813427e24734a108cd93f8bc0bc8de0f926
Parents: 82dc00f
Author: Christian Schneider 
Authored: Mon Jul 10 15:39:36 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jul 10 15:39:36 2017 +0200

--
 common/pom.xml| 2 +-
 decorator/pom.xml | 2 +-
 distribution/features/pom.xml | 2 +-
 distribution/multi-bundle/pom.xml | 2 +-
 distribution/pom.xml  | 4 ++--
 distribution/repository/pom.xml   | 2 +-
 distribution/sources/pom.xml  | 4 ++--
 itests/multi-bundle/pom.xml   | 2 +-
 itests/pom.xml| 4 ++--
 parent/pom.xml| 2 +-
 pom.xml   | 4 ++--
 provider-rs/pom.xml   | 2 +-
 provider-ws/pom.xml   | 2 +-
 samples/features/pom.xml  | 2 +-
 samples/pom.xml   | 2 +-
 samples/repository/pom.xml| 2 +-
 samples/rest/api/pom.xml  | 2 +-
 samples/rest/client/pom.xml   | 2 +-
 samples/rest/impl-jackson/pom.xml | 2 +-
 samples/rest/impl/pom.xml | 2 +-
 samples/rest/pom.xml  | 2 +-
 samples/security_filter/pom.xml   | 2 +-
 samples/soap/api/pom.xml  | 2 +-
 samples/soap/client/pom.xml   | 2 +-
 samples/soap/impl/pom.xml | 2 +-
 samples/soap/pom.xml  | 2 +-
 samples/ssl/pom.xml   | 2 +-
 samples/ssl/ssl-intent/pom.xml| 2 +-
 28 files changed, 32 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/24b29813/common/pom.xml
--
diff --git a/common/pom.xml b/common/pom.xml
index d8d8164..0485a05 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.2.0-SNAPSHOT
+2.2.0
 ../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/24b29813/decorator/pom.xml
--
diff --git a/decorator/pom.xml b/decorator/pom.xml
index ba3ebf6..4dc93a0 100644
--- a/decorator/pom.xml
+++ b/decorator/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.2.0-SNAPSHOT
+2.2.0
 ../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/24b29813/distribution/features/pom.xml
--
diff --git a/distribution/features/pom.xml b/distribution/features/pom.xml
index 0cef2e8..71a016e 100644
--- a/distribution/features/pom.xml
+++ b/distribution/features/pom.xml
@@ -20,7 +20,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.2.0-SNAPSHOT
+2.2.0
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/24b29813/distribution/multi-bundle/pom.xml
--
diff --git a/distribution/multi-bundle/pom.xml 
b/distribution/multi-bundle/pom.xml
index 633bb08..a91e483 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.2.0-SNAPSHOT
+2.2.0
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/24b29813/distribution/pom.xml
--
diff --git a/distribution/pom.xml b/distribution/pom.xml
index fc6ca57..54b89b8 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -21,7 +21,7 @@
 4.0.0
 org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.2.0-SNAPSHOT
+2.2.0
 pom
 CXF DOSGi Distribution Parent
 http://cxf.apache.org
@@ -29,7 +29,7 @@
 
   org.apache.cxf.dosgi
   cxf-dosgi-parent
-  2.2.0-SNAPSHOT
+  2.2.0
   ../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/24b29813/distribution/repository/pom.xml
--
diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index a72ac6e..bc08ca6 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -3,7 +3,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.2.0-SNAPSHOT
+2.2.0
 ../../parent/pom.xml
 

[cxf-dosgi] Git Push Summary

[cschneider]

Repository: cxf-dosgi
Updated Tags:  refs/tags/cxf-dosgi-2.2.0 [created] 45e408d64

cxf-dosgi git commit: [maven-release-plugin] prepare for next development iteration

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 24b298134 -> 2ce3ed1de


[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/master
Commit: 2ce3ed1deeae18df0ab97c33cd5bd3f9b48df436
Parents: 24b2981
Author: Christian Schneider 
Authored: Mon Jul 10 15:40:44 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jul 10 15:40:44 2017 +0200

--
 common/pom.xml| 2 +-
 decorator/pom.xml | 2 +-
 distribution/features/pom.xml | 2 +-
 distribution/multi-bundle/pom.xml | 2 +-
 distribution/pom.xml  | 4 ++--
 distribution/repository/pom.xml   | 2 +-
 distribution/sources/pom.xml  | 4 ++--
 itests/multi-bundle/pom.xml   | 2 +-
 itests/pom.xml| 4 ++--
 parent/pom.xml| 2 +-
 pom.xml   | 4 ++--
 provider-rs/pom.xml   | 2 +-
 provider-ws/pom.xml   | 2 +-
 samples/features/pom.xml  | 2 +-
 samples/pom.xml   | 2 +-
 samples/repository/pom.xml| 2 +-
 samples/rest/api/pom.xml  | 2 +-
 samples/rest/client/pom.xml   | 2 +-
 samples/rest/impl-jackson/pom.xml | 2 +-
 samples/rest/impl/pom.xml | 2 +-
 samples/rest/pom.xml  | 2 +-
 samples/security_filter/pom.xml   | 2 +-
 samples/soap/api/pom.xml  | 2 +-
 samples/soap/client/pom.xml   | 2 +-
 samples/soap/impl/pom.xml | 2 +-
 samples/soap/pom.xml  | 2 +-
 samples/ssl/pom.xml   | 2 +-
 samples/ssl/ssl-intent/pom.xml| 2 +-
 28 files changed, 32 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2ce3ed1d/common/pom.xml
--
diff --git a/common/pom.xml b/common/pom.xml
index 0485a05..1ec2b12 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.2.0
+2.3.0-SNAPSHOT
 ../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2ce3ed1d/decorator/pom.xml
--
diff --git a/decorator/pom.xml b/decorator/pom.xml
index 4dc93a0..4717212 100644
--- a/decorator/pom.xml
+++ b/decorator/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-parent
-2.2.0
+2.3.0-SNAPSHOT
 ../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2ce3ed1d/distribution/features/pom.xml
--
diff --git a/distribution/features/pom.xml b/distribution/features/pom.xml
index 71a016e..f985618 100644
--- a/distribution/features/pom.xml
+++ b/distribution/features/pom.xml
@@ -20,7 +20,7 @@
 
 org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.2.0
+2.3.0-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2ce3ed1d/distribution/multi-bundle/pom.xml
--
diff --git a/distribution/multi-bundle/pom.xml 
b/distribution/multi-bundle/pom.xml
index a91e483..9844fbb 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -27,7 +27,7 @@
   
 org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.2.0
+2.3.0-SNAPSHOT
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2ce3ed1d/distribution/pom.xml
--
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 54b89b8..0370e29 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -21,7 +21,7 @@
 4.0.0
 org.apache.cxf.dosgi
 cxf-dosgi-distribution-parent
-2.2.0
+2.3.0-SNAPSHOT
 pom
 CXF DOSGi Distribution Parent
 http://cxf.apache.org
@@ -29,7 +29,7 @@
 
   org.apache.cxf.dosgi
   cxf-dosgi-parent
-  2.2.0
+  2.3.0-SNAPSHOT
   ../parent/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2ce3ed1d/distribution/repository/pom.xml
--
diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index bc08ca6..c6bea15 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -3,7 +3,7 @@
 
 org.apache.cxf.dosgi
 

cxf-dosgi git commit: Update apache parent, remove duplicates

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 5f34bc9e1 -> 584283f3b


Update apache parent, remove duplicates


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

Branch: refs/heads/master
Commit: 584283f3bd40e6ae78d5bf211acc0bca9dec4dad
Parents: 5f34bc9
Author: Christian Schneider 
Authored: Mon Jul 10 15:12:23 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jul 10 15:12:23 2017 +0200

--
 parent/pom.xml |  1 +
 pom.xml| 96 +++--
 2 files changed, 28 insertions(+), 69 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/584283f3/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 3ce6811..2fd7989 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -52,6 +52,7 @@
 1.7.14
 4.8.0
 true
+..
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/584283f3/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 720b44a..da39f58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,13 @@
 -->
 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/maven-v4_0_0.xsd;>
 4.0.0
+
+
+org.apache
+apache
+18
+
+
 org.apache.cxf.dosgi
 cxf-dosgi-main
 2.2.0-SNAPSHOT
@@ -29,32 +36,14 @@
 
 
scm:git:http://git-wip-us.apache.org/repos/asf/cxf-dosgi.git
 
scm:git:http://git-wip-us.apache.org/repos/asf/cxf-dosgi.git
-  HEAD
-  
+HEAD
+
 
 
 jira
 https://issues.apache.org/jira/browse/DOSGI
 
 
-
-3.0
-
-
-
-
-apache.releases.https
-Apache Release Distribution Repository
-
https://repository.apache.org/service/local/staging/deploy/maven2
-
-
-apache.snapshots.https
-Apache Development Snapshot Repository
-
https://repository.apache.org/content/repositories/snapshots
-false
-
-
-
 2008
 
 
@@ -87,19 +76,6 @@
 
 
 
-
-
-The Apache Software License, Version 2.0
-http://www.apache.org/licenses/LICENSE-2.0.txt
-repo
-
-
-
-
-The Apache Software Foundation
-http://www.apache.org/
-
-
 
 parent
 decorator
@@ -111,40 +87,24 @@
 itests
 
 
-
-
-release
-
-
-
-
-true
-maven-deploy-plugin
-2.6
-
-
${deploy.altRepository}
-true
-
-
-
-
-maven-gpg-plugin
-1.3
-
-
-
-sign
-
-
-
-
-
-
-
-
-
 
 install
+
+
+
+org.apache.maven.plugins
+maven-source-plugin
+
+
+attach-sources
+
+jar
+
+
+
+
+
+  
 
 
 
@@ -153,12 +113,10 @@
 maven-release-plugin
 2.5.2
 
-false
-clean install
-deploy
--Prelease,deploy
+apache-release
 true
 forked-path
+
cxf-dosgi-@{project.version}
 
 
 

[1/2] cxf-fediz git commit: Fixing typo with using URI as the key instead of a String

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 99a2a4d60 -> 6392d4f75


Fixing typo with using URI as the key instead of a String


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

Branch: refs/heads/master
Commit: 3070c4c74b19d06832dfb8fcf359edb1cd27718f
Parents: 99a2a4d
Author: Colm O hEigeartaigh 
Authored: Mon Jul 10 11:40:13 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 10 11:40:13 2017 +0100

--
 .../org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/3070c4c7/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
--
diff --git 
a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
 
b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
index 85c1256..ac35b70 100644
--- 
a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
+++ 
b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
@@ -196,9 +196,9 @@ public class FedizSubjectCreator implements SubjectCreator {
 }
 
 if (roles != null && !roles.isEmpty() 
-&& supportedClaims.containsKey(FedizConstants.DEFAULT_ROLE_URI)) {
+&& 
supportedClaims.containsKey(FedizConstants.DEFAULT_ROLE_URI.toString())) {
 
-String roleClaimName = 
supportedClaims.get(FedizConstants.DEFAULT_ROLE_URI);
+String roleClaimName = 
supportedClaims.get(FedizConstants.DEFAULT_ROLE_URI.toString());
 if (requestedClaimsList.contains(roleClaimName)) {
 idToken.setClaim(roleClaimName, roles);
 }

[2/2] cxf-fediz git commit: Adding roles tests

[coheigea]

Adding roles tests


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

Branch: refs/heads/master
Commit: 6392d4f7574cbb9a9b72b895c6001d5c19a347b6
Parents: 3070c4c
Author: Colm O hEigeartaigh 
Authored: Mon Jul 10 11:48:47 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Jul 10 11:48:47 2017 +0100

--
 .../cxf/fediz/systests/oidc/OIDCTest.java   | 53 
 .../src/test/resources/oidc/data-manager.xml| 13 -
 2 files changed, 64 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6392d4f7/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
--
diff --git 
a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java 
b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
index 241e1b6..56014d9 100644
--- 
a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
+++ 
b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
@@ -35,6 +35,7 @@ import java.security.cert.X509Certificate;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
@@ -897,6 +898,45 @@ public class OIDCTest {
 webClient.close();
 }
 
+@org.junit.Test
+public void testOIDCLoginForClient1WithRoles() throws Exception {
+
+String url = "https://localhost:; + getRpHttpsPort() + 
"/fediz-oidc/idp/authorize?";
+url += "client_id=" + storedClientId;
+url += "_type=code";
+url += "=openid";
+url += "=roles";
+String user = "alice";
+String password = "ecila";
+
+// Login to the OIDC token endpoint + get the authorization code
+WebClient webClient = setupWebClient(user, password, 
getIdpHttpsPort());
+String authorizationCode = loginAndGetAuthorizationCode(url, 
webClient);
+Assert.assertNotNull(authorizationCode);
+
+// Now use the code to get an IdToken
+
+url = "https://localhost:; + getRpHttpsPort() + 
"/fediz-oidc/oauth2/token";
+WebRequest request = new WebRequest(new URL(url), HttpMethod.POST);
+
+request.setRequestParameters(new ArrayList());
+request.getRequestParameters().add(new NameValuePair("client_id", 
storedClientId));
+request.getRequestParameters().add(new NameValuePair("grant_type", 
"authorization_code"));
+request.getRequestParameters().add(new NameValuePair("code", 
authorizationCode));
+
+webClient.getOptions().setJavaScriptEnabled(false);
+final UnexpectedPage responsePage = webClient.getPage(request);
+String response = responsePage.getWebResponse().getContentAsString();
+
+// Check the IdToken
+String idToken = getIdToken(response);
+Assert.assertNotNull(idToken);
+validateIdToken(idToken, storedClientId, "User");
+
+webClient.close();
+}
+
+
 private static WebClient setupWebClient(String user, String password, 
String idpPort) {
 final WebClient webClient = new WebClient();
 webClient.getOptions().setUseInsecureSSL(true);
@@ -984,6 +1024,11 @@ public class OIDCTest {
 
 private void validateIdToken(String idToken, String audience)
 throws KeyStoreException, NoSuchAlgorithmException, 
CertificateException, IOException {
+validateIdToken(idToken, audience, null);
+}
+
+private void validateIdToken(String idToken, String audience, String role)
+throws KeyStoreException, NoSuchAlgorithmException, 
CertificateException, IOException {
 JwsJwtCompactConsumer jwtConsumer = new JwsJwtCompactConsumer(idToken);
 JwtToken jwt = jwtConsumer.getJwtToken();
 
@@ -994,6 +1039,14 @@ public class OIDCTest {
 Assert.assertNotNull(jwt.getClaim(JwtConstants.CLAIM_EXPIRY));
 Assert.assertNotNull(jwt.getClaim(JwtConstants.CLAIM_ISSUED_AT));
 
+// Check role
+if (role != null) {
+List roles = (List)jwt.getClaim("roles");
+Assert.assertNotNull(roles);
+Assert.assertFalse(roles.isEmpty());
+Assert.assertEquals(role, roles.get(0));
+}
+
 KeyStore keystore = KeyStore.getInstance("JKS");
 keystore.load(Loader.getResource("oidc.jks").openStream(), 
"password".toCharArray());
 Certificate cert = keystore.getCertificate("alice");

cxf-dosgi git commit: Fix docs

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master be1d9b7ba -> 5f34bc9e1


Fix docs

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

Branch: refs/heads/master
Commit: 5f34bc9e10958118f0b9e2bbae142ff8837a2fd8
Parents: be1d9b7
Author: Christian Schneider 
Authored: Mon Jul 10 12:29:26 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jul 10 12:29:26 2017 +0200

--
 samples/rest/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/5f34bc9e/samples/rest/README.md
--
diff --git a/samples/rest/README.md b/samples/rest/README.md
index 2a7311b..df7d98a 100644
--- a/samples/rest/README.md
+++ b/samples/rest/README.md
@@ -44,7 +44,7 @@ task:list
 
 The jaxrs sample also creates swagger documentation for the REST endpoint.
 
-[Get the swagger documentation for the jaxrs sample] 
(http://localhost:8181/cxf/tasks/api-docs?url=../swagger.json).
+[Get the swagger documentation for the jaxrs 
sample](http://localhost:8181/cxf/tasks/api-docs?url=../swagger.json).
 
 ### Add logging intent
 

[2/3] cxf-dosgi git commit: Update Felix version

[cschneider]

Update Felix version


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

Branch: refs/heads/master
Commit: ac8a037872eab53ba82d854681837b736171619e
Parents: e9e4434
Author: Christian Schneider 
Authored: Mon Jul 10 12:09:12 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jul 10 12:09:12 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/ac8a0378/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 4c4216d..3ce6811 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -31,7 +31,7 @@
 5.0.0
 1.11.0
 3.1.12
-5.4.0
+5.6.4
 3.4.8
 
1.0.0
 2.6.0

[3/3] cxf-dosgi git commit: [DOSGI-270] Add swagger documentation example

[cschneider]

[DOSGI-270] Add swagger documentation example


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

Branch: refs/heads/master
Commit: be1d9b7ba01baa4528c7b71a843d30050d225830
Parents: ac8a037
Author: Christian Schneider 
Authored: Mon Jul 10 12:15:20 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jul 10 12:15:20 2017 +0200

--
 distribution/multi-bundle/pom.xml   |  1 +
 distribution/repository/pom.xml |  3 +++
 .../features/src/main/resources/features.xml|  3 +++
 samples/rest/README.md  |  7 ++-
 .../cxf/dosgi/samples/rest/TaskResource.java| 18 ++--
 samples/rest/impl-jackson/pom.xml   |  4 ++--
 .../samples/rest/impl/TaskResourceImpl.java | 19 +
 samples/rest/impl/pom.xml   | 12 ++-
 .../samples/rest/impl/TaskResourceImpl.java | 22 +++-
 9 files changed, 68 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/be1d9b7b/distribution/multi-bundle/pom.xml
--
diff --git a/distribution/multi-bundle/pom.xml 
b/distribution/multi-bundle/pom.xml
index 58cb4db..633bb08 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -65,6 +65,7 @@
 
mvn:org.apache.cxf.dosgi/cxf-dosgi/${project.version}/xml/features
   
   
+   cxf-rs-description-swagger2
 cxf-dosgi-base
 aries-rsa-discovery-zookeeper
 cxf-dosgi-provider-ws

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/be1d9b7b/distribution/repository/pom.xml
--
diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index 45eb4da..a72ac6e 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -58,4 +58,7 @@
 
 
 
+
+   true
+
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/be1d9b7b/samples/features/src/main/resources/features.xml
--
diff --git a/samples/features/src/main/resources/features.xml 
b/samples/features/src/main/resources/features.xml
index 58b9c91..6d62713 100644
--- a/samples/features/src/main/resources/features.xml
+++ b/samples/features/src/main/resources/features.xml
@@ -19,6 +19,9 @@
 
 cxf-dosgi-provider-rs
 aries-rsa-discovery-zookeeper-server
+cxf-features-logging
+cxf-rs-description-swagger2
+mvn:org.webjars/swagger-ui/2.2.10-1
 
mvn:org.apache.cxf.dosgi.samples/cxf-dosgi-samples-rest-api/${project.version}
 
mvn:org.apache.cxf.dosgi.samples/cxf-dosgi-samples-rest-impl/${project.version}
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/be1d9b7b/samples/rest/README.md
--
diff --git a/samples/rest/README.md b/samples/rest/README.md
index eda3e1d..2a7311b 100644
--- a/samples/rest/README.md
+++ b/samples/rest/README.md
@@ -40,13 +40,18 @@ task:add 4 Mytask
 task:list
 ```
 
+### Browse Swagger documentation
+
+The jaxrs sample also creates swagger documentation for the REST endpoint.
+
+[Get the swagger documentation for the jaxrs sample] 
(http://localhost:8181/cxf/tasks/api-docs?url=../swagger.json).
+
 ### Add logging intent
 
 Starting with CXF 3.1.9 the CXF logging feature is exported as an intent by
 default this makes it very easy to add logging to the rest example.
 
 ```
-feature:install cxf-features-logging
 config:property-set -p TaskResource service.exported.intents logging
 endpoint http://localhost:8181/cxf/tasks
 ```

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/be1d9b7b/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
--
diff --git 
a/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
 
b/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
index 2ccedb6..15630f7 100644
--- 
a/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
+++ 
b/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
@@ -26,22 +26,36 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 
 import io.swagger.annotations.Api;
+import 

[1/3] cxf-dosgi git commit: Fix checkstyle issues

[cschneider]

Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 8639e4835 -> be1d9b7ba


Fix checkstyle issues

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

Branch: refs/heads/master
Commit: e9e44344ec1e340975e48eca0d76a7b621ff20b5
Parents: 8639e48
Author: Christian Schneider 
Authored: Fri Jul 7 17:08:55 2017 +0200
Committer: Christian Schneider 
Committed: Fri Jul 7 17:08:55 2017 +0200

--
 .../apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImplTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/e9e44344/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImplTest.java
--
diff --git 
a/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImplTest.java
 
b/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImplTest.java
index 400d793..1b4a44d 100644
--- 
a/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImplTest.java
+++ 
b/decorator/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImplTest.java
@@ -145,13 +145,13 @@ public class ServiceDecoratorImplTest extends TestCase {
 }
 
 private void assertDecorate(final Map serviceProps, 
-Map expected, URL ... 
resources) {
+Map expected, URL... 
resources) {
 Map actual = testDecorate(serviceProps, resources);
 assertEquals(expected, actual);
 }
 
 @SuppressWarnings("rawtypes")
-private Map testDecorate(final Map 
serviceProps, URL ... resources) {
+private Map testDecorate(final Map 
serviceProps, URL... resources) {
 Bundle b = createBundleContaining(resources);
 
 ServiceDecoratorImpl sd = new ServiceDecoratorImpl();