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

Merge branch '2.6' into 2.x

parents 7415f40b d7214f64
Branches
Tags
No related merge requests found
Pipeline #21972 passed with warnings with stages
in 1 minute and 36 seconds
......@@ -7,8 +7,8 @@
<packaging>war</packaging>
<properties>
<io.spring.platform-version>Brussels-SR14</io.spring.platform-version>
<io.netty-version>4.1.30.Final</io.netty-version>
<io.spring.platform-version>Brussels-SR15</io.spring.platform-version>
<io.netty-version>4.1.32.Final</io.netty-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<timestamp>${maven.build.timestamp}</timestamp>
<sonar.language>java</sonar.language>
......@@ -191,7 +191,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>3.2.9</version>
<version>3.2.10</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
......@@ -317,7 +317,7 @@
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version>2.5.6</version>
<version>2.5.8</version>
</dependency>
</dependencies>
......@@ -352,7 +352,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.12.v20180830</version>
<version>9.4.14.v20181114</version>
<configuration>
<scanIntervalSeconds>0</scanIntervalSeconds>
<webApp>
......@@ -463,7 +463,7 @@
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>2.2.5</version>
<version>2.2.6</version>
<executions>
<execution>
<goals>
......
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