camel-cdi test using owb by default as it works.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7d5704d5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7d5704d5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7d5704d5 Branch: refs/heads/master Commit: 7d5704d5b16124ad1bb55eee6c31f80ff7a0a360 Parents: 867607e Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Sep 7 10:04:57 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Sep 7 10:04:57 2014 +0200 ---------------------------------------------------------------------- components/camel-cdi/pom.xml | 8 ++++---- parent/pom.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7d5704d5/components/camel-cdi/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml index 2427215..464afbe 100644 --- a/components/camel-cdi/pom.xml +++ b/components/camel-cdi/pom.xml @@ -107,6 +107,9 @@ <profiles> <profile> <id>owb</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> <dependencies> <dependency> <groupId>org.apache.geronimo.specs</groupId> @@ -135,10 +138,7 @@ </profile> <profile> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <id>weld</id> + <id>weld2</id> <dependencies> <dependency> <groupId>org.apache.deltaspike.cdictrl</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/7d5704d5/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 98411d3..b208cc4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -326,7 +326,7 @@ <netty-version>4.0.23.Final</netty-version> <noggit-bundle-version>0.5_1</noggit-bundle-version> <!-- should be in-sync with deltaspike --> - <openwebbeans-version>1.1.5</openwebbeans-version> + <openwebbeans-version>1.2.0</openwebbeans-version> <olingo2-version>2.0.0</olingo2-version> <ognl-version>3.0.8_1</ognl-version> <openejb-version>4.6.0.2</openejb-version>
