[jira] [Closed] (JSIEVE-111) Libraries upgrade
[
https://issues.apache.org/jira/browse/JSIEVE-111?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Tellier Benoit closed JSIEVE-111.
-
Fix Version/s: 0.6
Resolution: Fixed
> Libraries upgrade
> -
>
> Key: JSIEVE-111
> URL: https://issues.apache.org/jira/browse/JSIEVE-111
> Project: James jSieve
> Issue Type: Wish
>Reporter: Rene Cordier
>Priority: Major
> Fix For: 0.6
>
> Time Spent: 1h 40m
> Remaining Estimate: 0h
>
> Libs update:
> {code:java}
> 4 [INFO] com.google.guava:guava .. 18.0 ->
> 28.1-jre
> 4 [INFO] commons-logging:commons-logging . 1.1.1 ->
> 1.2
> 4 [INFO] javax.mail:mail ... 1.4.4 ->
> 1.5.0-b01
> 4 [INFO] jmock:jmock . 1.2.0 ->
> 20031129.200437
> 4 [INFO] junit:junit .. 4.10 ->
> 4.13-beta-3
> 4 [INFO] log4j:log4j . 1.2.14 ->
> 1.2.17
> 4 [INFO] org.apache.james:apache-mime4j-core ... 0.8.1 ->
> 0.8.3
> 8 [INFO] org.apache.maven.doxia:doxia-core . 1.2 ->
> 1.9
> 2 [INFO] org.assertj:assertj-core . 1.7.1 ->
> 3.13.2
> 4 [INFO] org.mockito:mockito-core .. 1.9.0 ->
> 3.0.0{code}
>
> Plugins update:
> {code:java}
> 1 [INFO] maven-compiler-plugin .. 3.0 -> 3.3
> 1 [INFO] maven-compiler-plugin 3.0 -> 3.7.0
> 1 [INFO] maven-compiler-plugin 3.0 -> 3.8.0
> 2 [INFO] maven-site-plugin .. 3.5.1 -> 3.7.1
> 1 [INFO] org.apache.felix:maven-bundle-plugin ... 2.3.7 -> 2.5.4
> 1 [INFO] org.apache.felix:maven-bundle-plugin ... 2.3.7 -> 4.0.0
> 1 [INFO] org.apache.felix:maven-bundle-plugin ... 2.3.7 -> 4.2.0
> 2 [INFO] org.apache.felix:maven-bundle-plugin ... 4.2.0 -> 4.0.0
> 1 [INFO] org.codehaus.mojo:build-helper-maven-plugin .. 1.7 ->
> 3.0.0{code}
--
This message was sent by Atlassian Jira
(v8.3.2#803003)
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Closed] (JSIEVE-112) Use SLF4J & logback for logging
[ https://issues.apache.org/jira/browse/JSIEVE-112?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Tellier Benoit closed JSIEVE-112. - Fix Version/s: 0.6 Resolution: Fixed > Use SLF4J & logback for logging > --- > > Key: JSIEVE-112 > URL: https://issues.apache.org/jira/browse/JSIEVE-112 > Project: James jSieve > Issue Type: Improvement >Reporter: Tellier Benoit >Priority: Major > Fix For: 0.6 > > Time Spent: 2.5h > Remaining Estimate: 0h > > We should rely on SLF4J for logging within JSIEVE library and use > logback-classic for tests. -- This message was sent by Atlassian Jira (v8.3.2#803003) - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[james-jsieve] 04/16: JSIEVE-111 Upgrade Mime4j 0.8.1 -> 0.8.3
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 commit c3bb2faf05814b75f4b63ece15abcb1faff53c02 Author: Rene Cordier AuthorDate: Fri Sep 6 14:27:14 2019 +0700 JSIEVE-111 Upgrade Mime4j 0.8.1 -> 0.8.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f1b1ac8..340cbe4 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 1.9.0 1.7.1 18.0 -0.8.1 +0.8.3 - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[james-jsieve] 14/16: JSIEVE-111 Upgrade Guava 18.0 -> 25.1-jre
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 commit c5debaeee97fa0d0066659b7d432c2f61de60f6a Author: Rene Cordier AuthorDate: Fri Sep 6 14:31:35 2019 +0700 JSIEVE-111 Upgrade Guava 18.0 -> 25.1-jre --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 256b4af..0aa8147 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ 2.1 3.0.0 1.7.1 -18.0 +25.1-jre 0.8.3 - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[james-jsieve] 08/16: JSIEVE-111 Upgrade apache-rat-plugin 0.13
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 commit dc675c36855bdc58d53a867a6c3e1f31422ac407 Author: Rene Cordier AuthorDate: Fri Sep 6 14:56:49 2019 +0700 JSIEVE-111 Upgrade apache-rat-plugin 0.13 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index a96ae1c..023fab1 100644 --- a/pom.xml +++ b/pom.xml @@ -221,6 +221,7 @@ org.apache.rat apache-rat-plugin +0.13 **/*help.txt - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[james-jsieve] 02/16: JSIEVE-111 Upgrade apache parent pom version 18 -> 21
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 commit 436c3cce470b51d0bc26205fde4f49f1eac7185f Author: Rene Cordier AuthorDate: Fri Sep 6 13:52:54 2019 +0700 JSIEVE-111 Upgrade apache parent pom version 18 -> 21 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8cd9390..148155c 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache apache -18 +21 - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[james-jsieve] 07/16: JSIEVE-111 Upgrade maven-bundle-plugin 2.3.7 -> 4.2.1
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 commit 93906fcce02043df8cfabd5e8aa4e5aec9cd804c Author: Rene Cordier AuthorDate: Fri Sep 6 14:54:15 2019 +0700 JSIEVE-111 Upgrade maven-bundle-plugin 2.3.7 -> 4.2.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1452f27..a96ae1c 100644 --- a/pom.xml +++ b/pom.xml @@ -215,7 +215,7 @@ org.apache.felix maven-bundle-plugin -2.3.7 +4.2.1 true - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[james-jsieve] 11/16: JSIEVE-111 Remove geronimo for javax.mail and javax.activation
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
commit f755440fd428d4d8cb3934d47d6ba658c615b9c9
Author: Rene Cordier
AuthorDate: Fri Sep 6 15:30:42 2019 +0700
JSIEVE-111 Remove geronimo for javax.mail and javax.activation
---
core/pom.xml | 8
pom.xml | 17 -
util/pom.xml | 8
3 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 8dad0fa..c3952cf 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -69,14 +69,14 @@
-${javax.mail.groupId}
-${javax.mail.artifactId}
+javax.mail
+mail
test
-${javax.activation.groupId}
-${javax.activation.artifactId}
+javax.activation
+activation
test
diff --git a/pom.xml b/pom.xml
index 0290d5b..40c633f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,11 +73,6 @@
jsieve-website
-org.apache.geronimo.javamail
-
geronimo-javamail_1.4_mail
-
org.apache.geronimo.specs
-
geronimo-activation_1.1_spec
-
1.6
UTF-8
@@ -86,8 +81,6 @@
2.12.1
1.4.4
1.1.1
-1.1
-1.8.3
2.1
1.9.0
1.7.1
@@ -184,16 +177,6 @@
1
-org.apache.geronimo.specs
-geronimo-activation_1.1_spec
-${geronimo-activation.version}
-
-
-org.apache.geronimo.javamail
-geronimo-javamail_1.4_mail
-${geronimo-javamail.version}
-
-
org.mockito
mockito-core
${mockito-core.version}
diff --git a/util/pom.xml b/util/pom.xml
index f32749b..0d63d95 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -76,13 +76,13 @@
-${javax.mail.groupId}
-${javax.mail.artifactId}
+javax.mail
+mail
-${javax.activation.groupId}
-${javax.activation.artifactId}
+javax.activation
+activation
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[james-jsieve] 06/16: JSIEVE-111 Upgrade log4j 1.2.14 -> log4j-core 2.12.1
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
commit 299032d5f571f0f71660729f2f46f988818a81dc
Author: Rene Cordier
AuthorDate: Fri Sep 6 14:45:10 2019 +0700
JSIEVE-111 Upgrade log4j 1.2.14 -> log4j-core 2.12.1
---
core/pom.xml | 4 ++--
pom.xml | 10 +-
util/pom.xml | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index d3af024..c88e8ee 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -63,8 +63,8 @@
-log4j
-log4j
+org.apache.logging.log4j
+log4j-core
test
diff --git a/pom.xml b/pom.xml
index 9a337f0..1452f27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
4.12
1.2.0
-1.2.14
+2.12.1
1.4.4
1.1.1
1.1
@@ -141,8 +141,8 @@
logkit
-log4j
-log4j
+org.apache.logging.log4j
+log4j-core
javax.servlet
@@ -163,8 +163,8 @@
test
-log4j
-log4j
+org.apache.logging.log4j
+log4j-core
${log4j.version}
test
diff --git a/util/pom.xml b/util/pom.xml
index b80af42..f32749b 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -70,8 +70,8 @@
-log4j
-log4j
+org.apache.logging.log4j
+log4j-core
test
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[james-jsieve] 03/16: JSIEVE-111 Upgrade Junit 4.10 -> 4.12
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 commit 9c4e18772f3996cf9c062c449908c51bf43c5665 Author: Rene Cordier AuthorDate: Fri Sep 6 13:55:10 2019 +0700 JSIEVE-111 Upgrade Junit 4.10 -> 4.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 148155c..f1b1ac8 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ 1.6 UTF-8 -4.10 +4.12 1.2.0 1.2.14 1.4.4 - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[james-jsieve] 05/16: JSIEVE-111 Upgrade commons-logging 1.1.1 -> 1.2
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 commit 2667d513e23a69b0cde121b0dec11772e66a23ea Author: Rene Cordier AuthorDate: Fri Sep 6 14:34:28 2019 +0700 JSIEVE-111 Upgrade commons-logging 1.1.1 -> 1.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 340cbe4..9a337f0 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ commons-logging commons-logging -1.1.1 +1.2 avalon-framework - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[james-jsieve] 13/16: JSIEVE-111 Upgrade mockito-core 1.9.0 -> 3.0.0
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
commit a34a7313d856aad11841d99fad3c0cad3f562cf2
Author: Rene Cordier
AuthorDate: Tue Sep 10 11:54:31 2019 +0700
JSIEVE-111 Upgrade mockito-core 1.9.0 -> 3.0.0
---
.../test/java/org/apache/jsieve/VacationTest.java | 52 +-
pom.xml| 2 +-
2 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/core/src/test/java/org/apache/jsieve/VacationTest.java
b/core/src/test/java/org/apache/jsieve/VacationTest.java
index afe3f40..c5c4422 100644
--- a/core/src/test/java/org/apache/jsieve/VacationTest.java
+++ b/core/src/test/java/org/apache/jsieve/VacationTest.java
@@ -19,6 +19,12 @@
package org.apache.jsieve;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
import org.apache.jsieve.exception.SyntaxException;
import org.apache.jsieve.mail.ActionKeep;
import org.apache.jsieve.mail.optional.ActionVacation;
@@ -27,12 +33,6 @@ import org.apache.jsieve.utils.SieveMailAdapter;
import org.junit.Before;
import org.junit.Test;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-
public class VacationTest {
private SieveMailAdapter sieveMailAdapter;
@@ -111,9 +111,10 @@ public class VacationTest {
JUnitUtils.interpret(sieveMailAdapter, script);
-verify(sieveMailAdapter, times(2)).setContext(any(SieveContext.class));
+verify(sieveMailAdapter).setContext(any(SieveContext.class));
+verify(sieveMailAdapter).setContext(isNull(SieveContext.class));
verify(sieveMailAdapter).addAction(ActionVacation.builder().reason("reason").build());
-verify(sieveMailAdapter, times(2)).addAction(any(ActionKeep.class));
+verify(sieveMailAdapter).addAction(any(ActionKeep.class));
verify(sieveMailAdapter).executeActions();
verifyNoMoreInteractions(sieveMailAdapter);
}
@@ -124,9 +125,10 @@ public class VacationTest {
JUnitUtils.interpret(sieveMailAdapter, script);
-verify(sieveMailAdapter, times(2)).setContext(any(SieveContext.class));
+verify(sieveMailAdapter).setContext(any(SieveContext.class));
+verify(sieveMailAdapter).setContext(isNull(SieveContext.class));
verify(sieveMailAdapter).addAction(ActionVacation.builder().reason("reason").duration(3).build());
-verify(sieveMailAdapter, times(2)).addAction(any(ActionKeep.class));
+verify(sieveMailAdapter).addAction(any(ActionKeep.class));
verify(sieveMailAdapter).executeActions();
verifyNoMoreInteractions(sieveMailAdapter);
}
@@ -137,9 +139,10 @@ public class VacationTest {
JUnitUtils.interpret(sieveMailAdapter, script);
-verify(sieveMailAdapter, times(2)).setContext(any(SieveContext.class));
+verify(sieveMailAdapter).setContext(any(SieveContext.class));
+verify(sieveMailAdapter).setContext(isNull(SieveContext.class));
verify(sieveMailAdapter).addAction(ActionVacation.builder().reason("reason").subject("any").build());
-verify(sieveMailAdapter, times(2)).addAction(any(ActionKeep.class));
+verify(sieveMailAdapter).addAction(any(ActionKeep.class));
verify(sieveMailAdapter).executeActions();
verifyNoMoreInteractions(sieveMailAdapter);
}
@@ -150,9 +153,10 @@ public class VacationTest {
JUnitUtils.interpret(sieveMailAdapter, script);
-verify(sieveMailAdapter, times(2)).setContext(any(SieveContext.class));
+verify(sieveMailAdapter).setContext(any(SieveContext.class));
+verify(sieveMailAdapter).setContext(isNull(SieveContext.class));
verify(sieveMailAdapter).addAction(ActionVacation.builder().reason("reason").from("be...@apache.org").build());
-verify(sieveMailAdapter, times(2)).addAction(any(ActionKeep.class));
+verify(sieveMailAdapter).addAction(any(ActionKeep.class));
verify(sieveMailAdapter).executeActions();
verifyNoMoreInteractions(sieveMailAdapter);
}
@@ -164,9 +168,10 @@ public class VacationTest {
JUnitUtils.interpret(sieveMailAdapter, script);
-verify(sieveMailAdapter, times(2)).setContext(any(SieveContext.class));
+verify(sieveMailAdapter).setContext(any(SieveContext.class));
+verify(sieveMailAdapter).setContext(isNull(SieveContext.class));
verify(sieveMailAdapter).addAction(ActionVacation.builder().reason("reason").build());
-verify(sieveMailAdapter, times(2)).addAction(any(A
[james-jsieve] 10/16: JSIEVE-111 Upgrade build-helper-maven-plugin 1.7 -> 3.0.0
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 commit d2b4d9693863598de6314eec13c7fc96423230c0 Author: Rene Cordier AuthorDate: Fri Sep 6 15:01:12 2019 +0700 JSIEVE-111 Upgrade build-helper-maven-plugin 1.7 -> 3.0.0 --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index c88e8ee..8dad0fa 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -115,7 +115,7 @@ org.codehaus.mojo build-helper-maven-plugin -1.7 +3.0.0 add-source - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[james-jsieve] 12/16: JSIEVE-111 Upgrade javax.mail 1.4.4 -> 1.4.7
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 commit 769827efcfc712cd8debebd797c5420a9e385b40 Author: Rene Cordier AuthorDate: Fri Sep 6 15:34:56 2019 +0700 JSIEVE-111 Upgrade javax.mail 1.4.4 -> 1.4.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40c633f..05a67fa 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ 4.12 1.2.0 2.12.1 -1.4.4 +1.4.7 1.1.1 2.1 1.9.0 - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[james-jsieve] 01/16: JSIEVE-111 Upgrade maven-assembly-plugin 3.0.0 -> 3.1.1
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
commit 46cf127f088d834ab0afa4424dd3dddfbb3061ed
Author: Rene Cordier
AuthorDate: Fri Sep 6 13:52:33 2019 +0700
JSIEVE-111 Upgrade maven-assembly-plugin 3.0.0 -> 3.1.1
- Use goals `single` instead of `attached` by the recommendation at
http://maven.apache.org/plugins-archives/maven-assembly-plugin-2.5.5/attached-mojo.html
---
all/pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/all/pom.xml b/all/pom.xml
index 3f78c62..3701723 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -54,6 +54,7 @@
maven-assembly-plugin
+3.1.1
${project.basedir}/src/assemble/
gnu
@@ -63,7 +64,7 @@
make-assembly
package
-attached
+single
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[james-jsieve] 15/16: JSIEVE-112 Replace log4j by logback-classic
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
commit 2a729f0f0d43db33c9b856d9476c3c21637e2936
Author: Rene Cordier
AuthorDate: Tue Sep 10 16:38:17 2019 +0700
JSIEVE-112 Replace log4j by logback-classic
---
core/pom.xml | 4 ++--
pom.xml | 12 ++--
util/pom.xml | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index c3952cf..ba74dbb 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -63,8 +63,8 @@
-org.apache.logging.log4j
-log4j-core
+ch.qos.logback
+logback-classic
test
diff --git a/pom.xml b/pom.xml
index 0aa8147..7f90aa1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
4.12
1.2.0
-2.12.1
+1.2.3
1.4.7
1.1.1
2.1
@@ -134,8 +134,8 @@
logkit
-org.apache.logging.log4j
-log4j-core
+ch.qos.logback
+logback-classic
javax.servlet
@@ -156,9 +156,9 @@
test
-org.apache.logging.log4j
-log4j-core
-${log4j.version}
+ch.qos.logback
+logback-classic
+${logback.version}
test
diff --git a/util/pom.xml b/util/pom.xml
index 0d63d95..ac483e1 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -70,8 +70,8 @@
-org.apache.logging.log4j
-log4j-core
+ch.qos.logback
+logback-classic
test
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[james-jsieve] 16/16: JSIEVE-112 Replace commons-logging by slf4j
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
commit 8e52fc171e8e7c0d267ed40a84c90aa415afbb17
Author: Rene Cordier
AuthorDate: Tue Sep 10 16:49:16 2019 +0700
JSIEVE-112 Replace commons-logging by slf4j
---
core/pom.xml | 4 +-
.../java/org/apache/jsieve/BaseSieveContext.java | 18 +-
core/src/main/java/org/apache/jsieve/Command.java | 14 ++---
.../org/apache/jsieve/ConfigurationManager.java| 28 +++--
.../java/org/apache/jsieve/ScriptCoordinate.java | 64 +--
.../main/java/org/apache/jsieve/SieveContext.java | 8 ---
.../main/java/org/apache/jsieve/SieveFactory.java | 31 +++--
.../org/apache/jsieve/SieveParserVisitorImpl.java | 6 +-
core/src/main/java/org/apache/jsieve/Test.java | 9 ++-
.../java/org/apache/jsieve/commands/Require.java | 2 +-
.../org/apache/jsieve/commands/extensions/Log.java | 73 +++---
.../jsieve/commands/extensions/LogLevelTags.java | 2 -
.../java/org/apache/jsieve/tests/AbstractTest.java | 13 ++--
.../src/main/java/org/apache/jsieve/tests/Not.java | 2 +-
.../main/java/org/apache/jsieve/tests/Size.java| 2 +-
.../java/org/apache/jsieve/AddressParseTest.java | 13 ++--
core/src/test/java/org/apache/jsieve/LogTest.java | 17 -
.../jsieve/SieveParserVisitorImplQuoteTest.java| 17 +++--
.../jsieve/commands/optional/FileIntoTest.java | 16 +++--
.../org/apache/jsieve/utils/SieveMailAdapter.java | 11 ++--
pom.xml| 25 ++--
util/pom.xml | 4 +-
.../org/apache/jsieve/util/NodeToSieveAdapter.java | 11 ++--
23 files changed, 120 insertions(+), 270 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index ba74dbb..1c966b6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -52,8 +52,8 @@
apache-mime4j-core
-commons-logging
-commons-logging
+org.slf4j
+slf4j-api
diff --git a/core/src/main/java/org/apache/jsieve/BaseSieveContext.java
b/core/src/main/java/org/apache/jsieve/BaseSieveContext.java
index 8edc597..e66afb7 100644
--- a/core/src/main/java/org/apache/jsieve/BaseSieveContext.java
+++ b/core/src/main/java/org/apache/jsieve/BaseSieveContext.java
@@ -19,8 +19,6 @@
package org.apache.jsieve;
-import org.apache.commons.logging.Log;
-
/**
* Bean based implementation of context.
*/
@@ -38,17 +36,14 @@ public class BaseSieveContext extends SieveContext {
private final TestManager testManager;
-private final Log log;
-
public BaseSieveContext(final CommandManager commandManager,
final ComparatorManager comparatorManager,
-final TestManager testManager, final Log log) {
+final TestManager testManager) {
this.commandStateManager = new CommandStateManager();
this.conditionManager = new ConditionManager();
this.testManager = testManager;
this.commandManager = commandManager;
this.comparatorManager = comparatorManager;
-this.log = log;
}
/**
@@ -69,9 +64,6 @@ public class BaseSieveContext extends SieveContext {
@Override
public void setCoordinate(ScriptCoordinate coordinate) {
this.coordinate = coordinate;
-if (coordinate != null) {
-coordinate.setLog(getLog());
-}
}
/**
@@ -99,14 +91,6 @@ public class BaseSieveContext extends SieveContext {
}
/**
- * @see SieveContext#getLog()
- */
-@Override
-public Log getLog() {
-return log;
-}
-
-/**
* @see SieveContext#getComparatorManager()
*/
@Override
diff --git a/core/src/main/java/org/apache/jsieve/Command.java
b/core/src/main/java/org/apache/jsieve/Command.java
index 8d25904..4dc12a0 100644
--- a/core/src/main/java/org/apache/jsieve/Command.java
+++ b/core/src/main/java/org/apache/jsieve/Command.java
@@ -19,9 +19,10 @@
package org.apache.jsieve;
-import org.apache.commons.logging.Log;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.mail.MailAdapter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -31,6 +32,7 @@ import org.apache.jsieve.mail.MailAdapter;
* command = identifier arguments ( ";" / block )
*/
public class Command implements Executable {
+private static final Logger LOGGER =
LoggerFactory.getLogger(Command.class);
/** The name of this Command */
private String fieldName;
@@ -143,13 +145,9 @@ public class Command implements Executable {
/**
* @see org.apache.jsieve.Executable#execute(MailAdapter, SieveContext)
*/
-public Object execute(MailAdapter mail, SieveContext context)
-throws
[james-jsieve] 09/16: JSIEVE-111 Upgrade maven-compiler-plugin 3.0 -> 3.8.1
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
commit 9b36aede8b1df3157242d8ed24b7622f5c174339
Author: Rene Cordier
AuthorDate: Fri Sep 6 14:57:33 2019 +0700
JSIEVE-111 Upgrade maven-compiler-plugin 3.0 -> 3.8.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 023fab1..0290d5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -231,7 +231,7 @@
org.apache.maven.plugins
maven-compiler-plugin
-3.0
+3.8.1
true
${target.jdk}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[james-jsieve] branch master updated (697927f -> 8e52fc1)
This is an automated email from the ASF dual-hosted git repository. btellier pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/james-jsieve.git. from 697927f JSIEVE-107 Added unit test to verify issue JSIEVE-107 new 46cf127 JSIEVE-111 Upgrade maven-assembly-plugin 3.0.0 -> 3.1.1 new 436c3cc JSIEVE-111 Upgrade apache parent pom version 18 -> 21 new 9c4e187 JSIEVE-111 Upgrade Junit 4.10 -> 4.12 new c3bb2fa JSIEVE-111 Upgrade Mime4j 0.8.1 -> 0.8.3 new 2667d51 JSIEVE-111 Upgrade commons-logging 1.1.1 -> 1.2 new 299032d JSIEVE-111 Upgrade log4j 1.2.14 -> log4j-core 2.12.1 new 93906fc JSIEVE-111 Upgrade maven-bundle-plugin 2.3.7 -> 4.2.1 new dc675c3 JSIEVE-111 Upgrade apache-rat-plugin 0.13 new 9b36aed JSIEVE-111 Upgrade maven-compiler-plugin 3.0 -> 3.8.1 new d2b4d96 JSIEVE-111 Upgrade build-helper-maven-plugin 1.7 -> 3.0.0 new f755440 JSIEVE-111 Remove geronimo for javax.mail and javax.activation new 769827e JSIEVE-111 Upgrade javax.mail 1.4.4 -> 1.4.7 new a34a731 JSIEVE-111 Upgrade mockito-core 1.9.0 -> 3.0.0 new c5debae JSIEVE-111 Upgrade Guava 18.0 -> 25.1-jre new 2a729f0 JSIEVE-112 Replace log4j by logback-classic new 8e52fc1 JSIEVE-112 Replace commons-logging by slf4j The 16 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: all/pom.xml| 3 +- core/pom.xml | 18 +++--- .../java/org/apache/jsieve/BaseSieveContext.java | 18 +- core/src/main/java/org/apache/jsieve/Command.java | 14 ++--- .../org/apache/jsieve/ConfigurationManager.java| 28 +++-- .../java/org/apache/jsieve/ScriptCoordinate.java | 64 +-- .../main/java/org/apache/jsieve/SieveContext.java | 8 --- .../main/java/org/apache/jsieve/SieveFactory.java | 31 +++-- .../org/apache/jsieve/SieveParserVisitorImpl.java | 6 +- core/src/main/java/org/apache/jsieve/Test.java | 9 ++- .../java/org/apache/jsieve/commands/Require.java | 2 +- .../org/apache/jsieve/commands/extensions/Log.java | 73 +++--- .../jsieve/commands/extensions/LogLevelTags.java | 2 - .../java/org/apache/jsieve/tests/AbstractTest.java | 13 ++-- .../src/main/java/org/apache/jsieve/tests/Not.java | 2 +- .../main/java/org/apache/jsieve/tests/Size.java| 2 +- .../java/org/apache/jsieve/AddressParseTest.java | 13 ++-- core/src/test/java/org/apache/jsieve/LogTest.java | 17 - .../jsieve/SieveParserVisitorImplQuoteTest.java| 17 +++-- .../test/java/org/apache/jsieve/VacationTest.java | 52 --- .../jsieve/commands/optional/FileIntoTest.java | 16 +++-- .../org/apache/jsieve/utils/SieveMailAdapter.java | 11 ++-- pom.xml| 67 +--- util/pom.xml | 16 ++--- .../org/apache/jsieve/util/NodeToSieveAdapter.java | 11 ++-- 25 files changed, 178 insertions(+), 335 deletions(-) - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Created] (JAMES-2883) SearchIndex should not attempt to read a deleted mailbox
Tellier Benoit created JAMES-2883: - Summary: SearchIndex should not attempt to read a deleted mailbox Key: JAMES-2883 URL: https://issues.apache.org/jira/browse/JAMES-2883 Project: James Server Issue Type: Bug Components: mailbox Reporter: Tellier Benoit Currently, deleting a mailbox leads to errors as the search index tries to resolve the mailboxId of a no more existing mailbox. It's failing. It's retied. It waists test time. And data are no longer cleared. -- This message was sent by Atlassian Jira (v8.3.2#803003) - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
