Commit 13e18671 authored by Daniel Gerhardt's avatar Daniel Gerhardt

Merge branch '2.x'

parents 5e274af2 82b066fb
# Changelog # Changelog
## 2.5.2
This is a maintenance release which only brings libraries up to date to fix
potential bugs.
## 2.5.1 ## 2.5.1
This release fixes a performance issue on session creation affecting large This release fixes a performance issue on session creation affecting large
installations. installations.
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
<packaging>war</packaging> <packaging>war</packaging>
<properties> <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>
<org.aspectj-version>1.8.10</org.aspectj-version> <org.aspectj-version>1.8.10</org.aspectj-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>
...@@ -113,6 +114,13 @@ ...@@ -113,6 +114,13 @@
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>${io.netty-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
...@@ -247,7 +255,7 @@ ...@@ -247,7 +255,7 @@
<dependency> <dependency>
<groupId>com.corundumstudio.socketio</groupId> <groupId>com.corundumstudio.socketio</groupId>
<artifactId>netty-socketio</artifactId> <artifactId>netty-socketio</artifactId>
<version>1.7.12</version> <version>1.7.13</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.inject</groupId> <groupId>javax.inject</groupId>
...@@ -317,7 +325,7 @@ ...@@ -317,7 +325,7 @@
<dependency> <dependency>
<groupId>org.checkerframework</groupId> <groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId> <artifactId>checker-qual</artifactId>
<version>2.1.14</version> <version>2.2.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
...@@ -384,7 +392,7 @@ ...@@ -384,7 +392,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.6.2</version> <version>3.7.0</version>
<configuration> <configuration>
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>
...@@ -393,7 +401,7 @@ ...@@ -393,7 +401,7 @@
<plugin> <plugin>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>9.4.6.v20170531</version> <version>9.4.7.v20170914</version>
<configuration> <configuration>
<scanIntervalSeconds>1</scanIntervalSeconds> <scanIntervalSeconds>1</scanIntervalSeconds>
<webApp> <webApp>
...@@ -428,7 +436,7 @@ ...@@ -428,7 +436,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.20</version> <version>2.20.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
...@@ -514,7 +522,7 @@ ...@@ -514,7 +522,7 @@
<plugin> <plugin>
<groupId>pl.project13.maven</groupId> <groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId> <artifactId>git-commit-id-plugin</artifactId>
<version>2.2.2</version> <version>2.2.3</version>
<executions> <executions>
<execution> <execution>
<goals> <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