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

Merge branch '2.5' into 2.x

parents d6747d39 d49ddfed
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 3 deletions
pom.xml
+ 3
− 3
View file @ 63e70379
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<io.spring.platform-version>Brussels-SR1</io.spring.platform-version> <io.spring.platform-version>Brussels-SR2</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>
...@@ -298,7 +298,7 @@ ...@@ -298,7 +298,7 @@
<dependency> <dependency>
<groupId>org.checkerframework</groupId> <groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId> <artifactId>checker-qual</artifactId>
<version>2.1.9</version> <version>2.1.11</version>
</dependency> </dependency>
</dependencies> </dependencies>
...@@ -333,7 +333,7 @@ ...@@ -333,7 +333,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.3.v20170317</version> <version>9.4.5.v20170502</version>
<configuration> <configuration>
<scanIntervalSeconds>1</scanIntervalSeconds> <scanIntervalSeconds>1</scanIntervalSeconds>
<webApp> <webApp>
......
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