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

Merge branch '2.x'

parents 72c04567 82bc6028
Branches
No related merge requests found
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<properties> <properties>
<spring-boot-version>2.1.7.RELEASE</spring-boot-version> <spring-boot-version>2.1.7.RELEASE</spring-boot-version>
<commons-lang-version>2.6</commons-lang-version> <commons-lang-version>2.6</commons-lang-version>
<guava-version>28.0-jre</guava-version> <guava-version>28.1-jre</guava-version>
<directory-server-version>1.5.5</directory-server-version> <directory-server-version>1.5.5</directory-server-version>
<io.netty-version>4.1.39.Final</io.netty-version> <io.netty-version>4.1.39.Final</io.netty-version>
<org.aspectj-version>1.9.4</org.aspectj-version> <org.aspectj-version>1.9.4</org.aspectj-version>
...@@ -318,12 +318,12 @@ ...@@ -318,12 +318,12 @@
<dependency> <dependency>
<groupId>org.pac4j</groupId> <groupId>org.pac4j</groupId>
<artifactId>pac4j-oauth</artifactId> <artifactId>pac4j-oauth</artifactId>
<version>3.7.0</version> <version>3.8.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.pac4j</groupId> <groupId>org.pac4j</groupId>
<artifactId>pac4j-oidc</artifactId> <artifactId>pac4j-oidc</artifactId>
<version>3.7.0</version> <version>3.8.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.corundumstudio.socketio</groupId> <groupId>com.corundumstudio.socketio</groupId>
...@@ -405,12 +405,12 @@ ...@@ -405,12 +405,12 @@
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>1.5.22</version> <version>1.5.23</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.checkerframework</groupId> <groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId> <artifactId>checker-qual</artifactId>
<version>2.10.0</version> <version>2.11.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.websocket</groupId> <groupId>javax.websocket</groupId>
...@@ -506,7 +506,7 @@ ...@@ -506,7 +506,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.20.v20190813</version> <version>9.4.19.v20190610</version>
<configuration> <configuration>
<scanIntervalSeconds>0</scanIntervalSeconds> <scanIntervalSeconds>0</scanIntervalSeconds>
<webApp> <webApp>
...@@ -535,7 +535,7 @@ ...@@ -535,7 +535,7 @@
<plugin> <plugin>
<groupId>org.sonarsource.scanner.maven</groupId> <groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId> <artifactId>sonar-maven-plugin</artifactId>
<version>3.6.0.1398</version> <version>3.6.1.1688</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</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