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.4.0'
Browse files Browse the repository at this point in the history
* release/0.4.0:
  CHANGELOG
  pom.xml: version set to 0.4.0
  Upgrade kemitix-parent to 1.1.0
  Specify dependency versions in properties
  Upgrade kemitix-parent to 1.0.0
  Upgrade spring-context-support to 4.2.6
  Upgrade to test against simple-java-mail 3.0.1
  pom.xml: version set to 0.4.0-SNAPSHOT
  • Loading branch information
kemitix committed May 9, 2016
2 parents c31fca1 + d9c71f9 commit 14c4e6c
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 12 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
CHANGELOG
=========

0.4.0
------

* Upgrade kemitix-parent to 1.1.0
* (pom) Specify dependency versions in properties
* Upgrade spring-context-support to 4.2.6 (tests)
* Upgrade simple-java-mail to 3.0.1 (tests)

0.3.2
------

Expand Down
30 changes: 18 additions & 12 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.3.2</version>
<version>0.4.0</version>
<packaging>jar</packaging>

<name>wiser-assertions</name>
Expand All @@ -24,49 +24,55 @@
<url>[email protected]:kemitix/wiser-assertions.git</url>
</scm>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<parent>
<groupId>net.kemitix</groupId>
<artifactId>kemitix-parent</artifactId>
<version>0.9.0</version>
<version>1.1.0</version>
</parent>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<javax-mail.version>1.4.7</javax-mail.version>
<subethasmtp.version>3.1.7</subethasmtp.version>
<junit.version>4.12</junit.version>
<mockito-core.version>1.10.19</mockito-core.version>
<simple-java-mail.version>3.0.1</simple-java-mail.version>
<spring-framework.version>4.2.6.RELEASE</spring-framework.version>
</properties>

<dependencies>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4.7</version>
<version>${javax-mail.version}</version>
</dependency>
<dependency>
<groupId>org.subethamail</groupId>
<artifactId>subethasmtp</artifactId>
<version>3.1.7</version>
<version>${subethasmtp.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>${mockito-core.version}</version>
<scope>test</scope>
</dependency>
<dependency><!-- for Issue1Test -->
<groupId>org.codemonkey.simplejavamail</groupId>
<artifactId>simple-java-mail</artifactId>
<version>3.0.0</version>
<version>${simple-java-mail.version}</version>
<scope>test</scope>
</dependency>
<dependency><!-- for Issue6Test -->
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>4.2.5.RELEASE</version>
<version>${spring-framework.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down

0 comments on commit 14c4e6c

Please sign in to comment.