Update to gossip 1.9-SNAPSHOT for some minor fixes needed to make testsuite pass Update configuartion for gossip to reset slf4j and defer root level so that we always have a known level state for root.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/700ed377 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/700ed377 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/700ed377 Branch: refs/heads/slf4j-gossip Commit: 700ed377a576daf93ebf93cd46529d5a68f65890 Parents: e50b95f Author: Jason Dillon <ja...@planet57.com> Authored: Fri May 20 15:32:02 2016 -0700 Committer: Hervé Boutemy <hbout...@apache.org> Committed: Thu Jun 2 23:41:45 2016 +0200 ---------------------------------------------------------------------- .../logging/impl/gossip/GossipConfiguration.java | 16 +++++++++------- pom.xml | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/700ed377/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/GossipConfiguration.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/GossipConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/GossipConfiguration.java index e07b7a6..96a0545 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/GossipConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/GossipConfiguration.java @@ -22,6 +22,7 @@ package org.apache.maven.cli.logging.impl.gossip; import org.sonatype.gossip.Gossip; import org.apache.maven.cli.logging.BaseSlf4jConfiguration; +import org.slf4j.MavenSlf4jFriend; /** * Configuration for Gossip. @@ -32,30 +33,31 @@ import org.apache.maven.cli.logging.BaseSlf4jConfiguration; public class GossipConfiguration extends BaseSlf4jConfiguration { + private org.sonatype.gossip.Level rootLevel = org.sonatype.gossip.Level.INFO; + @Override - public void setRootLoggerLevel( Level level ) + public void setRootLoggerLevel( final Level level ) { - org.sonatype.gossip.Level value; switch ( level ) { case DEBUG: - value = org.sonatype.gossip.Level.DEBUG; + rootLevel = org.sonatype.gossip.Level.DEBUG; break; case INFO: - value = org.sonatype.gossip.Level.INFO; + rootLevel = org.sonatype.gossip.Level.INFO; break; default: - value = org.sonatype.gossip.Level.ERROR; + rootLevel = org.sonatype.gossip.Level.ERROR; break; } - Gossip.getInstance().getRoot().setLevel( value ); } @Override public void activate() { - // empty + MavenSlf4jFriend.reset(); + Gossip.getInstance().getRoot().setLevel( rootLevel ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/700ed377/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6ecef9a..9e2bcb3 100644 --- a/pom.xml +++ b/pom.xml @@ -292,7 +292,7 @@ under the License. <dependency> <groupId>org.sonatype.gossip</groupId> <artifactId>gossip-slf4j</artifactId> - <version>1.8</version> + <version>1.9-SNAPSHOT</version> </dependency> <dependency> <groupId>org.fusesource.jansi</groupId>
