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

Merge branch '2.3' into 2.4

parents 743aac18 7e070d2e
No related merge requests found
Pipeline #3350 passed with stages
in 3 minutes and 53 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
pom.xml
+ 2
− 2
View file @ 11d06c06
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<io.spring.platform-version>2.0.5.RELEASE</io.spring.platform-version> <io.spring.platform-version>2.0.6.RELEASE</io.spring.platform-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>
<sonar.language>java</sonar.language> <sonar.language>java</sonar.language>
...@@ -226,7 +226,7 @@ ...@@ -226,7 +226,7 @@
<dependency> <dependency>
<groupId>com.corundumstudio.socketio</groupId> <groupId>com.corundumstudio.socketio</groupId>
<artifactId>netty-socketio</artifactId> <artifactId>netty-socketio</artifactId>
<version>1.7.10</version> <version>1.7.11</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.inject</groupId> <groupId>javax.inject</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