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/12/18 03:26:56 UTC
[1/3] maven git commit: Revert "[MNG-5457] Show repository id when
downloading or uploading from/to a remote repository"
Repository: maven
Updated Branches:
refs/heads/master 8a1b6359f -> 286c7ffba
Revert "[MNG-5457] Show repository id when downloading or uploading from/to a remote repository"
This reverts commit 8a1b6359f31178ce804018cfb524e72f1178028a.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/2385484a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/2385484a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/2385484a
Branch: refs/heads/master
Commit: 2385484a813edc157ba151c9daa0625eaf8902f9
Parents: 8a1b635
Author: Christian Schulte <sc...@apache.org>
Authored: Sun Dec 18 04:24:02 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Sun Dec 18 04:24:02 2016 +0100
----------------------------------------------------------------------
.../transfer/AbstractMavenTransferListener.java | 32 +++++++-------------
.../transfer/Slf4jMavenTransferListener.java | 31 ++++++-------------
2 files changed, 21 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/2385484a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
index 2286510..e72aa47 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
@@ -23,6 +23,7 @@ import java.io.PrintStream;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.util.Locale;
+
import org.apache.commons.lang3.Validate;
import org.eclipse.aether.transfer.AbstractTransferListener;
import org.eclipse.aether.transfer.TransferCancelledException;
@@ -216,15 +217,9 @@ public abstract class AbstractMavenTransferListener
public void transferInitiated( TransferEvent event )
{
String type = event.getRequestType() == TransferEvent.RequestType.PUT ? "Uploading" : "Downloading";
- String direction = event.getRequestType() == TransferEvent.RequestType.PUT ? "to" : "from";
TransferResource resource = event.getResource();
- StringBuilder message = new StringBuilder();
- message.append( type ).append( ' ' ).append( direction ).append( ' ' ).append( resource.getRepositoryId() );
- message.append( ": " );
- message.append( resource.getRepositoryUrl() ).append( resource.getResourceName() );
-
- out.println( message.toString() );
+ out.println( type + ": " + resource.getRepositoryUrl() + resource.getResourceName() );
}
@Override
@@ -232,35 +227,30 @@ public abstract class AbstractMavenTransferListener
throws TransferCancelledException
{
TransferResource resource = event.getResource();
- out.println( "[WARNING] " + event.getException().getMessage() + " from " + resource.getRepositoryId() + " for "
- + resource.getRepositoryUrl() + resource.getResourceName() );
+ out.println( "[WARNING] " + event.getException().getMessage() + " for " + resource.getRepositoryUrl()
+ + resource.getResourceName() );
}
@Override
public void transferSucceeded( TransferEvent event )
{
- String type = ( event.getRequestType() == TransferEvent.RequestType.PUT ? "Uploaded" : "Downloaded" );
- String direction = event.getRequestType() == TransferEvent.RequestType.PUT ? "to" : "from";
-
TransferResource resource = event.getResource();
long contentLength = event.getTransferredBytes();
- FileSizeFormat format = new FileSizeFormat( Locale.ENGLISH );
- StringBuilder message = new StringBuilder();
- message.append( type ).append( ' ' ).append( direction ).append( ' ' ).append( resource.getRepositoryId() );
- message.append( ": " );
- message.append( resource.getRepositoryUrl() ).append( resource.getResourceName() );
- message.append( " (" ).append( format.format( contentLength ) );
+ FileSizeFormat format = new FileSizeFormat( Locale.ENGLISH );
+ String type = ( event.getRequestType() == TransferEvent.RequestType.PUT ? "Uploaded" : "Downloaded" );
+ String len = format.format( contentLength );
+ String throughput = "";
long duration = System.currentTimeMillis() - resource.getTransferStartTime();
if ( duration > 0L )
{
double bytesPerSecond = contentLength / ( duration / 1000.0 );
- message.append( " at " ).append( format.format( (long) bytesPerSecond ) ).append( "/s" );
+ throughput = " at " + format.format( (long) bytesPerSecond ) + "/s";
}
- message.append( ')' );
- out.println( message.toString() );
+ out.println( type + ": " + resource.getRepositoryUrl() + resource.getResourceName() + " (" + len
+ + throughput + ")" );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/2385484a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
index 5d1144a..5bfb7b4 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
@@ -50,15 +50,9 @@ public class Slf4jMavenTransferListener
public void transferInitiated( TransferEvent event )
{
String type = event.getRequestType() == TransferEvent.RequestType.PUT ? "Uploading" : "Downloading";
- String direction = event.getRequestType() == TransferEvent.RequestType.PUT ? "to" : "from";
TransferResource resource = event.getResource();
- StringBuilder message = new StringBuilder();
- message.append( type ).append( ' ' ).append( direction ).append( ' ' ).append( resource.getRepositoryId() );
- message.append( ": " );
- message.append( resource.getRepositoryUrl() ).append( resource.getResourceName() );
-
- out.info( message.toString() );
+ out.info( type + ": " + resource.getRepositoryUrl() + resource.getResourceName() );
}
@Override
@@ -66,35 +60,30 @@ public class Slf4jMavenTransferListener
throws TransferCancelledException
{
TransferResource resource = event.getResource();
- out.warn( event.getException().getMessage() + " from " + resource.getRepositoryId() + " for "
- + resource.getRepositoryUrl() + resource.getResourceName() );
+ out.warn( event.getException().getMessage() + " for " + resource.getRepositoryUrl()
+ + resource.getResourceName() );
}
@Override
public void transferSucceeded( TransferEvent event )
{
- String type = ( event.getRequestType() == TransferEvent.RequestType.PUT ? "Uploaded" : "Downloaded" );
- String direction = event.getRequestType() == TransferEvent.RequestType.PUT ? "to" : "from";
-
TransferResource resource = event.getResource();
long contentLength = event.getTransferredBytes();
- FileSizeFormat format = new FileSizeFormat( Locale.ENGLISH );
- StringBuilder message = new StringBuilder();
- message.append( type ).append( ' ' ).append( direction ).append( ' ' ).append( resource.getRepositoryId() );
- message.append( ": " );
- message.append( resource.getRepositoryUrl() ).append( resource.getResourceName() );
- message.append( " (" ).append( format.format( contentLength ) );
+ FileSizeFormat format = new FileSizeFormat( Locale.ENGLISH );
+ String type = ( event.getRequestType() == TransferEvent.RequestType.PUT ? "Uploaded" : "Downloaded" );
+ String len = format.format( contentLength );
+ String throughput = "";
long duration = System.currentTimeMillis() - resource.getTransferStartTime();
if ( duration > 0L )
{
double bytesPerSecond = contentLength / ( duration / 1000.0 );
- message.append( " at " ).append( format.format( (long) bytesPerSecond ) ).append( "/s" );
+ throughput = " at " + format.format( (long) bytesPerSecond ) + "/s";
}
- message.append( ')' );
- out.info( message.toString() );
+ out.info( type + ": " + resource.getRepositoryUrl() + resource.getResourceName() + " (" + len
+ + throughput + ")" );
}
}
[2/3] maven git commit: [MNG-6135] Maven plugins and core extensions
are not dependencies, they should be resolved the same way as projects.
Posted by sc...@apache.org.
[MNG-6135] Maven plugins and core extensions are not dependencies, they should be resolved the same way as projects.
o Simplified selectors.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/80f2fd63
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/80f2fd63
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/80f2fd63
Branch: refs/heads/master
Commit: 80f2fd6375ad5311031929c1bbaf87aa42a3c53a
Parents: 2385484
Author: Christian Schulte <sc...@apache.org>
Authored: Sun Dec 18 04:24:32 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Sun Dec 18 04:24:32 2016 +0100
----------------------------------------------------------------------
.../maven/plugin/internal/PlexusUtilsInjector.java | 15 ++++++---------
.../apache/maven/plugin/internal/WagonExcluder.java | 7 +------
2 files changed, 7 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/80f2fd63/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
index a69633f..eb36957 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
@@ -68,16 +68,13 @@ class PlexusUtilsInjector
find:
{
- if ( node.getDependency() != null )
+ if ( AID.equals( node.getArtifact().getArtifactId() )
+ && GID.equals( node.getArtifact().getGroupId() )
+ && EXT.equals( node.getArtifact().getExtension() )
+ && "".equals( node.getArtifact().getClassifier() ) )
{
- Artifact artifact = node.getDependency().getArtifact();
-
- if ( AID.equals( artifact.getArtifactId() ) && GID.equals( artifact.getGroupId() )
- && EXT.equals( artifact.getExtension() ) && "".equals( artifact.getClassifier() ) )
- {
- plexusUtils = node;
- break find;
- }
+ plexusUtils = node;
+ break find;
}
for ( DependencyNode child : node.getChildren() )
http://git-wip-us.apache.org/repos/asf/maven/blob/80f2fd63/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
index 8c21405..94a4814 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
@@ -58,12 +58,7 @@ class WagonExcluder
{
WagonExcluder child = this;
- if ( context.getDependency() == null && this.coreArtifact )
- {
- child = new WagonExcluder( false );
- }
- if ( context.getDependency() != null && !this.coreArtifact
- && isLegacyCoreArtifact( context.getDependency().getArtifact() ) )
+ if ( isLegacyCoreArtifact( context.getArtifact() ) && !this.coreArtifact )
{
child = new WagonExcluder( true );
}
[3/3] maven git commit: [MNG-6135] Maven plugins and core extensions
are not dependencies, they should be resolved the same way as projects.
Posted by sc...@apache.org.
[MNG-6135] Maven plugins and core extensions are not dependencies, they should be resolved the same way as projects.
o Updated to add missing 'ExclusionDependencySelector'.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/286c7ffb
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/286c7ffb
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/286c7ffb
Branch: refs/heads/master
Commit: 286c7ffba1696053274c5da6cad4336f678fceee
Parents: 80f2fd6
Author: Christian Schulte <sc...@apache.org>
Authored: Sun Dec 18 04:25:56 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Sun Dec 18 04:25:56 2016 +0100
----------------------------------------------------------------------
.../maven/plugin/internal/DefaultPluginDependenciesResolver.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/286c7ffb/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
index 95e1cb8..609df1b 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
@@ -58,6 +58,7 @@ import org.eclipse.aether.util.artifact.JavaScopes;
import org.eclipse.aether.util.filter.AndDependencyFilter;
import org.eclipse.aether.util.filter.ScopeDependencyFilter;
import org.eclipse.aether.util.graph.selector.AndDependencySelector;
+import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector;
import org.eclipse.aether.util.graph.transformer.ChainedDependencyGraphTransformer;
import org.eclipse.aether.util.repository.SimpleArtifactDescriptorPolicy;
@@ -280,7 +281,8 @@ public class DefaultPluginDependenciesResolver
try
{
final DependencySelector pluginDependencySelector =
- new AndDependencySelector( new PluginDependencySelector(), new WagonExcluder() );
+ new AndDependencySelector( new PluginDependencySelector(), new ExclusionDependencySelector(),
+ new WagonExcluder() );
final DependencyGraphTransformer pluginDependencyGraphTransformer =
ChainedDependencyGraphTransformer.newInstance( session.getDependencyGraphTransformer(), transformer );