You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2019/01/16 02:12:11 UTC
[brooklyn-server] 31/49: Updated CXF and JAX-RS version
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit f19af4790068a6161af9e7b90e4d8365ea97bbba
Author: Juan Cabrerizo <ju...@cloudsoft.io>
AuthorDate: Wed Jan 9 15:39:48 2019 +0000
Updated CXF and JAX-RS version
---
pom.xml | 4 ++--
.../org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index b96f16d..583ebd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
<kxml2.servicemix.version>2.3.0_3</kxml2.servicemix.version>
<!-- double-check downstream projects before changing jackson version -->
<fasterxml.jackson.version>2.9.6</fasterxml.jackson.version>
- <cxf.version>3.1.10</cxf.version>
+ <cxf.version>3.2.7</cxf.version>
<httpcomponents.httpclient.version>4.5.2</httpcomponents.httpclient.version>
<httpcomponents.httpcore.version>4.4.4</httpcomponents.httpcore.version>
<!-- @deprecated since 0.11 -->
@@ -154,7 +154,7 @@
<aopalliance.version>1.0</aopalliance.version>
<commons-configuration.version>1.7</commons-configuration.version>
<commons-lang.version>2.4</commons-lang.version>
- <jax-rs-api.version>2.0.1</jax-rs-api.version>
+ <jax-rs-api.version>2.1.1</jax-rs-api.version>
<maxmind.version>2.8.0-rc1</maxmind.version>
<maxmind-db.version>1.2.1</maxmind-db.version>
<winrm4j.version>0.5.0</winrm4j.version>
diff --git a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java
index 4a52a53..a1c1067 100644
--- a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java
+++ b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java
@@ -43,6 +43,7 @@ import org.apache.brooklyn.util.exceptions.Exceptions;
import org.apache.brooklyn.util.net.Urls;
import org.apache.brooklyn.util.repeat.Repeater;
import org.apache.brooklyn.util.time.Duration;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
@@ -97,8 +98,7 @@ public abstract class BrooklynRestResourceTest extends BrooklynRestApiTest {
serverEngine = new JettyHTTPServerEngineFactory().createJettyHTTPServerEngine(
ENDPOINT_ADDRESS_HOST, ENDPOINT_ADDRESS_PORT, "http");
serverEngine.setSessionSupport(true);
-
- JAXRSServerFactoryBean sf = ResourceUtils.createApplication(createRestApp(), true);
+ JAXRSServerFactoryBean sf = ResourceUtils.createApplication(createRestApp(), true,false,false, BusFactory.getDefaultBus());
if (clientProviders == null) {
clientProviders = sf.getProviders();
}