buildbot success in on cxf-site-production

[buildbot]

The Buildbot has detected a restored build on builder cxf-site-production while 
building . Full details are available at:
https://ci.apache.org/builders/cxf-site-production/builds/11254

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

buildbot failure in on cxf-site-production

[buildbot]

The Buildbot has detected a new failure on builder cxf-site-production while 
building . Full details are available at:
https://ci.apache.org/builders/cxf-site-production/builds/11253

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

[2/2] cxf git commit: Add KeyName as KeyIdentifier. This closes #175

[coheigea]

Add KeyName as KeyIdentifier. This closes #175


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

Branch: refs/heads/3.0.x-fixes
Commit: 99412463dcd661eaba9bd84f4bb28865855e67aa
Parents: 1628431
Author: Hugo Trippaers 
Authored: Sat Oct 8 23:28:16 2016 +0200
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 10 17:14:37 2016 +0100

--
 .../java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/99412463/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
--
diff --git 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
index 16ac06f..1df8591 100644
--- 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
+++ 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
@@ -457,6 +457,8 @@ public class XmlSecOutInterceptor extends 
AbstractPhaseInterceptor {
 return SecurityTokenConstants.KeyIdentifier_SkiKeyIdentifier;
 } else if ("KeyValue".equals(keyIdentifier)) {
 return SecurityTokenConstants.KeyIdentifier_KeyValue;
+} else if ("KeyName".equals(keyIdentifier)) {
+return SecurityTokenConstants.KeyIdentifier_KeyName;
 }
 return SecurityTokenConstants.KeyIdentifier_X509KeyIdentifier;
 }

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

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 16284314a -> aba8623f5


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

Branch: refs/heads/3.0.x-fixes
Commit: aba8623f57c5c0b36ae1f0d0dafc279f4173a423
Parents: 9941246
Author: Colm O hEigeartaigh 
Authored: Mon Oct 10 17:14:37 2016 +0100
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 10 17:14:37 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/aba8623f/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f00a42d..ad166db 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1019,6 +1019,7 @@ B dbfaf2b5aea3c4b09a825c82cae88c9d5f777aac
 B dc6fe383b095c6823e5de707b1c091556c9c378a
 B dc986e411b2f7449d6cd92481431cfebe18689bd
 B dd3c8f9d05b549d7aeb3804476bdc3fb344cf2d8
+B dd4862fcb09cb9725c750e21331ecd46fb9c21ab
 B dd598c4985d8f61fd3d4fa7754d936cc6651bcee
 B dd8025a1695ac207e8b28e3cff38bb7df6369361
 B dd9de09aa2dce0610e542ce6b2cf3cad4cd129f0

cxf git commit: Add KeyName as KeyIdentifier. This closes #175

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes f8a384f5a -> 2f530abd7


Add KeyName as KeyIdentifier. This closes #175


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

Branch: refs/heads/3.1.x-fixes
Commit: 2f530abd78774410b37d2ff07a69358795007f4d
Parents: f8a384f
Author: Hugo Trippaers 
Authored: Sat Oct 8 23:28:16 2016 +0200
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 10 17:11:12 2016 +0100

--
 .../java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2f530abd/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
--
diff --git 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
index 7b7d982..1f5193d 100644
--- 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
+++ 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
@@ -434,6 +434,8 @@ public class XmlSecOutInterceptor extends 
AbstractPhaseInterceptor {
 return SecurityTokenConstants.KeyIdentifier_SkiKeyIdentifier;
 } else if ("KeyValue".equals(keyIdentifier)) {
 return SecurityTokenConstants.KeyIdentifier_KeyValue;
+} else if ("KeyName".equals(keyIdentifier)) {
+return SecurityTokenConstants.KeyIdentifier_KeyName;
 }
 return SecurityTokenConstants.KeyIdentifier_X509KeyIdentifier;
 }

cxf git commit: Add KeyName as KeyIdentifier. This closes #175

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 183a2a402 -> 9c5d9f77a


Add KeyName as KeyIdentifier. This closes #175


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

Branch: refs/heads/master
Commit: 9c5d9f77aac1de3789d3b7f08ca528174429dbba
Parents: 183a2a4
Author: Hugo Trippaers 
Authored: Sat Oct 8 23:28:16 2016 +0200
Committer: Colm O hEigeartaigh 
Committed: Mon Oct 10 17:09:39 2016 +0100

--
 .../java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9c5d9f77/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
--
diff --git 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
index 7b7d982..1f5193d 100644
--- 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
+++ 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
@@ -434,6 +434,8 @@ public class XmlSecOutInterceptor extends 
AbstractPhaseInterceptor {
 return SecurityTokenConstants.KeyIdentifier_SkiKeyIdentifier;
 } else if ("KeyValue".equals(keyIdentifier)) {
 return SecurityTokenConstants.KeyIdentifier_KeyValue;
+} else if ("KeyName".equals(keyIdentifier)) {
+return SecurityTokenConstants.KeyIdentifier_KeyName;
 }
 return SecurityTokenConstants.KeyIdentifier_X509KeyIdentifier;
 }

cxf git commit: [CXF-6889] Adding another completion stage test

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master bbda68b6d -> 183a2a402


[CXF-6889] Adding another completion stage test


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

Branch: refs/heads/master
Commit: 183a2a4022b912a6c32c1d3e268982b2f78f7631
Parents: bbda68b
Author: Sergey Beryozkin 
Authored: Mon Oct 10 14:16:39 2016 +0100
Committer: Sergey Beryozkin 
Committed: Mon Oct 10 14:16:39 2016 +0100

--
 .../cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/183a2a40/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
index 4d32750..b313070 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
@@ -376,6 +376,22 @@ public class JAXRSAsyncClientTest extends 
AbstractBusClientServerTestBase {
 assertEquals(123L, book.getId());
 }
 @Test
+public void testGetBookAsyncStageThenAcceptAsync() throws Exception {
+String address = "http://localhost:; + PORT + "/bookstore/books";
+WebClient wc = createWebClient(address);
+CompletionStage stage = wc.path("123").rx().get(Book.class);
+Holder holder = new Holder();
+stage.thenApply(v -> {
+v.setId(v.getId() * 2);
+return v;
+}).thenAcceptAsync(v -> {
+holder.value = v;
+});
+Thread.sleep(3000);
+assertEquals(246L, holder.value.getId());
+}
+
+@Test
 public void testGetBookAsyncStage404() throws Exception {
 String address = "http://localhost:; + PORT + 
"/bookstore/bookheaders/404";
 WebClient wc = createWebClient(address);

cxf git commit: [CXF-6889] Adding a basic exception test

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 6958418ec -> bbda68b6d


[CXF-6889] Adding a basic exception test


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

Branch: refs/heads/master
Commit: bbda68b6d7948d098ee598d248266f4ce81c820a
Parents: 6958418
Author: Sergey Beryozkin 
Authored: Mon Oct 10 13:28:29 2016 +0100
Committer: Sergey Beryozkin 
Committed: Mon Oct 10 13:28:29 2016 +0100

--
 .../cxf/jaxrs/client/JaxrsClientStageCallback.java |  6 +++---
 .../apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 13 +
 2 files changed, 16 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/bbda68b6/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JaxrsClientStageCallback.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JaxrsClientStageCallback.java
 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JaxrsClientStageCallback.java
index 822d235..c26ffb4 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JaxrsClientStageCallback.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JaxrsClientStageCallback.java
@@ -21,6 +21,7 @@ package org.apache.cxf.jaxrs.client;
 
 import java.lang.reflect.Type;
 import java.util.Map;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Executor;
@@ -47,7 +48,6 @@ class JaxrsClientStageCallback extends 
JaxrsClientCallback  {
 public void handleResponse(Map ctx, Object[] res) {
 context = ctx;
 result = res;
-//consumer.accept((T)res[0]);
 done = true;
 synchronized (this) {
 notifyAll();
@@ -58,7 +58,7 @@ class JaxrsClientStageCallback extends 
JaxrsClientCallback  {
 public void handleException(Map ctx, final Throwable ex) {
 context = ctx;
 exception = ex;
-//handler.failed(exception);
+cf.completeExceptionally(ex);
 done = true;
 synchronized (this) {
 notifyAll();
@@ -68,7 +68,7 @@ class JaxrsClientStageCallback extends 
JaxrsClientCallback  {
 public boolean cancel(boolean mayInterruptIfRunning) {
 boolean result = super.cancel(mayInterruptIfRunning);
 if (result) {
-//handler.failed(new CancellationException());
+cf.completeExceptionally(new CancellationException());
 }
 return result;
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/bbda68b6/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
index 568e520..4d32750 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
@@ -375,6 +375,19 @@ public class JAXRSAsyncClientTest extends 
AbstractBusClientServerTestBase {
 Book book = stage.toCompletableFuture().join();
 assertEquals(123L, book.getId());
 }
+@Test
+public void testGetBookAsyncStage404() throws Exception {
+String address = "http://localhost:; + PORT + 
"/bookstore/bookheaders/404";
+WebClient wc = createWebClient(address);
+CompletionStage stage = wc.path("123").rx().get(Book.class);
+try {
+stage.toCompletableFuture().get();
+fail("Exception expected");
+} catch (ExecutionException ex) {
+assertTrue(ex.getCause() instanceof NotFoundException);
+}
+
+}
 private WebClient createWebClient(String address) {
 List providers = new ArrayList();
 return WebClient.create(address, providers);

cxf git commit: [CXF-6889] Continuing prototyping CompletionStage invoker code

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 1116dff4e -> 6958418ec


[CXF-6889] Continuing prototyping CompletionStage invoker code


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

Branch: refs/heads/master
Commit: 6958418ec4989c4391389ee6bfd1d9055ec127a5
Parents: 1116dff
Author: Sergey Beryozkin 
Authored: Mon Oct 10 13:05:16 2016 +0100
Committer: Sergey Beryozkin 
Committed: Mon Oct 10 13:05:16 2016 +0100

--
 .../cxf/jaxrs/client/JaxrsClientCallback.java   | 228 ---
 .../jaxrs/client/JaxrsClientStageCallback.java  |  91 
 .../org/apache/cxf/jaxrs/client/WebClient.java  |  27 ++-
 .../client/spec/InvocationBuilderImpl.java  |   5 +-
 .../cxf/systest/jaxrs/JAXRSAsyncClientTest.java |  18 +-
 5 files changed, 114 insertions(+), 255 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6958418e/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JaxrsClientCallback.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JaxrsClientCallback.java
 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JaxrsClientCallback.java
index a1e7049..0d10ad5 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JaxrsClientCallback.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JaxrsClientCallback.java
@@ -22,17 +22,10 @@ package org.apache.cxf.jaxrs.client;
 import java.lang.reflect.Type;
 import java.util.Map;
 import java.util.concurrent.CancellationException;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
-import java.util.function.Consumer;
-import java.util.function.Function;
 
 import javax.ws.rs.client.InvocationCallback;
 
@@ -75,11 +68,6 @@ class JaxrsClientCallback extends ClientCallback {
 return new JaxrsResponseFuture(this);
 }
 
-public CompletionStage createCompletionStage() {
-return null;
-}
-
-
 @SuppressWarnings("unchecked")
 public void handleResponse(Map ctx, Object[] res) {
 context = ctx;
@@ -159,220 +147,4 @@ class JaxrsClientCallback extends ClientCallback {
 return callback.isDone();
 }
 }
-static class JaxrsResponseStage implements CompletionStage {
-JaxrsClientCallback callback;
-JaxrsResponseStage(JaxrsClientCallback cb) {
-callback = cb;
-}
-@Override
-public  CompletionStage thenApply(Function fn) {
-// TODO Auto-generated method stub
-return null;
-}
-@Override
-public  CompletionStage thenApplyAsync(Function fn) {
-// TODO Auto-generated method stub
-return null;
-}
-@Override
-public  CompletionStage thenApplyAsync(Function fn, Executor executor) {
-// TODO Auto-generated method stub
-return null;
-}
-@Override
-public CompletionStage thenAccept(Consumer action) {
-// TODO Auto-generated method stub
-return null;
-}
-@Override
-public CompletionStage thenAcceptAsync(Consumer 
action) {
-// TODO Auto-generated method stub
-return null;
-}
-@Override
-public CompletionStage thenAcceptAsync(Consumer 
action, Executor executor) {
-// TODO Auto-generated method stub
-return null;
-}
-@Override
-public CompletionStage thenRun(Runnable action) {
-// TODO Auto-generated method stub
-return null;
-}
-@Override
-public CompletionStage thenRunAsync(Runnable action) {
-// TODO Auto-generated method stub
-return null;
-}
-@Override
-public CompletionStage thenRunAsync(Runnable action, Executor 
executor) {
-// TODO Auto-generated method stub
-return null;
-}
-@Override
-public  CompletionStage thenCombine(CompletionStage other,
- BiFunction fn) {
-// TODO Auto-generated method stub
-return null;
-}
-@Override
-public  

cxf git commit: [CXF-7077] Upgrading Servlet API version to 3.1

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master b06cafc07 -> 1116dff4e


[CXF-7077] Upgrading Servlet API version to 3.1


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

Branch: refs/heads/master
Commit: 1116dff4ec9f06e2e69b040f5aa03779c0424c23
Parents: b06cafc
Author: Sergey Beryozkin 
Authored: Mon Oct 10 09:24:20 2016 +0100
Committer: Sergey Beryozkin 
Committed: Mon Oct 10 09:24:20 2016 +0100

--
 osgi/itests-felix/pom.xml   |  4 +--
 .../cxf/osgi/itests/NoAriesBlueprintTest.java   |  2 +-
 parent/pom.xml  | 11 +++
 .../HttpServletRequestAdapter.java  | 33 
 .../HttpServletResponseAdapter.java | 16 ++
 rt/transports/http-undertow/pom.xml |  4 +--
 .../atmosphere/DefaultProtocolInterceptor.java  | 11 +++
 .../jetty/WebSocketVirtualServletRequest.java   | 32 +++
 .../jetty/WebSocketVirtualServletResponse.java  | 19 +++
 systests/transports/pom.xml |  4 +--
 10 files changed, 123 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1116dff4/osgi/itests-felix/pom.xml
--
diff --git a/osgi/itests-felix/pom.xml b/osgi/itests-felix/pom.xml
index 1e012fc..76dc850 100644
--- a/osgi/itests-felix/pom.xml
+++ b/osgi/itests-felix/pom.xml
@@ -72,8 +72,8 @@
 ${project.version}
 
 
-org.apache.geronimo.specs
-geronimo-servlet_3.0_spec
+${cxf.servlet-api.group}
+${cxf.servlet-api.artifact}
 
 
 org.apache.cxf

http://git-wip-us.apache.org/repos/asf/cxf/blob/1116dff4/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
--
diff --git 
a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
 
b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
index de3ed84..8f0360a 100644
--- 
a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
+++ 
b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
@@ -66,7 +66,7 @@ public class NoAriesBlueprintTest extends OSGiTestSupport {
 mvnBundle("org.apache.cxf", "cxf-rt-bindings-xml"),
 mvnBundle("org.apache.cxf", "cxf-rt-bindings-soap"),
 mvnBundle("org.apache.cxf", "cxf-rt-frontend-simple"),
-mvnBundle("org.apache.geronimo.specs", 
"geronimo-servlet_3.0_spec"),
+mvnBundle("javax.servlet", "javax.servlet-api"),
 mvnBundle("org.apache.cxf", "cxf-rt-transports-http"),
 mvnBundle("org.apache.cxf", "cxf-rt-frontend-jaxws"),
 junitBundles()

http://git-wip-us.apache.org/repos/asf/cxf/blob/1116dff4/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 1d39542..3630054 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -105,8 +105,6 @@
 
1.0.1
 1.0
 2.4.1
-1.0
-1.2
 
1.1.1
 1.9.0_1
 3.19.0-GA
@@ -140,9 +138,10 @@
 
[3.1,4)
 1.7R2
 
0.9.10_3
-
org.apache.geronimo.specs
-
geronimo-servlet_3.0_spec
-1.0
+javax.servlet
+javax.servlet-api
+3.1.0
+1.2
 
geronimo-servlet_2.5_spec
 1.1.2
 1.7.21
@@ -1559,7 +1558,7 @@
 ${cxf.servlet-api.version}
 
 
-${cxf.servlet-api.group}
+org.apache.geronimo.specs
 ${cxf.servlet-api-2.5.artifact}
 ${cxf.servlet-api-2.5.version}
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/1116dff4/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/HttpServletRequestAdapter.java
--
diff --git 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/HttpServletRequestAdapter.java
 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/HttpServletRequestAdapter.java
index 6ffcd71..b4cbcf2 100644
--- 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/HttpServletRequestAdapter.java
+++