Merge pull request #14 from amdmdi/CAMEL-15379
CAMEL-15379: Fix failing cdi examples tests
diff --git a/examples/camel-example-cdi-properties/src/test/java/org/apache/camel/example/cdi/properties/CdiPropertiesTest.java b/examples/camel-example-cdi-properties/src/test/java/org/apache/camel/example/cdi/properties/CdiPropertiesTest.java
index cafbddf..5e94c9f 100644
--- a/examples/camel-example-cdi-properties/src/test/java/org/apache/camel/example/cdi/properties/CdiPropertiesTest.java
+++ b/examples/camel-example-cdi-properties/src/test/java/org/apache/camel/example/cdi/properties/CdiPropertiesTest.java
@@ -23,21 +23,21 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.reifier.RouteReifier;
-import org.apache.camel.spi.CamelEvent.CamelContextStartingEvent;
+import org.apache.camel.spi.CamelEvent.CamelContextStartedEvent;
import org.apache.camel.test.cdi.CamelCdiRunner;
import org.apache.deltaspike.core.api.config.ConfigProperty;
import org.junit.Test;
import org.junit.runner.RunWith;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
@RunWith(CamelCdiRunner.class)
public class CdiPropertiesTest {
- static void advice(@Observes CamelContextStartingEvent event,
+ static void advice(@Observes CamelContextStartedEvent event,
ModelCamelContext context) throws Exception {
// Add a mock endpoint to the end of the route
RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context, new AdviceWithRouteBuilder() {
diff --git a/examples/camel-example-cdi-xml/src/test/java/org/apache/camel/example/cdi/xml/CdiXmlTest.java b/examples/camel-example-cdi-xml/src/test/java/org/apache/camel/example/cdi/xml/CdiXmlTest.java
index 41ceada..042ff9c 100644
--- a/examples/camel-example-cdi-xml/src/test/java/org/apache/camel/example/cdi/xml/CdiXmlTest.java
+++ b/examples/camel-example-cdi-xml/src/test/java/org/apache/camel/example/cdi/xml/CdiXmlTest.java
@@ -32,7 +32,7 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.reifier.RouteReifier;
-import org.apache.camel.spi.CamelEvent.CamelContextStartingEvent;
+import org.apache.camel.spi.CamelEvent.CamelContextStartedEvent;
import org.apache.camel.test.cdi.CamelCdiRunner;
import org.apache.camel.test.cdi.Order;
import org.awaitility.Awaitility;
@@ -41,6 +41,8 @@
import static org.apache.camel.component.mock.MockEndpoint.assertIsSatisfied;
+
+
@RunWith(CamelCdiRunner.class)
public class CdiXmlTest {
@@ -51,7 +53,7 @@
@Inject
private ProducerTemplate prompt;
- void pipeMatrixStream(@Observes CamelContextStartingEvent event,
+ void pipeMatrixStream(@Observes CamelContextStartedEvent event,
ModelCamelContext context) throws Exception {
RouteReifier
.adviceWith(context.getRouteDefinition("matrix"), context, new AdviceWithRouteBuilder() {
diff --git a/examples/camel-example-cxf-proxy/pom.xml b/examples/camel-example-cxf-proxy/pom.xml
index 86d1cb4..eadcc77 100644
--- a/examples/camel-example-cxf-proxy/pom.xml
+++ b/examples/camel-example-cxf-proxy/pom.xml
@@ -137,6 +137,7 @@
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
+ <version>${cxf-codegen-plugin-version}</version>
<executions>
<execution>
<id>generate-sources</id>
diff --git a/examples/camel-example-cxf/pom.xml b/examples/camel-example-cxf/pom.xml
index 14ed4bb..02e4622 100644
--- a/examples/camel-example-cxf/pom.xml
+++ b/examples/camel-example-cxf/pom.xml
@@ -294,6 +294,7 @@
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
+ <version>${cxf-codegen-plugin-version}</version>
<executions>
<execution>
<id>generate-sources</id>
