GUACAMOLE-1298: Correct Maven dependency version conflicts within RADIUS support.

This commit is contained in:
Michael Jumper
2021-03-30 12:57:40 -07:00
parent 6c8a699faa
commit c32b985658

View File

@@ -219,10 +219,26 @@
<artifactId>jradius-core</artifactId> <artifactId>jradius-core</artifactId>
<version>1.1.5</version> <version>1.1.5</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<!-- Rely on Guacamole's existing use of logback rather than log4j -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
@@ -240,6 +256,14 @@
<version>1.1.5</version> <version>1.1.5</version>
</dependency> </dependency>
<!-- Force single, specific version commons-logging (multiple
dependencies reference multiple versions of this). -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
</dependency>
</dependencies> </dependencies>
</project> </project>