Revert "Bump fasterxml, cxf and snakeyaml to work with karaf 4.2.1"
This reverts commit 4ddffae358cdbd7282778ac0ae95f63f9de94579. Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/5f132735 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/5f132735 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/5f132735 Branch: refs/heads/master Commit: 5f132735950675cca8a00112c84fe69041ba53bc Parents: 278f286 Author: Paul Campbell <paul.campb...@cloudsoft.io> Authored: Mon Oct 8 13:35:39 2018 +0100 Committer: Paul Campbell <paul.campb...@cloudsoft.io> Committed: Mon Oct 8 13:35:39 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, 4 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5f132735/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 9f6f1f8..e1b3737 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -235,16 +235,6 @@ <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/5f132735/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index df69f6f..eb92edb 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.7</fasterxml.jackson.version> - <cxf.version>3.2.6</cxf.version> + <fasterxml.jackson.version>2.9.6</fasterxml.jackson.version> + <cxf.version>3.1.10</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.23</snakeyaml.version> + <snakeyaml.version>1.22</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/5f132735/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 49e35c4..183f3de 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, false, false, null); + JAXRSServerFactoryBean sf = ResourceUtils.createApplication(createRestApp(), true); if (clientProviders == null) { clientProviders = sf.getProviders(); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5f132735/software/base/pom.xml ---------------------------------------------------------------------- diff --git a/software/base/pom.xml b/software/base/pom.xml index 6e51e22..4260120 100644 --- a/software/base/pom.xml +++ b/software/base/pom.xml @@ -104,11 +104,6 @@ <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/5f132735/software/winrm/pom.xml ---------------------------------------------------------------------- diff --git a/software/winrm/pom.xml b/software/winrm/pom.xml index a77a9a6..b4a3f7e 100644 --- a/software/winrm/pom.xml +++ b/software/winrm/pom.xml @@ -52,18 +52,6 @@ <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> <!--
