You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2016/06/02 22:09:31 UTC
[46/50] maven git commit: Update to gossip 2.0.0-SNAPSHOT
Update to gossip 2.0.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8cb186a8
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8cb186a8
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8cb186a8
Branch: refs/heads/slf4j-gossip
Commit: 8cb186a8d87d1e152edcfd1d367da213e441d173
Parents: c279b0a
Author: Jason Dillon <ja...@planet57.com>
Authored: Tue May 24 12:04:15 2016 -0700
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Thu Jun 2 23:41:45 2016 +0200
----------------------------------------------------------------------
apache-maven/pom.xml | 2 +-
maven-embedder/pom.xml | 2 +-
.../impl/gossip/ColorConsoleListener.java | 6 +-
.../cli/logging/impl/gossip/ColorRenderer.java | 6 +-
.../impl/gossip/GossipConfiguration.java | 10 +--
.../logging/impl/gossip/PatternRenderer.java | 8 +--
.../com.planet57.gossip/config.properties | 67 ++++++++++++++++++++
.../maven/slf4j-configuration.properties | 2 +-
.../org.sonatype.gossip/config.properties | 67 --------------------
pom.xml | 4 +-
10 files changed, 87 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/8cb186a8/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 80250ca..ec11cc2 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -92,7 +92,7 @@ under the License.
<artifactId>aether-transport-wagon</artifactId>
</dependency>
<dependency>
- <groupId>org.sonatype.gossip</groupId>
+ <groupId>com.planet57.gossip</groupId>
<artifactId>gossip-slf4j</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/8cb186a8/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 73555b8..fa59911 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -89,7 +89,7 @@ under the License.
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.sonatype.gossip</groupId>
+ <groupId>com.planet57.gossip</groupId>
<artifactId>gossip-slf4j</artifactId>
<optional>true</optional>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/8cb186a8/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java
index 4f80738..da8a7ed 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java
@@ -23,11 +23,11 @@ import java.io.PrintStream;
import org.fusesource.jansi.AnsiConsole;
-import org.sonatype.gossip.Event;
-import org.sonatype.gossip.listener.ListenerSupport;
+import com.planet57.gossip.Event;
+import com.planet57.gossip.listener.ListenerSupport;
/**
- * Specialized {@link org.sonatype.gossip.listener.Listener} which is aware of ANSI streams.
+ * Specialized {@link com.planet57.gossip.listener.Listener} which is aware of ANSI streams.
*
* @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
* @since 3.4.0
http://git-wip-us.apache.org/repos/asf/maven/blob/8cb186a8/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
index 8a03a55..14b7e2b 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
@@ -26,11 +26,11 @@ import static org.fusesource.jansi.Ansi.Color.RED;
import static org.fusesource.jansi.Ansi.Color.YELLOW;
import static org.fusesource.jansi.Ansi.ansi;
-import org.sonatype.gossip.Event;
-import org.sonatype.gossip.Level;
+import com.planet57.gossip.Event;
+import com.planet57.gossip.Level;
/**
- * Specialized {@link org.sonatype.gossip.render.Renderer} which is aware of basic Maven log messages to colorize.
+ * Specialized {@link com.planet57.gossip.render.Renderer} which is aware of basic Maven log messages to colorize.
*
* @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
* @since 3.4.0
http://git-wip-us.apache.org/repos/asf/maven/blob/8cb186a8/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 96a0545..3ef50a3 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
@@ -19,7 +19,7 @@ package org.apache.maven.cli.logging.impl.gossip;
* under the License.
*/
-import org.sonatype.gossip.Gossip;
+import com.planet57.gossip.Gossip;
import org.apache.maven.cli.logging.BaseSlf4jConfiguration;
import org.slf4j.MavenSlf4jFriend;
@@ -33,7 +33,7 @@ import org.slf4j.MavenSlf4jFriend;
public class GossipConfiguration
extends BaseSlf4jConfiguration
{
- private org.sonatype.gossip.Level rootLevel = org.sonatype.gossip.Level.INFO;
+ private com.planet57.gossip.Level rootLevel = com.planet57.gossip.Level.INFO;
@Override
public void setRootLoggerLevel( final Level level )
@@ -41,15 +41,15 @@ public class GossipConfiguration
switch ( level )
{
case DEBUG:
- rootLevel = org.sonatype.gossip.Level.DEBUG;
+ rootLevel = com.planet57.gossip.Level.DEBUG;
break;
case INFO:
- rootLevel = org.sonatype.gossip.Level.INFO;
+ rootLevel = com.planet57.gossip.Level.INFO;
break;
default:
- rootLevel = org.sonatype.gossip.Level.ERROR;
+ rootLevel = com.planet57.gossip.Level.ERROR;
break;
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/8cb186a8/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/PatternRenderer.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/PatternRenderer.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/PatternRenderer.java
index 7e767a1..8a5b431 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/PatternRenderer.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/PatternRenderer.java
@@ -19,17 +19,17 @@ package org.apache.maven.cli.logging.impl.gossip;
* under the License.
*/
-import org.sonatype.gossip.Event;
-import org.sonatype.gossip.Level;
+import com.planet57.gossip.Event;
+import com.planet57.gossip.Level;
/**
- * Specialized {@link org.sonatype.gossip.render.PatternRenderer} to cope with Maven specifics.
+ * Specialized {@link com.planet57.gossip.render.PatternRenderer} to cope with Maven specifics.
*
* @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
* @since 3.4.0
*/
public class PatternRenderer
- extends org.sonatype.gossip.render.PatternRenderer
+ extends com.planet57.gossip.render.PatternRenderer
{
protected static final String WARNING = "WARNING";
http://git-wip-us.apache.org/repos/asf/maven/blob/8cb186a8/maven-embedder/src/main/resources/META-INF/com.planet57.gossip/config.properties
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/resources/META-INF/com.planet57.gossip/config.properties b/maven-embedder/src/main/resources/META-INF/com.planet57.gossip/config.properties
new file mode 100644
index 0000000..bc63a9c
--- /dev/null
+++ b/maven-embedder/src/main/resources/META-INF/com.planet57.gossip/config.properties
@@ -0,0 +1,67 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+version=1.0.0
+
+profiles=default, maven-common, maven-plain, maven-color
+
+##
+## default
+##
+
+profile.default.includes=maven-common
+profile.default.listeners=console
+profile.default.listener.console=com.planet57.gossip.listener.ConsoleListener
+profile.default.listener.console.renderer=org.apache.maven.cli.logging.impl.gossip.PatternRenderer
+profile.default.listener.console.renderer.pattern=[%l] %m%n%x
+
+##
+## common
+##
+
+profile.maven-common.logger.*=INFO
+
+##
+## maven.logging=PLAIN
+##
+
+profile.maven-plain.includes=maven-common
+profile.maven-plain.listeners=console
+profile.maven-plain.listener.console=com.planet57.gossip.listener.ConsoleListener
+profile.maven-plain.listener.console.renderer=org.apache.maven.cli.logging.impl.gossip.PatternRenderer
+profile.maven-plain.listener.console.renderer.pattern=[%l] %m%n%x
+profile.maven-plain.triggers=default
+profile.maven-plain.trigger.default=com.planet57.gossip.trigger.SystemPropertyTrigger
+profile.maven-plain.trigger.default.name=maven.logging
+profile.maven-plain.trigger.default.value=PLAIN
+profile.maven-plain.trigger.default.ignoreCase=true
+
+##
+## maven.logging=COLOR
+##
+
+profile.maven-color.includes=maven-common
+profile.maven-color.listeners=console
+profile.maven-color.listener.console=org.apache.maven.cli.logging.impl.gossip.ColorConsoleListener
+profile.maven-color.listener.console.renderer=org.apache.maven.cli.logging.impl.gossip.ColorRenderer
+profile.maven-color.listener.console.renderer.pattern=[%l] %m%n%x
+profile.maven-color.triggers=default
+profile.maven-color.trigger.default=com.planet57.gossip.trigger.SystemPropertyTrigger
+profile.maven-color.trigger.default.name=maven.logging
+profile.maven-color.trigger.default.value=COLOR
+profile.maven-color.trigger.default.ignoreCase=true
+
http://git-wip-us.apache.org/repos/asf/maven/blob/8cb186a8/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
index fd69cdc..e385dcb 100644
--- a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
+++ b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
@@ -20,4 +20,4 @@
org.slf4j.impl.SimpleLoggerFactory org.apache.maven.cli.logging.impl.Slf4jSimpleConfiguration
org.apache.logging.slf4j.Log4jLoggerFactory org.apache.maven.cli.logging.impl.Log4j2Configuration
ch.qos.logback.classic.LoggerContext org.apache.maven.cli.logging.impl.LogbackConfiguration
-org.sonatype.gossip.Gossip org.apache.maven.cli.logging.impl.gossip.GossipConfiguration
+com.planet57.gossip.Gossip org.apache.maven.cli.logging.impl.gossip.GossipConfiguration
http://git-wip-us.apache.org/repos/asf/maven/blob/8cb186a8/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties b/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties
deleted file mode 100644
index 587b2be..0000000
--- a/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties
+++ /dev/null
@@ -1,67 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-version=1.0.0
-
-profiles=default, maven-common, maven-plain, maven-color
-
-##
-## default
-##
-
-profile.default.includes=maven-common
-profile.default.listeners=console
-profile.default.listener.console=org.sonatype.gossip.listener.ConsoleListener
-profile.default.listener.console.renderer=org.apache.maven.cli.logging.impl.gossip.PatternRenderer
-profile.default.listener.console.renderer.pattern=[%l] %m%n%x
-
-##
-## common
-##
-
-profile.maven-common.logger.*=INFO
-
-##
-## maven.logging=PLAIN
-##
-
-profile.maven-plain.includes=maven-common
-profile.maven-plain.listeners=console
-profile.maven-plain.listener.console=org.sonatype.gossip.listener.ConsoleListener
-profile.maven-plain.listener.console.renderer=org.apache.maven.cli.logging.impl.gossip.PatternRenderer
-profile.maven-plain.listener.console.renderer.pattern=[%l] %m%n%x
-profile.maven-plain.triggers=default
-profile.maven-plain.trigger.default=org.sonatype.gossip.trigger.SystemPropertyTrigger
-profile.maven-plain.trigger.default.name=maven.logging
-profile.maven-plain.trigger.default.value=PLAIN
-profile.maven-plain.trigger.default.ignoreCase=true
-
-##
-## maven.logging=COLOR
-##
-
-profile.maven-color.includes=maven-common
-profile.maven-color.listeners=console
-profile.maven-color.listener.console=org.apache.maven.cli.logging.impl.gossip.ColorConsoleListener
-profile.maven-color.listener.console.renderer=org.apache.maven.cli.logging.impl.gossip.ColorRenderer
-profile.maven-color.listener.console.renderer.pattern=[%l] %m%n%x
-profile.maven-color.triggers=default
-profile.maven-color.trigger.default=org.sonatype.gossip.trigger.SystemPropertyTrigger
-profile.maven-color.trigger.default.name=maven.logging
-profile.maven-color.trigger.default.value=COLOR
-profile.maven-color.trigger.default.ignoreCase=true
-
http://git-wip-us.apache.org/repos/asf/maven/blob/8cb186a8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9e2bcb3..55b0e7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -290,9 +290,9 @@ under the License.
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.sonatype.gossip</groupId>
+ <groupId>com.planet57.gossip</groupId>
<artifactId>gossip-slf4j</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.fusesource.jansi</groupId>