Repository: camel Updated Branches: refs/heads/master 808b0176e -> 0aed44aa2
Update Deltaspike to 0.5 Add Weld 2 profile for testing configure test to have it working for Weld 1 and OWB profiles Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1595b17b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1595b17b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1595b17b Branch: refs/heads/master Commit: 1595b17b7f6a93c4523e8c34a35c469c9937f358 Parents: a9ca68d Author: Antoine Sabot-Durand <anto...@sabot-durand.net> Authored: Thu Nov 7 10:25:38 2013 +0100 Committer: Antoine Sabot-Durand <anto...@sabot-durand.net> Committed: Thu Nov 7 10:25:38 2013 +0100 ---------------------------------------------------------------------- components/camel-cdi/pom.xml | 74 +++++++++++++++----- .../EndpointDefinedUsingConfigPropertyTest.java | 10 +-- 2 files changed, 61 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/1595b17b/components/camel-cdi/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml index cafc652..de1ec6d 100644 --- a/components/camel-cdi/pom.xml +++ b/components/camel-cdi/pom.xml @@ -15,7 +15,8 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> @@ -43,12 +44,22 @@ org.apache.camel.cdi.component.*;${camel.osgi.version} </camel.osgi.export.pkg> <camel.osgi.provide.capability> - org.ops4j.pax.cdi.extension; extension=camel-cdi-extension + org.ops4j.pax.cdi.extension; extension=camel-cdi-extension </camel.osgi.provide.capability> + <openwebbeans-version>1.1.7</openwebbeans-version> + <deltaspike-version>0.5</deltaspike-version> + <cdi-api.version>1.0-SP4</cdi-api.version> </properties> <dependencies> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>${cdi-api.version}</version> + <scope>provided</scope> + </dependency> + <!-- Camel --> <dependency> <groupId>org.apache.camel</groupId> @@ -65,6 +76,7 @@ <groupId>org.apache.deltaspike.core</groupId> <artifactId>deltaspike-core-impl</artifactId> <version>${deltaspike-version}</version> + <scope>runtime</scope> </dependency> <!-- only required for the Main --> @@ -74,21 +86,6 @@ <version>${deltaspike-version}</version> </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-atinject_1.0_spec</artifactId> - <version>${geronimo-atinject-1.0-spec-version}</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jcdi_1.0_spec</artifactId> - <version>${geronimo-jcdi-1.0-spec-version}</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-interceptor_1.1_spec</artifactId> - <version>${geronimo-interceptor-1.1-spec-version}</version> - </dependency> <!-- logging --> <dependency> @@ -137,11 +134,29 @@ <version>${openwebbeans-version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-atinject_1.0_spec</artifactId> + <version>${geronimo-atinject-1.0-spec-version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jcdi_1.0_spec</artifactId> + <version>${geronimo-jcdi-1.0-spec-version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-interceptor_1.1_spec</artifactId> + <version>${geronimo-interceptor-1.1-spec-version}</version> + <scope>test</scope> + </dependency> </dependencies> </profile> <profile> - <id>weld</id> + <id>weld-1</id> <!-- active by default as the overriding of InvocationTarget is currently broken in owb which breaks ProduceInjectTest --> <activation> <activeByDefault>true</activeByDefault> @@ -157,8 +172,31 @@ <groupId>org.jboss.weld.se</groupId> <artifactId>weld-se-core</artifactId> <version>${weld-version}</version> + <scope>test</scope> + </dependency> + + </dependencies> + </profile> + <profile> + <id>weld-2</id> + <properties> + <weld-version>2.1.0.Final</weld-version> + <cdi-api.version>1.1</cdi-api.version> + </properties> + <dependencies> + <dependency> + <groupId>org.apache.deltaspike.cdictrl</groupId> + <artifactId>deltaspike-cdictrl-weld</artifactId> + <version>${deltaspike-version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.weld.se</groupId> + <artifactId>weld-se-core</artifactId> + <version>${weld-version}</version> <scope>provided</scope> </dependency> + </dependencies> </profile> </profiles> http://git-wip-us.apache.org/repos/asf/camel/blob/1595b17b/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointDefinedUsingConfigPropertyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointDefinedUsingConfigPropertyTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointDefinedUsingConfigPropertyTest.java index 52496c2..17d596a 100644 --- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointDefinedUsingConfigPropertyTest.java +++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointDefinedUsingConfigPropertyTest.java @@ -16,10 +16,6 @@ */ package org.apache.camel.cdi; -import java.util.ArrayList; -import java.util.List; -import javax.inject.Inject; - import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.Produce; @@ -27,9 +23,13 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.cdi.store.Item; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.deltaspike.core.api.config.annotation.ConfigProperty; +import org.apache.deltaspike.core.api.config.ConfigProperty; import org.junit.Test; +import javax.inject.Inject; +import java.util.ArrayList; +import java.util.List; + public class EndpointDefinedUsingConfigPropertyTest extends CdiContextTestSupport { @Inject @ConfigProperty(name = "directEndpoint")
