You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2018/10/09 18:35:08 UTC
[10/14] brooklyn-server git commit: Bump fasterxml,
cxf and snakeyaml to work with karaf 4.2.1
Bump fasterxml, cxf and snakeyaml to work with karaf 4.2.1
* fasterxml.jackson from 2.9.6 to 2.9.7
* cxf from 3.1.10 to 3.2.6
* snakeyaml from 1.22.23
Updating cxf required adding exclusions to winrm4j as it has a dependency upon
cxf 3.1.10.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/4ddffae3
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/4ddffae3
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/4ddffae3
Branch: refs/heads/master
Commit: 4ddffae358cdbd7282778ac0ae95f63f9de94579
Parents: f5cb5d9
Author: Paul Campbell <pa...@cloudsoft.io>
Authored: Mon Oct 1 15:43:44 2018 +0100
Committer: Paul Campbell <pa...@cloudsoft.io>
Committed: Mon Oct 1 15:43:44 2018 +0100
----------------------------------------------------------------------
parent/pom.xml | 10 ++++++++++
pom.xml | 6 +++---
.../brooklyn/rest/testing/BrooklynRestResourceTest.java | 2 +-
software/base/pom.xml | 5 +++++
software/winrm/pom.xml | 12 ++++++++++++
5 files changed, 31 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4ddffae3/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ac90a4a..f9a026b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -235,6 +235,16 @@
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>${fasterxml.jackson.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4ddffae3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0aa847f..26dfbb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,8 +116,8 @@
<xpp3.servicemix.version>1.1.4c_7</xpp3.servicemix.version>
<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>
+ <fasterxml.jackson.version>2.9.7</fasterxml.jackson.version>
+ <cxf.version>3.2.6</cxf.version>
<httpcomponents.httpclient.version>4.5.2</httpcomponents.httpclient.version>
<httpcomponents.httpcore.version>4.4.4</httpcomponents.httpcore.version>
<!-- @deprecated since 0.11 -->
@@ -125,7 +125,7 @@
<commons-lang3.version>3.3.2</commons-lang3.version>
<groovy.version>2.4.15</groovy.version> <!-- Version 2.4.7 supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.1-Release-Notes; not sure what more recent will be -->
<jsr305.version>2.0.1</jsr305.version>
- <snakeyaml.version>1.22</snakeyaml.version>
+ <snakeyaml.version>1.23</snakeyaml.version>
<!-- Next version of swagger requires changes to how path mapping and scanner injection are done. -->
<swagger.version>1.5.6</swagger.version>
<gson.version>2.5</gson.version>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4ddffae3/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java
----------------------------------------------------------------------
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 183f3de..49e35c4 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
@@ -89,7 +89,7 @@ public abstract class BrooklynRestResourceTest extends BrooklynRestApiTest {
protected synchronized void startServer() throws Exception {
if (server == null) {
setUpResources();
- JAXRSServerFactoryBean sf = ResourceUtils.createApplication(createRestApp(), true);
+ JAXRSServerFactoryBean sf = ResourceUtils.createApplication(createRestApp(), true, false, false, null);
if (clientProviders == null) {
clientProviders = sf.getProviders();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4ddffae3/software/base/pom.xml
----------------------------------------------------------------------
diff --git a/software/base/pom.xml b/software/base/pom.xml
index 4260120..6e51e22 100644
--- a/software/base/pom.xml
+++ b/software/base/pom.xml
@@ -104,6 +104,11 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-core</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
<dependency>
<groupId>org.testng</groupId>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4ddffae3/software/winrm/pom.xml
----------------------------------------------------------------------
diff --git a/software/winrm/pom.xml b/software/winrm/pom.xml
index b4a3f7e..a77a9a6 100644
--- a/software/winrm/pom.xml
+++ b/software/winrm/pom.xml
@@ -52,6 +52,18 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-hc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!--