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
The following commit(s) were added to refs/heads/master by this push:
new 19722307c0 [ENHANCEMENT] Use provided scope for James dependencies in
extensions (#1397)
19722307c0 is described below
commit 19722307c0508c5cdefdd3dfaa02ed8f2c8afbd2
Author: Benoit TELLIER <[email protected]>
AuthorDate: Thu Jan 19 21:36:26 2023 +0700
[ENHANCEMENT] Use provided scope for James dependencies in extensions
(#1397)
---
Jenkinsfile | 4 ++--
examples/custom-healthcheck/pom.xml | 2 ++
examples/custom-imap/pom.xml | 4 ++++
examples/custom-listeners/pom.xml | 1 +
examples/custom-mailets/pom.xml | 3 +++
examples/custom-smtp-command/pom.xml | 1 +
examples/custom-smtp-hooks/pom.xml | 1 +
examples/custom-webadmin-route/pom.xml | 1 +
examples/metrics-graphite/pom.xml | 5 ++++-
third-party/clamav/pom.xml | 3 +++
third-party/elasticsearch/pom.xml | 8 ++++++++
third-party/rspamd/pom.xml | 16 ++++++++++++++++
third-party/spamassassin/pom.xml | 13 +++++++++++++
13 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b1c514cf5b..aec7480f77 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -95,7 +95,7 @@ pipeline {
stage('Stable Tests') {
steps {
echo 'Running tests'
- sh 'mvn -B -e -fae test ${MVN_SHOW_TIMESTAMPS} -P ci-test
${MVN_LOCAL_REPO_OPT}'
+ sh 'mvn -B -e -fae test ${MVN_SHOW_TIMESTAMPS} -P ci-test
${MVN_LOCAL_REPO_OPT} -Dassembly.skipAssembly=true'
}
post {
always {
@@ -113,7 +113,7 @@ pipeline {
steps {
echo 'Running unstable tests'
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
- sh 'mvn -B -e -fae test -Punstable-tests
${MVN_SHOW_TIMESTAMPS} -P ci-test ${MVN_LOCAL_REPO_OPT}'
+ sh 'mvn -B -e -fae test -Punstable-tests
${MVN_SHOW_TIMESTAMPS} -P ci-test ${MVN_LOCAL_REPO_OPT}
-Dassembly.skipAssembly=true'
}
}
post {
diff --git a/examples/custom-healthcheck/pom.xml
b/examples/custom-healthcheck/pom.xml
index a284033d45..199a97af07 100644
--- a/examples/custom-healthcheck/pom.xml
+++ b/examples/custom-healthcheck/pom.xml
@@ -36,11 +36,13 @@
<groupId>${james.groupId}</groupId>
<artifactId>james-core</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>3.4.18</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/examples/custom-imap/pom.xml b/examples/custom-imap/pom.xml
index 39ce1ed0d5..fb6979a04b 100644
--- a/examples/custom-imap/pom.xml
+++ b/examples/custom-imap/pom.xml
@@ -37,6 +37,7 @@
<groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-imap</artifactId>
<version>${james.baseVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
@@ -49,6 +50,7 @@
<groupId>${james.groupId}</groupId>
<artifactId>james-server-memory-app</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
@@ -66,11 +68,13 @@
<groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-imap</artifactId>
<version>${james.baseVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>5.1.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/examples/custom-listeners/pom.xml
b/examples/custom-listeners/pom.xml
index b28a3d289d..9f1ab72680 100644
--- a/examples/custom-listeners/pom.xml
+++ b/examples/custom-listeners/pom.xml
@@ -31,6 +31,7 @@
<groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<version>${james.baseVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
diff --git a/examples/custom-mailets/pom.xml b/examples/custom-mailets/pom.xml
index 97af7ec205..dfd105bd0a 100644
--- a/examples/custom-mailets/pom.xml
+++ b/examples/custom-mailets/pom.xml
@@ -31,16 +31,19 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet-api</artifactId>
<version>${james.baseVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<version>${james.baseVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
<version>${james.baseVersion}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
<build>
diff --git a/examples/custom-smtp-command/pom.xml
b/examples/custom-smtp-command/pom.xml
index ade170305f..52098aa05c 100644
--- a/examples/custom-smtp-command/pom.xml
+++ b/examples/custom-smtp-command/pom.xml
@@ -35,6 +35,7 @@
<groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-smtp</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/examples/custom-smtp-hooks/pom.xml
b/examples/custom-smtp-hooks/pom.xml
index 17ddfe2208..e10c9f3644 100644
--- a/examples/custom-smtp-hooks/pom.xml
+++ b/examples/custom-smtp-hooks/pom.xml
@@ -35,6 +35,7 @@
<groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-smtp</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/examples/custom-webadmin-route/pom.xml
b/examples/custom-webadmin-route/pom.xml
index 95c8fa4cb2..634dd3f450 100644
--- a/examples/custom-webadmin-route/pom.xml
+++ b/examples/custom-webadmin-route/pom.xml
@@ -35,6 +35,7 @@
<groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/examples/metrics-graphite/pom.xml
b/examples/metrics-graphite/pom.xml
index 9dac607a13..f96c554688 100644
--- a/examples/metrics-graphite/pom.xml
+++ b/examples/metrics-graphite/pom.xml
@@ -31,22 +31,25 @@
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-graphite</artifactId>
- <version>4.2.9</version>
+ <version>4.2.15</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>5.1.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-guice-configuration</artifactId>
<version>${james.baseVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
<version>${james.baseVersion}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/third-party/clamav/pom.xml b/third-party/clamav/pom.xml
index bbddb71d0f..e50a7ba472 100644
--- a/third-party/clamav/pom.xml
+++ b/third-party/clamav/pom.xml
@@ -33,10 +33,12 @@
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
@@ -46,6 +48,7 @@
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
diff --git a/third-party/elasticsearch/pom.xml
b/third-party/elasticsearch/pom.xml
index 6f0c28ee92..24e1c41f0e 100644
--- a/third-party/elasticsearch/pom.xml
+++ b/third-party/elasticsearch/pom.xml
@@ -46,15 +46,18 @@
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>james-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
@@ -74,10 +77,12 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.linagora</groupId>
@@ -86,6 +91,7 @@
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
@@ -95,10 +101,12 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/third-party/rspamd/pom.xml b/third-party/rspamd/pom.xml
index e8eecb237a..e4df127f1c 100644
--- a/third-party/rspamd/pom.xml
+++ b/third-party/rspamd/pom.xml
@@ -57,14 +57,17 @@
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
@@ -86,10 +89,12 @@
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
@@ -101,6 +106,7 @@
<groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
<version>${james.baseVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
@@ -111,6 +117,7 @@
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>james-server-task-json</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
@@ -120,6 +127,7 @@
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
@@ -137,17 +145,25 @@
<artifactId>testing-base</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>net.javacrumbs.json-unit</groupId>
diff --git a/third-party/spamassassin/pom.xml b/third-party/spamassassin/pom.xml
index 2042349664..78dc768127 100644
--- a/third-party/spamassassin/pom.xml
+++ b/third-party/spamassassin/pom.xml
@@ -51,10 +51,12 @@
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
@@ -74,10 +76,12 @@
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>james-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
@@ -105,6 +109,7 @@
<groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-smtp</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
@@ -114,6 +119,7 @@
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>metrics-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
@@ -135,26 +141,32 @@
<dependency>
<groupId>com.github.fge</groupId>
<artifactId>throwing-lambdas</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
@@ -164,6 +176,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
