GUACAMOLE-670: Use exclusion to block loading of duplicate slf4j. Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/95dfb5e7 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/95dfb5e7 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/95dfb5e7
Branch: refs/heads/master Commit: 95dfb5e7657a5685500f18497230ffcb8916b538 Parents: 73744d2 Author: Nick Couchman <vn...@apache.org> Authored: Mon Dec 3 07:35:22 2018 -0500 Committer: Nick Couchman <vn...@apache.org> Committed: Mon Dec 3 07:35:22 2018 -0500 ---------------------------------------------------------------------- extensions/guacamole-auth-cas/pom.xml | 14 ++++++-------- extensions/guacamole-auth-radius/pom.xml | 14 ++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/95dfb5e7/extensions/guacamole-auth-cas/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-cas/pom.xml b/extensions/guacamole-auth-cas/pom.xml index 323b667..ae8bd67 100644 --- a/extensions/guacamole-auth-cas/pom.xml +++ b/extensions/guacamole-auth-cas/pom.xml @@ -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,14 +255,6 @@ <scope>provided</scope> </dependency> - <!-- slf4j Logging --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.7.7</version> - <scope>provided</scope> - </dependency> - </dependencies> </project> http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/95dfb5e7/extensions/guacamole-auth-radius/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-radius/pom.xml b/extensions/guacamole-auth-radius/pom.xml index af838d8..d07a60a 100644 --- a/extensions/guacamole-auth-radius/pom.xml +++ b/extensions/guacamole-auth-radius/pom.xml @@ -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 --> @@ -230,14 +236,6 @@ <artifactId>jradius-extended</artifactId> <version>1.1.5</version> </dependency> - - <!-- slf4j Logging --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.7.7</version> - <scope>provided</scope> - </dependency> </dependencies>
