You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2015/11/23 20:26:52 UTC
servicemix git commit: SM. 2741: Upgrade to Apache Camel 2.16.1 and
Apache CXF 3.1.4
Repository: servicemix
Updated Branches:
refs/heads/master 0959a868c -> 7110dec0d
SM. 2741: Upgrade to Apache Camel 2.16.1 and Apache CXF 3.1.4
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/7110dec0
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/7110dec0
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/7110dec0
Branch: refs/heads/master
Commit: 7110dec0dcccd45f209ae4e52f643aad7fdea3bf
Parents: 0959a86
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Nov 23 20:26:18 2015 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Mon Nov 23 20:26:18 2015 +0100
----------------------------------------------------------------------
.../main/resources/OSGI-INF/blueprint/camel-server.xml | 10 ++++++++--
parent/pom.xml | 10 +++++-----
2 files changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/7110dec0/examples/drools/drools-camel-cxf-server/src/main/resources/OSGI-INF/blueprint/camel-server.xml
----------------------------------------------------------------------
diff --git a/examples/drools/drools-camel-cxf-server/src/main/resources/OSGI-INF/blueprint/camel-server.xml b/examples/drools/drools-camel-cxf-server/src/main/resources/OSGI-INF/blueprint/camel-server.xml
index 263096e..dbf780b 100644
--- a/examples/drools/drools-camel-cxf-server/src/main/resources/OSGI-INF/blueprint/camel-server.xml
+++ b/examples/drools/drools-camel-cxf-server/src/main/resources/OSGI-INF/blueprint/camel-server.xml
@@ -43,13 +43,19 @@ http://cxf.apache.org/blueprint/core http://cxf.apache.org/schemas/blueprint/cor
<!-- CAMEL -->
<camelContext id="camel"
xmlns="http://camel.apache.org/schema/blueprint">
+
+ <dataFormats>
+ <xstream id="xstream-default"
+ permissions="org.drools.core.command.**,org.apache.servicemix.examples.drools.**"/>
+ </dataFormats>
+
<!-- Route catch REST request and forward request to Kie Policy Bean-->
<route>
<from uri="cxfrs:bean:restKieServer" />
<policy ref="kiePolicy">
- <unmarshal ref="xstream" />
+ <unmarshal ref="xstream-default" />
<to uri="kie:simpleRuleKSession" />
- <marshal ref="xstream" />
+ <marshal ref="xstream-default" />
</policy>
</route>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/7110dec0/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6ae9366..950c2f2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -45,7 +45,7 @@
<aries.proxy.version>1.0.4</aries.proxy.version>
<aries.transaction.version>1.1.1</aries.transaction.version>
<aries.util.version>1.1.1</aries.util.version>
- <camel.version>2.16.0</camel.version>
+ <camel.version>2.16.1</camel.version>
<commons-codec.bundle.version>1.10</commons-codec.bundle.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
<commons-fileupload.version>1.3.1</commons-fileupload.version>
@@ -53,7 +53,7 @@
<commons-io.version>2.4</commons-io.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-lang3.version>3.4</commons-lang3.version>
- <cxf.version>3.1.2</cxf.version>
+ <cxf.version>3.1.4</cxf.version>
<derby.bundle.version>10.11.1.1_1</derby.bundle.version>
<drools.bundle.version>${drools.version}_1</drools.bundle.version>
<drools.version>5.6.0.Final</drools.version>
@@ -72,7 +72,7 @@
<javassist.bundle.version>3.12.1.GA_3</javassist.bundle.version>
<javax-inject.bundle.version>1_2</javax-inject.bundle.version>
<jaxb.api.version>2.2</jaxb.api.version>
- <jodatime2.bundle.version>2.8.2</jodatime2.bundle.version>
+ <jodatime2.bundle.version>2.9</jodatime2.bundle.version>
<jpa.version>2.1.0</jpa.version>
<json4s.bundle.version>3.2.11_1</json4s.bundle.version>
<karaf.version>3.0.5</karaf.version>
@@ -83,7 +83,7 @@
<pax.logging.version>1.8.4</pax.logging.version>
<pax.url.version>2.4.1</pax.url.version>
<postgresql.version>9.1-901</postgresql.version>
- <reflections.bundle.version>0.9.9_1</reflections.bundle.version>
+ <reflections.bundle.version>0.9.10_3</reflections.bundle.version>
<scala-2.10.version>2.10.4</scala-2.10.version>
<scala-xml.version>1.0.4</scala-xml.version>
<scala.version>2.11.7</scala.version>
@@ -93,7 +93,7 @@
<swagger.bundle.version>1.3.12_1</swagger.bundle.version>
<swagger.core.bundle.version>1.3.12_2</swagger.core.bundle.version>
<swagger.version>1.3.12</swagger.version>
- <thoughtworks.paranamer.version>2.7</thoughtworks.paranamer.version>
+ <thoughtworks.paranamer.version>2.8</thoughtworks.paranamer.version>
<typesafe-config.version>1.2.0</typesafe-config.version>
<wsdl4j.bundle.version>1.6.3_1</wsdl4j.bundle.version>
<xalan.bundle.version>2.7.2_2</xalan.bundle.version>