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

Merge branch '2.5' into 2.6

parents 25004bb8 59e5b3c3
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
pom.xml
+ 2
− 2
View file @ 4e0b358e
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<packaging>war</packaging> <packaging>war</packaging>
<properties> <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> <io.netty-version>4.1.30.Final</io.netty-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<timestamp>${maven.build.timestamp}</timestamp> <timestamp>${maven.build.timestamp}</timestamp>
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
<dependency> <dependency>
<groupId>cglib</groupId> <groupId>cglib</groupId>
<artifactId>cglib</artifactId> <artifactId>cglib</artifactId>
<version>3.2.8</version> <version>3.2.9</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</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