This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 5d58a317a00b3d2ee572a8d3e38f6b5fae5a825f Author: Benoit TELLIER <[email protected]> AuthorDate: Tue Sep 30 08:12:06 2025 +0200 [REMOVAL] Relocate test extensions into james-server-guice-cassandra for reuse --- mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml | 13 +++++++------ pom.xml | 6 ++++++ server/apps/distributed-app/pom.xml | 13 +++++++------ server/apps/distributed-pop3-app/pom.xml | 13 +++++++------ .../src/test/java/org/apache/james/CassandraExtension.java | 0 .../src/test/java/org/apache/james/DockerCassandraRule.java | 0 .../distributed-jmap-rfc-8621-integration-tests/pom.xml | 10 +++------- .../distributed-webadmin-integration-test/pom.xml | 7 ++++--- 8 files changed, 34 insertions(+), 28 deletions(-) diff --git a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml index 0440eff7e0..697ec1cce7 100644 --- a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml +++ b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml @@ -69,12 +69,6 @@ <type>test-jar</type> <scope>test</scope> </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-app</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>james-server-distributed-app</artifactId> @@ -97,6 +91,13 @@ <type>test-jar</type> <scope>test</scope> </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-cassandra</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-opensearch</artifactId> diff --git a/pom.xml b/pom.xml index 7afecdea53..16bbf5d17b 100644 --- a/pom.xml +++ b/pom.xml @@ -1552,6 +1552,12 @@ <version>${project.version}</version> <type>test-jar</type> </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-cassandra</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-common</artifactId> diff --git a/server/apps/distributed-app/pom.xml b/server/apps/distributed-app/pom.xml index a024a979e5..4692033189 100644 --- a/server/apps/distributed-app/pom.xml +++ b/server/apps/distributed-app/pom.xml @@ -133,12 +133,6 @@ <artifactId>event-sourcing-event-store-memory</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-app</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>james-server-cli</artifactId> @@ -154,6 +148,13 @@ <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-cassandra</artifactId> </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-cassandra</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-common</artifactId> diff --git a/server/apps/distributed-pop3-app/pom.xml b/server/apps/distributed-pop3-app/pom.xml index d04034be77..9e31b59e64 100644 --- a/server/apps/distributed-pop3-app/pom.xml +++ b/server/apps/distributed-pop3-app/pom.xml @@ -123,12 +123,6 @@ <artifactId>event-sourcing-event-store-memory</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-app</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>james-server-cli</artifactId> @@ -150,6 +144,13 @@ <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-cassandra</artifactId> </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-cassandra</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-common</artifactId> diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/CassandraExtension.java b/server/container/guice/cassandra/src/test/java/org/apache/james/CassandraExtension.java similarity index 100% rename from server/apps/cassandra-app/src/test/java/org/apache/james/CassandraExtension.java rename to server/container/guice/cassandra/src/test/java/org/apache/james/CassandraExtension.java diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/DockerCassandraRule.java b/server/container/guice/cassandra/src/test/java/org/apache/james/DockerCassandraRule.java similarity index 100% rename from server/apps/cassandra-app/src/test/java/org/apache/james/DockerCassandraRule.java rename to server/container/guice/cassandra/src/test/java/org/apache/james/DockerCassandraRule.java diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml index f30262f2ac..f65cf112f2 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml +++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml @@ -93,20 +93,16 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-app</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>james-server-distributed-app</artifactId> + <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-distributed-app</artifactId> + <artifactId>james-server-guice-cassandra</artifactId> + <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml index 7ef08c6122..9b99187092 100644 --- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml +++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml @@ -77,18 +77,19 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-app</artifactId> - <type>test-jar</type> + <artifactId>james-server-distributed-app</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>james-server-distributed-app</artifactId> + <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-distributed-app</artifactId> + <artifactId>james-server-guice-cassandra</artifactId> + <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
