You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2022/10/21 03:28:51 UTC
[james-jsieve] branch master updated: [UPGRADE] Various updates for JSIEVE (#24)
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-jsieve.git
The following commit(s) were added to refs/heads/master by this push:
new 82ab618 [UPGRADE] Various updates for JSIEVE (#24)
82ab618 is described below
commit 82ab61883c807aa430862e9da7b458437f061b4a
Author: Benoit TELLIER <bt...@linagora.com>
AuthorDate: Fri Oct 21 10:28:47 2022 +0700
[UPGRADE] Various updates for JSIEVE (#24)
- bundle packaging -> jar
- Fix version for javacc as more recent version fails to build
- Various small dependency updates
---
core/pom.xml | 6 +++---
pom.xml | 25 +++++++++++++++----------
util/pom.xml | 5 ++---
3 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 1c966b6..b6b56a4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -28,7 +28,6 @@
</parent>
<artifactId>apache-jsieve-core</artifactId>
- <packaging>bundle</packaging>
<inceptionYear>2004</inceptionYear>
<name>Apache James :: jSieve :: Core</name>
@@ -69,8 +68,8 @@
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
<scope>test</scope>
</dependency>
@@ -102,6 +101,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
+ <version>2.6</version>
<executions>
<execution>
<id>generate-jjtree</id>
diff --git a/pom.xml b/pom.xml
index f05033e..ffc9a77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,17 +76,16 @@
<target.jdk>1.8</target.jdk>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <junit.version>4.12</junit.version>
+ <junit.version>4.13.2</junit.version>
<jmock.version>1.2.0</jmock.version>
- <logback.version>1.2.3</logback.version>
- <mail.version>1.4.7</mail.version>
+ <logback.version>1.4.4</logback.version>
+ <mail.version>1.6.2</mail.version>
<activation.version>1.1.1</activation.version>
- <commons-io.version>2.1</commons-io.version>
<mockito-core.version>3.0.0</mockito-core.version>
- <assertj.version>3.12.2</assertj.version>
- <guava.version>25.1-jre</guava.version>
- <mime4j.version>0.8.3</mime4j.version>
- <slf4j.version>1.7.27</slf4j.version>
+ <assertj.version>3.23.1</assertj.version>
+ <guava.version>31.1-jre</guava.version>
+ <mime4j.version>0.8.7</mime4j.version>
+ <slf4j.version>2.0.3</slf4j.version>
</properties>
<dependencyManagement>
@@ -145,9 +144,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
<version>${mail.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
diff --git a/util/pom.xml b/util/pom.xml
index f56e94d..91b19bf 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -28,7 +28,6 @@
</parent>
<artifactId>apache-jsieve-util</artifactId>
- <packaging>bundle</packaging>
<name>Apache James :: jSieve :: Utilities</name>
<description>
@@ -76,8 +75,8 @@
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org