This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ccd5194b0f480d71912105f83b283899a95c0fcc Author: James Netherton <jamesnether...@gmail.com> AuthorDate: Thu Sep 17 08:09:41 2020 +0100 Combine some of the simpler component extensions into a single itest module --- .../{controlbus => foundation}/pom.xml | 85 ++++++++++- .../it/controlbus}/ControlbusResource.java | 6 +- .../foundation/it/controlbus}/ControlbusRoute.java | 14 +- .../foundation/it/mock}/MockResource.java | 24 +-- .../foundation/it/mock}/MockRouteBuilder.java | 13 +- .../component/foundation/it/ref}/RefResource.java | 2 +- .../it/scheduler}/SchedulerResource.java | 4 +- .../foundation/it/scheduler}/SchedulerRoute.java | 4 +- .../foundation/it/seda}/SedaResource.java | 2 +- .../foundation/it/stream}/StreamResource.java | 2 +- .../foundation/it/controlbus}/ControlbusIT.java | 2 +- .../foundation/it/controlbus}/ControlbusTest.java | 2 +- .../component/foundation/it/mock}/MockIT.java | 2 +- .../component/foundation/it/mock}/MockTest.java | 6 +- .../component/foundation/it/ref}/RefIT.java | 2 +- .../component/foundation/it/ref}/RefTest.java | 2 +- .../foundation/it/scheduler}/SchedulerIT.java | 2 +- .../foundation/it/scheduler}/SchedulerTest.java | 2 +- .../component/foundation/it/seda}/SedaIT.java | 2 +- .../component/foundation/it/seda}/SedaTest.java | 2 +- .../component/foundation/it/stream}/StreamIT.java | 2 +- .../foundation/it/stream}/StreamTest.java | 2 +- integration-tests/mock/pom.xml | 163 --------------------- integration-tests/pom.xml | 7 +- integration-tests/ref/pom.xml | 133 ----------------- integration-tests/scheduler/pom.xml | 144 ------------------ integration-tests/seda/pom.xml | 116 --------------- integration-tests/stream/pom.xml | 116 --------------- tooling/scripts/test-categories.yaml | 7 +- 29 files changed, 134 insertions(+), 736 deletions(-) diff --git a/integration-tests/controlbus/pom.xml b/integration-tests/foundation/pom.xml similarity index 66% rename from integration-tests/controlbus/pom.xml rename to integration-tests/foundation/pom.xml index dec3be8..af8326c 100644 --- a/integration-tests/controlbus/pom.xml +++ b/integration-tests/foundation/pom.xml @@ -25,9 +25,9 @@ <version>1.2.0-SNAPSHOT</version> </parent> - <artifactId>camel-quarkus-integration-test-controlbus</artifactId> - <name>Camel Quarkus :: Integration Tests :: ControlBus</name> - <description>Integration tests for Camel Quarkus ControlBus extension</description> + <artifactId>camel-quarkus-integration-test-foundation</artifactId> + <name>Camel Quarkus :: Integration Tests :: Foundation</name> + <description>Integration tests for Camel Quarkus Foundation</description> <dependencies> <dependency> @@ -36,15 +36,31 @@ </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-direct</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-log</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-direct</artifactId> + <artifactId>camel-quarkus-mock</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-timer</artifactId> + <artifactId>camel-quarkus-ref</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-seda</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-scheduler</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-stream</artifactId> </dependency> <dependency> <groupId>io.quarkus</groupId> @@ -62,6 +78,11 @@ <artifactId>rest-assured</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + <scope>test</scope> + </dependency> <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory --> <dependency> @@ -105,7 +126,59 @@ </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-timer-deployment</artifactId> + <artifactId>camel-quarkus-mock-deployment</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-ref-deployment</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-seda-deployment</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-scheduler-deployment</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-stream-deployment</artifactId> <version>${project.version}</version> <type>pom</type> <scope>test</scope> diff --git a/integration-tests/controlbus/src/main/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusResource.java b/integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/controlbus/ControlbusResource.java similarity index 93% rename from integration-tests/controlbus/src/main/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusResource.java rename to integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/controlbus/ControlbusResource.java index 1f45b48..c78bb2a 100644 --- a/integration-tests/controlbus/src/main/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusResource.java +++ b/integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/controlbus/ControlbusResource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.controlbus.it; +package org.apache.camel.quarkus.component.foundation.it.controlbus; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; @@ -48,7 +48,7 @@ public class ControlbusResource { @GET @Produces(MediaType.TEXT_PLAIN) public String start() throws Exception { - final String message = producerTemplate.requestBody("direct:start", "", String.class); + final String message = producerTemplate.requestBody("direct:startRoute", "", String.class); LOG.infof("Received from controlbus: %s", message); return message; } @@ -57,7 +57,7 @@ public class ControlbusResource { @GET @Produces(MediaType.TEXT_PLAIN) public String stop() throws Exception { - final String message = producerTemplate.requestBody("direct:stop", "", String.class); + final String message = producerTemplate.requestBody("direct:stopRoute", "", String.class); LOG.infof("Received from controlbus: %s", message); return message; } diff --git a/integration-tests/controlbus/src/main/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusRoute.java b/integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/controlbus/ControlbusRoute.java similarity index 72% rename from integration-tests/controlbus/src/main/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusRoute.java rename to integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/controlbus/ControlbusRoute.java index 4ae1f6b..5b862a0 100644 --- a/integration-tests/controlbus/src/main/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusRoute.java +++ b/integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/controlbus/ControlbusRoute.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.controlbus.it; +package org.apache.camel.quarkus.component.foundation.it.controlbus; import org.apache.camel.builder.RouteBuilder; @@ -22,15 +22,15 @@ public class ControlbusRoute extends RouteBuilder { @Override public void configure() throws Exception { - from("timer:foo").routeId("foo").log("Foo route"); + from("direct:control").routeId("control").log("Controlbus route"); from("direct:status") - .transform().exchange(e -> e.getContext().getRouteController().getRouteStatus("foo").name()); + .transform().exchange(e -> e.getContext().getRouteController().getRouteStatus("control").name()); - from("direct:stop") - .to("controlbus:route?routeId=foo&action=stop"); + from("direct:stopRoute") + .to("controlbus:route?routeId=control&action=stop"); - from("direct:start") - .to("controlbus:route?routeId=foo&action=start"); + from("direct:startRoute") + .to("controlbus:route?routeId=control&action=start"); } } diff --git a/integration-tests/mock/src/main/java/org/apache/camel/quarkus/component/mock/it/MockResource.java b/integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/mock/MockResource.java similarity index 83% rename from integration-tests/mock/src/main/java/org/apache/camel/quarkus/component/mock/it/MockResource.java rename to integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/mock/MockResource.java index 04f9d12..6d0e29c 100644 --- a/integration-tests/mock/src/main/java/org/apache/camel/quarkus/component/mock/it/MockResource.java +++ b/integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/mock/MockResource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.mock.it; +package org.apache.camel.quarkus.component.foundation.it.mock; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; @@ -51,7 +51,7 @@ public class MockResource { // advice the first route using the inlined AdviceWith route builder // which has extended capabilities than the regular route builder - RouteReifier.adviceWith(context.adapt(ModelCamelContext.class).getRouteDefinitions().get(0), context, + RouteReifier.adviceWith(context.adapt(ModelCamelContext.class).getRouteDefinition("forMocking"), context, new AdviceWithRouteBuilder() { @Override public void configure() throws Exception { @@ -60,16 +60,16 @@ public class MockResource { } }); - MockEndpoint mockEndpoint1 = context.getEndpoint("mock:direct:start", MockEndpoint.class); + MockEndpoint mockEndpoint1 = context.getEndpoint("mock:direct:mockStart", MockEndpoint.class); mockEndpoint1.expectedBodiesReceived("Hello World"); - MockEndpoint mockEndpoint2 = context.getEndpoint("mock:direct:foo", MockEndpoint.class); + MockEndpoint mockEndpoint2 = context.getEndpoint("mock:direct:mockFoo", MockEndpoint.class); mockEndpoint2.expectedBodiesReceived("Hello World"); - MockEndpoint mockEndpoint3 = context.getEndpoint("mock:log:foo", MockEndpoint.class); + MockEndpoint mockEndpoint3 = context.getEndpoint("mock:log:mockFoo", MockEndpoint.class); mockEndpoint3.expectedBodiesReceived("Bye World"); MockEndpoint mockEndpoint4 = context.getEndpoint("mock:result", MockEndpoint.class); mockEndpoint4.expectedBodiesReceived("Bye World"); - producerTemplate.sendBody("direct:start", "Hello World"); + producerTemplate.sendBody("direct:mockStart", "Hello World"); mockEndpoint1.assertIsSatisfied(); mockEndpoint2.assertIsSatisfied(); @@ -77,14 +77,14 @@ public class MockResource { mockEndpoint4.assertIsSatisfied(); // test to ensure correct endpoints in registry - Assert.assertNotNull(context.hasEndpoint("direct:start")); - Assert.assertNotNull(context.hasEndpoint("direct:foo")); - Assert.assertNotNull(context.hasEndpoint("log:foo")); + Assert.assertNotNull(context.hasEndpoint("direct:mockStart")); + Assert.assertNotNull(context.hasEndpoint("direct:mockFoo")); + Assert.assertNotNull(context.hasEndpoint("log:mockFoo")); Assert.assertNotNull(context.hasEndpoint("mock:result")); // all the endpoints was mocked - Assert.assertNotNull(context.hasEndpoint("mock:direct:start")); - Assert.assertNotNull(context.hasEndpoint("mock:direct:foo")); - Assert.assertNotNull(context.hasEndpoint("mock:log:foo")); + Assert.assertNotNull(context.hasEndpoint("mock:direct:mockStart")); + Assert.assertNotNull(context.hasEndpoint("mock:direct:mockFoo")); + Assert.assertNotNull(context.hasEndpoint("mock:log:mockFoo")); } @Path("/basic") diff --git a/integration-tests/mock/src/main/java/org/apache/camel/quarkus/component/mock/it/MockRouteBuilder.java b/integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/mock/MockRouteBuilder.java similarity index 64% rename from integration-tests/mock/src/main/java/org/apache/camel/quarkus/component/mock/it/MockRouteBuilder.java rename to integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/mock/MockRouteBuilder.java index acee562..8b1076f 100644 --- a/integration-tests/mock/src/main/java/org/apache/camel/quarkus/component/mock/it/MockRouteBuilder.java +++ b/integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/mock/MockRouteBuilder.java @@ -14,15 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.mock.it; +package org.apache.camel.quarkus.component.foundation.it.mock; +import org.apache.camel.Exchange; +import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; public class MockRouteBuilder extends RouteBuilder { @Override public void configure() { - from("direct:start").to("direct:foo").to("log:foo").to("mock:result"); + from("direct:mockStart").routeId("forMocking").to("direct:mockFoo").to("log:mockFoo").to("mock:result"); - from("direct:foo").transform(constant("Bye World")); + from("direct:mockFoo").process(new Processor() { + @Override + public void process(Exchange exchange) throws Exception { + System.out.println(exchange.getMessage().getBody()); + } + }).transform(constant("Bye World")); } } diff --git a/integration-tests/ref/src/main/java/org/apache/camel/quarkus/component/ref/it/RefResource.java b/integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/ref/RefResource.java similarity index 97% rename from integration-tests/ref/src/main/java/org/apache/camel/quarkus/component/ref/it/RefResource.java rename to integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/ref/RefResource.java index 7db6817..7d8ae0e 100644 --- a/integration-tests/ref/src/main/java/org/apache/camel/quarkus/component/ref/it/RefResource.java +++ b/integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/ref/RefResource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.ref.it; +package org.apache.camel.quarkus.component.foundation.it.ref; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; diff --git a/integration-tests/scheduler/src/main/java/org/apache/camel/quarkus/component/scheduler/it/SchedulerResource.java b/integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/scheduler/SchedulerResource.java similarity index 90% rename from integration-tests/scheduler/src/main/java/org/apache/camel/quarkus/component/scheduler/it/SchedulerResource.java rename to integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/scheduler/SchedulerResource.java index cbb27a4..b50d5e5 100644 --- a/integration-tests/scheduler/src/main/java/org/apache/camel/quarkus/component/scheduler/it/SchedulerResource.java +++ b/integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/scheduler/SchedulerResource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.scheduler.it; +package org.apache.camel.quarkus.component.foundation.it.scheduler; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; @@ -40,7 +40,7 @@ public class SchedulerResource { @GET @Produces(MediaType.TEXT_PLAIN) public Response get() throws Exception { - String response = producerTemplate.requestBody("direct:start", null, String.class); + String response = producerTemplate.requestBody("direct:getCounter", null, String.class); LOG.infof("Got response from scheduler: %s", response); return Response.ok(response).build(); } diff --git a/integration-tests/scheduler/src/main/java/org/apache/camel/quarkus/component/scheduler/it/SchedulerRoute.java b/integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/scheduler/SchedulerRoute.java similarity index 92% rename from integration-tests/scheduler/src/main/java/org/apache/camel/quarkus/component/scheduler/it/SchedulerRoute.java rename to integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/scheduler/SchedulerRoute.java index 255f3e1..c37472b 100644 --- a/integration-tests/scheduler/src/main/java/org/apache/camel/quarkus/component/scheduler/it/SchedulerRoute.java +++ b/integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/scheduler/SchedulerRoute.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.scheduler.it; +package org.apache.camel.quarkus.component.foundation.it.scheduler; import java.util.concurrent.atomic.AtomicInteger; @@ -29,7 +29,7 @@ public class SchedulerRoute extends RouteBuilder { from("scheduler:start?initialDelay=1") .process(e -> counter.incrementAndGet()); - from("direct:start") + from("direct:getCounter") .setBody(e -> counter.get()); } } diff --git a/integration-tests/seda/src/main/java/org/apache/camel/quarkus/component/seda/it/SedaResource.java b/integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/seda/SedaResource.java similarity index 97% rename from integration-tests/seda/src/main/java/org/apache/camel/quarkus/component/seda/it/SedaResource.java rename to integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/seda/SedaResource.java index 1d75786..96bf03c 100644 --- a/integration-tests/seda/src/main/java/org/apache/camel/quarkus/component/seda/it/SedaResource.java +++ b/integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/seda/SedaResource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.seda.it; +package org.apache.camel.quarkus.component.foundation.it.seda; import java.net.URI; diff --git a/integration-tests/stream/src/main/java/org/apache/camel/quarkus/component/stream/it/StreamResource.java b/integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/stream/StreamResource.java similarity index 96% rename from integration-tests/stream/src/main/java/org/apache/camel/quarkus/component/stream/it/StreamResource.java rename to integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/stream/StreamResource.java index 24f6ea0..e687a94 100644 --- a/integration-tests/stream/src/main/java/org/apache/camel/quarkus/component/stream/it/StreamResource.java +++ b/integration-tests/foundation/src/main/java/org/apache/camel/quarkus/component/foundation/it/stream/StreamResource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.stream.it; +package org.apache.camel.quarkus.component.foundation.it.stream; import java.io.ByteArrayOutputStream; diff --git a/integration-tests/controlbus/src/test/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusIT.java b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/controlbus/ControlbusIT.java similarity index 92% rename from integration-tests/controlbus/src/test/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusIT.java rename to integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/controlbus/ControlbusIT.java index 24700f5..666c228 100644 --- a/integration-tests/controlbus/src/test/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusIT.java +++ b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/controlbus/ControlbusIT.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.controlbus.it; +package org.apache.camel.quarkus.component.foundation.it.controlbus; import io.quarkus.test.junit.NativeImageTest; diff --git a/integration-tests/controlbus/src/test/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusTest.java b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/controlbus/ControlbusTest.java similarity index 95% rename from integration-tests/controlbus/src/test/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusTest.java rename to integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/controlbus/ControlbusTest.java index af190f3..ba248dd 100644 --- a/integration-tests/controlbus/src/test/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusTest.java +++ b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/controlbus/ControlbusTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.controlbus.it; +package org.apache.camel.quarkus.component.foundation.it.controlbus; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; diff --git a/integration-tests/mock/src/test/java/org/apache/camel/quarkus/component/mock/it/MockIT.java b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/mock/MockIT.java similarity index 93% rename from integration-tests/mock/src/test/java/org/apache/camel/quarkus/component/mock/it/MockIT.java rename to integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/mock/MockIT.java index 6b76d0d..e43776c 100644 --- a/integration-tests/mock/src/test/java/org/apache/camel/quarkus/component/mock/it/MockIT.java +++ b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/mock/MockIT.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.mock.it; +package org.apache.camel.quarkus.component.foundation.it.mock; import io.quarkus.test.junit.NativeImageTest; diff --git a/integration-tests/mock/src/test/java/org/apache/camel/quarkus/component/mock/it/MockTest.java b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/mock/MockTest.java similarity index 91% rename from integration-tests/mock/src/test/java/org/apache/camel/quarkus/component/mock/it/MockTest.java rename to integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/mock/MockTest.java index 2c5b733..803e9fc 100644 --- a/integration-tests/mock/src/test/java/org/apache/camel/quarkus/component/mock/it/MockTest.java +++ b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/mock/MockTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.mock.it; +package org.apache.camel.quarkus.component.foundation.it.mock; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; @@ -27,10 +27,10 @@ class MockTest { @Test public void basic() { final String msg = java.util.UUID.randomUUID().toString().replace("-", ""); - RestAssured.given() // + RestAssured.given() .contentType(ContentType.TEXT) .body(msg) - .post("/mock/basic") // + .post("/mock/basic") .then() .statusCode(204); } diff --git a/integration-tests/ref/src/test/java/org/apache/camel/quarkus/component/ref/it/RefIT.java b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/ref/RefIT.java similarity index 93% rename from integration-tests/ref/src/test/java/org/apache/camel/quarkus/component/ref/it/RefIT.java rename to integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/ref/RefIT.java index 1ca0fa8..744031d 100644 --- a/integration-tests/ref/src/test/java/org/apache/camel/quarkus/component/ref/it/RefIT.java +++ b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/ref/RefIT.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.ref.it; +package org.apache.camel.quarkus.component.foundation.it.ref; import io.quarkus.test.junit.NativeImageTest; diff --git a/integration-tests/ref/src/test/java/org/apache/camel/quarkus/component/ref/it/RefTest.java b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/ref/RefTest.java similarity index 95% rename from integration-tests/ref/src/test/java/org/apache/camel/quarkus/component/ref/it/RefTest.java rename to integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/ref/RefTest.java index 9da46de..ff0e0f2 100644 --- a/integration-tests/ref/src/test/java/org/apache/camel/quarkus/component/ref/it/RefTest.java +++ b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/ref/RefTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.ref.it; +package org.apache.camel.quarkus.component.foundation.it.ref; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; diff --git a/integration-tests/scheduler/src/test/java/org/apache/camel/quarkus/component/scheduler/it/SchedulerIT.java b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/scheduler/SchedulerIT.java similarity index 93% rename from integration-tests/scheduler/src/test/java/org/apache/camel/quarkus/component/scheduler/it/SchedulerIT.java rename to integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/scheduler/SchedulerIT.java index db02afd..12ec486 100644 --- a/integration-tests/scheduler/src/test/java/org/apache/camel/quarkus/component/scheduler/it/SchedulerIT.java +++ b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/scheduler/SchedulerIT.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.scheduler.it; +package org.apache.camel.quarkus.component.foundation.it.scheduler; import io.quarkus.test.junit.NativeImageTest; diff --git a/integration-tests/scheduler/src/test/java/org/apache/camel/quarkus/component/scheduler/it/SchedulerTest.java b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/scheduler/SchedulerTest.java similarity index 95% rename from integration-tests/scheduler/src/test/java/org/apache/camel/quarkus/component/scheduler/it/SchedulerTest.java rename to integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/scheduler/SchedulerTest.java index a767335..2bda587 100644 --- a/integration-tests/scheduler/src/test/java/org/apache/camel/quarkus/component/scheduler/it/SchedulerTest.java +++ b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/scheduler/SchedulerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.scheduler.it; +package org.apache.camel.quarkus.component.foundation.it.scheduler; import java.util.concurrent.TimeUnit; diff --git a/integration-tests/seda/src/test/java/org/apache/camel/quarkus/component/seda/it/SedaIT.java b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/seda/SedaIT.java similarity index 93% rename from integration-tests/seda/src/test/java/org/apache/camel/quarkus/component/seda/it/SedaIT.java rename to integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/seda/SedaIT.java index 564adfa..579e3cb 100644 --- a/integration-tests/seda/src/test/java/org/apache/camel/quarkus/component/seda/it/SedaIT.java +++ b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/seda/SedaIT.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.seda.it; +package org.apache.camel.quarkus.component.foundation.it.seda; import io.quarkus.test.junit.NativeImageTest; diff --git a/integration-tests/seda/src/test/java/org/apache/camel/quarkus/component/seda/it/SedaTest.java b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/seda/SedaTest.java similarity index 95% rename from integration-tests/seda/src/test/java/org/apache/camel/quarkus/component/seda/it/SedaTest.java rename to integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/seda/SedaTest.java index 23b3a30..8f0ea02 100644 --- a/integration-tests/seda/src/test/java/org/apache/camel/quarkus/component/seda/it/SedaTest.java +++ b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/seda/SedaTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.seda.it; +package org.apache.camel.quarkus.component.foundation.it.seda; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; diff --git a/integration-tests/stream/src/test/java/org/apache/camel/quarkus/component/stream/it/StreamIT.java b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/stream/StreamIT.java similarity index 93% rename from integration-tests/stream/src/test/java/org/apache/camel/quarkus/component/stream/it/StreamIT.java rename to integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/stream/StreamIT.java index fc594fb..02b2e01 100644 --- a/integration-tests/stream/src/test/java/org/apache/camel/quarkus/component/stream/it/StreamIT.java +++ b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/stream/StreamIT.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.stream.it; +package org.apache.camel.quarkus.component.foundation.it.stream; import io.quarkus.test.junit.NativeImageTest; diff --git a/integration-tests/stream/src/test/java/org/apache/camel/quarkus/component/stream/it/StreamTest.java b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/stream/StreamTest.java similarity index 95% rename from integration-tests/stream/src/test/java/org/apache/camel/quarkus/component/stream/it/StreamTest.java rename to integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/stream/StreamTest.java index 374c3c7..6b570b4 100644 --- a/integration-tests/stream/src/test/java/org/apache/camel/quarkus/component/stream/it/StreamTest.java +++ b/integration-tests/foundation/src/test/java/org/apache/camel/quarkus/component/foundation/it/stream/StreamTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.quarkus.component.stream.it; +package org.apache.camel.quarkus.component.foundation.it.stream; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; diff --git a/integration-tests/mock/pom.xml b/integration-tests/mock/pom.xml deleted file mode 100644 index 042142e..0000000 --- a/integration-tests/mock/pom.xml +++ /dev/null @@ -1,163 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - 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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-integration-tests</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-integration-test-mock</artifactId> - <name>Camel Quarkus :: Integration Tests :: Mock</name> - <description>Integration tests for Camel Quarkus Mock extension</description> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-bom-test</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-mock</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-resteasy</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-direct</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-log</artifactId> - </dependency> - - <!-- test dependencies --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit5</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>io.rest-assured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - - <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory --> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-direct-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-log-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-mock-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>build</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>native</id> - <activation> - <property> - <name>native</name> - </property> - </activation> - <properties> - <quarkus.package.type>native</quarkus.package.type> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index ac739e5..62087d0 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -75,7 +75,6 @@ <module>caffeine</module> <module>compression</module> <module>consul</module> - <module>controlbus</module> <module>couchdb</module> <module>csv</module> <module>dataformat</module> @@ -90,6 +89,7 @@ <module>file</module> <module>flatpack</module> <module>fop</module> + <module>foundation</module> <module>ftp</module> <module>git</module> <module>github</module> @@ -118,7 +118,6 @@ <module>master</module> <module>messaging</module> <module>microprofile</module> - <module>mock</module> <module>mongodb</module> <module>mustache</module> <module>nats</module> @@ -133,14 +132,11 @@ <module>qute</module> <module>rabbitmq</module> <module>reactive-streams</module> - <module>ref</module> <module>rest</module> <module>rest-binding-mode-xml</module> <module>rest-openapi</module> <module>salesforce</module> <module>sap-netweaver</module> - <module>scheduler</module> - <module>seda</module> <module>send-dynamic-http</module> <module>servicenow</module> <module>servlet</module> @@ -148,7 +144,6 @@ <module>smallrye-reactive-messaging</module> <module>soap</module> <module>sql</module> - <module>stream</module> <module>tarfile</module> <module>telegram</module> <module>tika</module> diff --git a/integration-tests/ref/pom.xml b/integration-tests/ref/pom.xml deleted file mode 100644 index 81b4b1f..0000000 --- a/integration-tests/ref/pom.xml +++ /dev/null @@ -1,133 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - 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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-integration-tests</artifactId> - <version>1.2.0-SNAPSHOT</version> - </parent> - - <artifactId>camel-quarkus-integration-test-ref</artifactId> - <name>Camel Quarkus :: Integration Tests :: Ref</name> - <description>Integration tests for Camel Quarkus Ref extension</description> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-ref</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-direct</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-resteasy</artifactId> - </dependency> - - <!-- test dependencies --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit5</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>io.rest-assured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - - <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory --> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-direct-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-ref-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>build</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>native</id> - <activation> - <property> - <name>native</name> - </property> - </activation> - <properties> - <quarkus.package.type>native</quarkus.package.type> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> diff --git a/integration-tests/scheduler/pom.xml b/integration-tests/scheduler/pom.xml deleted file mode 100644 index 6d11bcd..0000000 --- a/integration-tests/scheduler/pom.xml +++ /dev/null @@ -1,144 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - 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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-integration-tests</artifactId> - <version>1.2.0-SNAPSHOT</version> - </parent> - - <artifactId>camel-quarkus-integration-test-scheduler</artifactId> - <name>Camel Quarkus :: Integration Tests :: Scheduler</name> - <description>Integration tests for Camel Quarkus Scheduler extension</description> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-scheduler</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-direct</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-resteasy</artifactId> - </dependency> - - <!-- test dependencies --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit5</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>io.rest-assured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory --> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-direct-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-scheduler-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>build</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>native</id> - <activation> - <property> - <name>native</name> - </property> - </activation> - <properties> - <quarkus.package.type>native</quarkus.package.type> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> diff --git a/integration-tests/seda/pom.xml b/integration-tests/seda/pom.xml deleted file mode 100644 index 40b90e2..0000000 --- a/integration-tests/seda/pom.xml +++ /dev/null @@ -1,116 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - 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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-integration-tests</artifactId> - <version>1.2.0-SNAPSHOT</version> - </parent> - - <artifactId>camel-quarkus-integration-test-seda</artifactId> - <name>Camel Quarkus :: Integration Tests :: SEDA</name> - <description>Integration tests for Camel Quarkus SEDA extension</description> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-seda</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-resteasy</artifactId> - </dependency> - - <!-- test dependencies --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit5</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>io.rest-assured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - - <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory --> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-seda-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>build</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>native</id> - <activation> - <property> - <name>native</name> - </property> - </activation> - <properties> - <quarkus.package.type>native</quarkus.package.type> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> diff --git a/integration-tests/stream/pom.xml b/integration-tests/stream/pom.xml deleted file mode 100644 index 7bf9130..0000000 --- a/integration-tests/stream/pom.xml +++ /dev/null @@ -1,116 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - 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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-integration-tests</artifactId> - <version>1.2.0-SNAPSHOT</version> - </parent> - - <artifactId>camel-quarkus-integration-test-stream</artifactId> - <name>Camel Quarkus :: Integration Tests :: Stream</name> - <description>Integration tests for Camel Quarkus Stream extension</description> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-stream</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-resteasy</artifactId> - </dependency> - - <!-- test dependencies --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit5</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>io.rest-assured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - - <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory --> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-stream-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>build</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>native</id> - <activation> - <property> - <name>native</name> - </property> - </activation> - <properties> - <quarkus.package.type>native</quarkus.package.type> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml index dc7a041..5c35259 100644 --- a/tooling/scripts/test-categories.yaml +++ b/tooling/scripts/test-categories.yaml @@ -60,16 +60,13 @@ dataformats: - xstream foundation: - bean - - controlbus - exec - file + - foundation - hystrix - jta - jsonpath - quartz - - scheduler - - ref - - seda xml-json-olingo4: - rest-binding-mode-xml - xml @@ -83,7 +80,6 @@ dozer-social: - telegram - twitter - master - - mock messaging-networking1: - activemq - amqp @@ -102,7 +98,6 @@ misc: - mustache - pdf - qute - - stream - tika - as2 - kotlin