Skip to content
This repository has been archived by the owner on Jan 22, 2023. It is now read-only.

Commit

Permalink
Merge branch release/0.3.2 into master
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
kemitix committed Mar 5, 2016
2 parents 099e77d + d8509eb commit c31fca1
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
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
------

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.kemitix</groupId>
<artifactId>wiser-assertions</artifactId>
<version>0.4.0-SNAPSHOT</version>
<version>0.3.2</version>
<packaging>jar</packaging>

<name>wiser-assertions</name>
Expand Down Expand Up @@ -60,13 +60,13 @@
<dependency><!-- for Issue1Test -->
<groupId>org.codemonkey.simplejavamail</groupId>
<artifactId>simple-java-mail</artifactId>
<version>2.5.1</version>
<version>3.0.0</version>
<scope>test</scope>
</dependency>
<dependency><!-- for Issue6Test -->
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>4.2.4.RELEASE</version>
<version>4.2.5.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/net/kemitix/wiser/assertions/Issue1Test.java
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package net.kemitix.wiser.assertions;

import org.codemonkey.simplejavamail.Email;
import org.codemonkey.simplejavamail.Mailer;
import org.codemonkey.simplejavamail.email.Email;
import org.junit.Test;

import javax.mail.Message;

/**
* Regression test for issue #1.
*
* @see https://github.com/kemitix/wiser-assertions/issues/1
* @author pcampbell
* @see https://github.com/kemitix/wiser-assertions/issues/1
*/
public class Issue1Test extends AbstractWiserTest {

Expand Down

0 comments on commit c31fca1

Please sign in to comment.