#31 - Move away from deprecated assertion methods in Spring 5.

We now consistently use Assert.notNull(…) et al that take an error message as the overload without a message have been deprecated in Spring 5.

Added build profile for Spring 5 releases and snapshots.
This commit is contained in:
Oliver Gierke
2017-01-31 10:48:22 +01:00
parent 66eaf45b17
commit 2abef3aafc
4 changed files with 44 additions and 14 deletions

42
pom.xml
View File

@@ -12,7 +12,7 @@
<name>Pivotal Software, Inc.</name>
<url>http://www.spring.io</url>
</organization>
<inceptionYear>2008-2016</inceptionYear>
<inceptionYear>2008-2017</inceptionYear>
<url>https://github.com/spring-projects/spring-plugin</url>
<licenses>
@@ -44,8 +44,8 @@
</modules>
<properties>
<spring.version>4.3.3.BUILD-SNAPSHOT</spring.version>
<slf4j.version>1.7.21</slf4j.version>
<spring.version>4.3.6.RELEASE</spring.version>
<slf4j.version>1.7.22</slf4j.version>
</properties>
<developers>
@@ -62,6 +62,36 @@
</developer>
</developers>
<profiles>
<profile>
<id>spring5</id>
<properties>
<spring.version>5.0.0.M3</spring.version>
</properties>
<repositories>
<repository>
<id>spring-libs-milestone</id>
<url>https://repo.spring.io/libs-milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
</profile>
<profile>
<id>spring5-next</id>
<properties>
<spring.version>5.0.0.BUILD-SNAPSHOT</spring.version>
</properties>
<repositories>
<repository>
<id>spring-libs-snapshot</id>
<url>https://repo.spring.io/libs-snapshot</url>
</repository>
</repositories>
</profile>
</profiles>
<dependencies>
<!-- Common test dependencies -->
@@ -197,10 +227,10 @@
<repositories>
<repository>
<id>spring-libs-snapshot</id>
<url>https://repo.spring.io/libs-snapshot</url>
<id>spring-libs-release</id>
<url>https://repo.spring.io/libs-release</url>
<snapshots>
<enabled>true</enabled>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>