You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2020/09/25 09:42:07 UTC
[camel] branch master updated: Reorganize the test infra code
(#4294)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 47161c8 Reorganize the test infra code (#4294)
47161c8 is described below
commit 47161c8bfae8c091784693c6c0418f6d56fb90c6
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Fri Sep 25 11:41:47 2020 +0200
Reorganize the test infra code (#4294)
Move the shared test infrastructure code to the project root and make
small adjustments to ensure greater consistency with the rest of the
Camel Core
---
core/pom.xml | 1 -
pom.xml | 1 +
.../camel-test-infra-common/pom.xml | 2 +-
.../src/main/resources/META-INF/MANIFEST.MF | 0
.../test/java/org/apache/camel/test/infra/common/TestUtils.java | 0
.../camel-test-infra-kafka/pom.xml | 2 +-
.../src/main/resources/META-INF/MANIFEST.MF | 0
.../test/infra/services/kafka/ContainerLocalKafkaService.java | 0
.../org/apache/camel/test/infra/services/kafka/KafkaService.java | 0
.../camel/test/infra/services/kafka/KafkaServiceFactory.java | 0
.../camel/test/infra/services/kafka/RemoteKafkaService.java | 0
.../apache/camel/test/infra/services/kafka/StrimziContainer.java | 0
.../apache/camel/test/infra/services/kafka/StrimziService.java | 0
.../camel/test/infra/services/kafka/ZookeeperContainer.java | 0
.../camel-test-infra-parent/pom.xml | 4 ++--
{core/camel-test-infra => test-infra}/pom.xml | 8 ++++----
16 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index fedd71e..3c3c964 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -56,7 +56,6 @@
<module>camel-allcomponents</module>
<module>camel-endpointdsl</module>
<module>camel-componentdsl</module>
- <module>camel-test-infra</module>
</modules>
<properties>
diff --git a/pom.xml b/pom.xml
index 47e0e17..7ee7e9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,6 +76,7 @@
<module>buildingtools</module>
<module>tooling</module>
<module>core</module>
+ <module>test-infra</module>
<module>components</module>
<module>archetypes</module>
<module>catalog</module>
diff --git a/core/camel-test-infra/camel-test-infra-common/pom.xml b/test-infra/camel-test-infra-common/pom.xml
similarity index 96%
rename from core/camel-test-infra/camel-test-infra-common/pom.xml
rename to test-infra/camel-test-infra-common/pom.xml
index b6fa5e6..69b36ec 100644
--- a/core/camel-test-infra/camel-test-infra-common/pom.xml
+++ b/test-infra/camel-test-infra-common/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>camel-test-infra-common</artifactId>
- <name>Camel :: Test :: Infra :: Common </name>
+ <name>Camel :: Test Infra :: Common</name>
<description>Common test infrastructure code for Camel</description>
<build>
diff --git a/core/camel-test-infra/camel-test-infra-kafka/src/main/resources/META-INF/MANIFEST.MF b/test-infra/camel-test-infra-common/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from core/camel-test-infra/camel-test-infra-kafka/src/main/resources/META-INF/MANIFEST.MF
rename to test-infra/camel-test-infra-common/src/main/resources/META-INF/MANIFEST.MF
diff --git a/core/camel-test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/TestUtils.java b/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/TestUtils.java
similarity index 100%
rename from core/camel-test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/TestUtils.java
rename to test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/TestUtils.java
diff --git a/core/camel-test-infra/camel-test-infra-kafka/pom.xml b/test-infra/camel-test-infra-kafka/pom.xml
similarity index 97%
rename from core/camel-test-infra/camel-test-infra-kafka/pom.xml
rename to test-infra/camel-test-infra-kafka/pom.xml
index 6700490..495d825 100644
--- a/core/camel-test-infra/camel-test-infra-kafka/pom.xml
+++ b/test-infra/camel-test-infra-kafka/pom.xml
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>camel-test-infra-kafka</artifactId>
- <name>Camel :: Test :: Infra :: Kafka </name>
+ <name>Camel :: Test Infra :: Kafka</name>
<description>Kafka test infrastructure for Camel</description>
<dependencies>
diff --git a/core/camel-test-infra/camel-test-infra-common/src/main/resources/META-INF/MANIFEST.MF b/test-infra/camel-test-infra-kafka/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from core/camel-test-infra/camel-test-infra-common/src/main/resources/META-INF/MANIFEST.MF
rename to test-infra/camel-test-infra-kafka/src/main/resources/META-INF/MANIFEST.MF
diff --git a/core/camel-test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/ContainerLocalKafkaService.java b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/ContainerLocalKafkaService.java
similarity index 100%
rename from core/camel-test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/ContainerLocalKafkaService.java
rename to test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/ContainerLocalKafkaService.java
diff --git a/core/camel-test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/KafkaService.java b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/KafkaService.java
similarity index 100%
rename from core/camel-test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/KafkaService.java
rename to test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/KafkaService.java
diff --git a/core/camel-test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/KafkaServiceFactory.java b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/KafkaServiceFactory.java
similarity index 100%
rename from core/camel-test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/KafkaServiceFactory.java
rename to test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/KafkaServiceFactory.java
diff --git a/core/camel-test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/RemoteKafkaService.java b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/RemoteKafkaService.java
similarity index 100%
rename from core/camel-test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/RemoteKafkaService.java
rename to test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/RemoteKafkaService.java
diff --git a/core/camel-test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/StrimziContainer.java b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/StrimziContainer.java
similarity index 100%
rename from core/camel-test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/StrimziContainer.java
rename to test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/StrimziContainer.java
diff --git a/core/camel-test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/StrimziService.java b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/StrimziService.java
similarity index 100%
rename from core/camel-test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/StrimziService.java
rename to test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/StrimziService.java
diff --git a/core/camel-test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/ZookeeperContainer.java b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/ZookeeperContainer.java
similarity index 100%
rename from core/camel-test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/ZookeeperContainer.java
rename to test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/services/kafka/ZookeeperContainer.java
diff --git a/core/camel-test-infra/camel-test-infra-parent/pom.xml b/test-infra/camel-test-infra-parent/pom.xml
similarity index 96%
rename from core/camel-test-infra/camel-test-infra-parent/pom.xml
rename to test-infra/camel-test-infra-parent/pom.xml
index 6cd01bc..2a84cb2 100644
--- a/core/camel-test-infra/camel-test-infra-parent/pom.xml
+++ b/test-infra/camel-test-infra-parent/pom.xml
@@ -20,7 +20,7 @@
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">
<parent>
- <artifactId>camel-test-core</artifactId>
+ <artifactId>test-infra</artifactId>
<groupId>org.apache.camel</groupId>
<version>3.6.0-SNAPSHOT</version>
</parent>
@@ -28,7 +28,7 @@
<artifactId>camel-test-infra-parent</artifactId>
<packaging>pom</packaging>
- <name>Camel :: Test :: Infra Parent</name>
+ <name>Camel :: Test Infra :: Parent</name>
<description>Parent pom for the test infrastructure for Camel</description>
<dependencies>
diff --git a/core/camel-test-infra/pom.xml b/test-infra/pom.xml
similarity index 89%
rename from core/camel-test-infra/pom.xml
rename to test-infra/pom.xml
index 1c988b6..d5f2079 100644
--- a/core/camel-test-infra/pom.xml
+++ b/test-infra/pom.xml
@@ -20,17 +20,17 @@
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">
<parent>
- <artifactId>core</artifactId>
+ <artifactId>camel-parent</artifactId>
<groupId>org.apache.camel</groupId>
<version>3.6.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-test-core</artifactId>
+ <artifactId>test-infra</artifactId>
<packaging>pom</packaging>
- <name>Camel :: Test :: Infra </name>
+ <name>Camel :: Test Infra</name>
<description>Test infrastructure for Camel</description>
<modules>