GUACAMOLE-670: Merge changes correcting conflicting versions of SLF4J.

This commit is contained in:
Michael Jumper
2018-12-03 07:30:23 -08:00
2 changed files with 12 additions and 1 deletions

View File

@@ -227,6 +227,12 @@
<groupId>org.jasig.cas.client</groupId>
<artifactId>cas-client-core</artifactId>
<version>3.4.1</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Guice -->
@@ -249,7 +255,6 @@
<scope>provided</scope>
</dependency>
</dependencies>
</project>

View File

@@ -215,6 +215,12 @@
<groupId>net.jradius</groupId>
<artifactId>jradius-core</artifactId>
<version>1.1.5</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- JRadius Dictionary, for accessing packet attributes -->