Skip to content
Snippets Groups Projects
Commit f618ebe3 authored by Daniel Gerhardt's avatar Daniel Gerhardt
Browse files

Merge branch '2.6' into 2.x

parents c0b74cb9 91b72c09
Branches
Tags
No related merge requests found
......@@ -7,7 +7,7 @@
<packaging>war</packaging>
<properties>
<io.spring.platform-version>Brussels-SR13</io.spring.platform-version>
<io.spring.platform-version>Brussels-SR14</io.spring.platform-version>
<io.netty-version>4.1.30.Final</io.netty-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<timestamp>${maven.build.timestamp}</timestamp>
......@@ -191,7 +191,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>3.2.8</version>
<version>3.2.9</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
......@@ -377,7 +377,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.0</version>
<version>2.22.1</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment