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 2014/04/11 20:32:02 UTC
git commit: SM-2274: Upgrade to Camel 2.13.0 Thanks to Wim Verreydt
for the pull request!
Repository: servicemix
Updated Branches:
refs/heads/master 9a139cedf -> f7f0a6032
SM-2274: Upgrade to Camel 2.13.0
Thanks to Wim Verreydt for the pull request!
(cherry picked from commit 4a7bc1f384974ed6a0e7d37abfe1a9ea34551350)
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/f7f0a603
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/f7f0a603
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/f7f0a603
Branch: refs/heads/master
Commit: f7f0a60326b93224d36f846d8ae9a918bbd44908
Parents: 9a139ce
Author: Wim Verreydt <wi...@studentenleuven.be>
Authored: Sat Apr 5 13:18:43 2014 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Fri Apr 11 20:24:39 2014 +0200
----------------------------------------------------------------------
assembly/src/main/filtered-resources/examples.xml | 16 +++++++++++-----
.../itests/ExamplesIntegrationTests.scala | 5 +++--
parent/pom.xml | 2 +-
3 files changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/f7f0a603/assembly/src/main/filtered-resources/examples.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/examples.xml b/assembly/src/main/filtered-resources/examples.xml
index 1872611..076c2a2 100644
--- a/assembly/src/main/filtered-resources/examples.xml
+++ b/assembly/src/main/filtered-resources/examples.xml
@@ -101,28 +101,34 @@
<bundle>mvn:org.apache.servicemix.examples/camel-cxf-rest-route/${version}</bundle>
</feature>
<feature name="examples-cxf-ws-addressing" version="${version}" resolver="(obr)">
- <feature version="${cxf.version}">cxf</feature>
+ <feature version="${cxf.version}">cxf-core</feature>
<bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
<bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-addressing/${version}</bundle>
</feature>
<feature name="examples-cxf-ws-security-osgi" version="${version}" resolver="(obr)">
- <feature version="${cxf.version}">cxf</feature>
+ <feature version="${cxf.version}">cxf-core</feature>
+ <feature version="${cxf.version}">cxf-ws-security</feature>
<bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-osgi/${version}</bundle>
</feature>
<feature name="examples-cxf-ws-security-blueprint" version="${version}" resolver="(obr)">
- <feature version="${cxf.version}">cxf</feature>
+ <feature version="${cxf.version}">cxf-core</feature>
+ <feature version="${cxf.version}">cxf-ws-security</feature>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-blueprint/${version}</bundle>
</feature>
<feature name="examples-cxf-ws-security-signature" version="${version}" resolver="(obr)">
- <feature version="${cxf.version}">cxf</feature>
+ <feature version="${cxf.version}">cxf-core</feature>
+ <feature version="${cxf.version}">cxf-ws-security</feature>
+ <feature version="${cxf.version}">cxf-ws-rm</feature>
+ <bundle dependency="true">mvn:org.apache.cxf/cxf-bundle-compatible/${cxf.version}</bundle>
<bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
<bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-signature/${version}</bundle>
</feature>
<feature name="examples-cxf-ws-rm" version="${version}" resolver="(obr)">
- <feature version="${cxf.version}">cxf</feature>
+ <feature version="${cxf.version}">cxf-core</feature>
+ <feature version="${cxf.version}">cxf-ws-rm</feature>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-rm/${version}</bundle>
</feature>
<feature name="examples-cxf-wsn-receive" version="${version}" resolver="(obr)">
http://git-wip-us.apache.org/repos/asf/servicemix/blob/f7f0a603/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
----------------------------------------------------------------------
diff --git a/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala b/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
index eef5189..15cdc32 100644
--- a/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
+++ b/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
@@ -19,7 +19,7 @@ package org.apache.servicemix.itests
import org.junit.runner.RunWith
import org.junit.{Ignore, Test}
import org.apache.camel.{Exchange, Processor}
-import org.ops4j.pax.exam.spi.reactors.{PerClass, ExamReactorStrategy}
+import org.ops4j.pax.exam.spi.reactors.{PerMethod, PerClass, ExamReactorStrategy}
import org.ops4j.pax.exam.Configuration
import org.ops4j.pax.exam.junit.PaxExam
@@ -109,9 +109,10 @@ class CamelExamplesTest extends ExamplesIntegrationTests {
/**
* Tests for the CXF examples
*/
+@ExamReactorStrategy(Array(classOf[PerMethod]))
class CxfExamplesTest extends ExamplesIntegrationTests {
@Test
- def testCxfJaxRsExample = testWithFeature("examples-cxf-jaxrs", "camel-http") {
+ def testCxfJaxRsExample = testWithFeature(false,"examples-cxf-jaxrs", "camel-http") {
expect { logging.containsMessage( _.contains("Setting the server's publish address to be /crm")) }
// TODO: the service appears to be started, but the URLs are not accessible
// assertTrue(httpGet("http://localhost:8181/cxf/crm/customerservice/customers/123").contains("<Customer><id>123</id>"))
http://git-wip-us.apache.org/repos/asf/servicemix/blob/f7f0a603/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 152c0d0..4d06168 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -39,7 +39,7 @@
<properties>
<activemq.version>5.9.0</activemq.version>
<activiti.version>5.10</activiti.version>
- <camel.version>2.12.3</camel.version>
+ <camel.version>2.13.0</camel.version>
<cxf.version>2.7.10</cxf.version>
<felix.obr.version>1.6.6</felix.obr.version>