diff options
author | Decebal Suiu <decebal.suiu@gmail.com> | 2014-04-14 17:44:15 +0300 |
---|---|---|
committer | Decebal Suiu <decebal.suiu@gmail.com> | 2014-04-14 17:44:15 +0300 |
commit | 7df691ccec5303aa3740919344e7c7cf556d7691 (patch) | |
tree | ec88cf00590c44239aa0fff61a667f6ee6f86661 /pf4j | |
parent | eb24fa2b3257bd6e06fe7b5d32be46a1d3d63cf3 (diff) | |
download | pf4j-7df691ccec5303aa3740919344e7c7cf556d7691.tar.gz pf4j-7df691ccec5303aa3740919344e7c7cf556d7691.zip |
update slf4j to 1.7.5
Diffstat (limited to 'pf4j')
-rw-r--r-- | pf4j/pom.xml | 18 | ||||
-rw-r--r-- | pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java | 9 |
2 files changed, 13 insertions, 14 deletions
diff --git a/pf4j/pom.xml b/pf4j/pom.xml index 862ba4b..00e6cc6 100644 --- a/pf4j/pom.xml +++ b/pf4j/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - + <parent> <groupId>ro.fortsoft.pf4j</groupId> <artifactId>pf4j-parent</artifactId> @@ -25,19 +25,19 @@ </plugin> </plugins> </build> - + <dependencies> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.4</version> + <version>1.7.5</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java b/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java index c4ffedf..22f899d 100644 --- a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java +++ b/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java @@ -432,7 +432,6 @@ public class DefaultPluginManager implements PluginManager { throw new IllegalArgumentException(String.format("Unknown pluginId %s", pluginId)); } - PluginWrapper pluginWrapper = getPlugin(pluginId); PluginDescriptor pluginDescriptor = pluginWrapper.getDescriptor(); PluginState pluginState = pluginWrapper.getPluginState(); @@ -470,8 +469,7 @@ public class DefaultPluginManager implements PluginManager { PluginWrapper pluginWrapper = getPlugin(pluginId); if (!isPluginValid(pluginWrapper)) { - log.warn("Plugin '{}:{}' can not be enabled", - pluginWrapper.getPluginId(), + log.warn("Plugin '{}:{}' can not be enabled", pluginWrapper.getPluginId(), pluginWrapper.getDescriptor().getVersion()); return false; } @@ -663,10 +661,11 @@ public class DefaultPluginManager implements PluginManager { return true; } - log.warn(String.format("Plugin '%s:%s' requires a minimum system version of %s", + log.warn("Plugin '{}:{}' requires a minimum system version of {}", pluginWrapper.getPluginId(), pluginWrapper.getDescriptor().getVersion(), - requires)); + requires); + return false; } |