You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2019/02/19 11:35:11 UTC
[syncope] branch 2_0_X updated: Stabilizing notification tests
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new 804ce00 Stabilizing notification tests
804ce00 is described below
commit 804ce00f1d7a53c6cb819d82003a645e9474ef0b
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Feb 19 12:03:04 2019 +0100
Stabilizing notification tests
---
fit/build-tools/pom.xml | 4 ----
.../java/com/icegreen/greenmail/smtp/InterruptableSmtpServer.java | 5 ++---
fit/core-reference/src/{main => test}/resources/mail.properties | 0
pom.xml | 4 ++++
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/fit/build-tools/pom.xml b/fit/build-tools/pom.xml
index 2e46b99..d0bb52f 100644
--- a/fit/build-tools/pom.xml
+++ b/fit/build-tools/pom.xml
@@ -51,10 +51,6 @@ under the License.
<dependency>
<groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-core-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-service-builder</artifactId>
<version>${apacheds.version}</version>
</dependency>
diff --git a/fit/build-tools/src/main/java/com/icegreen/greenmail/smtp/InterruptableSmtpServer.java b/fit/build-tools/src/main/java/com/icegreen/greenmail/smtp/InterruptableSmtpServer.java
index ca9e0af..5a1d2b3 100644
--- a/fit/build-tools/src/main/java/com/icegreen/greenmail/smtp/InterruptableSmtpServer.java
+++ b/fit/build-tools/src/main/java/com/icegreen/greenmail/smtp/InterruptableSmtpServer.java
@@ -41,10 +41,9 @@ public class InterruptableSmtpServer extends SmtpServer {
} catch (IOException e) {
// ignore
}
- return null;
- } else {
- return super.createProtocolHandler(clientSocket);
}
+
+ return super.createProtocolHandler(clientSocket);
}
}
diff --git a/fit/core-reference/src/main/resources/mail.properties b/fit/core-reference/src/test/resources/mail.properties
similarity index 100%
rename from fit/core-reference/src/main/resources/mail.properties
rename to fit/core-reference/src/test/resources/mail.properties
diff --git a/pom.xml b/pom.xml
index cb0b936..a0561da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1335,6 +1335,10 @@ under the License.
<artifactId>activation</artifactId>
</exclusion>
<exclusion>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</exclusion>