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

Merge branch '2.5' into 2.x

parents 7a2bcb99 aa2802a0
Branches
Tags
No related merge requests found
Pipeline #14315 passed with stages
in 1 minute and 56 seconds
# Changelog # Changelog
## 2.5.5
This is a maintenance release which only brings libraries up to date to fix
potential bugs.
## 2.5.4 ## 2.5.4
This is a maintenance release which only brings libraries up to date to fix This is a maintenance release which only brings libraries up to date to fix
potential bugs. potential bugs.
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<io.spring.platform-version>Brussels-SR7</io.spring.platform-version> <io.spring.platform-version>Brussels-SR9</io.spring.platform-version>
<io.netty-version>4.1.22.Final</io.netty-version> <io.netty-version>4.1.23.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>
<sonar.language>java</sonar.language> <sonar.language>java</sonar.language>
...@@ -344,7 +344,7 @@ ...@@ -344,7 +344,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.8.v20171121</version> <version>9.4.9.v20180320</version>
<configuration> <configuration>
<scanIntervalSeconds>1</scanIntervalSeconds> <scanIntervalSeconds>1</scanIntervalSeconds>
<webApp> <webApp>
...@@ -384,7 +384,7 @@ ...@@ -384,7 +384,7 @@
<plugin> <plugin>
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.0</version> <version>0.8.1</version>
<executions> <executions>
<execution> <execution>
<id>default-prepare-agent</id> <id>default-prepare-agent</id>
...@@ -427,7 +427,7 @@ ...@@ -427,7 +427,7 @@
<plugin> <plugin>
<groupId>com.github.kongchen</groupId> <groupId>com.github.kongchen</groupId>
<artifactId>swagger-maven-plugin</artifactId> <artifactId>swagger-maven-plugin</artifactId>
<version>3.1.6</version> <version>3.1.7</version>
<configuration> <configuration>
<apiSources> <apiSources>
<apiSource> <apiSource>
......
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