This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 0ba02e5d5478606b894fef2ac634accfb314a07b Author: lburgazzoli <lburgazz...@gmail.com> AuthorDate: Tue May 12 16:12:30 2020 +0200 Remove 'core' prefix for main related integration tests modules --- .github/test-categories.yaml | 11 ++++++----- .../pom.xml | 4 ++-- .../camel/quarkus/core/CoreMainCaffeineLRUCacheResource.java | 0 .../src/main/resources/application.properties | 0 .../quarkus/core/CoreMainCaffeineLRUCacheResourceIT.java | 0 .../quarkus/core/CoreMainCaffeineLRUCacheResourceTest.java | 0 .../{core-main-collector => main-collector}/pom.xml | 4 ++-- .../apache/camel/quarkus/core/CoreMainCollectorResource.java | 0 .../src/main/resources/application.properties | 0 .../org/apache/camel/quarkus/core/CoreMainCollectorTest.java | 0 integration-tests/{core-main-xml-io => main-xml-io}/pom.xml | 4 ++-- .../org/apache/camel/quarkus/core/CoreMainXmlIoResource.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/routes/my-routes.xml | 0 .../java/org/apache/camel/quarkus/core/CoreMainXmlIoIT.java | 0 .../java/org/apache/camel/quarkus/core/CoreMainXmlIoTest.java | 0 .../{core-main-xml-jaxb => main-xml-jaxb}/pom.xml | 4 ++-- .../apache/camel/quarkus/core/CoreMainXmlJaxbResource.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/routes/my-routes.xml | 0 .../java/org/apache/camel/quarkus/core/CoreMainXmlJaxbIT.java | 0 .../org/apache/camel/quarkus/core/CoreMainXmlJaxbTest.java | 0 integration-tests/{core-main => main}/pom.xml | 4 ++-- .../java/org/apache/camel/quarkus/core/CamelComponents.java | 0 .../main/java/org/apache/camel/quarkus/core/CamelRoute.java | 0 .../org/apache/camel/quarkus/core/CamelRouteFiltered.java | 0 .../org/apache/camel/quarkus/core/CamelRouteProducer.java | 0 .../apache/camel/quarkus/core/CamelRouteWithEndpointDSL.java | 0 .../java/org/apache/camel/quarkus/core/CoreMainResource.java | 0 .../src/main/resources/application.properties | 0 .../test/java/org/apache/camel/quarkus/core/CoreMainIT.java | 0 .../test/java/org/apache/camel/quarkus/core/CoreMainTest.java | 0 .../org/apache/camel/quarkus/core/CoreMainTestResource.java | 0 integration-tests/pom.xml | 10 +++++----- 34 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.github/test-categories.yaml b/.github/test-categories.yaml index 4817d04..cd203ac 100644 --- a/.github/test-categories.yaml +++ b/.github/test-categories.yaml @@ -25,11 +25,12 @@ cloud: core: - core - core-impl - - core-main - - core-main-caffeine-lrucache - - core-main-collector - - core-main-xml-io - - core-main-xml-jaxb +main: + - main + - main-caffeine-lrucache + - main-collector + - main-xml-io + - main-xml-jaxb database: - couchdb - influxdb diff --git a/integration-tests/core-main-caffeine-lrucache/pom.xml b/integration-tests/main-caffeine-lrucache/pom.xml similarity index 96% rename from integration-tests/core-main-caffeine-lrucache/pom.xml rename to integration-tests/main-caffeine-lrucache/pom.xml index 7152ae1..746df22 100644 --- a/integration-tests/core-main-caffeine-lrucache/pom.xml +++ b/integration-tests/main-caffeine-lrucache/pom.xml @@ -25,8 +25,8 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>camel-quarkus-integration-test-core-main-caffein-lrucache</artifactId> - <name>Camel Quarkus :: Integration Tests :: Core Main Caffeine LRUCache :: Tests</name> + <artifactId>camel-quarkus-integration-test-main-caffein-lrucache</artifactId> + <name>Camel Quarkus :: Integration Tests :: Main Caffeine LRUCache :: Tests</name> <description>The camel integration tests</description> <properties> diff --git a/integration-tests/core-main-caffeine-lrucache/src/main/java/org/apache/camel/quarkus/core/CoreMainCaffeineLRUCacheResource.java b/integration-tests/main-caffeine-lrucache/src/main/java/org/apache/camel/quarkus/core/CoreMainCaffeineLRUCacheResource.java similarity index 100% rename from integration-tests/core-main-caffeine-lrucache/src/main/java/org/apache/camel/quarkus/core/CoreMainCaffeineLRUCacheResource.java rename to integration-tests/main-caffeine-lrucache/src/main/java/org/apache/camel/quarkus/core/CoreMainCaffeineLRUCacheResource.java diff --git a/integration-tests/core-main-caffeine-lrucache/src/main/resources/application.properties b/integration-tests/main-caffeine-lrucache/src/main/resources/application.properties similarity index 100% rename from integration-tests/core-main-caffeine-lrucache/src/main/resources/application.properties rename to integration-tests/main-caffeine-lrucache/src/main/resources/application.properties diff --git a/integration-tests/core-main-caffeine-lrucache/src/test/java/org/apache/camel/quarkus/core/CoreMainCaffeineLRUCacheResourceIT.java b/integration-tests/main-caffeine-lrucache/src/test/java/org/apache/camel/quarkus/core/CoreMainCaffeineLRUCacheResourceIT.java similarity index 100% rename from integration-tests/core-main-caffeine-lrucache/src/test/java/org/apache/camel/quarkus/core/CoreMainCaffeineLRUCacheResourceIT.java rename to integration-tests/main-caffeine-lrucache/src/test/java/org/apache/camel/quarkus/core/CoreMainCaffeineLRUCacheResourceIT.java diff --git a/integration-tests/core-main-caffeine-lrucache/src/test/java/org/apache/camel/quarkus/core/CoreMainCaffeineLRUCacheResourceTest.java b/integration-tests/main-caffeine-lrucache/src/test/java/org/apache/camel/quarkus/core/CoreMainCaffeineLRUCacheResourceTest.java similarity index 100% rename from integration-tests/core-main-caffeine-lrucache/src/test/java/org/apache/camel/quarkus/core/CoreMainCaffeineLRUCacheResourceTest.java rename to integration-tests/main-caffeine-lrucache/src/test/java/org/apache/camel/quarkus/core/CoreMainCaffeineLRUCacheResourceTest.java diff --git a/integration-tests/core-main-collector/pom.xml b/integration-tests/main-collector/pom.xml similarity index 96% rename from integration-tests/core-main-collector/pom.xml rename to integration-tests/main-collector/pom.xml index 8f0a576..4d045e5 100644 --- a/integration-tests/core-main-collector/pom.xml +++ b/integration-tests/main-collector/pom.xml @@ -25,8 +25,8 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>camel-quarkus-integration-test-core-main-collector</artifactId> - <name>Camel Quarkus :: Integration Tests :: Core Main Collector :: Tests</name> + <artifactId>camel-quarkus-integration-test-main-collector</artifactId> + <name>Camel Quarkus :: Integration Tests :: Main Collector :: Tests</name> <description>The camel integration tests</description> <properties> diff --git a/integration-tests/core-main-collector/src/main/java/org/apache/camel/quarkus/core/CoreMainCollectorResource.java b/integration-tests/main-collector/src/main/java/org/apache/camel/quarkus/core/CoreMainCollectorResource.java similarity index 100% rename from integration-tests/core-main-collector/src/main/java/org/apache/camel/quarkus/core/CoreMainCollectorResource.java rename to integration-tests/main-collector/src/main/java/org/apache/camel/quarkus/core/CoreMainCollectorResource.java diff --git a/integration-tests/core-main-collector/src/main/resources/application.properties b/integration-tests/main-collector/src/main/resources/application.properties similarity index 100% rename from integration-tests/core-main-collector/src/main/resources/application.properties rename to integration-tests/main-collector/src/main/resources/application.properties diff --git a/integration-tests/core-main-collector/src/test/java/org/apache/camel/quarkus/core/CoreMainCollectorTest.java b/integration-tests/main-collector/src/test/java/org/apache/camel/quarkus/core/CoreMainCollectorTest.java similarity index 100% rename from integration-tests/core-main-collector/src/test/java/org/apache/camel/quarkus/core/CoreMainCollectorTest.java rename to integration-tests/main-collector/src/test/java/org/apache/camel/quarkus/core/CoreMainCollectorTest.java diff --git a/integration-tests/core-main-xml-io/pom.xml b/integration-tests/main-xml-io/pom.xml similarity index 97% rename from integration-tests/core-main-xml-io/pom.xml rename to integration-tests/main-xml-io/pom.xml index a195e07..74a75cf 100644 --- a/integration-tests/core-main-xml-io/pom.xml +++ b/integration-tests/main-xml-io/pom.xml @@ -25,8 +25,8 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>camel-quarkus-integration-test-core-main-xml-io</artifactId> - <name>Camel Quarkus :: Integration Tests :: Core Main XML Io :: Tests</name> + <artifactId>camel-quarkus-integration-test-main-xml-io</artifactId> + <name>Camel Quarkus :: Integration Tests :: Main XML Io :: Tests</name> <description>The camel integration tests</description> <properties> diff --git a/integration-tests/core-main-xml-io/src/main/java/org/apache/camel/quarkus/core/CoreMainXmlIoResource.java b/integration-tests/main-xml-io/src/main/java/org/apache/camel/quarkus/core/CoreMainXmlIoResource.java similarity index 100% rename from integration-tests/core-main-xml-io/src/main/java/org/apache/camel/quarkus/core/CoreMainXmlIoResource.java rename to integration-tests/main-xml-io/src/main/java/org/apache/camel/quarkus/core/CoreMainXmlIoResource.java diff --git a/integration-tests/core-main-xml-jaxb/src/main/resources/application.properties b/integration-tests/main-xml-io/src/main/resources/application.properties similarity index 100% rename from integration-tests/core-main-xml-jaxb/src/main/resources/application.properties rename to integration-tests/main-xml-io/src/main/resources/application.properties diff --git a/integration-tests/core-main-xml-jaxb/src/main/resources/routes/my-routes.xml b/integration-tests/main-xml-io/src/main/resources/routes/my-routes.xml similarity index 100% rename from integration-tests/core-main-xml-jaxb/src/main/resources/routes/my-routes.xml rename to integration-tests/main-xml-io/src/main/resources/routes/my-routes.xml diff --git a/integration-tests/core-main-xml-io/src/test/java/org/apache/camel/quarkus/core/CoreMainXmlIoIT.java b/integration-tests/main-xml-io/src/test/java/org/apache/camel/quarkus/core/CoreMainXmlIoIT.java similarity index 100% rename from integration-tests/core-main-xml-io/src/test/java/org/apache/camel/quarkus/core/CoreMainXmlIoIT.java rename to integration-tests/main-xml-io/src/test/java/org/apache/camel/quarkus/core/CoreMainXmlIoIT.java diff --git a/integration-tests/core-main-xml-io/src/test/java/org/apache/camel/quarkus/core/CoreMainXmlIoTest.java b/integration-tests/main-xml-io/src/test/java/org/apache/camel/quarkus/core/CoreMainXmlIoTest.java similarity index 100% rename from integration-tests/core-main-xml-io/src/test/java/org/apache/camel/quarkus/core/CoreMainXmlIoTest.java rename to integration-tests/main-xml-io/src/test/java/org/apache/camel/quarkus/core/CoreMainXmlIoTest.java diff --git a/integration-tests/core-main-xml-jaxb/pom.xml b/integration-tests/main-xml-jaxb/pom.xml similarity index 96% rename from integration-tests/core-main-xml-jaxb/pom.xml rename to integration-tests/main-xml-jaxb/pom.xml index fecb046..b227bc7 100644 --- a/integration-tests/core-main-xml-jaxb/pom.xml +++ b/integration-tests/main-xml-jaxb/pom.xml @@ -25,8 +25,8 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>camel-quarkus-integration-test-core-main-xml-jaxb</artifactId> - <name>Camel Quarkus :: Integration Tests :: Core Main XML Jaxb :: Tests</name> + <artifactId>camel-quarkus-integration-test-main-xml-jaxb</artifactId> + <name>Camel Quarkus :: Integration Tests :: Main XML Jaxb :: Tests</name> <description>The camel integration tests</description> <properties> diff --git a/integration-tests/core-main-xml-jaxb/src/main/java/org/apache/camel/quarkus/core/CoreMainXmlJaxbResource.java b/integration-tests/main-xml-jaxb/src/main/java/org/apache/camel/quarkus/core/CoreMainXmlJaxbResource.java similarity index 100% rename from integration-tests/core-main-xml-jaxb/src/main/java/org/apache/camel/quarkus/core/CoreMainXmlJaxbResource.java rename to integration-tests/main-xml-jaxb/src/main/java/org/apache/camel/quarkus/core/CoreMainXmlJaxbResource.java diff --git a/integration-tests/core-main-xml-io/src/main/resources/application.properties b/integration-tests/main-xml-jaxb/src/main/resources/application.properties similarity index 100% rename from integration-tests/core-main-xml-io/src/main/resources/application.properties rename to integration-tests/main-xml-jaxb/src/main/resources/application.properties diff --git a/integration-tests/core-main-xml-io/src/main/resources/routes/my-routes.xml b/integration-tests/main-xml-jaxb/src/main/resources/routes/my-routes.xml similarity index 100% rename from integration-tests/core-main-xml-io/src/main/resources/routes/my-routes.xml rename to integration-tests/main-xml-jaxb/src/main/resources/routes/my-routes.xml diff --git a/integration-tests/core-main-xml-jaxb/src/test/java/org/apache/camel/quarkus/core/CoreMainXmlJaxbIT.java b/integration-tests/main-xml-jaxb/src/test/java/org/apache/camel/quarkus/core/CoreMainXmlJaxbIT.java similarity index 100% rename from integration-tests/core-main-xml-jaxb/src/test/java/org/apache/camel/quarkus/core/CoreMainXmlJaxbIT.java rename to integration-tests/main-xml-jaxb/src/test/java/org/apache/camel/quarkus/core/CoreMainXmlJaxbIT.java diff --git a/integration-tests/core-main-xml-jaxb/src/test/java/org/apache/camel/quarkus/core/CoreMainXmlJaxbTest.java b/integration-tests/main-xml-jaxb/src/test/java/org/apache/camel/quarkus/core/CoreMainXmlJaxbTest.java similarity index 100% rename from integration-tests/core-main-xml-jaxb/src/test/java/org/apache/camel/quarkus/core/CoreMainXmlJaxbTest.java rename to integration-tests/main-xml-jaxb/src/test/java/org/apache/camel/quarkus/core/CoreMainXmlJaxbTest.java diff --git a/integration-tests/core-main/pom.xml b/integration-tests/main/pom.xml similarity index 97% rename from integration-tests/core-main/pom.xml rename to integration-tests/main/pom.xml index 70b9886..7578d85 100644 --- a/integration-tests/core-main/pom.xml +++ b/integration-tests/main/pom.xml @@ -25,8 +25,8 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>camel-quarkus-integration-test-core-main</artifactId> - <name>Camel Quarkus :: Integration Tests :: Core Main :: Tests</name> + <artifactId>camel-quarkus-integration-test-main</artifactId> + <name>Camel Quarkus :: Integration Tests :: Main :: Tests</name> <description>The camel integration tests</description> <properties> diff --git a/integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CamelComponents.java b/integration-tests/main/src/main/java/org/apache/camel/quarkus/core/CamelComponents.java similarity index 100% rename from integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CamelComponents.java rename to integration-tests/main/src/main/java/org/apache/camel/quarkus/core/CamelComponents.java diff --git a/integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CamelRoute.java b/integration-tests/main/src/main/java/org/apache/camel/quarkus/core/CamelRoute.java similarity index 100% rename from integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CamelRoute.java rename to integration-tests/main/src/main/java/org/apache/camel/quarkus/core/CamelRoute.java diff --git a/integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CamelRouteFiltered.java b/integration-tests/main/src/main/java/org/apache/camel/quarkus/core/CamelRouteFiltered.java similarity index 100% rename from integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CamelRouteFiltered.java rename to integration-tests/main/src/main/java/org/apache/camel/quarkus/core/CamelRouteFiltered.java diff --git a/integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CamelRouteProducer.java b/integration-tests/main/src/main/java/org/apache/camel/quarkus/core/CamelRouteProducer.java similarity index 100% rename from integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CamelRouteProducer.java rename to integration-tests/main/src/main/java/org/apache/camel/quarkus/core/CamelRouteProducer.java diff --git a/integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CamelRouteWithEndpointDSL.java b/integration-tests/main/src/main/java/org/apache/camel/quarkus/core/CamelRouteWithEndpointDSL.java similarity index 100% rename from integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CamelRouteWithEndpointDSL.java rename to integration-tests/main/src/main/java/org/apache/camel/quarkus/core/CamelRouteWithEndpointDSL.java diff --git a/integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CoreMainResource.java b/integration-tests/main/src/main/java/org/apache/camel/quarkus/core/CoreMainResource.java similarity index 100% rename from integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CoreMainResource.java rename to integration-tests/main/src/main/java/org/apache/camel/quarkus/core/CoreMainResource.java diff --git a/integration-tests/core-main/src/main/resources/application.properties b/integration-tests/main/src/main/resources/application.properties similarity index 100% rename from integration-tests/core-main/src/main/resources/application.properties rename to integration-tests/main/src/main/resources/application.properties diff --git a/integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CoreMainIT.java b/integration-tests/main/src/test/java/org/apache/camel/quarkus/core/CoreMainIT.java similarity index 100% rename from integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CoreMainIT.java rename to integration-tests/main/src/test/java/org/apache/camel/quarkus/core/CoreMainIT.java diff --git a/integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CoreMainTest.java b/integration-tests/main/src/test/java/org/apache/camel/quarkus/core/CoreMainTest.java similarity index 100% rename from integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CoreMainTest.java rename to integration-tests/main/src/test/java/org/apache/camel/quarkus/core/CoreMainTest.java diff --git a/integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CoreMainTestResource.java b/integration-tests/main/src/test/java/org/apache/camel/quarkus/core/CoreMainTestResource.java similarity index 100% rename from integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CoreMainTestResource.java rename to integration-tests/main/src/test/java/org/apache/camel/quarkus/core/CoreMainTestResource.java diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 7619d63..495bc74 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -46,12 +46,12 @@ <modules> <!-- build those first --> <module>core</module> - <module>core-main</module> - <module>core-main-xml-jaxb</module> - <module>core-main-xml-io</module> - <module>core-main-collector</module> - <module>core-main-caffeine-lrucache</module> <module>core-impl</module> + <module>main</module> + <module>main-xml-jaxb</module> + <module>main-xml-io</module> + <module>main-collector</module> + <module>main-caffeine-lrucache</module> <!-- extensions a..z; do not remove this comment, it is important when sorting via mvn process-resources -Pformat --> <module>activemq</module>