Commit 6e527957 authored by Daniel Gerhardt's avatar Daniel Gerhardt

Merge branch '2.5' into 2.x

parents 82ded6ac 3e51b766
# Changelog
## 2.5.2
This is a maintenance release which only brings libraries up to date to fix
potential bugs.
## 2.5.1
This release fixes a performance issue on session creation affecting large
installations.
......
......@@ -7,7 +7,8 @@
<packaging>war</packaging>
<properties>
<io.spring.platform-version>Brussels-SR4</io.spring.platform-version>
<io.spring.platform-version>Brussels-SR5</io.spring.platform-version>
<io.netty-version>4.1.16.Final</io.netty-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<timestamp>${maven.build.timestamp}</timestamp>
<sonar.language>java</sonar.language>
......@@ -112,6 +113,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>${io.netty-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
......@@ -227,7 +235,7 @@
<dependency>
<groupId>com.corundumstudio.socketio</groupId>
<artifactId>netty-socketio</artifactId>
<version>1.7.12</version>
<version>1.7.13</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
......@@ -336,7 +344,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.6.v20170531</version>
<version>9.4.7.v20170914</version>
<configuration>
<scanIntervalSeconds>1</scanIntervalSeconds>
<webApp>
......@@ -457,7 +465,7 @@
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>2.2.2</version>
<version>2.2.3</version>
<executions>
<execution>
<goals>
......
Markdown is supported
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