Merge branch 'release/0.4.0'

* 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
This commit is contained in:
Paul Campbell 2016-05-09 11:45:30 +01:00
commit 14c4e6c536
2 changed files with 26 additions and 12 deletions

View file

@ -1,6 +1,14 @@
CHANGELOG 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 0.3.2
------ ------

30
pom.xml
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.3.2</version> <version>0.4.0</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>wiser-assertions</name> <name>wiser-assertions</name>
@ -24,49 +24,55 @@
<url>git@github.com:kemitix/wiser-assertions.git</url> <url>git@github.com:kemitix/wiser-assertions.git</url>
</scm> </scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<parent> <parent>
<groupId>net.kemitix</groupId> <groupId>net.kemitix</groupId>
<artifactId>kemitix-parent</artifactId> <artifactId>kemitix-parent</artifactId>
<version>0.9.0</version> <version>1.1.0</version>
</parent> </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> <dependencies>
<dependency> <dependency>
<groupId>javax.mail</groupId> <groupId>javax.mail</groupId>
<artifactId>mail</artifactId> <artifactId>mail</artifactId>
<version>1.4.7</version> <version>${javax-mail.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.subethamail</groupId> <groupId>org.subethamail</groupId>
<artifactId>subethasmtp</artifactId> <artifactId>subethasmtp</artifactId>
<version>3.1.7</version> <version>${subethasmtp.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.12</version> <version>${junit.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<version>1.10.19</version> <version>${mockito-core.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<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>3.0.0</version> <version>${simple-java-mail.version}</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.5.RELEASE</version> <version>${spring-framework.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>