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 2020/11/20 10:09:33 UTC
[james-project] 10/16: JAMES-2124 Uses explicit groupId for mime4j
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 61e9e382a0acbfea803432772bc5da8944a56c0e
Author: Jean Helou <jh...@codamens.fr>
AuthorDate: Wed Nov 18 19:49:10 2020 +0100
JAMES-2124 Uses explicit groupId for mime4j
---
javax-mail-extension/pom.xml | 8 ++++----
mailbox/api/pom.xml | 8 ++++----
mailbox/lucene/pom.xml | 16 ++++++++--------
mailbox/maildir/pom.xml | 16 ++++++++--------
mailbox/store/pom.xml | 24 ++++++++++++------------
mailet/base/pom.xml | 8 ++++----
mailet/standard/pom.xml | 10 +++++-----
mdn/pom.xml | 8 ++++----
pom.xml | 20 ++++++++++----------
protocols/imap/pom.xml | 16 ++++++++--------
server/container/util/pom.xml | 8 ++++----
server/mailet/dkim/pom.xml | 8 ++++----
server/mailet/mailets/pom.xml | 16 ++++++++--------
server/protocols/jmap-draft/pom.xml | 16 ++++++++--------
14 files changed, 91 insertions(+), 91 deletions(-)
diff --git a/javax-mail-extension/pom.xml b/javax-mail-extension/pom.xml
index eeb79aa..0d16da3 100644
--- a/javax-mail-extension/pom.xml
+++ b/javax-mail-extension/pom.xml
@@ -34,10 +34,6 @@
<dependencies>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>testing-base</artifactId>
<scope>test</scope>
</dependency>
@@ -53,5 +49,9 @@
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-core</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/mailbox/api/pom.xml b/mailbox/api/pom.xml
index ab480e2..a6146c3 100644
--- a/mailbox/api/pom.xml
+++ b/mailbox/api/pom.xml
@@ -34,10 +34,6 @@
<dependencies>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>james-core</artifactId>
</dependency>
<dependency>
@@ -100,6 +96,10 @@
<artifactId>commons-text</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-dom</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
diff --git a/mailbox/lucene/pom.xml b/mailbox/lucene/pom.xml
index 4f9da7e..caeceb3 100644
--- a/mailbox/lucene/pom.xml
+++ b/mailbox/lucene/pom.xml
@@ -70,14 +70,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>metrics-tests</artifactId>
<scope>test</scope>
</dependency>
@@ -95,6 +87,14 @@
<artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-dom</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers</artifactId>
<version>${lucene.version}</version>
diff --git a/mailbox/maildir/pom.xml b/mailbox/maildir/pom.xml
index f7f7f66..29cd01c 100644
--- a/mailbox/maildir/pom.xml
+++ b/mailbox/maildir/pom.xml
@@ -53,14 +53,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
@@ -87,6 +79,14 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-dom</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
diff --git a/mailbox/store/pom.xml b/mailbox/store/pom.xml
index 2868ef7..54d955b 100644
--- a/mailbox/store/pom.xml
+++ b/mailbox/store/pom.xml
@@ -48,18 +48,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-james-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>james-core</artifactId>
</dependency>
<dependency>
@@ -119,6 +107,18 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-dom</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-james-utils</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
diff --git a/mailet/base/pom.xml b/mailet/base/pom.xml
index 44c6cd5..b856620 100644
--- a/mailet/base/pom.xml
+++ b/mailet/base/pom.xml
@@ -49,10 +49,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>james-mdn</artifactId>
</dependency>
<dependency>
@@ -86,6 +82,10 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml
index cb3349b..a46de03 100644
--- a/mailet/standard/pom.xml
+++ b/mailet/standard/pom.xml
@@ -48,11 +48,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
- <version>${apache-mime4j.version}</version>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
@@ -103,6 +98,11 @@
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-dom</artifactId>
+ <version>${apache-mime4j.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
diff --git a/mdn/pom.xml b/mdn/pom.xml
index 26367b4..8578bba 100644
--- a/mdn/pom.xml
+++ b/mdn/pom.xml
@@ -33,10 +33,6 @@
<dependencies>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
@@ -65,6 +61,10 @@
<artifactId>javax.activation-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-dom</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.parboiled</groupId>
<artifactId>parboiled_${scala.base}</artifactId>
<version>2.2.0</version>
diff --git a/pom.xml b/pom.xml
index f1ff4cc..8ffaff4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1047,16 +1047,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
- <version>${apache-mime4j.version}</version>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-james-utils</artifactId>
- <version>${apache-mime4j.version}</version>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>backup</artifactId>
<version>${project.version}</version>
</dependency>
@@ -2435,6 +2425,16 @@
<version>4.5.10</version>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-dom</artifactId>
+ <version>${apache-mime4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-james-utils</artifactId>
+ <version>${apache-mime4j.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.james.jspf</groupId>
<artifactId>apache-jspf-resolver</artifactId>
<version>${apache-jspf-resolver.version}</version>
diff --git a/protocols/imap/pom.xml b/protocols/imap/pom.xml
index 982e215..4d44ce1 100644
--- a/protocols/imap/pom.xml
+++ b/protocols/imap/pom.xml
@@ -50,14 +50,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
@@ -99,6 +91,14 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-dom</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
diff --git a/server/container/util/pom.xml b/server/container/util/pom.xml
index 29e5c3c..b3fed4e 100644
--- a/server/container/util/pom.xml
+++ b/server/container/util/pom.xml
@@ -35,10 +35,6 @@
<dependencies>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>testing-base</artifactId>
<scope>test</scope>
</dependency>
@@ -89,6 +85,10 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-dom</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
diff --git a/server/mailet/dkim/pom.xml b/server/mailet/dkim/pom.xml
index 42f5f6b..be32d89 100644
--- a/server/mailet/dkim/pom.xml
+++ b/server/mailet/dkim/pom.xml
@@ -65,11 +65,11 @@
<artifactId>apache-mailet</artifactId>
</exclusion>
<exclusion>
- <groupId>${james.groupId}</groupId>
+ <groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-core</artifactId>
</exclusion>
<exclusion>
- <groupId>${james.groupId}</groupId>
+ <groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-dom</artifactId>
</exclusion>
<exclusion>
@@ -94,11 +94,11 @@
<artifactId>apache-mailet</artifactId>
</exclusion>
<exclusion>
- <groupId>${james.groupId}</groupId>
+ <groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-core</artifactId>
</exclusion>
<exclusion>
- <groupId>${james.groupId}</groupId>
+ <groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-dom</artifactId>
</exclusion>
<exclusion>
diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml
index b78788b..7926369 100644
--- a/server/mailet/mailets/pom.xml
+++ b/server/mailet/mailets/pom.xml
@@ -90,14 +90,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-james-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>james-mdn</artifactId>
</dependency>
<dependency>
@@ -218,6 +210,14 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-dom</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-james-utils</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.james.jspf</groupId>
<artifactId>apache-jspf-resolver</artifactId>
</dependency>
diff --git a/server/protocols/jmap-draft/pom.xml b/server/protocols/jmap-draft/pom.xml
index 8352479..9da08e2 100644
--- a/server/protocols/jmap-draft/pom.xml
+++ b/server/protocols/jmap-draft/pom.xml
@@ -65,14 +65,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-memory</artifactId>
<scope>test</scope>
</dependency>
@@ -228,6 +220,14 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-dom</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org