Merge branch release/0.3.2 into master

Upgrade to test with spring-context-support 4.2.5
Upgrade to test with simple-java-mail 3.0.0
Upgrade kemitix-parent to 0.9.0

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
This commit is contained in:
Paul Campbell 2016-03-05 15:18:04 +00:00
commit c31fca12d7
3 changed files with 12 additions and 5 deletions

View file

@ -1,6 +1,13 @@
CHANGELOG CHANGELOG
========= =========
0.3.2
------
* Upgrade to test with spring-context-support 4.2.5
* Upgrade to test with simple-java-mail 3.0.0
* Upgrade kemitix-parent to 0.9.0
0.3.1 0.3.1
------ ------

View file

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>net.kemitix</groupId> <groupId>net.kemitix</groupId>
<artifactId>wiser-assertions</artifactId> <artifactId>wiser-assertions</artifactId>
<version>0.4.0-SNAPSHOT</version> <version>0.3.2</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>wiser-assertions</name> <name>wiser-assertions</name>
@ -60,13 +60,13 @@
<dependency><!-- for Issue1Test --> <dependency><!-- for Issue1Test -->
<groupId>org.codemonkey.simplejavamail</groupId> <groupId>org.codemonkey.simplejavamail</groupId>
<artifactId>simple-java-mail</artifactId> <artifactId>simple-java-mail</artifactId>
<version>2.5.1</version> <version>3.0.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency><!-- for Issue6Test --> <dependency><!-- for Issue6Test -->
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId> <artifactId>spring-context-support</artifactId>
<version>4.2.4.RELEASE</version> <version>4.2.5.RELEASE</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

View file

@ -1,7 +1,7 @@
package net.kemitix.wiser.assertions; package net.kemitix.wiser.assertions;
import org.codemonkey.simplejavamail.Email;
import org.codemonkey.simplejavamail.Mailer; import org.codemonkey.simplejavamail.Mailer;
import org.codemonkey.simplejavamail.email.Email;
import org.junit.Test; import org.junit.Test;
import javax.mail.Message; import javax.mail.Message;
@ -9,8 +9,8 @@ import javax.mail.Message;
/** /**
* Regression test for issue #1. * Regression test for issue #1.
* *
* @see https://github.com/kemitix/wiser-assertions/issues/1
* @author pcampbell * @author pcampbell
* @see https://github.com/kemitix/wiser-assertions/issues/1
*/ */
public class Issue1Test extends AbstractWiserTest { public class Issue1Test extends AbstractWiserTest {