You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2016/06/17 19:35:58 UTC
[01/20] maven git commit: [MNG-6037] add support for Gossip slf4j
provider Submitted by: Jason Dillon Applied with modifications since general
Maven color support was extracted from logging in MNG-3507 this closes #81
[Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-6006 1ac426708 -> 0d785b59c (forced update)
[MNG-6037] add support for Gossip slf4j provider
Submitted by: Jason Dillon
Applied with modifications since general Maven color support was
extracted from logging in MNG-3507
this closes #81
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/427f18c3
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/427f18c3
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/427f18c3
Branch: refs/heads/MNG-6006
Commit: 427f18c3a3c4ee1e7e88895e5346260a0917a43a
Parents: 2859eb0
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sat Jun 11 13:09:36 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Sat Jun 11 13:09:36 2016 +0200
----------------------------------------------------------------------
maven-embedder/pom.xml | 5 +
.../impl/gossip/ColorConsoleListener.java | 72 +++++++++++
.../cli/logging/impl/gossip/ColorRenderer.java | 124 +++++++++++++++++++
.../impl/gossip/GossipConfiguration.java | 63 ++++++++++
.../com.planet57.gossip/config.properties | 30 +++++
.../maven/slf4j-configuration.properties | 1 +
pom.xml | 9 ++
7 files changed, 304 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/427f18c3/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 0c86310..eb72f93 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -97,6 +97,11 @@ under the License.
<artifactId>logback-classic</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>com.planet57.gossip</groupId>
+ <artifactId>gossip-slf4j</artifactId>
+ <optional>true</optional>
+ </dependency>
<!-- CLI -->
<dependency>
<groupId>commons-cli</groupId>
http://git-wip-us.apache.org/repos/asf/maven/blob/427f18c3/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
new file mode 100644
index 0000000..b9c97a9
--- /dev/null
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java
@@ -0,0 +1,72 @@
+package org.apache.maven.cli.logging.impl.gossip;
+
+/*
+ * 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.
+ */
+
+import java.io.PrintStream;
+
+import com.planet57.gossip.listener.ConsoleListener;
+import org.fusesource.jansi.AnsiConsole;
+import org.fusesource.jansi.internal.CLibrary;
+
+/**
+ * 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
+ */
+public class ColorConsoleListener
+ extends ConsoleListener
+{
+ private PrintStream out;
+
+ /**
+ * Returns file descriptor identifier for the configured stream.
+ */
+ private int getFileno()
+ {
+ switch ( getStream() )
+ {
+ case OUT:
+ return CLibrary.STDOUT_FILENO;
+
+ case ERR:
+ return CLibrary.STDERR_FILENO;
+
+ default:
+ throw new InternalError();
+ }
+ }
+
+ /**
+ * Returns an ANSI aware wrapped stream.
+ *
+ * Needed so that jansi (limited) logic to detect supported streams is applied and copes with
+ * redirection of stream to file to strip out ANSI sequences.
+ */
+ @Override
+ protected PrintStream getOut()
+ {
+ if ( out == null )
+ {
+ out = new PrintStream( AnsiConsole.wrapOutputStream( super.getOut(), getFileno() ) );
+ }
+ return out;
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven/blob/427f18c3/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
new file mode 100644
index 0000000..00007cc
--- /dev/null
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
@@ -0,0 +1,124 @@
+package org.apache.maven.cli.logging.impl.gossip;
+
+/*
+ * 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.
+ */
+
+import static org.fusesource.jansi.Ansi.ansi;
+
+import com.planet57.gossip.Event;
+import com.planet57.gossip.Level;
+
+/**
+ * Specialized {@link com.planet57.gossip.render.Renderer} which colorizes level and error rendering.
+ *
+ * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
+ * @since 3.4.0
+ */
+public class ColorRenderer
+extends com.planet57.gossip.render.PatternRenderer
+{
+ protected static final String WARNING = "WARNING";
+
+ @Override
+ protected void renderLevel( final Event event, final StringBuilder buff )
+ {
+ assert event != null;
+ assert buff != null;
+
+ Level level = event.getLevel();
+ switch ( level )
+ {
+ case TRACE:
+ case DEBUG:
+ buff.append( ansi().bold().fgCyan().a( level.name() ).reset() );
+ break;
+
+ case INFO:
+ buff.append( ansi().bold().fgGreen().a( level.name() ).reset() );
+ break;
+
+ case WARN:
+ // Maven uses WARNING instead of WARN
+ buff.append( ansi().bold().fgYellow().a( WARNING ).reset() );
+ break;
+
+ case ERROR:
+ buff.append( ansi().bold().fgRed().a( level.name() ).reset() );
+ break;
+
+ default:
+ throw new InternalError();
+ }
+ }
+
+ @Override
+ protected void renderName( final Event event, final StringBuilder buff, final boolean shortName )
+ {
+ StringBuilder tmp = new StringBuilder();
+ super.renderName( event, tmp, shortName );
+ buff.append( ansi().fgGreen().a( tmp ).reset() );
+ }
+
+
+ @Override
+ protected void renderCause( final Event event, final StringBuilder buff )
+ {
+ assert event != null;
+ assert buff != null;
+
+ Throwable cause = event.getCause();
+ if ( cause == null )
+ {
+ return;
+ }
+
+ buff.append( ansi().bold().fgRed().a( cause.getClass().getName() ).reset() );
+ if ( cause.getMessage() != null )
+ {
+ buff.append( ": " );
+ buff.append( ansi().bold().fgRed().a( cause.getMessage() ).reset() );
+ }
+ renderNewLine( buff );
+
+ while ( cause != null )
+ {
+ for ( StackTraceElement e : cause.getStackTrace() )
+ {
+ buff.append( " " );
+ buff.append( ansi().bold().a( "at" ).reset().a( " " )
+ .a( e.getClassName() ).a( "." ).a( e.getMethodName() ) );
+ buff.append( ansi().a( " (" ).bold().a( getLocation( e ) ).reset().a( ")" ) );
+ renderNewLine( buff );
+ }
+
+ cause = cause.getCause();
+ if ( cause != null )
+ {
+ buff.append( ansi().bold().a( "Caused by" ).reset().a( ": " )
+ .a( cause.getClass().getName() ) );
+ if ( cause.getMessage() != null )
+ {
+ buff.append( ": " );
+ buff.append( ansi().bold().fgRed().a( cause.getMessage() ).reset() );
+ }
+ renderNewLine( buff );
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven/blob/427f18c3/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
new file mode 100644
index 0000000..3ef50a3
--- /dev/null
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/GossipConfiguration.java
@@ -0,0 +1,63 @@
+package org.apache.maven.cli.logging.impl.gossip;
+
+/*
+ * 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.
+ */
+
+import com.planet57.gossip.Gossip;
+
+import org.apache.maven.cli.logging.BaseSlf4jConfiguration;
+import org.slf4j.MavenSlf4jFriend;
+
+/**
+ * Configuration for Gossip.
+ *
+ * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
+ * @since 3.4.0
+ */
+public class GossipConfiguration
+ extends BaseSlf4jConfiguration
+{
+ private com.planet57.gossip.Level rootLevel = com.planet57.gossip.Level.INFO;
+
+ @Override
+ public void setRootLoggerLevel( final Level level )
+ {
+ switch ( level )
+ {
+ case DEBUG:
+ rootLevel = com.planet57.gossip.Level.DEBUG;
+ break;
+
+ case INFO:
+ rootLevel = com.planet57.gossip.Level.INFO;
+ break;
+
+ default:
+ rootLevel = com.planet57.gossip.Level.ERROR;
+ break;
+ }
+ }
+
+ @Override
+ public void activate()
+ {
+ MavenSlf4jFriend.reset();
+ Gossip.getInstance().getRoot().setLevel( rootLevel );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven/blob/427f18c3/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..4050ee6
--- /dev/null
+++ b/maven-embedder/src/main/resources/META-INF/com.planet57.gossip/config.properties
@@ -0,0 +1,30 @@
+# 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
+
+##
+## default
+##
+
+profile.default.logger.*=INFO
+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.ColorRenderer
+profile.default.listener.console.renderer.pattern=[%l] %m%n%x
http://git-wip-us.apache.org/repos/asf/maven/blob/427f18c3/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 cd01f9e..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,3 +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
+com.planet57.gossip.Gossip org.apache.maven.cli.logging.impl.gossip.GossipConfiguration
http://git-wip-us.apache.org/repos/asf/maven/blob/427f18c3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 11135ee..a9af928 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,6 +148,9 @@ under the License.
<contributor>
<name>Joseph Walton (MNG-5297)</name>
</contributor>
+ <contributor>
+ <name>Jason Dillon (MNG-6037)</name>
+ </contributor>
</contributors>
<!-- This marked as deprecated for Maven 3.X. This is checked by maven-enforcer-plugin -->
@@ -294,6 +297,12 @@ under the License.
<version>1.1.7</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>com.planet57.gossip</groupId>
+ <artifactId>gossip-slf4j</artifactId>
+ <version>2.0.0</version>
+ <optional>true</optional>
+ </dependency>
<!-- Wagon -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>
[05/20] maven git commit: [MNG-3507] forgot bold for skipped yellow
messages
Posted by sc...@apache.org.
[MNG-3507] forgot bold for skipped yellow messages
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/9fff5599
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9fff5599
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9fff5599
Branch: refs/heads/MNG-6006
Commit: 9fff55993e849379a2b58b4ec6947c7a79860eb3
Parents: 3355318
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sun Jun 12 17:57:26 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Sun Jun 12 17:57:26 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/maven/cli/event/ExecutionEventLogger.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/9fff5599/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
index 5af7406..ee57121 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
@@ -161,7 +161,7 @@ public class ExecutionEventLogger
if ( buildSummary == null )
{
- buffer.append( ansi().fgYellow().a( "SKIPPED" ).reset() );
+ buffer.append( ansi().bold().fgYellow().a( "SKIPPED" ).reset() );
}
else if ( buildSummary instanceof BuildSuccess )
{
[17/20] maven git commit: [MNG-5227] The 'optional' flag of a
dependency should be manageable.
Posted by sc...@apache.org.
[MNG-5227] The 'optional' flag of a dependency should be manageable.
o This reverts commit 0931a8fe0aa43a95a34d7dacb5050df6746c1b55.
It is better to have this in Maven 3.4 which will be released with an Aether
version not supporting this feature correctly. In 3.5 we will be using an
updated Aether version with bugfixes to resolution issues which will make
this start working. The confusion about this feature is the Aether
bugfixes needed to make it work as expected, not the feature itself.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/09bfdee6
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/09bfdee6
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/09bfdee6
Branch: refs/heads/MNG-6006
Commit: 09bfdee699443b2482d2427b5eff7226768b340a
Parents: 7e1b961
Author: Christian Schulte <sc...@apache.org>
Authored: Thu Jun 16 20:31:51 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Thu Jun 16 20:38:49 2016 +0200
----------------------------------------------------------------------
.../model/management/DefaultDependencyManagementInjector.java | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/09bfdee6/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
index e611973..731cdd8 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
@@ -82,13 +82,6 @@ public class DefaultDependencyManagementInjector
}
@Override
- protected void mergeDependency_Optional( Dependency target, Dependency source, boolean sourceDominant,
- Map<Object, Object> context )
- {
- // optional flag is not managed
- }
-
- @Override
protected void mergeDependency_Exclusions( Dependency target, Dependency source, boolean sourceDominant,
Map<Object, Object> context )
{
[20/20] maven git commit: [MNG-5761] Dependency management is not
transitive.
Posted by sc...@apache.org.
[MNG-5761] Dependency management is not transitive.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0d785b59
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0d785b59
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0d785b59
Branch: refs/heads/MNG-6006
Commit: 0d785b59ce04c1adbb95aebd256e191ca188a40c
Parents: 5145c34
Author: Christian Schulte <sc...@apache.org>
Authored: Fri Jun 10 16:55:30 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Fri Jun 17 21:33:18 2016 +0200
----------------------------------------------------------------------
.../maven/repository/internal/MavenRepositorySystemUtils.java | 4 ++--
.../apache/maven/artifact/AbstractArtifactComponentTestCase.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/0d785b59/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
index 3a98b2a..b0b0a8d 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
@@ -33,7 +33,7 @@ import org.eclipse.aether.impl.MetadataGeneratorFactory;
import org.eclipse.aether.impl.VersionRangeResolver;
import org.eclipse.aether.impl.VersionResolver;
import org.eclipse.aether.util.artifact.DefaultArtifactTypeRegistry;
-import org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
+import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager;
import org.eclipse.aether.util.graph.selector.AndDependencySelector;
import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector;
import org.eclipse.aether.util.graph.selector.OptionalDependencySelector;
@@ -95,7 +95,7 @@ public final class MavenRepositorySystemUtils
DependencyTraverser depTraverser = new FatArtifactTraverser();
session.setDependencyTraverser( depTraverser );
- DependencyManager depManager = new ClassicDependencyManager();
+ DependencyManager depManager = new TransitiveDependencyManager();
session.setDependencyManager( depManager );
DependencySelector depFilter =
http://git-wip-us.apache.org/repos/asf/maven/blob/0d785b59/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
index 365acc4..73780c1 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
@@ -39,7 +39,7 @@ import org.eclipse.aether.collection.DependencySelector;
import org.eclipse.aether.collection.DependencyTraverser;
import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
import org.eclipse.aether.repository.LocalRepository;
-import org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
+import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager;
import org.eclipse.aether.util.graph.selector.AndDependencySelector;
import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector;
import org.eclipse.aether.util.graph.selector.OptionalDependencySelector;
@@ -349,7 +349,7 @@ public abstract class AbstractArtifactComponentTestCase
DependencyTraverser depTraverser = new FatArtifactTraverser();
session.setDependencyTraverser( depTraverser );
- DependencyManager depManager = new ClassicDependencyManager();
+ DependencyManager depManager = new TransitiveDependencyManager();
session.setDependencyManager( depManager );
DependencySelector depFilter = new AndDependencySelector( new ScopeDependencySelector( "test", "provided" ),
[16/20] maven git commit: [MNG-3507] added color to Maven execution
output messages
Posted by sc...@apache.org.
[MNG-3507] added color to Maven execution output messages
o Updated to stop combining color and bold and to provide more colored
execution messages. The idea behind this is to distinguish between messages
logged by Maven core and logged by plugins based on the color of the message.
This means there are a lot of 'Logger.xyz' calls in core still to be ANSIfied.
There really should be a separate 'Logger' used by Maven core and passed to
Maven plugins to make this easier. Also things already are loosing the
eye-catching effect the colors are good for. Everything beyond green,red and
yellow already is too much, in my opinion. Feel free to revert the last two
commits or improve on how Maven presents itself to users starting with 3.4
until things reach a point everyone agrees to.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7e1b961e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7e1b961e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7e1b961e
Branch: refs/heads/MNG-6006
Commit: 7e1b961edd44c7d2843b1b7cd01cea5a1cd1a70d
Parents: 71e4ff8
Author: Christian Schulte <sc...@apache.org>
Authored: Thu Jun 16 19:54:01 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Thu Jun 16 20:01:56 2016 +0200
----------------------------------------------------------------------
.../lifecycle/LifecycleExecutionException.java | 16 +--
.../maven/cli/event/ExecutionEventLogger.java | 104 +++++++++++--------
.../apache/maven/cli/logging/Slf4jLogger.java | 13 +--
.../cli/logging/impl/gossip/ColorRenderer.java | 25 ++---
4 files changed, 87 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/7e1b961e/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
index b94a7bc..35c7032 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
@@ -80,27 +80,27 @@ public class LifecycleExecutionException
{
Ansi buffer = ansi( /*256*/ );
- buffer.a( "Failed to execute goal" ).reset();
+ buffer.fgRed().a( "Failed to execute goal" );
if ( execution != null )
{
- buffer.a( ' ' ).a( execution.getGroupId() ).a( ':' ).a( execution.getArtifactId() );
- buffer.a( ':' ).a( execution.getVersion() ).a( ':' ).a( execution.getGoal() ).reset();
- buffer.bold().a( " (" ).a( execution.getExecutionId() ).a( ')' ).reset();
+ buffer.a( ' ' ).a( execution.getGroupId() ).a( ':' ).a( execution.getArtifactId() ).
+ a( ':' ).a( execution.getVersion() ).a( ':' ).a( execution.getGoal() ).
+ a( " (" ).a( execution.getExecutionId() ).a( ')' );
+
}
if ( project != null )
{
- buffer.a( " on project " );
- buffer.fgCyan().a( project.getArtifactId() ).reset();
+ buffer.a( " on project " ).a( project.getArtifactId() );
}
if ( cause != null )
{
- buffer.a( ": " ).bold().fgRed().a( cause.getMessage() ).reset();
+ buffer.a( ": " ).a( cause.getMessage() );
}
- return buffer.toString();
+ return buffer.reset().toString();
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/7e1b961e/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
index 7f5d65a..7180a43 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
@@ -51,7 +51,7 @@ public class ExecutionEventLogger
private static final int LINE_LENGTH = 72;
private static final int MAX_PADDED_BUILD_TIME_DURATION_LENGTH = 9;
- private static final int MAX_PROJECT_NAME_LENGTH = 52;
+ private static final int MAX_PROJECT_NAME_LENGTH = LINE_LENGTH - MAX_PADDED_BUILD_TIME_DURATION_LENGTH - 12;
public ExecutionEventLogger()
{
@@ -83,7 +83,7 @@ public class ExecutionEventLogger
private void infoMain( String msg )
{
- logger.info( ansi().bold().a( msg ).reset().toString() );
+ logger.info( ansi().fgBlue().a( msg ).reset().toString() );
}
@Override
@@ -91,7 +91,7 @@ public class ExecutionEventLogger
{
if ( logger.isInfoEnabled() )
{
- logger.info( "Scanning for projects..." );
+ logger.info( ansi().fgBlue().a( "Scanning for projects..." ).reset().toString() );
}
}
@@ -108,7 +108,7 @@ public class ExecutionEventLogger
for ( MavenProject project : event.getSession().getProjects() )
{
- logger.info( project.getName() );
+ logger.info( ansi().fgBlue().a( project.getName() ).reset().toString() );
}
}
}
@@ -143,61 +143,74 @@ public class ExecutionEventLogger
for ( MavenProject project : session.getProjects() )
{
- StringBuilder buffer = new StringBuilder( 128 );
+ BuildSummary buildSummary = result.getBuildSummary( project );
+ Ansi ansi = ansi();
- buffer.append( project.getName() );
- buffer.append( ' ' );
+ if ( buildSummary == null )
+ {
+ ansi.fgYellow();
+ }
+ else if ( buildSummary instanceof BuildSuccess )
+ {
+ ansi.fgGreen();
+ }
+ else if ( buildSummary instanceof BuildFailure )
+ {
+ ansi.fgRed();
+ }
- if ( buffer.length() <= MAX_PROJECT_NAME_LENGTH )
+ ansi.a( project.getName() );
+ ansi.a( ' ' );
+
+ int dots = MAX_PROJECT_NAME_LENGTH - project.getName().length();
+
+ for ( int i = 0; i < dots; i++ )
{
- while ( buffer.length() < MAX_PROJECT_NAME_LENGTH )
- {
- buffer.append( '.' );
- }
- buffer.append( ' ' );
+ ansi.a( '.' );
}
- BuildSummary buildSummary = result.getBuildSummary( project );
+ ansi.a( ' ' );
if ( buildSummary == null )
{
- buffer.append( ansi().bold().fgYellow().a( "SKIPPED" ).reset() );
+ ansi.a( "SKIPPED" );
}
else if ( buildSummary instanceof BuildSuccess )
{
- buffer.append( ansi().bold().fgGreen().a( "SUCCESS" ).reset() );
- buffer.append( " [" );
+ ansi.a( "SUCCESS" );
+ ansi.a( " [" );
String buildTimeDuration = formatDuration( buildSummary.getTime() );
int padSize = MAX_PADDED_BUILD_TIME_DURATION_LENGTH - buildTimeDuration.length();
if ( padSize > 0 )
{
- buffer.append( chars( ' ', padSize ) );
+ ansi.a( chars( ' ', padSize ) );
}
- buffer.append( buildTimeDuration );
- buffer.append( ']' );
+ ansi.a( buildTimeDuration );
+ ansi.a( ']' );
}
else if ( buildSummary instanceof BuildFailure )
{
- buffer.append( ansi().bold().fgRed().a( "FAILURE" ).reset() );
- buffer.append( " [" );
+ ansi.a( "FAILURE" );
+ ansi.a( " [" );
String buildTimeDuration = formatDuration( buildSummary.getTime() );
int padSize = MAX_PADDED_BUILD_TIME_DURATION_LENGTH - buildTimeDuration.length();
if ( padSize > 0 )
{
- buffer.append( chars( ' ', padSize ) );
+ ansi.a( chars( ' ', padSize ) );
}
- buffer.append( buildTimeDuration );
- buffer.append( ']' );
+ ansi.a( buildTimeDuration );
+ ansi.a( ']' );
}
- logger.info( buffer.toString() );
+ ansi.reset();
+ logger.info( ansi.toString() );
}
}
private void logResult( MavenSession session )
{
infoLine( '-' );
- Ansi ansi = ansi().bold();
+ Ansi ansi = ansi();
if ( session.getResult().hasExceptions() )
{
@@ -220,9 +233,9 @@ public class ExecutionEventLogger
String wallClock = session.getRequest().getDegreeOfConcurrency() > 1 ? " (Wall Clock)" : "";
- logger.info( "Total time: " + formatDuration( time ) + wallClock );
+ logger.info( ansi().fgBlue().a( "Total time: " + formatDuration( time ) + wallClock ).reset().toString() );
- logger.info( "Finished at: " + formatTimestamp( finish ) );
+ logger.info( ansi().fgBlue().a( "Finished at: " + formatTimestamp( finish ) ).reset().toString() );
System.gc();
@@ -230,7 +243,8 @@ public class ExecutionEventLogger
long mb = 1024 * 1024;
- logger.info( "Final Memory: " + ( r.totalMemory() - r.freeMemory() ) / mb + "M/" + r.totalMemory() / mb + "M" );
+ logger.info( ansi().fgBlue().a( "Final Memory: " + ( r.totalMemory() - r.freeMemory() ) / mb + "M/"
+ + r.totalMemory() / mb + "M" ).reset().toString() );
}
@Override
@@ -242,7 +256,8 @@ public class ExecutionEventLogger
infoLine( '-' );
infoMain( "Skipping " + event.getProject().getName() );
- logger.info( "This project has been banned from the build due to previous failures." );
+ logger.info( ansi().fgBlue().a( "This project has been banned from the build due to previous failures." ).
+ reset().toString() );
infoLine( '-' );
}
@@ -267,8 +282,11 @@ public class ExecutionEventLogger
{
if ( logger.isWarnEnabled() )
{
- logger.warn( "Goal " + event.getMojoExecution().getGoal()
- + " requires online mode for execution but Maven is currently offline, skipping" );
+ logger.warn( ansi().fgYellow().
+ a( "Goal " + event.getMojoExecution().getGoal()
+ + " requires online mode for execution but Maven is currently offline, skipping" ).
+ reset().toString() );
+
}
}
@@ -282,10 +300,10 @@ public class ExecutionEventLogger
{
logger.info( "" );
- Ansi ansi = ansi().bold().a( "--- " ).reset();
+ Ansi ansi = ansi().fgBlue().a( "--- " ).reset();
append( ansi, event.getMojoExecution() );
append( ansi, event.getProject() );
- ansi.bold().a( " ---" ).reset();
+ ansi.fgBlue().a( " ---" ).reset();
logger.info( ansi.toString() );
}
@@ -302,12 +320,12 @@ public class ExecutionEventLogger
{
logger.info( "" );
- Ansi ansi = ansi().bold().a( ">>> " ).reset();
+ Ansi ansi = ansi().fgBlue().a( ">>> " ).reset();
append( ansi, event.getMojoExecution() );
- ansi.bold().a( " > " ).reset();
+ ansi.fgBlue().a( " > " ).reset();
appendForkInfo( ansi, event.getMojoExecution().getMojoDescriptor() );
append( ansi, event.getProject() );
- ansi.bold().a( " >>>" ).reset();
+ ansi.fgBlue().a( " >>>" ).reset();
logger.info( ansi.toString() );
}
@@ -326,12 +344,12 @@ public class ExecutionEventLogger
{
logger.info( "" );
- Ansi ansi = ansi().bold().a( "<<< " ).reset();
+ Ansi ansi = ansi().fgBlue().a( "<<< " ).reset();
append( ansi, event.getMojoExecution() );
- ansi.bold().a( " < " ).reset();
+ ansi.fgBlue().a( " < " ).reset();
appendForkInfo( ansi, event.getMojoExecution().getMojoDescriptor() );
append( ansi, event.getProject() );
- ansi.bold().a( " <<<" ).reset();
+ ansi.fgBlue().a( " <<<" ).reset();
logger.info( ansi.toString() );
}
@@ -343,13 +361,13 @@ public class ExecutionEventLogger
ansi.a( ':' ).a( me.getGoal() ).reset();
if ( me.getExecutionId() != null )
{
- ansi.fgBlue().bold().a( " (" ).a( me.getExecutionId() ).a( ')' ).reset();
+ ansi.fgBlue().a( " (" ).a( me.getExecutionId() ).a( ')' ).reset();
}
}
private void appendForkInfo( Ansi ansi, MojoDescriptor md )
{
- ansi.bold();
+ ansi.fgBlue();
if ( StringUtils.isNotEmpty( md.getExecutePhase() ) )
{
// forked phase
http://git-wip-us.apache.org/repos/asf/maven/blob/7e1b961e/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
index 3957464..485395e 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
@@ -20,6 +20,7 @@ package org.apache.maven.cli.logging;
*/
import org.codehaus.plexus.logging.Logger;
+import static org.fusesource.jansi.Ansi.ansi;
/**
* Adapt an SLF4J logger to a Plexus logger, ignoring Plexus logger API parts that are not classical and
@@ -71,12 +72,12 @@ public class Slf4jLogger
public void warn( String message )
{
- logger.warn( message );
+ logger.warn( ansi().fgYellow().a( message ).reset().toString() );
}
public void warn( String message, Throwable throwable )
{
- logger.warn( message, throwable );
+ logger.warn( ansi().fgYellow().a( message ).reset().toString(), throwable );
}
public boolean isWarnEnabled()
@@ -86,12 +87,12 @@ public class Slf4jLogger
public void error( String message )
{
- logger.error( message );
+ logger.error( ansi().fgRed().a( message ).reset().toString() );
}
public void error( String message, Throwable throwable )
{
- logger.error( message, throwable );
+ logger.error( ansi().fgRed().a( message ).reset().toString(), throwable );
}
public boolean isErrorEnabled()
@@ -101,12 +102,12 @@ public class Slf4jLogger
public void fatalError( String message )
{
- logger.error( message );
+ logger.error( ansi().fgRed().a( message ).reset().toString() );
}
public void fatalError( String message, Throwable throwable )
{
- logger.error( message, throwable );
+ logger.error( ansi().fgRed().a( message ).reset().toString(), throwable );
}
public boolean isFatalErrorEnabled()
http://git-wip-us.apache.org/repos/asf/maven/blob/7e1b961e/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 0f135dd..f18af9e 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
@@ -46,20 +46,20 @@ extends com.planet57.gossip.render.PatternRenderer
{
case TRACE:
case DEBUG:
- buff.append( ansi().bold().fgCyan().a( level.name() ).reset() );
+ buff.append( ansi().fgCyan().a( level.name() ).reset() );
break;
case INFO:
- buff.append( ansi().bold().fgBlue().a( level.name() ).reset() );
+ buff.append( ansi().fgBlue().a( level.name() ).reset() );
break;
case WARN:
// Maven uses WARNING instead of WARN
- buff.append( ansi().bold().fgYellow().a( WARNING ).reset() );
+ buff.append( ansi().fgYellow().a( WARNING ).reset() );
break;
case ERROR:
- buff.append( ansi().bold().fgRed().a( level.name() ).reset() );
+ buff.append( ansi().fgRed().a( level.name() ).reset() );
break;
default:
@@ -88,11 +88,11 @@ extends com.planet57.gossip.render.PatternRenderer
return;
}
- buff.append( ansi().bold().fgRed().a( cause.getClass().getName() ).reset() );
+ buff.append( ansi().fgRed().a( cause.getClass().getName() ).reset() );
if ( cause.getMessage() != null )
{
- buff.append( ": " );
- buff.append( ansi().bold().fgRed().a( cause.getMessage() ).reset() );
+ buff.append( ansi().fgRed().a( ": " ).reset() );
+ buff.append( ansi().fgRed().a( cause.getMessage() ).reset() );
}
renderNewLine( buff );
@@ -101,21 +101,18 @@ extends com.planet57.gossip.render.PatternRenderer
for ( StackTraceElement e : cause.getStackTrace() )
{
buff.append( " " );
- buff.append( ansi().bold().a( "at" ).reset().a( " " )
- .a( e.getClassName() ).a( "." ).a( e.getMethodName() ) );
- buff.append( ansi().a( " (" ).bold().a( getLocation( e ) ).reset().a( ")" ) );
+ buff.append( ansi().a( "at " ).a( e.getClassName() ).a( "." ).a( e.getMethodName() ) );
+ buff.append( ansi().a( " (" ).a( getLocation( e ) ).a( ")" ).reset() );
renderNewLine( buff );
}
cause = cause.getCause();
if ( cause != null )
{
- buff.append( ansi().bold().a( "Caused by" ).reset().a( ": " )
- .a( cause.getClass().getName() ) );
+ buff.append( ansi().fgRed().a( "Caused by: " ).a( cause.getClass().getName() ) );
if ( cause.getMessage() != null )
{
- buff.append( ": " );
- buff.append( ansi().bold().fgRed().a( cause.getMessage() ).reset() );
+ buff.append( ansi().fgRed().a( ": " ).a( cause.getMessage() ).reset() );
}
renderNewLine( buff );
}
[19/20] maven git commit: [MNG-6006] Import Aether to Maven codebase
Posted by sc...@apache.org.
[MNG-6006] Import Aether to Maven codebase
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5145c34d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5145c34d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5145c34d
Branch: refs/heads/MNG-6006
Commit: 5145c34d672ab40495cecf0cd81649f6f9645ef9
Parents: 7d89f05
Author: Christian Schulte <sc...@apache.org>
Authored: Fri Jun 10 16:50:33 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Fri Jun 17 21:33:18 2016 +0200
----------------------------------------------------------------------
apache-maven/pom.xml | 4 ++--
maven-aether-provider/pom.xml | 12 ++++++------
maven-compat/pom.xml | 4 ++--
maven-core/pom.xml | 6 +++---
pom.xml | 14 +++++++-------
5 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/5145c34d/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 37751cc..3f8a05a 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -84,11 +84,11 @@ under the License.
<artifactId>wagon-file</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-transport-wagon</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/5145c34d/maven-aether-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 6306d4f..e6fd8f4 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -47,19 +47,19 @@ under the License.
<artifactId>maven-repository-metadata</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-api</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-util</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-impl</artifactId>
</dependency>
<dependency>
@@ -88,12 +88,12 @@ under the License.
</dependency>
<!-- Testing -->
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-transport-wagon</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/5145c34d/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index f828d6e..6ca061e 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -85,12 +85,12 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-transport-wagon</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/5145c34d/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index cc648be..f55fe69 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -73,15 +73,15 @@ under the License.
<artifactId>maven-aether-provider</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-impl</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-api</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-util</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/5145c34d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6698f94..72683dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@ under the License.
<cipherVersion>1.7</cipherVersion>
<modelloVersion>1.8.3</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
- <aetherVersion>1.0.2.v20150114</aetherVersion>
+ <aetherVersion>1.2.0-SNAPSHOT</aetherVersion>
<!-- Upgrade of SLF4J blocked by SLF4J-370 (MNG-6023). -->
<!-- https://issues.apache.org/jira/browse/MNG-6023 -->
<!-- http://jira.qos.ch/browse/SLF4J-370 -->
@@ -328,32 +328,32 @@ under the License.
</dependency>
<!-- Repository -->
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-api</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-spi</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-impl</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-util</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-transport-wagon</artifactId>
<version>${aetherVersion}</version>
</dependency>
[08/20] maven git commit: [MNG-6041] Option -l does not disables the
colorized output.
Posted by sc...@apache.org.
[MNG-6041] Option -l does not disables the colorized output.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c786ff3d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c786ff3d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c786ff3d
Branch: refs/heads/MNG-6006
Commit: c786ff3d1b3f702e831cbaa5e09c75d7d8ee4f0c
Parents: 92334a1
Author: rfscholte <rf...@apache.org>
Authored: Mon Jun 13 21:03:45 2016 +0200
Committer: rfscholte <rf...@apache.org>
Committed: Mon Jun 13 21:03:45 2016 +0200
----------------------------------------------------------------------
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/c786ff3d/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 38caf83..045381b 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -479,6 +479,8 @@ public class MavenCli
File logFile = new File( cliRequest.commandLine.getOptionValue( CLIManager.LOG_FILE ) );
logFile = resolveFile( logFile, cliRequest.workingDirectory );
+ Ansi.setEnabled( false );
+
// redirect stdout and stderr to file
try
{
@@ -1315,7 +1317,7 @@ public class MavenCli
//
// ----------------------------------------------------------------------
- @SuppressWarnings( "unchecked" ) List<String> goals = commandLine.getArgList();
+ List<String> goals = commandLine.getArgList();
boolean recursive = true;
[09/20] maven git commit: added slf4j-api and jansi dependencies
Posted by sc...@apache.org.
added slf4j-api and jansi dependencies
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c15e5c33
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c15e5c33
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c15e5c33
Branch: refs/heads/MNG-6006
Commit: c15e5c334352a7f5cb9d94d014c0aae4f6b3c415
Parents: c786ff3
Author: Herv� Boutemy <hb...@apache.org>
Authored: Mon Jun 13 21:13:48 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Mon Jun 13 22:08:46 2016 +0200
----------------------------------------------------------------------
src/site/resources/images/maven-deps.png | Bin 70791 -> 74014 bytes
src/site/xdoc/index.xml | 4 ++++
src/site/xdoc/maven-deps.odg | Bin 32242 -> 33675 bytes
3 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/c15e5c33/src/site/resources/images/maven-deps.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/maven-deps.png b/src/site/resources/images/maven-deps.png
index 99f7a10..6f5d6db 100644
Binary files a/src/site/resources/images/maven-deps.png and b/src/site/resources/images/maven-deps.png differ
http://git-wip-us.apache.org/repos/asf/maven/blob/c15e5c33/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index fb4b40f..5e97077 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -55,7 +55,10 @@
<area shape="rect" coords="449,229,532,266" alt="maven-settings" href="maven-settings/" />
<area shape="rect" coords="388,284,521,319" alt="maven-model-builder" href="maven-model-builder/" />
<area shape="rect" coords="409,342,500,378" alt="maven-model" href="maven-model/" />
+ <area shape="rect" coords="88,59,192,94" alt="slf4j-api" href="http://www.slf4j.org/manual.html" />
<area shape="rect" coords="551,58,707,94" alt="commons-cli" href="http://commons.apache.org/cli/" />
+ <area shape="rect" coords="109,175,192,212" alt="jansi" href="http://fusesource.github.io/jansi/" />
+ <area shape="rect" coords="1,175,83,212" alt="jansi-native" href="https://github.com/fusesource/jansi-native" />
<area shape="rect" coords="551,116,739,152" alt="wagon-provider-api" href="https://maven.apache.org/wagon/wagon-provider-api/" />
<area shape="rect" coords="550,175,690,211" alt="plexus-sec-dispatcher" href="https://github.com/codehaus-plexus/plexus-sec-dispatcher" />
<area shape="rect" coords="581,230,660,265" alt="plexus-cipher" href="https://github.com/codehaus-plexus/plexus-cipher" />
@@ -72,6 +75,7 @@
</p>
</section>
+
</body>
</document>
http://git-wip-us.apache.org/repos/asf/maven/blob/c15e5c33/src/site/xdoc/maven-deps.odg
----------------------------------------------------------------------
diff --git a/src/site/xdoc/maven-deps.odg b/src/site/xdoc/maven-deps.odg
index 7923879..533eaa7 100644
Binary files a/src/site/xdoc/maven-deps.odg and b/src/site/xdoc/maven-deps.odg differ
[10/20] maven git commit: [MNG-5971] Imported dependencies should be
available to inheritance processing
Posted by sc...@apache.org.
[MNG-5971] Imported dependencies should be available to inheritance processing
o Updated to revert changes to the value returned by 'ModelProblem.getSource'.
This value should be the path to the POM the 'ModelProblem' corresponds to.
It was changed to hold additional information (the path to the imported POM).
Most of the time those POM files will not be part of the reactor and the
location will always be the path of the POM in the local repository. During
preliminary testing it turned out that at leat m2eclipse relies on that
value to represent a single path. There may be other tools depending on
this. Those tools should not need to start parsing the value without gaining
any benefit.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ded1379e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ded1379e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ded1379e
Branch: refs/heads/MNG-6006
Commit: ded1379ebf5d5ee943d52cf12e6d368b5d54ce70
Parents: c15e5c3
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Jun 14 19:48:02 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Tue Jun 14 19:48:02 2016 +0200
----------------------------------------------------------------------
.../model/building/DefaultModelProblemCollector.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ded1379e/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
index 16740dc..e46cc98 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
@@ -160,13 +160,11 @@ class DefaultModelProblemCollector
}
}
- modelId = modelId != null
- ? this.getModelId() + " [" + modelId + "]"
- : this.getModelId();
-
- src = src != null
- ? this.getSource() + " [" + src + "]"
- : this.getSource();
+ if ( modelId == null )
+ {
+ modelId = getModelId();
+ src = getSource();
+ }
if ( line <= 0 && column <= 0 && req.getException() instanceof ModelParseException )
{
[07/20] maven git commit: [MNG-3507] enhanced error hints with color
Posted by sc...@apache.org.
[MNG-3507] enhanced error hints with color
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/92334a1d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/92334a1d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/92334a1d
Branch: refs/heads/MNG-6006
Commit: 92334a1dd9f2f3df77b3c039be7742ea19a8ee81
Parents: 050936c
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sun Jun 12 19:30:48 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Sun Jun 12 19:30:48 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/maven/cli/MavenCli.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/92334a1d/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 15dc575..38caf83 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -19,6 +19,8 @@ package org.apache.maven.cli;
* under the License.
*/
+import static org.fusesource.jansi.Ansi.ansi;
+
import java.io.BufferedInputStream;
import java.io.Console;
import java.io.File;
@@ -1011,11 +1013,13 @@ public class MavenCli
if ( !cliRequest.showErrors )
{
- slf4jLogger.error( "To see the full stack trace of the errors, re-run Maven with the -e switch." );
+ slf4jLogger.error( "To see the full stack trace of the errors, re-run Maven with the "
+ + ansi().bold().a( "-e" ).reset() + " switch." );
}
if ( !slf4jLogger.isDebugEnabled() )
{
- slf4jLogger.error( "Re-run Maven using the -X switch to enable full debug logging." );
+ slf4jLogger.error( "Re-run Maven using the " + ansi().bold().a( "-X" ).reset()
+ + " switch to enable full debug logging." );
}
if ( !references.isEmpty() )
@@ -1026,7 +1030,7 @@ public class MavenCli
for ( Map.Entry<String, String> entry : references.entrySet() )
{
- slf4jLogger.error( entry.getValue() + " " + entry.getKey() );
+ slf4jLogger.error( ansi().bold().a( entry.getValue() ).reset() + " " + entry.getKey() );
}
}
@@ -1034,7 +1038,8 @@ public class MavenCli
{
slf4jLogger.error( "" );
slf4jLogger.error( "After correcting the problems, you can resume the build with the command" );
- slf4jLogger.error( " mvn <goals> -rf :" + project.getArtifactId() );
+ slf4jLogger.error( ansi().bold().a( " mvn <goals> -rf :" )
+ .a( project.getArtifactId() ).reset().toString() );
}
if ( MavenExecutionRequest.REACTOR_FAIL_NEVER.equals( cliRequest.request.getReactorFailureBehavior() ) )
[06/20] maven git commit: [MNG-3507] added color to mojo execution
failure message
Posted by sc...@apache.org.
[MNG-3507] added color to mojo execution failure message
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/050936ce
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/050936ce
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/050936ce
Branch: refs/heads/MNG-6006
Commit: 050936ce19298c3bca582c7e044abf7bde076f3b
Parents: 9fff559
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sun Jun 12 19:13:11 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Sun Jun 12 19:13:11 2016 +0200
----------------------------------------------------------------------
maven-core/pom.xml | 4 +++
.../lifecycle/LifecycleExecutionException.java | 27 ++++++++------------
2 files changed, 15 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/050936ce/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 30d91f0..cc648be 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -84,6 +84,10 @@ under the License.
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
+ </dependency>
<!-- Plexus -->
<dependency>
<groupId>org.eclipse.sisu</groupId>
http://git-wip-us.apache.org/repos/asf/maven/blob/050936ce/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
index 89b2cb0..fd4bca0 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
@@ -19,8 +19,11 @@ package org.apache.maven.lifecycle;
* under the License.
*/
+import static org.fusesource.jansi.Ansi.ansi;
+
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.project.MavenProject;
+import org.fusesource.jansi.Ansi;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -75,34 +78,26 @@ public class LifecycleExecutionException
private static String createMessage( MojoExecution execution, MavenProject project, Throwable cause )
{
- StringBuilder buffer = new StringBuilder( 256 );
+ Ansi buffer = ansi( /*256*/ );
- buffer.append( "Failed to execute goal" );
+ buffer.a( "Failed to execute goal" ).reset();
if ( execution != null )
{
- buffer.append( ' ' );
- buffer.append( execution.getGroupId() );
- buffer.append( ':' );
- buffer.append( execution.getArtifactId() );
- buffer.append( ':' );
- buffer.append( execution.getVersion() );
- buffer.append( ':' );
- buffer.append( execution.getGoal() );
- buffer.append( " (" );
- buffer.append( execution.getExecutionId() );
- buffer.append( ')' );
+ buffer.a( ' ' ).a( execution.getGroupId() ).a( ':' ).fgGreen().a( execution.getArtifactId() );
+ buffer.a( ':' ).a( execution.getVersion() ).a( ':' ).a( execution.getGoal() ).reset();
+ buffer.bold().a( " (" ).a( execution.getExecutionId() ).a( ')' ).reset();
}
if ( project != null )
{
- buffer.append( " on project " );
- buffer.append( project.getArtifactId() );
+ buffer.a( " on project " );
+ buffer.fgCyan().a( project.getArtifactId() ).reset();
}
if ( cause != null )
{
- buffer.append( ": " ).append( cause.getMessage() );
+ buffer.a( ": " ).bold().fgRed().a( cause.getMessage() ).reset();
}
return buffer.toString();
[11/20] maven git commit: [MNG-6043] Colorization is disabled too
late in batch mode
Posted by sc...@apache.org.
[MNG-6043] Colorization is disabled too late in batch mode
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ecdb0bc2
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ecdb0bc2
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ecdb0bc2
Branch: refs/heads/MNG-6006
Commit: ecdb0bc2ba3ebdad837b6794315b64c64854f5cf
Parents: ded1379
Author: Michael Osipov <mi...@apache.org>
Authored: Tue Jun 14 20:26:13 2016 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Tue Jun 14 20:29:15 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/maven/cli/MavenCli.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ecdb0bc2/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 045381b..b07fdc9 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -474,6 +474,11 @@ public class MavenCli
// else fall back to default log level specified in conf
// see https://issues.apache.org/jira/browse/MNG-2570
+ if ( cliRequest.commandLine.hasOption( CLIManager.BATCH_MODE ) )
+ {
+ Ansi.setEnabled( false );
+ }
+
if ( cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) )
{
File logFile = new File( cliRequest.commandLine.getOptionValue( CLIManager.LOG_FILE ) );
@@ -1304,7 +1309,6 @@ public class MavenCli
if ( commandLine.hasOption( CLIManager.BATCH_MODE ) )
{
request.setInteractiveMode( false );
- Ansi.setEnabled( false );
}
boolean noSnapshotUpdates = false;
[12/20] maven git commit: [MNG-3507] keep green for success: INFO in
blue (DEBUG is cyan)
Posted by sc...@apache.org.
[MNG-3507] keep green for success: INFO in blue (DEBUG is cyan)
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e7a783db
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e7a783db
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e7a783db
Branch: refs/heads/MNG-6006
Commit: e7a783db1f577a340a91f6c958f1b9319c52c176
Parents: ecdb0bc
Author: Herv� Boutemy <hb...@apache.org>
Authored: Tue Jun 14 21:25:02 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Tue Jun 14 21:25:02 2016 +0200
----------------------------------------------------------------------
.../org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/e7a783db/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 00007cc..52e0489 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
@@ -50,7 +50,7 @@ extends com.planet57.gossip.render.PatternRenderer
break;
case INFO:
- buff.append( ansi().bold().fgGreen().a( level.name() ).reset() );
+ buff.append( ansi().bold().fgBlue().a( level.name() ).reset() );
break;
case WARN:
[15/20] maven git commit: [MNG-3507] added color to Maven execution
output messages
Posted by sc...@apache.org.
[MNG-3507] added color to Maven execution output messages
o Updated to stop using colors green, yellow or red for anything not status related.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/71e4ff8e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/71e4ff8e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/71e4ff8e
Branch: refs/heads/MNG-6006
Commit: 71e4ff8e358dd43fb52f2e760b82ef7ab39f1dbb
Parents: bcaad56
Author: Christian Schulte <sc...@apache.org>
Authored: Thu Jun 16 17:34:31 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Thu Jun 16 17:34:31 2016 +0200
----------------------------------------------------------------------
.../org/apache/maven/lifecycle/LifecycleExecutionException.java | 2 +-
.../java/org/apache/maven/cli/event/ExecutionEventLogger.java | 4 ++--
.../org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/71e4ff8e/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
index fd4bca0..b94a7bc 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
@@ -84,7 +84,7 @@ public class LifecycleExecutionException
if ( execution != null )
{
- buffer.a( ' ' ).a( execution.getGroupId() ).a( ':' ).fgGreen().a( execution.getArtifactId() );
+ buffer.a( ' ' ).a( execution.getGroupId() ).a( ':' ).a( execution.getArtifactId() );
buffer.a( ':' ).a( execution.getVersion() ).a( ':' ).a( execution.getGoal() ).reset();
buffer.bold().a( " (" ).a( execution.getExecutionId() ).a( ')' ).reset();
}
http://git-wip-us.apache.org/repos/asf/maven/blob/71e4ff8e/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
index ee57121..7f5d65a 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
@@ -339,11 +339,11 @@ public class ExecutionEventLogger
private void append( Ansi ansi, MojoExecution me )
{
- ansi.fgGreen().a( me.getArtifactId() ).a( ':' ).a( me.getVersion() );
+ ansi.fgBlue().a( me.getArtifactId() ).a( ':' ).a( me.getVersion() );
ansi.a( ':' ).a( me.getGoal() ).reset();
if ( me.getExecutionId() != null )
{
- ansi.bold().a( " (" ).a( me.getExecutionId() ).a( ')' ).reset();
+ ansi.fgBlue().bold().a( " (" ).a( me.getExecutionId() ).a( ')' ).reset();
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/71e4ff8e/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 52e0489..0f135dd 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
@@ -72,7 +72,7 @@ extends com.planet57.gossip.render.PatternRenderer
{
StringBuilder tmp = new StringBuilder();
super.renderName( event, tmp, shortName );
- buff.append( ansi().fgGreen().a( tmp ).reset() );
+ buff.append( ansi().fgBlue().a( tmp ).reset() );
}
[14/20] maven git commit: [MNG-6046] upgrade JAnsi from 1.12 to 1.13
Posted by sc...@apache.org.
[MNG-6046] upgrade JAnsi from 1.12 to 1.13
now color should not make BSD users unable to use Maven
thank you to JAnsi maintainers for merging PRs and doing the release
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/bcaad566
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/bcaad566
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/bcaad566
Branch: refs/heads/MNG-6006
Commit: bcaad5668ead035e2c2cae7971b9ebed33fa82b9
Parents: cdc87a9
Author: Herv� Boutemy <hb...@apache.org>
Authored: Thu Jun 16 08:42:18 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Thu Jun 16 08:42:18 2016 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/bcaad566/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4a22e9d..6698f94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -278,7 +278,7 @@ under the License.
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
- <version>1.12</version>
+ <version>1.13</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
[04/20] maven git commit: [MNG-5967] Dependency updates.
Posted by sc...@apache.org.
[MNG-5967] Dependency updates.
o Downgraded to latest Aether release @Eclipse giving up on bugfixes already pushed to central.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/33553186
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/33553186
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/33553186
Branch: refs/heads/MNG-6006
Commit: 3355318652081478c22b6085422578ab8eac7708
Parents: 0931a8f
Author: Christian Schulte <sc...@apache.org>
Authored: Sun Jun 12 16:48:43 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Sun Jun 12 16:48:43 2016 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/33553186/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a9af928..4a22e9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@ under the License.
<cipherVersion>1.7</cipherVersion>
<modelloVersion>1.8.3</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
- <aetherVersion>1.1.0</aetherVersion>
+ <aetherVersion>1.0.2.v20150114</aetherVersion>
<!-- Upgrade of SLF4J blocked by SLF4J-370 (MNG-6023). -->
<!-- https://issues.apache.org/jira/browse/MNG-6023 -->
<!-- http://jira.qos.ch/browse/SLF4J-370 -->
[02/20] maven git commit: [MNG-6038] use Gossip slf4j provider (with
level color support)
Posted by sc...@apache.org.
[MNG-6038] use Gossip slf4j provider (with level color support)
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/644ac9c4
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/644ac9c4
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/644ac9c4
Branch: refs/heads/MNG-6006
Commit: 644ac9c40ad41bf61e3b099918af33b8eb950621
Parents: 427f18c
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sat Jun 11 13:26:05 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Sat Jun 11 13:26:05 2016 +0200
----------------------------------------------------------------------
apache-maven/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/644ac9c4/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 9405df8..37751cc 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -92,8 +92,8 @@ under the License.
<artifactId>aether-transport-wagon</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <groupId>com.planet57.gossip</groupId>
+ <artifactId>gossip-slf4j</artifactId>
</dependency>
</dependencies>
[03/20] maven git commit: [MNG-5227] The 'optional' flag of a
dependency should be manageable.
Posted by sc...@apache.org.
[MNG-5227] The 'optional' flag of a dependency should be manageable.
This reverts commit 2fb5fd5e6b7ebded597329d1e87e255fb368ba73.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0931a8fe
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0931a8fe
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0931a8fe
Branch: refs/heads/MNG-6006
Commit: 0931a8fe0aa43a95a34d7dacb5050df6746c1b55
Parents: 644ac9c
Author: Christian Schulte <sc...@apache.org>
Authored: Sun Jun 12 16:46:43 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Sun Jun 12 16:46:43 2016 +0200
----------------------------------------------------------------------
.../model/management/DefaultDependencyManagementInjector.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/0931a8fe/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
index 731cdd8..e611973 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
@@ -82,6 +82,13 @@ public class DefaultDependencyManagementInjector
}
@Override
+ protected void mergeDependency_Optional( Dependency target, Dependency source, boolean sourceDominant,
+ Map<Object, Object> context )
+ {
+ // optional flag is not managed
+ }
+
+ @Override
protected void mergeDependency_Exclusions( Dependency target, Dependency source, boolean sourceDominant,
Map<Object, Object> context )
{
[18/20] maven git commit: [MNG-3507] added color to Maven execution
output messages
Posted by sc...@apache.org.
[MNG-3507] added color to Maven execution output messages
This reverts commits
7e1b961edd44c7d2843b1b7cd01cea5a1cd1a70d
71e4ff8e358dd43fb52f2e760b82ef7ab39f1dbb
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7d89f058
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7d89f058
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7d89f058
Branch: refs/heads/MNG-6006
Commit: 7d89f0583f504615bd87956897971d4b3edeff92
Parents: 09bfdee
Author: Christian Schulte <sc...@apache.org>
Authored: Thu Jun 16 21:48:01 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Thu Jun 16 21:48:46 2016 +0200
----------------------------------------------------------------------
.../lifecycle/LifecycleExecutionException.java | 16 +--
.../maven/cli/event/ExecutionEventLogger.java | 106 ++++++++-----------
.../apache/maven/cli/logging/Slf4jLogger.java | 13 ++-
.../cli/logging/impl/gossip/ColorRenderer.java | 27 ++---
4 files changed, 73 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/7d89f058/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
index 35c7032..fd4bca0 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
@@ -80,27 +80,27 @@ public class LifecycleExecutionException
{
Ansi buffer = ansi( /*256*/ );
- buffer.fgRed().a( "Failed to execute goal" );
+ buffer.a( "Failed to execute goal" ).reset();
if ( execution != null )
{
- buffer.a( ' ' ).a( execution.getGroupId() ).a( ':' ).a( execution.getArtifactId() ).
- a( ':' ).a( execution.getVersion() ).a( ':' ).a( execution.getGoal() ).
- a( " (" ).a( execution.getExecutionId() ).a( ')' );
-
+ buffer.a( ' ' ).a( execution.getGroupId() ).a( ':' ).fgGreen().a( execution.getArtifactId() );
+ buffer.a( ':' ).a( execution.getVersion() ).a( ':' ).a( execution.getGoal() ).reset();
+ buffer.bold().a( " (" ).a( execution.getExecutionId() ).a( ')' ).reset();
}
if ( project != null )
{
- buffer.a( " on project " ).a( project.getArtifactId() );
+ buffer.a( " on project " );
+ buffer.fgCyan().a( project.getArtifactId() ).reset();
}
if ( cause != null )
{
- buffer.a( ": " ).a( cause.getMessage() );
+ buffer.a( ": " ).bold().fgRed().a( cause.getMessage() ).reset();
}
- return buffer.reset().toString();
+ return buffer.toString();
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/7d89f058/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
index 7180a43..ee57121 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
@@ -51,7 +51,7 @@ public class ExecutionEventLogger
private static final int LINE_LENGTH = 72;
private static final int MAX_PADDED_BUILD_TIME_DURATION_LENGTH = 9;
- private static final int MAX_PROJECT_NAME_LENGTH = LINE_LENGTH - MAX_PADDED_BUILD_TIME_DURATION_LENGTH - 12;
+ private static final int MAX_PROJECT_NAME_LENGTH = 52;
public ExecutionEventLogger()
{
@@ -83,7 +83,7 @@ public class ExecutionEventLogger
private void infoMain( String msg )
{
- logger.info( ansi().fgBlue().a( msg ).reset().toString() );
+ logger.info( ansi().bold().a( msg ).reset().toString() );
}
@Override
@@ -91,7 +91,7 @@ public class ExecutionEventLogger
{
if ( logger.isInfoEnabled() )
{
- logger.info( ansi().fgBlue().a( "Scanning for projects..." ).reset().toString() );
+ logger.info( "Scanning for projects..." );
}
}
@@ -108,7 +108,7 @@ public class ExecutionEventLogger
for ( MavenProject project : event.getSession().getProjects() )
{
- logger.info( ansi().fgBlue().a( project.getName() ).reset().toString() );
+ logger.info( project.getName() );
}
}
}
@@ -143,74 +143,61 @@ public class ExecutionEventLogger
for ( MavenProject project : session.getProjects() )
{
- BuildSummary buildSummary = result.getBuildSummary( project );
- Ansi ansi = ansi();
+ StringBuilder buffer = new StringBuilder( 128 );
- if ( buildSummary == null )
- {
- ansi.fgYellow();
- }
- else if ( buildSummary instanceof BuildSuccess )
- {
- ansi.fgGreen();
- }
- else if ( buildSummary instanceof BuildFailure )
- {
- ansi.fgRed();
- }
+ buffer.append( project.getName() );
+ buffer.append( ' ' );
- ansi.a( project.getName() );
- ansi.a( ' ' );
-
- int dots = MAX_PROJECT_NAME_LENGTH - project.getName().length();
-
- for ( int i = 0; i < dots; i++ )
+ if ( buffer.length() <= MAX_PROJECT_NAME_LENGTH )
{
- ansi.a( '.' );
+ while ( buffer.length() < MAX_PROJECT_NAME_LENGTH )
+ {
+ buffer.append( '.' );
+ }
+ buffer.append( ' ' );
}
- ansi.a( ' ' );
+ BuildSummary buildSummary = result.getBuildSummary( project );
if ( buildSummary == null )
{
- ansi.a( "SKIPPED" );
+ buffer.append( ansi().bold().fgYellow().a( "SKIPPED" ).reset() );
}
else if ( buildSummary instanceof BuildSuccess )
{
- ansi.a( "SUCCESS" );
- ansi.a( " [" );
+ buffer.append( ansi().bold().fgGreen().a( "SUCCESS" ).reset() );
+ buffer.append( " [" );
String buildTimeDuration = formatDuration( buildSummary.getTime() );
int padSize = MAX_PADDED_BUILD_TIME_DURATION_LENGTH - buildTimeDuration.length();
if ( padSize > 0 )
{
- ansi.a( chars( ' ', padSize ) );
+ buffer.append( chars( ' ', padSize ) );
}
- ansi.a( buildTimeDuration );
- ansi.a( ']' );
+ buffer.append( buildTimeDuration );
+ buffer.append( ']' );
}
else if ( buildSummary instanceof BuildFailure )
{
- ansi.a( "FAILURE" );
- ansi.a( " [" );
+ buffer.append( ansi().bold().fgRed().a( "FAILURE" ).reset() );
+ buffer.append( " [" );
String buildTimeDuration = formatDuration( buildSummary.getTime() );
int padSize = MAX_PADDED_BUILD_TIME_DURATION_LENGTH - buildTimeDuration.length();
if ( padSize > 0 )
{
- ansi.a( chars( ' ', padSize ) );
+ buffer.append( chars( ' ', padSize ) );
}
- ansi.a( buildTimeDuration );
- ansi.a( ']' );
+ buffer.append( buildTimeDuration );
+ buffer.append( ']' );
}
- ansi.reset();
- logger.info( ansi.toString() );
+ logger.info( buffer.toString() );
}
}
private void logResult( MavenSession session )
{
infoLine( '-' );
- Ansi ansi = ansi();
+ Ansi ansi = ansi().bold();
if ( session.getResult().hasExceptions() )
{
@@ -233,9 +220,9 @@ public class ExecutionEventLogger
String wallClock = session.getRequest().getDegreeOfConcurrency() > 1 ? " (Wall Clock)" : "";
- logger.info( ansi().fgBlue().a( "Total time: " + formatDuration( time ) + wallClock ).reset().toString() );
+ logger.info( "Total time: " + formatDuration( time ) + wallClock );
- logger.info( ansi().fgBlue().a( "Finished at: " + formatTimestamp( finish ) ).reset().toString() );
+ logger.info( "Finished at: " + formatTimestamp( finish ) );
System.gc();
@@ -243,8 +230,7 @@ public class ExecutionEventLogger
long mb = 1024 * 1024;
- logger.info( ansi().fgBlue().a( "Final Memory: " + ( r.totalMemory() - r.freeMemory() ) / mb + "M/"
- + r.totalMemory() / mb + "M" ).reset().toString() );
+ logger.info( "Final Memory: " + ( r.totalMemory() - r.freeMemory() ) / mb + "M/" + r.totalMemory() / mb + "M" );
}
@Override
@@ -256,8 +242,7 @@ public class ExecutionEventLogger
infoLine( '-' );
infoMain( "Skipping " + event.getProject().getName() );
- logger.info( ansi().fgBlue().a( "This project has been banned from the build due to previous failures." ).
- reset().toString() );
+ logger.info( "This project has been banned from the build due to previous failures." );
infoLine( '-' );
}
@@ -282,11 +267,8 @@ public class ExecutionEventLogger
{
if ( logger.isWarnEnabled() )
{
- logger.warn( ansi().fgYellow().
- a( "Goal " + event.getMojoExecution().getGoal()
- + " requires online mode for execution but Maven is currently offline, skipping" ).
- reset().toString() );
-
+ logger.warn( "Goal " + event.getMojoExecution().getGoal()
+ + " requires online mode for execution but Maven is currently offline, skipping" );
}
}
@@ -300,10 +282,10 @@ public class ExecutionEventLogger
{
logger.info( "" );
- Ansi ansi = ansi().fgBlue().a( "--- " ).reset();
+ Ansi ansi = ansi().bold().a( "--- " ).reset();
append( ansi, event.getMojoExecution() );
append( ansi, event.getProject() );
- ansi.fgBlue().a( " ---" ).reset();
+ ansi.bold().a( " ---" ).reset();
logger.info( ansi.toString() );
}
@@ -320,12 +302,12 @@ public class ExecutionEventLogger
{
logger.info( "" );
- Ansi ansi = ansi().fgBlue().a( ">>> " ).reset();
+ Ansi ansi = ansi().bold().a( ">>> " ).reset();
append( ansi, event.getMojoExecution() );
- ansi.fgBlue().a( " > " ).reset();
+ ansi.bold().a( " > " ).reset();
appendForkInfo( ansi, event.getMojoExecution().getMojoDescriptor() );
append( ansi, event.getProject() );
- ansi.fgBlue().a( " >>>" ).reset();
+ ansi.bold().a( " >>>" ).reset();
logger.info( ansi.toString() );
}
@@ -344,12 +326,12 @@ public class ExecutionEventLogger
{
logger.info( "" );
- Ansi ansi = ansi().fgBlue().a( "<<< " ).reset();
+ Ansi ansi = ansi().bold().a( "<<< " ).reset();
append( ansi, event.getMojoExecution() );
- ansi.fgBlue().a( " < " ).reset();
+ ansi.bold().a( " < " ).reset();
appendForkInfo( ansi, event.getMojoExecution().getMojoDescriptor() );
append( ansi, event.getProject() );
- ansi.fgBlue().a( " <<<" ).reset();
+ ansi.bold().a( " <<<" ).reset();
logger.info( ansi.toString() );
}
@@ -357,17 +339,17 @@ public class ExecutionEventLogger
private void append( Ansi ansi, MojoExecution me )
{
- ansi.fgBlue().a( me.getArtifactId() ).a( ':' ).a( me.getVersion() );
+ ansi.fgGreen().a( me.getArtifactId() ).a( ':' ).a( me.getVersion() );
ansi.a( ':' ).a( me.getGoal() ).reset();
if ( me.getExecutionId() != null )
{
- ansi.fgBlue().a( " (" ).a( me.getExecutionId() ).a( ')' ).reset();
+ ansi.bold().a( " (" ).a( me.getExecutionId() ).a( ')' ).reset();
}
}
private void appendForkInfo( Ansi ansi, MojoDescriptor md )
{
- ansi.fgBlue();
+ ansi.bold();
if ( StringUtils.isNotEmpty( md.getExecutePhase() ) )
{
// forked phase
http://git-wip-us.apache.org/repos/asf/maven/blob/7d89f058/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
index 485395e..3957464 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
@@ -20,7 +20,6 @@ package org.apache.maven.cli.logging;
*/
import org.codehaus.plexus.logging.Logger;
-import static org.fusesource.jansi.Ansi.ansi;
/**
* Adapt an SLF4J logger to a Plexus logger, ignoring Plexus logger API parts that are not classical and
@@ -72,12 +71,12 @@ public class Slf4jLogger
public void warn( String message )
{
- logger.warn( ansi().fgYellow().a( message ).reset().toString() );
+ logger.warn( message );
}
public void warn( String message, Throwable throwable )
{
- logger.warn( ansi().fgYellow().a( message ).reset().toString(), throwable );
+ logger.warn( message, throwable );
}
public boolean isWarnEnabled()
@@ -87,12 +86,12 @@ public class Slf4jLogger
public void error( String message )
{
- logger.error( ansi().fgRed().a( message ).reset().toString() );
+ logger.error( message );
}
public void error( String message, Throwable throwable )
{
- logger.error( ansi().fgRed().a( message ).reset().toString(), throwable );
+ logger.error( message, throwable );
}
public boolean isErrorEnabled()
@@ -102,12 +101,12 @@ public class Slf4jLogger
public void fatalError( String message )
{
- logger.error( ansi().fgRed().a( message ).reset().toString() );
+ logger.error( message );
}
public void fatalError( String message, Throwable throwable )
{
- logger.error( ansi().fgRed().a( message ).reset().toString(), throwable );
+ logger.error( message, throwable );
}
public boolean isFatalErrorEnabled()
http://git-wip-us.apache.org/repos/asf/maven/blob/7d89f058/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 f18af9e..52e0489 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
@@ -46,20 +46,20 @@ extends com.planet57.gossip.render.PatternRenderer
{
case TRACE:
case DEBUG:
- buff.append( ansi().fgCyan().a( level.name() ).reset() );
+ buff.append( ansi().bold().fgCyan().a( level.name() ).reset() );
break;
case INFO:
- buff.append( ansi().fgBlue().a( level.name() ).reset() );
+ buff.append( ansi().bold().fgBlue().a( level.name() ).reset() );
break;
case WARN:
// Maven uses WARNING instead of WARN
- buff.append( ansi().fgYellow().a( WARNING ).reset() );
+ buff.append( ansi().bold().fgYellow().a( WARNING ).reset() );
break;
case ERROR:
- buff.append( ansi().fgRed().a( level.name() ).reset() );
+ buff.append( ansi().bold().fgRed().a( level.name() ).reset() );
break;
default:
@@ -72,7 +72,7 @@ extends com.planet57.gossip.render.PatternRenderer
{
StringBuilder tmp = new StringBuilder();
super.renderName( event, tmp, shortName );
- buff.append( ansi().fgBlue().a( tmp ).reset() );
+ buff.append( ansi().fgGreen().a( tmp ).reset() );
}
@@ -88,11 +88,11 @@ extends com.planet57.gossip.render.PatternRenderer
return;
}
- buff.append( ansi().fgRed().a( cause.getClass().getName() ).reset() );
+ buff.append( ansi().bold().fgRed().a( cause.getClass().getName() ).reset() );
if ( cause.getMessage() != null )
{
- buff.append( ansi().fgRed().a( ": " ).reset() );
- buff.append( ansi().fgRed().a( cause.getMessage() ).reset() );
+ buff.append( ": " );
+ buff.append( ansi().bold().fgRed().a( cause.getMessage() ).reset() );
}
renderNewLine( buff );
@@ -101,18 +101,21 @@ extends com.planet57.gossip.render.PatternRenderer
for ( StackTraceElement e : cause.getStackTrace() )
{
buff.append( " " );
- buff.append( ansi().a( "at " ).a( e.getClassName() ).a( "." ).a( e.getMethodName() ) );
- buff.append( ansi().a( " (" ).a( getLocation( e ) ).a( ")" ).reset() );
+ buff.append( ansi().bold().a( "at" ).reset().a( " " )
+ .a( e.getClassName() ).a( "." ).a( e.getMethodName() ) );
+ buff.append( ansi().a( " (" ).bold().a( getLocation( e ) ).reset().a( ")" ) );
renderNewLine( buff );
}
cause = cause.getCause();
if ( cause != null )
{
- buff.append( ansi().fgRed().a( "Caused by: " ).a( cause.getClass().getName() ) );
+ buff.append( ansi().bold().a( "Caused by" ).reset().a( ": " )
+ .a( cause.getClass().getName() ) );
if ( cause.getMessage() != null )
{
- buff.append( ansi().fgRed().a( ": " ).a( cause.getMessage() ).reset() );
+ buff.append( ": " );
+ buff.append( ansi().bold().fgRed().a( cause.getMessage() ).reset() );
}
renderNewLine( buff );
}
[13/20] maven git commit: o Updated to remove errors reported by
Checkstyle.
Posted by sc...@apache.org.
o Updated to remove errors reported by Checkstyle.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/cdc87a90
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/cdc87a90
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/cdc87a90
Branch: refs/heads/MNG-6006
Commit: cdc87a909c3160fe521e73aae4ec2c7ef756ca38
Parents: e7a783d
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Jun 14 21:26:56 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Tue Jun 14 21:28:00 2016 +0200
----------------------------------------------------------------------
.../UnknownRepositoryLayoutException.java | 3 +-
.../DefaultArtifactRepositoryFactory.java | 4 +-
.../repository/layout/FlatRepositoryLayout.java | 6 +-
.../artifact/resolver/ArtifactResolver.java | 62 +++++++-------
.../resolver/DefaultArtifactResolver.java | 12 ++-
.../profiles/activation/ProfileActivator.java | 4 +-
.../org/apache/maven/project/ProjectUtils.java | 15 ++--
.../AbstractStringBasedModelInterpolator.java | 22 +++--
.../StringSearchModelInterpolator.java | 14 ++--
.../project/path/DefaultPathTranslator.java | 10 +--
.../repository/MetadataResolutionResult.java | 26 +++---
.../repository/legacy/DefaultWagonManager.java | 85 +++++++++++++-------
.../legacy/LegacyRepositorySystem.java | 31 ++++---
.../maven/repository/legacy/WagonManager.java | 6 +-
.../repository/ArtifactRepositoryFactory.java | 6 +-
.../DefaultLegacyArtifactCollector.java | 84 +++++++++++--------
.../resolver/LegacyArtifactCollector.java | 9 ++-
.../repository/metadata/MetadataGraph.java | 3 +-
.../repository/metadata/MetadataGraphEdge.java | 3 +-
.../MetadataGraphTransformationException.java | 4 +-
.../usability/plugin/ExpressionDocumenter.java | 18 +++--
21 files changed, 247 insertions(+), 180 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java b/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
index cb0af7f..e23bea9 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
@@ -19,12 +19,11 @@ package org.apache.maven.artifact;
* under the License.
*/
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
/**
* Exception which is meant to occur when a layout specified for a particular
- * repository doesn't have a corresponding {@link ArtifactRepositoryLayout}
+ * repository doesn't have a corresponding {@link org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout}
* component in the current container.
*
* @author jdcasey
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
index 658dbda..0f69835 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
@@ -81,7 +81,9 @@ public class DefaultArtifactRepositoryFactory
ArtifactRepositoryPolicy snapshots,
ArtifactRepositoryPolicy releases )
{
- return injectSession( factory.createArtifactRepository( id, url, repositoryLayout, snapshots, releases ), true );
+ return injectSession( factory.createArtifactRepository( id, url, repositoryLayout, snapshots, releases ),
+ true );
+
}
public void setGlobalUpdatePolicy( String updatePolicy )
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
index 8553a31..58143e0 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
@@ -25,15 +25,11 @@ import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.codehaus.plexus.component.annotations.Component;
-/**
- * The code in this class is taken from DefaultRepositorylayout, located at:
- * http://svn.apache.org/viewvc/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
- *
- */
@Component( role = ArtifactRepositoryLayout.class, hint = "flat" )
public class FlatRepositoryLayout
implements ArtifactRepositoryLayout
{
+
private static final char ARTIFACT_SEPARATOR = '-';
private static final char GROUP_SEPARATOR = '.';
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
index 7b5faa1..d36ebde 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
@@ -39,61 +39,60 @@ public interface ArtifactResolver
ArtifactResolutionResult resolve( ArtifactResolutionRequest request );
// The rest is deprecated
-
// USED BY MAVEN ASSEMBLY PLUGIN 2.2-beta-2
@Deprecated
String ROLE = ArtifactResolver.class.getName();
// USED BY SUREFIRE, DEPENDENCY PLUGIN
@Deprecated
- ArtifactResolutionResult resolveTransitively(
- Set<Artifact> artifacts, Artifact originatingArtifact,
- ArtifactRepository localRepository,
- List<ArtifactRepository> remoteRepositories,
- ArtifactMetadataSource source, ArtifactFilter filter )
+ ArtifactResolutionResult resolveTransitively(
+ Set<Artifact> artifacts, Artifact originatingArtifact,
+ ArtifactRepository localRepository,
+ List<ArtifactRepository> remoteRepositories,
+ ArtifactMetadataSource source, ArtifactFilter filter )
throws ArtifactResolutionException, ArtifactNotFoundException;
// USED BY MAVEN ASSEMBLY PLUGIN
@Deprecated
- ArtifactResolutionResult resolveTransitively(
- Set<Artifact> artifacts, Artifact originatingArtifact,
- Map<String,Artifact> managedVersions, ArtifactRepository localRepository,
- List<ArtifactRepository> remoteRepositories,
- ArtifactMetadataSource source )
+ ArtifactResolutionResult resolveTransitively(
+ Set<Artifact> artifacts, Artifact originatingArtifact,
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
+ List<ArtifactRepository> remoteRepositories,
+ ArtifactMetadataSource source )
throws ArtifactResolutionException, ArtifactNotFoundException;
// USED BY MAVEN ASSEMBLY PLUGIN
@Deprecated
- ArtifactResolutionResult resolveTransitively(
- Set<Artifact> artifacts, Artifact originatingArtifact,
- Map<String,Artifact> managedVersions, ArtifactRepository localRepository,
- List<ArtifactRepository> remoteRepositories,
- ArtifactMetadataSource source, ArtifactFilter filter )
+ ArtifactResolutionResult resolveTransitively(
+ Set<Artifact> artifacts, Artifact originatingArtifact,
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
+ List<ArtifactRepository> remoteRepositories,
+ ArtifactMetadataSource source, ArtifactFilter filter )
throws ArtifactResolutionException, ArtifactNotFoundException;
// USED BY INVOKER PLUGIN
@Deprecated
- ArtifactResolutionResult resolveTransitively(
- Set<Artifact> artifacts, Artifact originatingArtifact,
- List<ArtifactRepository> remoteRepositories,
- ArtifactRepository localRepository, ArtifactMetadataSource source )
+ ArtifactResolutionResult resolveTransitively(
+ Set<Artifact> artifacts, Artifact originatingArtifact,
+ List<ArtifactRepository> remoteRepositories,
+ ArtifactRepository localRepository, ArtifactMetadataSource source )
throws ArtifactResolutionException, ArtifactNotFoundException;
@Deprecated
- ArtifactResolutionResult resolveTransitively(
- Set<Artifact> artifacts, Artifact originatingArtifact,
- Map<String,Artifact> managedVersions, ArtifactRepository localRepository,
- List<ArtifactRepository> remoteRepositories,
- ArtifactMetadataSource source, ArtifactFilter filter,
- List<ResolutionListener> listeners )
+ ArtifactResolutionResult resolveTransitively(
+ Set<Artifact> artifacts, Artifact originatingArtifact,
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
+ List<ArtifactRepository> remoteRepositories,
+ ArtifactMetadataSource source, ArtifactFilter filter,
+ List<ResolutionListener> listeners )
throws ArtifactResolutionException, ArtifactNotFoundException;
@Deprecated
- ArtifactResolutionResult resolveTransitively(
- Set<Artifact> artifacts, Artifact originatingArtifact,
- List<ArtifactRepository> remoteRepositories,
- ArtifactRepository localRepository, ArtifactMetadataSource source,
- List<ResolutionListener> listeners )
+ ArtifactResolutionResult resolveTransitively(
+ Set<Artifact> artifacts, Artifact originatingArtifact,
+ List<ArtifactRepository> remoteRepositories,
+ ArtifactRepository localRepository, ArtifactMetadataSource source,
+ List<ResolutionListener> listeners )
throws ArtifactResolutionException, ArtifactNotFoundException;
// USED BY REMOTE RESOURCES PLUGIN, DEPENDENCY PLUGIN, SHADE PLUGIN
@@ -112,4 +111,5 @@ public interface ArtifactResolver
void resolveAlways( Artifact artifact, List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException;
+
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index 5e281c1..6a5f330 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -332,10 +332,16 @@ public class DefaultArtifactResolver
throws ArtifactResolutionException,
ArtifactNotFoundException
{
- ArtifactResolutionRequest request =
- new ArtifactResolutionRequest().setArtifact( originatingArtifact ).setResolveRoot( false )
+ ArtifactResolutionRequest request = new ArtifactResolutionRequest().
+ setArtifact( originatingArtifact ).
+ setResolveRoot( false ).
// This is required by the surefire plugin
- .setArtifactDependencies( artifacts ).setManagedVersionMap( managedVersions ).setLocalRepository( localRepository ).setRemoteRepositories( remoteRepositories ).setCollectionFilter( filter ).setListeners( listeners );
+ setArtifactDependencies( artifacts ).
+ setManagedVersionMap( managedVersions ).
+ setLocalRepository( localRepository ).
+ setRemoteRepositories( remoteRepositories ).
+ setCollectionFilter( filter ).
+ setListeners( listeners );
injectSession2( request, legacySupport.getSession() );
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java b/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java
index d0a9ecb..2688785 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java
@@ -24,10 +24,12 @@ import org.apache.maven.model.Profile;
@Deprecated
public interface ProfileActivator
{
- final String ROLE = ProfileActivator.class.getName();
+
+ String ROLE = ProfileActivator.class.getName();
boolean canDetermineActivation( Profile profile );
boolean isActive( Profile profile )
throws ProfileActivationException;
+
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java b/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
index d15a892..72ea6d1 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
@@ -45,9 +45,8 @@ public final class ProjectUtils
{
}
- public static List<ArtifactRepository> buildArtifactRepositories( List<Repository> repositories,
- ArtifactRepositoryFactory artifactRepositoryFactory,
- PlexusContainer c )
+ public static List<ArtifactRepository> buildArtifactRepositories(
+ List<Repository> repositories, ArtifactRepositoryFactory artifactRepositoryFactory, PlexusContainer c )
throws InvalidRepositoryException
{
@@ -61,17 +60,15 @@ public final class ProjectUtils
return remoteRepositories;
}
- public static ArtifactRepository buildDeploymentArtifactRepository( DeploymentRepository repo,
- ArtifactRepositoryFactory artifactRepositoryFactory,
- PlexusContainer c )
+ public static ArtifactRepository buildDeploymentArtifactRepository(
+ DeploymentRepository repo, ArtifactRepositoryFactory artifactRepositoryFactory, PlexusContainer c )
throws InvalidRepositoryException
{
return buildArtifactRepository( repo, artifactRepositoryFactory, c );
}
- public static ArtifactRepository buildArtifactRepository( Repository repo,
- ArtifactRepositoryFactory artifactRepositoryFactory,
- PlexusContainer c )
+ public static ArtifactRepository buildArtifactRepository(
+ Repository repo, ArtifactRepositoryFactory artifactRepositoryFactory, PlexusContainer c )
throws InvalidRepositoryException
{
RepositorySystem repositorySystem = rs( c );
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
index 634c43a..4a3144a 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
@@ -65,6 +65,7 @@ public abstract class AbstractStringBasedModelInterpolator
extends AbstractLogEnabled
implements ModelInterpolator, Initializable
{
+
private static final List<String> PROJECT_PREFIXES = Arrays.asList( "pom.", "project." );
private static final List<String> TRANSLATED_PATH_EXPRESSIONS;
@@ -122,8 +123,9 @@ public abstract class AbstractStringBasedModelInterpolator
* <br/>
* <b>NOTE:</b> This will result in a different instance of Model being returned!!!
*
- * @param model The inbound Model instance, to serialize and reference for expression resolution
+ * @param model The inbound Model instance, to serialize and reference for expression resolution
* @param context The other context map to be used during resolution
+ *
* @return The resolved instance of the inbound Model. This is a different instance!
*
* @deprecated Use {@link ModelInterpolator#interpolate(Model, File, ProjectBuilderConfiguration, boolean)} instead.
@@ -225,6 +227,7 @@ public abstract class AbstractStringBasedModelInterpolator
ValueSource basedirValueSource = new PrefixedValueSourceWrapper( new AbstractValueSource( false )
{
+
public Object getValue( String expression )
{
if ( projectDir != null && "basedir".equals( expression ) )
@@ -233,9 +236,11 @@ public abstract class AbstractStringBasedModelInterpolator
}
return null;
}
+
}, PROJECT_PREFIXES, true );
ValueSource baseUriValueSource = new PrefixedValueSourceWrapper( new AbstractValueSource( false )
{
+
public Object getValue( String expression )
{
if ( projectDir != null && "baseUri".equals( expression ) )
@@ -244,6 +249,7 @@ public abstract class AbstractStringBasedModelInterpolator
}
return null;
}
+
}, PROJECT_PREFIXES, false );
List<ValueSource> valueSources = new ArrayList<>( 9 );
@@ -258,10 +264,12 @@ public abstract class AbstractStringBasedModelInterpolator
valueSources.add( new MapBasedValueSource( config.getExecutionProperties() ) );
valueSources.add( new AbstractValueSource( false )
{
+
public Object getValue( String expression )
{
return config.getExecutionProperties().getProperty( "env." + expression );
}
+
} );
valueSources.add( modelValueSource2 );
@@ -271,11 +279,13 @@ public abstract class AbstractStringBasedModelInterpolator
protected List<InterpolationPostProcessor> createPostProcessors( final Model model, final File projectDir,
final ProjectBuilderConfiguration config )
{
- return Collections.singletonList( (InterpolationPostProcessor) new PathTranslatingPostProcessor(
- PROJECT_PREFIXES,
- TRANSLATED_PATH_EXPRESSIONS,
- projectDir,
- pathTranslator ) );
+ return Collections.singletonList(
+ (InterpolationPostProcessor) new PathTranslatingPostProcessor(
+ PROJECT_PREFIXES,
+ TRANSLATED_PATH_EXPRESSIONS,
+ projectDir,
+ pathTranslator ) );
+
}
@SuppressWarnings( "unchecked" )
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
index 13ceaf7..ecde27f 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
@@ -47,8 +47,8 @@ public class StringSearchModelInterpolator
extends AbstractStringBasedModelInterpolator
{
- private static final Map<Class<?>, Field[]> fieldsByClass = new WeakHashMap<>();
- private static final Map<Class<?>, Boolean> fieldIsPrimitiveByClass = new WeakHashMap<>();
+ private static final Map<Class<?>, Field[]> FIELDS_BY_CLASS = new WeakHashMap<>();
+ private static final Map<Class<?>, Boolean> PRIMITIVE_BY_CLASS = new WeakHashMap<>();
public StringSearchModelInterpolator()
{
@@ -161,11 +161,11 @@ public class StringSearchModelInterpolator
}
else if ( isQualifiedForInterpolation( cls ) )
{
- Field[] fields = fieldsByClass.get( cls );
+ Field[] fields = FIELDS_BY_CLASS.get( cls );
if ( fields == null )
{
fields = cls.getDeclaredFields();
- fieldsByClass.put( cls, fields );
+ FIELDS_BY_CLASS.put( cls, fields );
}
for ( Field field : fields )
@@ -350,12 +350,12 @@ public class StringSearchModelInterpolator
private boolean isQualifiedForInterpolation( Field field, Class<?> fieldType )
{
- if ( !fieldIsPrimitiveByClass.containsKey( fieldType ) )
+ if ( !PRIMITIVE_BY_CLASS.containsKey( fieldType ) )
{
- fieldIsPrimitiveByClass.put( fieldType, fieldType.isPrimitive() );
+ PRIMITIVE_BY_CLASS.put( fieldType, fieldType.isPrimitive() );
}
- if ( fieldIsPrimitiveByClass.get( fieldType ) )
+ if ( PRIMITIVE_BY_CLASS.get( fieldType ) )
{
return false;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java b/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
index b4061ec..eb3f24d 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
@@ -125,17 +125,13 @@ public class DefaultPathTranslator
if ( s != null )
{
String basedirExpr = null;
- for ( String BASEDIR_EXPRESSION : BASEDIR_EXPRESSIONS )
+ for ( String expression : BASEDIR_EXPRESSIONS )
{
- basedirExpr = BASEDIR_EXPRESSION;
- if ( s.startsWith( basedirExpr ) )
+ if ( s.startsWith( expression ) )
{
+ basedirExpr = expression;
break;
}
- else
- {
- basedirExpr = null;
- }
}
if ( basedirExpr != null )
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
index 8b31f22..b695b8d 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
@@ -333,20 +333,24 @@ public class MetadataResolutionResult
public String toString()
{
- if ( artifacts == null )
- return "";
+ String string = "";
- StringBuilder sb = new StringBuilder( 256 );
- int i = 1;
- sb.append( "---------\n" );
- sb.append( artifacts.size() ).append( '\n' );
- for ( Artifact a : artifacts )
+ if ( artifacts != null )
{
- sb.append( i ).append( ' ' ).append( a ).append( '\n' );
- i++;
+ StringBuilder sb = new StringBuilder( 256 );
+ int i = 1;
+ sb.append( "---------\n" );
+ sb.append( artifacts.size() ).append( '\n' );
+ for ( Artifact a : artifacts )
+ {
+ sb.append( i ).append( ' ' ).append( a ).append( '\n' );
+ i++;
+ }
+ sb.append( "---------\n" );
+ string = sb.toString();
}
- sb.append( "---------\n" );
- return sb.toString();
+
+ return string;
}
public MetadataGraph getResolvedTree()
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
index 6fa72ce..b8835b5 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
@@ -63,10 +63,19 @@ import org.eclipse.aether.util.ConfigUtils;
public class DefaultWagonManager
implements WagonManager
{
- private static final String[] CHECKSUM_IDS = { "md5", "sha1" };
- /** have to match the CHECKSUM_IDS */
- private static final String[] CHECKSUM_ALGORITHMS = { "MD5", "SHA-1" };
+ private static final String[] CHECKSUM_IDS =
+ {
+ "md5", "sha1"
+ };
+
+ /**
+ * have to match the CHECKSUM_IDS
+ */
+ private static final String[] CHECKSUM_ALGORITHMS =
+ {
+ "MD5", "SHA-1"
+ };
@Requirement
private Logger logger;
@@ -80,7 +89,6 @@ public class DefaultWagonManager
@Requirement
private LegacySupport legacySupport;
-
//
// Retriever
//
@@ -96,14 +104,15 @@ public class DefaultWagonManager
if ( !policy.isEnabled() )
{
logger.debug( "Skipping disabled repository " + repository.getId() + " for resolution of "
- + artifact.getId() );
+ + artifact.getId() );
+
}
else if ( artifact.isSnapshot() || !artifact.getFile().exists() )
{
if ( force || updateCheckManager.isUpdateRequired( artifact, repository ) )
{
logger.debug( "Trying repository " + repository.getId() + " for resolution of " + artifact.getId()
- + " from " + remotePath );
+ + " from " + remotePath );
try
{
@@ -133,17 +142,21 @@ public class DefaultWagonManager
String error = updateCheckManager.getError( artifact, repository );
if ( error != null )
{
- throw new TransferFailedException( "Failure to resolve " + remotePath + " from "
- + repository.getUrl() + " was cached in the local repository. "
- + "Resolution will not be reattempted until the update interval of " + repository.getId()
- + " has elapsed or updates are forced. Original error: " + error );
+ throw new TransferFailedException(
+ "Failure to resolve " + remotePath + " from " + repository.getUrl()
+ + " was cached in the local repository. "
+ + "Resolution will not be reattempted until the update interval of "
+ + repository.getId() + " has elapsed or updates are forced. Original error: " + error );
+
}
else
{
- throw new ResourceDoesNotExistException( "Failure to resolve " + remotePath + " from "
- + repository.getUrl() + " was cached in the local repository. "
- + "Resolution will not be reattempted until the update interval of " + repository.getId()
- + " has elapsed or updates are forced." );
+ throw new ResourceDoesNotExistException(
+ "Failure to resolve " + remotePath + " from " + repository.getUrl()
+ + " was cached in the local repository. "
+ + "Resolution will not be reattempted until the update interval of "
+ + repository.getId() + " has elapsed or updates are forced." );
+
}
}
}
@@ -174,7 +187,8 @@ public class DefaultWagonManager
// because we want to cycle through them all before squawking.
logger.debug( "Unable to find artifact " + artifact.getId() + " in repository " + repository.getId()
- + " (" + repository.getUrl() + ")", e );
+ + " (" + repository.getUrl() + ")", e );
+
}
catch ( TransferFailedException e )
{
@@ -183,6 +197,7 @@ public class DefaultWagonManager
String msg =
"Unable to get artifact " + artifact.getId() + " from repository " + repository.getId() + " ("
+ repository.getUrl() + "): " + e.getMessage();
+
if ( logger.isDebugEnabled() )
{
logger.warn( msg, e );
@@ -233,6 +248,7 @@ public class DefaultWagonManager
*
* @param wagon
* @param repository
+ *
* @throws ConnectionException
* @throws AuthenticationException
*/
@@ -241,13 +257,15 @@ public class DefaultWagonManager
{
// MNG-5509
// See org.eclipse.aether.connector.wagon.WagonRepositoryConnector.connectWagon(Wagon)
- if( legacySupport.getRepositorySession() != null )
+ if ( legacySupport.getRepositorySession() != null )
{
- String userAgent = ConfigUtils.getString( legacySupport.getRepositorySession(), null, ConfigurationProperties.USER_AGENT );
- if( userAgent == null)
+ String userAgent = ConfigUtils.getString( legacySupport.getRepositorySession(), null,
+ ConfigurationProperties.USER_AGENT );
+
+ if ( userAgent == null )
{
Properties headers = new Properties();
-
+
headers.put( "User-Agent", ConfigUtils.getString( legacySupport.getRepositorySession(), "Maven",
ConfigurationProperties.USER_AGENT ) );
try
@@ -269,18 +287,21 @@ public class DefaultWagonManager
if ( repository.getProxy() != null && logger.isDebugEnabled() )
{
logger.debug( "Using proxy " + repository.getProxy().getHost() + ":" + repository.getProxy().getPort()
- + " for " + repository.getUrl() );
+ + " for " + repository.getUrl() );
+
}
if ( repository.getAuthentication() != null && repository.getProxy() != null )
{
wagon.connect( new Repository( repository.getId(), repository.getUrl() ), authenticationInfo( repository ),
proxyInfo( repository ) );
+
}
else if ( repository.getAuthentication() != null )
{
wagon.connect( new Repository( repository.getId(), repository.getUrl() ),
authenticationInfo( repository ) );
+
}
else if ( repository.getProxy() != null )
{
@@ -414,10 +435,10 @@ public class DefaultWagonManager
}
catch ( ChecksumFailedException e )
{
- // if we catch a ChecksumFailedException, it means the transfer/read succeeded, but the checksum
- // doesn't match. This could be a problem with the server (ibiblio HTTP-200 error page), so we'll
- // try this up to two times. On the second try, we'll handle it as a bona-fide error, based on the
- // repository's checksum checking policy.
+ // if we catch a ChecksumFailedException, it means the transfer/read succeeded, but the
+ // checksum doesn't match. This could be a problem with the server (ibiblio HTTP-200 error
+ // page), so we'll try this up to two times. On the second try, we'll handle it as a bona-fide
+ // error, based on the repository's checksum checking policy.
if ( firstRun )
{
logger.warn( "*** CHECKSUM FAILED - " + e.getMessage() + " - RETRYING" );
@@ -507,7 +528,6 @@ public class DefaultWagonManager
// File.renameTo operation doesn't really work across file systems.
// So we will attempt to do a File.renameTo for efficiency and atomicity, if this fails
// then we will use a brute force copy and delete the temporary file.
-
if ( !temp.renameTo( destination ) )
{
try
@@ -522,7 +542,8 @@ public class DefaultWagonManager
catch ( IOException e )
{
throw new TransferFailedException( "Error copying temporary file to the final destination: "
- + e.getMessage(), e );
+ + e.getMessage(), e );
+
}
}
}
@@ -642,9 +663,9 @@ public class DefaultWagonManager
cleanupTemporaryFiles( temporaryFiles );
// Remove every checksum listener
- for ( String aCHECKSUM_IDS : CHECKSUM_IDS )
+ for ( String id : CHECKSUM_IDS )
{
- TransferListener checksumListener = checksums.get( aCHECKSUM_IDS );
+ TransferListener checksumListener = checksums.get( id );
if ( checksumListener != null )
{
wagon.removeTransferListener( checksumListener );
@@ -721,7 +742,7 @@ public class DefaultWagonManager
// check for 'ALGO (name) = CHECKSUM' like used by openssl
if ( expectedChecksum.regionMatches( true, 0, "MD", 0, 2 )
- || expectedChecksum.regionMatches( true, 0, "SHA", 0, 3 ) )
+ || expectedChecksum.regionMatches( true, 0, "SHA", 0, 3 ) )
{
int lastSpacePos = expectedChecksum.lastIndexOf( ' ' );
expectedChecksum = expectedChecksum.substring( lastSpacePos + 1 );
@@ -752,7 +773,8 @@ public class DefaultWagonManager
else
{
throw new ChecksumFailedException( "Checksum failed on download: local = '" + actualChecksum
- + "'; remote = '" + expectedChecksum + "'" );
+ + "'; remote = '" + expectedChecksum + "'" );
+
}
}
catch ( IOException e )
@@ -814,7 +836,8 @@ public class DefaultWagonManager
catch ( ComponentLookupException e )
{
throw new UnsupportedProtocolException( "Cannot find wagon which supports the requested protocol: "
- + protocol, e );
+ + protocol, e );
+
}
return wagon;
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
index ba34096..bd5988a 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
@@ -367,22 +367,21 @@ public class LegacyRepositorySystem
return artifactResolver.resolve( request );
}
- /*
- public void addProxy( String protocol, String host, int port, String username, String password, String nonProxyHosts )
- {
- ProxyInfo proxyInfo = new ProxyInfo();
- proxyInfo.setHost( host );
- proxyInfo.setType( protocol );
- proxyInfo.setPort( port );
- proxyInfo.setNonProxyHosts( nonProxyHosts );
- proxyInfo.setUserName( username );
- proxyInfo.setPassword( password );
-
- proxies.put( protocol, proxyInfo );
-
- wagonManager.addProxy( protocol, host, port, username, password, nonProxyHosts );
- }
- */
+// public void addProxy( String protocol, String host, int port, String username, String password,
+// String nonProxyHosts )
+// {
+// ProxyInfo proxyInfo = new ProxyInfo();
+// proxyInfo.setHost( host );
+// proxyInfo.setType( protocol );
+// proxyInfo.setPort( port );
+// proxyInfo.setNonProxyHosts( nonProxyHosts );
+// proxyInfo.setUserName( username );
+// proxyInfo.setPassword( password );
+//
+// proxies.put( protocol, proxyInfo );
+//
+// wagonManager.addProxy( protocol, host, port, username, password, nonProxyHosts );
+// }
public List<ArtifactRepository> getEffectiveRepositories( List<ArtifactRepository> repositories )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
index 73ead26..35fcf42 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
@@ -45,7 +45,8 @@ public interface WagonManager
//
// Retriever
//
- void getArtifact( Artifact artifact, ArtifactRepository repository, TransferListener transferListener, boolean force )
+ void getArtifact( Artifact artifact, ArtifactRepository repository, TransferListener transferListener,
+ boolean force )
throws TransferFailedException, ResourceDoesNotExistException;
void getArtifact( Artifact artifact, List<ArtifactRepository> remoteRepositories,
@@ -71,7 +72,8 @@ public interface WagonManager
TransferListener downloadMonitor )
throws TransferFailedException;
- void putRemoteFile( ArtifactRepository repository, File source, String remotePath, TransferListener downloadMonitor )
+ void putRemoteFile( ArtifactRepository repository, File source, String remotePath,
+ TransferListener downloadMonitor )
throws TransferFailedException;
void putArtifactMetadata( File source, ArtifactMetadata artifactMetadata, ArtifactRepository repository )
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java
index b982f91..aeb5739 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java
@@ -37,7 +37,8 @@ public interface ArtifactRepositoryFactory
throws UnknownRepositoryLayoutException;
@Deprecated
- ArtifactRepository createDeploymentArtifactRepository( String id, String url, String layoutId, boolean uniqueVersion )
+ ArtifactRepository createDeploymentArtifactRepository( String id, String url, String layoutId,
+ boolean uniqueVersion )
throws UnknownRepositoryLayoutException;
ArtifactRepository createDeploymentArtifactRepository( String id, String url, ArtifactRepositoryLayout layout,
@@ -48,7 +49,8 @@ public interface ArtifactRepositoryFactory
throws UnknownRepositoryLayoutException;
ArtifactRepository createArtifactRepository( String id, String url, ArtifactRepositoryLayout repositoryLayout,
- ArtifactRepositoryPolicy snapshots, ArtifactRepositoryPolicy releases );
+ ArtifactRepositoryPolicy snapshots,
+ ArtifactRepositoryPolicy releases );
void setGlobalUpdatePolicy( String snapshotPolicy );
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
index 77fc705..4601eee 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
@@ -63,6 +63,7 @@ import org.codehaus.plexus.logging.Logger;
public class DefaultLegacyArtifactCollector
implements LegacyArtifactCollector
{
+
@Requirement( hint = "nearest" )
private ConflictResolver defaultConflictResolver;
@@ -102,7 +103,8 @@ public class DefaultLegacyArtifactCollector
}
public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
- Map<String, Artifact> managedVersions, ArtifactResolutionRequest repositoryRequest,
+ Map<String, Artifact> managedVersions,
+ ArtifactResolutionRequest repositoryRequest,
ArtifactMetadataSource source, ArtifactFilter filter,
List<ResolutionListener> listeners,
List<ConflictResolver> conflictResolvers )
@@ -206,7 +208,8 @@ public class DefaultLegacyArtifactCollector
* @param originatingArtifact artifact we are processing
* @param managedVersions original managed versions
*/
- private ManagedVersionMap getManagedVersionsMap( Artifact originatingArtifact, Map<String,Artifact> managedVersions )
+ private ManagedVersionMap getManagedVersionsMap( Artifact originatingArtifact,
+ Map<String, Artifact> managedVersions )
{
ManagedVersionMap versionMap;
if ( ( managedVersions != null ) && ( managedVersions instanceof ManagedVersionMap ) )
@@ -218,7 +221,7 @@ public class DefaultLegacyArtifactCollector
versionMap = new ManagedVersionMap( managedVersions );
}
- /* remove the originating artifact if it is also in managed versions to avoid being modified during resolution */
+ // remove the originating artifact if it is also in managed versions to avoid being modified during resolution
Artifact managedOriginatingArtifact = versionMap.get( originatingArtifact.getDependencyConflictId() );
if ( managedOriginatingArtifact != null )
@@ -286,7 +289,10 @@ public class DefaultLegacyArtifactCollector
// Select an appropriate available version from the (now restricted) range
// Note this version was selected before to get the appropriate POM
// But it was reset by the call to setVersionRange on restricting the version
- ResolutionNode[] resetNodes = { previous, node };
+ ResolutionNode[] resetNodes =
+ {
+ previous, node
+ };
for ( int j = 0; j < 2; j++ )
{
Artifact resetArtifact = resetNodes[j].getArtifact();
@@ -306,6 +312,7 @@ public class DefaultLegacyArtifactCollector
{
MetadataResolutionRequest metadataRequest =
new DefaultMetadataResolutionRequest( request );
+
metadataRequest.setArtifact( resetArtifact );
versions = source.retrieveAvailableVersions( metadataRequest );
resetArtifact.setAvailableVersions( versions );
@@ -314,25 +321,29 @@ public class DefaultLegacyArtifactCollector
{
resetArtifact.setDependencyTrail( node.getDependencyTrail() );
throw new ArtifactResolutionException(
- "Unable to get dependency information: "
- + e.getMessage(), resetArtifact,
- request.getRemoteRepositories(), e );
+ "Unable to get dependency information: "
+ + e.getMessage(), resetArtifact, request.getRemoteRepositories(),
+ e );
+
}
}
// end hack
// MNG-2861: match version can return null
- ArtifactVersion selectedVersion =
- resetArtifact.getVersionRange().matchVersion( resetArtifact.getAvailableVersions() );
+ ArtifactVersion selectedVersion = resetArtifact.getVersionRange().
+ matchVersion( resetArtifact.getAvailableVersions() );
+
if ( selectedVersion != null )
{
resetArtifact.selectVersion( selectedVersion.toString() );
}
else
{
- throw new OverConstrainedVersionException( " Unable to find a version in "
- + resetArtifact.getAvailableVersions() + " to match the range "
- + resetArtifact.getVersionRange(), resetArtifact );
+ throw new OverConstrainedVersionException(
+ "Unable to find a version in " + resetArtifact.getAvailableVersions()
+ + " to match the range " + resetArtifact.getVersionRange(),
+ resetArtifact );
+
}
fireEvent( ResolutionListener.SELECT_VERSION_FROM_RANGE, listeners, resetNodes[j] );
@@ -342,7 +353,8 @@ public class DefaultLegacyArtifactCollector
// Conflict Resolution
ResolutionNode resolved = null;
- for ( Iterator<ConflictResolver> j = conflictResolvers.iterator(); ( resolved == null ) && j.hasNext(); )
+ for ( Iterator<ConflictResolver> j = conflictResolvers.iterator();
+ resolved == null && j.hasNext(); )
{
ConflictResolver conflictResolver = j.next();
@@ -354,8 +366,10 @@ public class DefaultLegacyArtifactCollector
// TODO: add better exception that can detail the two conflicting artifacts
ArtifactResolutionException are =
new ArtifactResolutionException( "Cannot resolve artifact version conflict between "
- + previous.getArtifact().getVersion() + " and " + node.getArtifact().getVersion(),
+ + previous.getArtifact().getVersion() + " and "
+ + node.getArtifact().getVersion(),
previous.getArtifact() );
+
result.addVersionRangeViolation( are );
}
@@ -363,8 +377,9 @@ public class DefaultLegacyArtifactCollector
{
// TODO: add better exception
result.addVersionRangeViolation( new ArtifactResolutionException(
- "Conflict resolver returned unknown resolution node: ",
- resolved.getArtifact() ) );
+ "Conflict resolver returned unknown resolution node: ",
+ resolved.getArtifact() ) );
+
}
// TODO: should this be part of mediation?
@@ -509,15 +524,16 @@ public class DefaultLegacyArtifactCollector
if ( versions.isEmpty() )
{
throw new OverConstrainedVersionException(
- "No versions are present in the repository for the artifact with a range "
- + versionRange,
- artifact,
- childRemoteRepositories );
+ "No versions are present in the repository for the artifact"
+ + " with a range " + versionRange, artifact,
+ childRemoteRepositories );
+
}
- throw new OverConstrainedVersionException( "Couldn't find a version in "
- + versions + " to match range " + versionRange, artifact,
- childRemoteRepositories );
+ throw new OverConstrainedVersionException(
+ "Couldn't find a version in " + versions + " to match range "
+ + versionRange, artifact, childRemoteRepositories );
+
}
}
else
@@ -536,10 +552,10 @@ public class DefaultLegacyArtifactCollector
break;
}
}
- while( !childKey.equals( child.getKey() ) );
+ while ( !childKey.equals( child.getKey() ) );
if ( parentArtifact != null && parentArtifact.getDependencyFilter() != null
- && !parentArtifact.getDependencyFilter().include( artifact ) )
+ && !parentArtifact.getDependencyFilter().include( artifact ) )
{
// MNG-3769: the [probably relocated] artifact is excluded.
// We could process exclusions on relocated artifact details in the
@@ -574,7 +590,9 @@ public class DefaultLegacyArtifactCollector
artifact.setDependencyTrail( node.getDependencyTrail() );
throw new ArtifactResolutionException( "Unable to get dependency information for "
- + artifact.getId() + ": " + e.getMessage(), artifact, childRemoteRepositories, e );
+ + artifact.getId() + ": " + e.getMessage(),
+ artifact, childRemoteRepositories, e );
+
}
ArtifactResolutionRequest subRequest = new ArtifactResolutionRequest( metadataRequest );
@@ -583,6 +601,7 @@ public class DefaultLegacyArtifactCollector
subRequest.setProxies( request.getProxies() );
recurse( result, child, resolvedArtifacts, managedVersions, subRequest, source, filter,
listeners, conflictResolvers );
+
}
}
catch ( OverConstrainedVersionException e )
@@ -610,9 +629,8 @@ public class DefaultLegacyArtifactCollector
// explicit child override depMgmt (viz. depMgmt should only
// provide defaults to children, but should override transitives).
// We can do this by calling isChildOfRootNode on the current node.
-
if ( ( artifact.getVersion() != null )
- && ( !node.isChildOfRootNode() || node.getArtifact().getVersion() == null ) )
+ && ( !node.isChildOfRootNode() || node.getArtifact().getVersion() == null ) )
{
fireEvent( ResolutionListener.MANAGE_ARTIFACT_VERSION, listeners, node, artifact );
node.getArtifact().setVersion( artifact.getVersion() );
@@ -625,7 +643,7 @@ public class DefaultLegacyArtifactCollector
}
if ( Artifact.SCOPE_SYSTEM.equals( node.getArtifact().getScope() ) && ( node.getArtifact().getFile() == null )
- && ( artifact.getFile() != null ) )
+ && ( artifact.getFile() != null ) )
{
fireEvent( ResolutionListener.MANAGE_ARTIFACT_SYSTEM_PATH, listeners, node, artifact );
node.getArtifact().setFile( artifact.getFile() );
@@ -648,15 +666,15 @@ public class DefaultLegacyArtifactCollector
/* farthest is runtime and nearest has lower priority, change to runtime */
if ( Artifact.SCOPE_RUNTIME.equals( farthestArtifact.getScope() )
- && ( Artifact.SCOPE_TEST.equals( nearestArtifact.getScope() )
- || Artifact.SCOPE_PROVIDED.equals( nearestArtifact.getScope() ) ) )
+ && ( Artifact.SCOPE_TEST.equals( nearestArtifact.getScope() )
+ || Artifact.SCOPE_PROVIDED.equals( nearestArtifact.getScope() ) ) )
{
updateScope = true;
}
/* farthest is compile and nearest is not (has lower priority), change to compile */
if ( Artifact.SCOPE_COMPILE.equals( farthestArtifact.getScope() )
- && !Artifact.SCOPE_COMPILE.equals( nearestArtifact.getScope() ) )
+ && !Artifact.SCOPE_COMPILE.equals( nearestArtifact.getScope() ) )
{
updateScope = true;
}
@@ -762,7 +780,7 @@ public class DefaultLegacyArtifactCollector
break;
case ResolutionListener.RESTRICT_RANGE:
if ( node.getArtifact().getVersionRange().hasRestrictions()
- || replacement.getVersionRange().hasRestrictions() )
+ || replacement.getVersionRange().hasRestrictions() )
{
listener.restrictRange( node.getArtifact(), replacement, newRange );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java
index 133bd58..4045258 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java
@@ -42,19 +42,22 @@ import org.apache.maven.repository.legacy.resolver.conflict.ConflictResolver;
public interface LegacyArtifactCollector
{
- ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact, Map<String, Artifact> managedVersions,
+ ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
+ Map<String, Artifact> managedVersions,
ArtifactResolutionRequest repositoryRequest, ArtifactMetadataSource source,
ArtifactFilter filter, List<ResolutionListener> listeners,
List<ConflictResolver> conflictResolvers );
- ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact, Map<String, Artifact> managedVersions,
+ ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
+ Map<String, Artifact> managedVersions,
ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter,
List<ResolutionListener> listeners, List<ConflictResolver> conflictResolvers );
// used by maven-dependency-tree and maven-dependency-plugin
@Deprecated
- ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact, Map<String, Artifact> managedVersions,
+ ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
+ Map<String, Artifact> managedVersions,
ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter,
List<ResolutionListener> listeners );
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
index cdc824d..532cd3c 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
@@ -104,7 +104,8 @@ public class MetadataGraph
*
* @param tree "dirty" tree root
* @param versionedVertices true if graph nodes should be versioned (different versions -> different nodes)
- * @param scopedVertices true if graph nodes should be versioned and scoped (different versions and/or scopes -> different nodes)
+ * @param scopedVertices true if graph nodes should be versioned and scoped
+ * (different versions and/or scopes -> different nodes)
*
*/
public MetadataGraph( MetadataTreeNode tree, boolean versionedVertices, boolean scopedVertices )
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
index 5f16df0..5a4c106 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
@@ -88,7 +88,8 @@ public class MetadataGraphEdge
MetadataGraphEdge e = (MetadataGraphEdge) o;
return objectsEqual( version, e.version )
- && ArtifactScopeEnum.checkScope( scope ).getScope().equals( ArtifactScopeEnum.checkScope( e.scope ).getScope() )
+ && ArtifactScopeEnum.checkScope( scope ).getScope().
+ equals( ArtifactScopeEnum.checkScope( e.scope ).getScope() )
&& depth == e.depth;
}
return false;
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java
index 16a34a8..7861b48 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java
@@ -21,12 +21,12 @@ package org.apache.maven.repository.metadata;
/**
* @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
- *
*/
public class MetadataGraphTransformationException
extends Exception
{
- private static final long serialVersionUID = -4029897098314019152L;
+
+ private static final long serialVersionUID = -4029897098314019152L;
public MetadataGraphTransformationException()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/cdc87a90/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java b/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
index 65bd9cf..b5e606d 100644
--- a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
+++ b/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
@@ -38,7 +38,10 @@ import java.util.Map;
public class ExpressionDocumenter
{
- private static final String[] EXPRESSION_ROOTS = { "project", "settings", "session", "plugin", "rootless" };
+ private static final String[] EXPRESSION_ROOTS =
+ {
+ "project", "settings", "session", "plugin", "rootless"
+ };
private static final String EXPRESSION_DOCO_ROOTPATH = "META-INF/maven/plugin-expressions/";
@@ -53,10 +56,10 @@ public class ExpressionDocumenter
ClassLoader docLoader = initializeDocLoader();
- for ( String EXPRESSION_ROOT : EXPRESSION_ROOTS )
+ for ( String root : EXPRESSION_ROOTS )
{
try ( InputStream docStream = docLoader.getResourceAsStream(
- EXPRESSION_DOCO_ROOTPATH + EXPRESSION_ROOT + ".paramdoc.xml" ) )
+ EXPRESSION_DOCO_ROOTPATH + root + ".paramdoc.xml" ) )
{
if ( docStream != null )
{
@@ -68,12 +71,12 @@ public class ExpressionDocumenter
catch ( IOException e )
{
throw new ExpressionDocumentationException(
- "Failed to read documentation for expression root: " + EXPRESSION_ROOT, e );
+ "Failed to read documentation for expression root: " + root, e );
}
catch ( XmlPullParserException e )
{
throw new ExpressionDocumentationException(
- "Failed to parse documentation for expression root: " + EXPRESSION_ROOT, e );
+ "Failed to parse documentation for expression root: " + root, e );
}
}
@@ -161,7 +164,10 @@ public class ExpressionDocumenter
"Cannot construct expression documentation classpath" + " resource base.", e );
}
- return new URLClassLoader( new URL[]{ docResource } );
+ return new URLClassLoader( new URL[]
+ {
+ docResource
+ } );
}
}