Skip to content

Commit

Permalink
CAMEL-21715: Fix test-jar dependencies
Browse files Browse the repository at this point in the history
- Since we have been moving some classes in the test-infra-* modules from src/test/java to src/main/java we need to explicitly depend on both test-jar and normal typed dependencies
- Maven will figure it out but IDEs such as IntelliJ raise compile errors
- Explicitly add dependency to test-infra-* modules to avoid compile errors in IntelliJ due to test-jar typed dependencies
  • Loading branch information
christophd committed Feb 5, 2025
1 parent 56c4fa4 commit 80fb201
Show file tree
Hide file tree
Showing 133 changed files with 827 additions and 113 deletions.
8 changes: 6 additions & 2 deletions components/camel-activemq/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,19 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-artemis</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-artemis</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-messaging-common</artifactId>
Expand Down
12 changes: 9 additions & 3 deletions components/camel-activemq6/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,23 +52,29 @@
<version>${activemq6-version}</version>
</dependency>

<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>

<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-artemis</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-artemis</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>

<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-messaging-common</artifactId>
<version>${project.version}</version>
Expand Down
9 changes: 7 additions & 2 deletions components/camel-ai/camel-chatscript/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,14 @@
<scope>test</scope>
</dependency>


<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-chatscript</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-chatscript</artifactId>
<version>${project.version}</version>
Expand Down
6 changes: 6 additions & 0 deletions components/camel-ai/camel-kserve/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@
</dependency>

<!-- test infra -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-triton</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-triton</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions components/camel-ai/camel-langchain4j-chat/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@
<version>${langchain4j-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-ollama</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-ollama</artifactId>
Expand Down
18 changes: 18 additions & 0 deletions components/camel-ai/camel-langchain4j-embeddings/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,20 +108,38 @@
</dependency>

<!-- test infra -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-qdrant</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-qdrant</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-milvus</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-milvus</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-neo4j</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-neo4j</artifactId>
Expand Down
8 changes: 7 additions & 1 deletion components/camel-ai/camel-milvus/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,13 @@
</dependency>

<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-milvus</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-milvus</artifactId>
<version>${project.version}</version>
Expand Down
6 changes: 6 additions & 0 deletions components/camel-ai/camel-neo4j/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@
</dependency>

<!-- test infra -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-neo4j</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-neo4j</artifactId>
Expand Down
8 changes: 7 additions & 1 deletion components/camel-ai/camel-qdrant/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,13 @@
</dependency>

<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-qdrant</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-qdrant</artifactId>
<version>${project.version}</version>
Expand Down
6 changes: 6 additions & 0 deletions components/camel-ai/camel-tensorflow-serving/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@
</dependency>

<!-- test infra -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-tensorflow-serving</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-tensorflow-serving</artifactId>
Expand Down
8 changes: 7 additions & 1 deletion components/camel-ai/camel-torchserve/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,13 @@
</dependency>

<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-torchserve</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-torchserve</artifactId>
<version>${project.version}</version>
Expand Down
12 changes: 9 additions & 3 deletions components/camel-amqp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,21 @@

<!-- testing -->
<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>

<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-artemis</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-artemis</artifactId>
<version>${project.version}</version>
Expand All @@ -98,7 +104,7 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down
8 changes: 7 additions & 1 deletion components/camel-arangodb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,15 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-arangodb</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-arangodb</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
</dependencies>


Expand Down
8 changes: 7 additions & 1 deletion components/camel-aws/camel-aws-bedrock/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,13 @@
<scope>test</scope>
</dependency>

<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
Expand Down
8 changes: 7 additions & 1 deletion components/camel-aws/camel-aws-cloudtrail/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,13 @@
</dependency>

<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
Expand Down
8 changes: 7 additions & 1 deletion components/camel-aws/camel-aws-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,13 @@
</dependency>

<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
Expand Down
8 changes: 7 additions & 1 deletion components/camel-aws/camel-aws-secrets-manager/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,13 @@
</dependency>

<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
Expand Down
8 changes: 7 additions & 1 deletion components/camel-aws/camel-aws2-athena/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,13 @@
</dependency>

<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
Expand Down
8 changes: 7 additions & 1 deletion components/camel-aws/camel-aws2-cw/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,13 @@
</dependency>

<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
Expand Down
8 changes: 7 additions & 1 deletion components/camel-aws/camel-aws2-ddb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,13 @@
<scope>test</scope>
</dependency>
<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
Expand Down
8 changes: 7 additions & 1 deletion components/camel-aws/camel-aws2-ec2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,13 @@
<scope>test</scope>
</dependency>
<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
Expand Down
6 changes: 6 additions & 0 deletions components/camel-aws/camel-aws2-eks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
Expand Down
Loading

0 comments on commit 80fb201

Please sign in to comment.