You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/02/04 05:02:34 UTC
[james-project] 08/18: JAMES-3498 event-bus-cassandra POM ordering
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 1484bec9eee37ae31341eab6844482f404829d89
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Jan 25 15:48:36 2021 +0700
JAMES-3498 event-bus-cassandra POM ordering
---
event-bus/cassandra/pom.xml | 28 ++++----
.../events/CassandraEventDeadLettersGroupDAO.java | 2 -
examples/custom-mailets/pom.xml | 78 ++++++++++------------
examples/pom.xml | 51 ++++++--------
mpt/impl/imap-mailbox/jpa/pom.xml | 10 +--
mpt/impl/imap-mailbox/lucenesearch/pom.xml | 8 +--
pom.xml | 2 +-
server/protocols/webadmin/webadmin-mailbox/pom.xml | 10 +--
8 files changed, 87 insertions(+), 102 deletions(-)
diff --git a/event-bus/cassandra/pom.xml b/event-bus/cassandra/pom.xml
index b085d77..c65d376 100644
--- a/event-bus/cassandra/pom.xml
+++ b/event-bus/cassandra/pom.xml
@@ -17,13 +17,11 @@
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">
+<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>
- <artifactId>event-bus</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>event-bus</artifactId>
<version>3.6.0-SNAPSHOT</version>
</parent>
@@ -33,16 +31,6 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-cassandra</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-cassandra</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>${james.groupId}</groupId>
<artifactId>event-bus-api</artifactId>
</dependency>
@@ -58,9 +46,19 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-backends-cassandra</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-backends-cassandra</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/event-bus/cassandra/src/main/java/org/apache/james/events/CassandraEventDeadLettersGroupDAO.java b/event-bus/cassandra/src/main/java/org/apache/james/events/CassandraEventDeadLettersGroupDAO.java
index 766d507..2fefd3c 100644
--- a/event-bus/cassandra/src/main/java/org/apache/james/events/CassandraEventDeadLettersGroupDAO.java
+++ b/event-bus/cassandra/src/main/java/org/apache/james/events/CassandraEventDeadLettersGroupDAO.java
@@ -20,8 +20,6 @@
package org.apache.james.events;
import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.insertInto;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
import javax.inject.Inject;
diff --git a/examples/custom-mailets/pom.xml b/examples/custom-mailets/pom.xml
index dfceb5d..779a3db 100644
--- a/examples/custom-mailets/pom.xml
+++ b/examples/custom-mailets/pom.xml
@@ -1,44 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
- <parent>
- <artifactId>examples</artifactId>
- <groupId>org.apache.james.examples</groupId>
- <version>3.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <name>Apache James :: Examples :: Custom Mailets</name>
-
- <artifactId>custom-mailets</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mailet-api</artifactId>
- <version>${james.baseVersion}</version>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <version>${james.baseVersion}</version>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>james-server-util</artifactId>
- <version>${james.baseVersion}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>11</source>
- <target>11</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.james.examples</groupId>
+ <artifactId>examples</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>custom-mailets</artifactId>
+ <name>Apache James :: Examples :: Custom Mailets</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet-api</artifactId>
+ <version>${james.baseVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>apache-mailet-base</artifactId>
+ <version>${james.baseVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-util</artifactId>
+ <version>${james.baseVersion}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>11</source>
+ <target>11</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/examples/pom.xml b/examples/pom.xml
index b6345b2..843f552 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -18,33 +18,26 @@
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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>23</version>
- <relativePath></relativePath>
- </parent>
-
- <packaging>pom</packaging>
- <groupId>org.apache.james.examples</groupId>
- <artifactId>examples</artifactId>
- <version>3.6.0-SNAPSHOT</version>
-
- <name>Apache James :: Examples</name>
-
- <modules>
- <module>custom-listeners</module>
- <module>custom-mailets</module>
- </modules>
-
- <properties>
- <james.groupId>org.apache.james</james.groupId>
- <james.baseVersion>${project.version}</james.baseVersion>
-
- <maven.compiler.target>1.11</maven.compiler.target>
- <maven.compiler.source>1.11</maven.compiler.source>
- </properties>
-
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>23</version>
+ <relativePath></relativePath>
+ </parent>
+ <groupId>org.apache.james.examples</groupId>
+ <artifactId>examples</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Apache James :: Examples</name>
+ <modules>
+ <module>custom-listeners</module>
+ <module>custom-mailets</module>
+ </modules>
+ <properties>
+ <james.groupId>org.apache.james</james.groupId>
+ <james.baseVersion>${project.version}</james.baseVersion>
+ <maven.compiler.target>1.11</maven.compiler.target>
+ <maven.compiler.source>1.11</maven.compiler.source>
+ </properties>
</project>
diff --git a/mpt/impl/imap-mailbox/jpa/pom.xml b/mpt/impl/imap-mailbox/jpa/pom.xml
index 054d0ab..ee202b7 100644
--- a/mpt/impl/imap-mailbox/jpa/pom.xml
+++ b/mpt/impl/imap-mailbox/jpa/pom.xml
@@ -45,11 +45,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>event-bus-in-vm</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
<scope>test</scope>
</dependency>
@@ -70,6 +65,11 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
+ <artifactId>event-bus-in-vm</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-tests</artifactId>
<scope>test</scope>
</dependency>
diff --git a/mpt/impl/imap-mailbox/lucenesearch/pom.xml b/mpt/impl/imap-mailbox/lucenesearch/pom.xml
index 65130fb..31f8d87 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/pom.xml
+++ b/mpt/impl/imap-mailbox/lucenesearch/pom.xml
@@ -42,10 +42,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>event-bus-in-vm</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-lucene</artifactId>
<type>test-jar</type>
</dependency>
@@ -72,6 +68,10 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
+ <artifactId>event-bus-in-vm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-tests</artifactId>
<scope>test</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index dd59b37..5e7a4d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1157,8 +1157,8 @@
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>event-bus-api</artifactId>
- <type>test-jar</type>
<version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
diff --git a/server/protocols/webadmin/webadmin-mailbox/pom.xml b/server/protocols/webadmin/webadmin-mailbox/pom.xml
index 0ea715a..6f229e1 100644
--- a/server/protocols/webadmin/webadmin-mailbox/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailbox/pom.xml
@@ -59,11 +59,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>event-bus-in-vm</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
@@ -137,6 +132,11 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
+ <artifactId>event-bus-in-vm</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-json</artifactId>
<type>test-jar</type>
<scope>test</scope>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org