[1/3] maven git commit: [MNG-6180] groupId has plain color when goal fails [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-6057 bb722723e -> d45c316b1 (forced update)
[MNG-6180] groupId has plain color when goal fails
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8f025faa
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8f025faa
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8f025faa
Branch: refs/heads/MNG-6057
Commit: 8f025faab8fe0a3a6dbf3b76742fe365f4352e64
Parents: 34afec6
Author: rfscholte
Authored: Sun Mar 5 17:25:43 2017 +0100
Committer: rfscholte
Committed: Fri Mar 10 10:48:41 2017 +0100
--
.../org/apache/maven/lifecycle/LifecycleExecutionException.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/8f025faa/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 62ae269..0831a4f 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,8 +84,9 @@ public class LifecycleExecutionException
if ( execution != null )
{
-buffer.a( ' ' ).a( execution.getGroupId() ).a( ':' );
-buffer.mojo( execution.getArtifactId() + ':' +
execution.getVersion() + ':' + execution.getGoal() );
+buffer.a( ' ' );
+buffer.mojo( execution.getGroupId() + ':' +
execution.getArtifactId() + ':' + execution.getVersion() + ':'
++ execution.getGoal() );
buffer.a( ' ' ).strong( '(' + execution.getExecutionId() + ')' );
}
[2/3] maven git commit: [MNG-6176] Javadoc errors prevent release with Java 8 Upgrade modello to 1.9.0 Fix invalid Javadoc
[MNG-6176] Javadoc errors prevent release with Java 8 Upgrade modello to 1.9.0 Fix invalid Javadoc Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/587317b0 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/587317b0 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/587317b0 Branch: refs/heads/MNG-6057 Commit: 587317b0095fc5d51041fed9e5b4786246a29a7b Parents: 8f025fa Author: rfscholte Authored: Fri Mar 10 16:17:28 2017 +0100 Committer: rfscholte Committed: Fri Mar 10 16:17:28 2017 +0100 -- .../artifact/versioning/ComparableVersion.java | 8 +++--- .../maven/artifact/versioning/VersionRange.java | 5 ++-- maven-compat/pom.xml| 12 + .../resolver/ArtifactResolutionResult.java | 13 +++--- .../maven/artifact/resolver/ResolutionNode.java | 2 +- .../maven/execution/MojoExecutionEvent.java | 4 ++- .../maven/execution/MojoExecutionListener.java | 4 ++- .../maven/execution/ProjectExecutionEvent.java | 4 ++- .../execution/ProjectExecutionListener.java | 4 ++- .../scope/WeakMojoExecutionListener.java| 3 ++- .../lifecycle/MojoExecutionConfigurator.java| 5 ++-- .../lifecycle/internal/BuildListCalculator.java | 3 ++- ...DefaultLifecycleExecutionPlanCalculator.java | 4 +-- .../DefaultLifecyclePluginAnalyzer.java | 4 +-- .../DefaultLifecycleTaskSegmentCalculator.java | 6 ++--- .../lifecycle/internal/DependencyContext.java | 7 ++--- .../lifecycle/internal/ExecutionPlanItem.java | 5 ++-- .../maven/lifecycle/internal/GoalTask.java | 5 ++-- .../internal/LifecycleDebugLogger.java | 5 ++-- .../internal/LifecycleDependencyResolver.java | 6 ++--- .../LifecycleExecutionPlanCalculator.java | 1 - .../internal/LifecycleModuleBuilder.java| 7 ++--- .../internal/LifecyclePluginResolver.java | 3 +-- .../maven/lifecycle/internal/LifecycleTask.java | 5 ++-- .../LifecycleTaskSegmentCalculator.java | 6 ++--- .../internal/MojoDescriptorCreator.java | 5 ++-- .../maven/lifecycle/internal/MojoExecutor.java | 5 ++-- .../maven/lifecycle/internal/PhaseRecorder.java | 3 +-- .../internal/ProjectArtifactFactory.java| 4 ++- .../lifecycle/internal/ProjectBuildList.java| 5 ++-- .../maven/lifecycle/internal/ProjectIndex.java | 5 ++-- .../lifecycle/internal/ProjectSegment.java | 18 - .../maven/lifecycle/internal/TaskSegment.java | 4 +-- .../lifecycle/internal/builder/Builder.java | 5 ++-- .../ConcurrencyDependencyGraph.java | 5 ++-- .../multithreaded/MultiThreadedBuilder.java | 4 +-- .../multithreaded/ThreadOutputMuxer.java| 8 +++--- .../PluginParameterExpressionEvaluator.java | 2 +- .../internal/DefaultMavenPluginManager.java | 10 +--- .../org/apache/maven/project/MavenProject.java | 9 +++ .../project/RepositorySessionDecorator.java | 2 +- .../maven/repository/ArtifactTransferEvent.java | 4 +-- .../legacy/metadata/ArtifactMetadataSource.java | 6 ++--- .../maven/toolchain/ToolchainPrivate.java | 2 +- .../java/org/apache/maven/cli/MavenCli.java | 4 --- .../maven/cli/event/ExecutionEventLogger.java | 6 +++-- .../model/interpolation/ModelInterpolator.java | 2 -- .../apache/maven/model/merge/ModelMerger.java | 4 +-- maven-model/src/main/mdo/maven.mdo | 14 +- .../org/apache/maven/plugin/AbstractMojo.java | 27 +--- .../org/apache/maven/plugin/ContextEnabled.java | 3 +-- .../main/java/org/apache/maven/plugin/Mojo.java | 9 +++ .../maven/plugin/MojoExecutionException.java| 3 +-- .../maven/plugin/MojoFailureException.java | 3 +-- .../maven/plugin/descriptor/MojoDescriptor.java | 3 +-- .../org/apache/maven/plugin/logging/Log.java| 27 +++- .../ArtifactDescriptorReaderDelegate.java | 2 +- maven-settings/src/main/mdo/settings.mdo| 2 +- pom.xml | 2 +- 59 files changed, 186 insertions(+), 162 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java -- diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java index f434ef0..5222871 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java @@ -29,9 +29,11 @@ import java.util.Properties; import java.ut
[3/3] maven git commit: [MNG-6090] CI friendly properties break submodule builds [MNG-6057] Problem with CI friendly usage of ${..} reactor order is changed o Based on the missing replacement of the v
[MNG-6090] CI friendly properties break submodule builds
[MNG-6057] Problem with CI friendly usage of ${..} reactor order is changed
o Based on the missing replacement of the versions ${revision}
${changelist} or ${sha1} within the parent element the order
of the reactor changes.
[MNG-5895] Problem with CI friendly usage of ${..} which is already
defined via property in pom file.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d45c316b
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d45c316b
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d45c316b
Branch: refs/heads/MNG-6057
Commit: d45c316b147c8e7512722d94001f7a742b3651c2
Parents: 587317b
Author: Karl Heinz Marbaise
Authored: Tue Sep 29 11:46:48 2015 +0200
Committer: Karl Heinz Marbaise
Committed: Sat Mar 11 11:58:04 2017 +0100
--
.../resolver/DefaultArtifactResolver.java | 46
.../model/building/DefaultModelBuilder.java | 35 +--
.../AbstractStringBasedModelInterpolator.java | 33 +++---
3 files changed, 77 insertions(+), 37 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/d45c316b/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 b78846b..93a5919 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
@@ -22,10 +22,12 @@ package org.apache.maven.artifact.resolver;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
@@ -149,21 +151,21 @@ public class DefaultArtifactResolver
public void resolve( Artifact artifact, List
remoteRepositories,
ArtifactRepository localRepository, TransferListener
resolutionListener )
- throws ArtifactResolutionException,
ArtifactNotFoundException
+throws ArtifactResolutionException, ArtifactNotFoundException
{
resolve( artifact, remoteRepositories, getSession( localRepository ) );
}
public void resolveAlways( Artifact artifact, List
remoteRepositories,
ArtifactRepository localRepository )
- throws ArtifactResolutionException,
ArtifactNotFoundException
+throws ArtifactResolutionException, ArtifactNotFoundException
{
resolve( artifact, remoteRepositories, getSession( localRepository ) );
}
private void resolve( Artifact artifact, List
remoteRepositories,
RepositorySystemSession session )
- throws ArtifactResolutionException,
ArtifactNotFoundException
+throws ArtifactResolutionException, ArtifactNotFoundException
{
if ( artifact == null )
{
@@ -255,8 +257,7 @@ public class DefaultArtifactResolver
ArtifactRepository
localRepository,
List remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter )
- throws
ArtifactResolutionException,
-
ArtifactNotFoundException
+throws ArtifactResolutionException, ArtifactNotFoundException
{
return resolveTransitively( artifacts, originatingArtifact,
Collections.EMPTY_MAP, localRepository,
remoteRepositories, source, filter );
@@ -268,8 +269,7 @@ public class DefaultArtifactResolver
ArtifactRepository
localRepository,
List remoteRepositories,
ArtifactMetadataSource source )
- throws
ArtifactResolutionException,
-
ArtifactNotFoundException
+throws ArtifactResolutionException, ArtifactNotF
[4/6] maven git commit: [MNG-6180] groupId has plain color when goal fails
[MNG-6180] groupId has plain color when goal fails
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8f025faa
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8f025faa
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8f025faa
Branch: refs/heads/MNG-6170
Commit: 8f025faab8fe0a3a6dbf3b76742fe365f4352e64
Parents: 34afec6
Author: rfscholte
Authored: Sun Mar 5 17:25:43 2017 +0100
Committer: rfscholte
Committed: Fri Mar 10 10:48:41 2017 +0100
--
.../org/apache/maven/lifecycle/LifecycleExecutionException.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/8f025faa/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 62ae269..0831a4f 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,8 +84,9 @@ public class LifecycleExecutionException
if ( execution != null )
{
-buffer.a( ' ' ).a( execution.getGroupId() ).a( ':' );
-buffer.mojo( execution.getArtifactId() + ':' +
execution.getVersion() + ':' + execution.getGoal() );
+buffer.a( ' ' );
+buffer.mojo( execution.getGroupId() + ':' +
execution.getArtifactId() + ':' + execution.getVersion() + ':'
++ execution.getGoal() );
buffer.a( ' ' ).strong( '(' + execution.getExecutionId() + ')' );
}
[3/6] maven git commit: [MNG-6183] Dependency management debug message enhancements.
[MNG-6183] Dependency management debug message enhancements.
o Updated to add debug log messages about optional flag management.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/34afec69
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/34afec69
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/34afec69
Branch: refs/heads/MNG-6170
Commit: 34afec69c866f731f3f9d9b3606bbc31b51d64e7
Parents: ab800b0
Author: Christian Schulte
Authored: Wed Jan 27 03:46:11 2016 +0100
Committer: Christian Schulte
Committed: Wed Mar 8 19:37:31 2017 +0100
--
.../maven/project/DefaultProjectDependenciesResolver.java| 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/34afec69/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 16b60c2..21dfaa2 100644
---
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -273,6 +273,14 @@ public class DefaultProjectDependenciesResolver
appendManagementSource( buffer, art, "version" );
buffer.append( ')' );
}
+
+Boolean premanagedOptional =
DependencyManagerUtils.getPremanagedOptional( node );
+if ( premanagedOptional != null && !premanagedOptional.equals(
dep.getOptional() ) )
+{
+buffer.append( " (optionality managed from " ).append(
premanagedOptional );
+appendManagementSource( buffer, art, "optional" );
+buffer.append( ')' );
+}
}
else
{
[6/6] maven git commit: [MNG-6170] NPE in cases using Multithreaded -T X versions:set -DnewVersion=1.0-SNAPSHOT o In some cases the code will return a null which should not be scheduled.
[MNG-6170] NPE in cases using Multithreaded -T X versions:set
-DnewVersion=1.0-SNAPSHOT
o In some cases the code will return a null which should
not be scheduled.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7cdff43a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7cdff43a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7cdff43a
Branch: refs/heads/MNG-6170
Commit: 7cdff43aba436408c79d2b4afc169b9c6909235a
Parents: 587317b
Author: Karl Heinz Marbaise
Authored: Sun Feb 12 12:59:25 2017 +0100
Committer: Karl Heinz Marbaise
Committed: Sat Mar 11 12:00:24 2017 +0100
--
.../multithreaded/MultiThreadedBuilder.java | 27
1 file changed, 16 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/7cdff43a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
index 072aec8..1414a12 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
@@ -55,6 +55,7 @@ import org.codehaus.plexus.logging.Logger;
* @since 3.0
* @author Kristian Rosenvold
* Builds one or more lifecycles for a full module
+ * NOTE: This class is not part of any public api and can be changed
or deleted without prior notice.
*/
@Component( role = Builder.class, hint = "multithreaded" )
public class MultiThreadedBuilder
@@ -67,7 +68,6 @@ public class MultiThreadedBuilder
@Requirement
private LifecycleModuleBuilder lifecycleModuleBuilder;
-
public MultiThreadedBuilder()
{
}
@@ -142,15 +142,20 @@ public class MultiThreadedBuilder
{
break;
}
-final List newItemsThatCanBeBuilt =
-analyzer.markAsFinished( projectBuild.getProject() );
-for ( MavenProject mavenProject : newItemsThatCanBeBuilt )
+
+// MNG-6170: Only schedule other modules from reactor if we
have more modules to build than one.
+if ( analyzer.getNumberOfBuilds() > 1 )
{
-ProjectSegment scheduledDependent = projectBuildList.get(
mavenProject );
-logger.debug( "Scheduling: " + scheduledDependent );
-Callable cb =
-createBuildCallable( rootSession, scheduledDependent,
reactorContext, taskSegment, muxer );
-service.submit( cb );
+final List newItemsThatCanBeBuilt =
+analyzer.markAsFinished( projectBuild.getProject() );
+for ( MavenProject mavenProject : newItemsThatCanBeBuilt )
+{
+ProjectSegment scheduledDependent =
projectBuildList.get( mavenProject );
+logger.debug( "Scheduling: " + scheduledDependent );
+Callable cb =
+createBuildCallable( rootSession,
scheduledDependent, reactorContext, taskSegment, muxer );
+service.submit( cb );
+}
}
}
catch ( InterruptedException e )
@@ -160,13 +165,13 @@ public class MultiThreadedBuilder
}
catch ( ExecutionException e )
{
-// TODO MNG-5766 changes likely made this redundant
+// TODO MNG-5766 changes likely made this redundant
rootSession.getResult().addException( e );
break;
}
}
-// cancel outstanding builds (if any) - this can happen if an
exception is thrown in above block
+// cancel outstanding builds (if any) - this can happen if an
exception is thrown in above block
Future unprocessed;
while ( ( unprocessed = service.poll() ) != null )
[2/6] maven git commit: [MNG-6182] ModelResolver interface enhancements.
[MNG-6182] ModelResolver interface enhancements.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab800b0c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab800b0c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab800b0c
Branch: refs/heads/MNG-6170
Commit: ab800b0cfae4e3ca9453304e3b9727ba4a4b712b
Parents: 114ef6c
Author: Christian Schulte
Authored: Sat Jan 30 19:17:34 2016 +0100
Committer: Christian Schulte
Committed: Wed Mar 8 18:24:18 2017 +0100
--
.../maven/project/ProjectModelResolver.java | 84 +++
.../maven/model/resolution/ModelResolver.java | 32
.../internal/DefaultModelResolver.java | 85
3 files changed, 167 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/ab800b0c/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index 7b93217..3a31d33 100644
---
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -28,7 +28,7 @@ import java.util.Set;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
-
+import org.apache.maven.model.Dependency;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Repository;
import org.apache.maven.model.building.FileModelSource;
@@ -203,24 +203,26 @@ public class ProjectModelResolver
return new FileModelSource( pomFile );
}
-public ModelSource resolveModel( Parent parent )
+@Override
+public ModelSource resolveModel( final Parent parent )
throws UnresolvableModelException
{
-Artifact artifact = new DefaultArtifact( parent.getGroupId(),
parent.getArtifactId(), "", "pom",
- parent.getVersion() );
-
-VersionRangeRequest versionRangeRequest = new VersionRangeRequest(
artifact, repositories, context );
-versionRangeRequest.setTrace( trace );
-
try
{
-VersionRangeResult versionRangeResult =
resolver.resolveVersionRange( session, versionRangeRequest );
+final Artifact artifact = new DefaultArtifact(
parent.getGroupId(), parent.getArtifactId(), "", "pom",
+ parent.getVersion()
);
+
+final VersionRangeRequest versionRangeRequest = new
VersionRangeRequest( artifact, repositories, context );
+versionRangeRequest.setTrace( trace );
+
+final VersionRangeResult versionRangeResult =
resolver.resolveVersionRange( session, versionRangeRequest );
if ( versionRangeResult.getHighestVersion() == null )
{
-throw new UnresolvableModelException( "No versions matched the
requested range '" + parent.getVersion()
- + "'",
parent.getGroupId(), parent.getArtifactId(),
- parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "No versions matched the requested parent
version range '%s'",
+ parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(),
parent.getVersion() );
}
@@ -229,21 +231,69 @@ public class ProjectModelResolver
&&
versionRangeResult.getVersionConstraint().getRange().getUpperBound() == null )
{
// Message below is checked for in the MNG-2199 core IT.
-throw new UnresolvableModelException( "The requested version
range '" + parent.getVersion()
- + "' does not
specify an upper bound", parent.getGroupId(),
- parent.getArtifactId(),
parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "The requested parent version range '%s'
does not specify an upper bound",
+ parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(),
parent.getVersion() );
}
parent.setVersion(
versionRangeResult.getHighestVersion().toString() );
+
+return resolveModel( parent.getGroupId(), parent.getArtifactId(),
parent.getVersion() );
}
-catch ( VersionRangeResolutionExcepti
[5/6] maven git commit: [MNG-6176] Javadoc errors prevent release with Java 8 Upgrade modello to 1.9.0 Fix invalid Javadoc
[MNG-6176] Javadoc errors prevent release with Java 8 Upgrade modello to 1.9.0 Fix invalid Javadoc Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/587317b0 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/587317b0 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/587317b0 Branch: refs/heads/MNG-6170 Commit: 587317b0095fc5d51041fed9e5b4786246a29a7b Parents: 8f025fa Author: rfscholte Authored: Fri Mar 10 16:17:28 2017 +0100 Committer: rfscholte Committed: Fri Mar 10 16:17:28 2017 +0100 -- .../artifact/versioning/ComparableVersion.java | 8 +++--- .../maven/artifact/versioning/VersionRange.java | 5 ++-- maven-compat/pom.xml| 12 + .../resolver/ArtifactResolutionResult.java | 13 +++--- .../maven/artifact/resolver/ResolutionNode.java | 2 +- .../maven/execution/MojoExecutionEvent.java | 4 ++- .../maven/execution/MojoExecutionListener.java | 4 ++- .../maven/execution/ProjectExecutionEvent.java | 4 ++- .../execution/ProjectExecutionListener.java | 4 ++- .../scope/WeakMojoExecutionListener.java| 3 ++- .../lifecycle/MojoExecutionConfigurator.java| 5 ++-- .../lifecycle/internal/BuildListCalculator.java | 3 ++- ...DefaultLifecycleExecutionPlanCalculator.java | 4 +-- .../DefaultLifecyclePluginAnalyzer.java | 4 +-- .../DefaultLifecycleTaskSegmentCalculator.java | 6 ++--- .../lifecycle/internal/DependencyContext.java | 7 ++--- .../lifecycle/internal/ExecutionPlanItem.java | 5 ++-- .../maven/lifecycle/internal/GoalTask.java | 5 ++-- .../internal/LifecycleDebugLogger.java | 5 ++-- .../internal/LifecycleDependencyResolver.java | 6 ++--- .../LifecycleExecutionPlanCalculator.java | 1 - .../internal/LifecycleModuleBuilder.java| 7 ++--- .../internal/LifecyclePluginResolver.java | 3 +-- .../maven/lifecycle/internal/LifecycleTask.java | 5 ++-- .../LifecycleTaskSegmentCalculator.java | 6 ++--- .../internal/MojoDescriptorCreator.java | 5 ++-- .../maven/lifecycle/internal/MojoExecutor.java | 5 ++-- .../maven/lifecycle/internal/PhaseRecorder.java | 3 +-- .../internal/ProjectArtifactFactory.java| 4 ++- .../lifecycle/internal/ProjectBuildList.java| 5 ++-- .../maven/lifecycle/internal/ProjectIndex.java | 5 ++-- .../lifecycle/internal/ProjectSegment.java | 18 - .../maven/lifecycle/internal/TaskSegment.java | 4 +-- .../lifecycle/internal/builder/Builder.java | 5 ++-- .../ConcurrencyDependencyGraph.java | 5 ++-- .../multithreaded/MultiThreadedBuilder.java | 4 +-- .../multithreaded/ThreadOutputMuxer.java| 8 +++--- .../PluginParameterExpressionEvaluator.java | 2 +- .../internal/DefaultMavenPluginManager.java | 10 +--- .../org/apache/maven/project/MavenProject.java | 9 +++ .../project/RepositorySessionDecorator.java | 2 +- .../maven/repository/ArtifactTransferEvent.java | 4 +-- .../legacy/metadata/ArtifactMetadataSource.java | 6 ++--- .../maven/toolchain/ToolchainPrivate.java | 2 +- .../java/org/apache/maven/cli/MavenCli.java | 4 --- .../maven/cli/event/ExecutionEventLogger.java | 6 +++-- .../model/interpolation/ModelInterpolator.java | 2 -- .../apache/maven/model/merge/ModelMerger.java | 4 +-- maven-model/src/main/mdo/maven.mdo | 14 +- .../org/apache/maven/plugin/AbstractMojo.java | 27 +--- .../org/apache/maven/plugin/ContextEnabled.java | 3 +-- .../main/java/org/apache/maven/plugin/Mojo.java | 9 +++ .../maven/plugin/MojoExecutionException.java| 3 +-- .../maven/plugin/MojoFailureException.java | 3 +-- .../maven/plugin/descriptor/MojoDescriptor.java | 3 +-- .../org/apache/maven/plugin/logging/Log.java| 27 +++- .../ArtifactDescriptorReaderDelegate.java | 2 +- maven-settings/src/main/mdo/settings.mdo| 2 +- pom.xml | 2 +- 59 files changed, 186 insertions(+), 162 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java -- diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java index f434ef0..5222871 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java @@ -29,9 +29,11 @@ import java.util.Properties; import java.ut
[1/6] maven git commit: [MNG-6173] MavenSession.getAllProjects() should return all projects in the reactor [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-6170 28bb897a1 -> 7cdff43ab (forced update)
[MNG-6173] MavenSession.getAllProjects() should return all projects in the
reactor
This commit removes the initialization of the MavenSession object from the
DefaultGraphBuilder. The GraphBuilder implementation should only build the
graph and should not touch the MavenSession object passed into it.
To allow complete initialization of the MavenSession the ProjectDependencyGraph
interface got enhanced so that GraphBuilder implementations can communicate all
collected projects in addition to the processed list of projects.
This closes #105
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/114ef6c5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/114ef6c5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/114ef6c5
Branch: refs/heads/MNG-6170
Commit: 114ef6c5a2802e8758e466af92b70f51fd7a2929
Parents: 862c84a
Author: Christoph Böhme
Authored: Mon Feb 20 07:32:17 2017 +0100
Committer: Christian Schulte
Committed: Mon Mar 6 17:35:24 2017 +0100
--
.../java/org/apache/maven/DefaultMaven.java | 2 +-
.../maven/execution/ProjectDependencyGraph.java | 9 ++
.../apache/maven/graph/DefaultGraphBuilder.java | 109 ---
.../graph/DefaultProjectDependencyGraph.java| 32 ++
.../graph/FilteredProjectDependencyGraph.java | 8 ++
.../AbstractCoreMavenComponentTestCase.java | 1 +
.../maven/lifecycle/LifecycleExecutorTest.java | 5 +
.../stub/ProjectDependencyGraphStub.java| 5 +
8 files changed, 106 insertions(+), 65 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/114ef6c5/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
--
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index 15b946e..7e46ad0 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -525,7 +525,7 @@ public class DefaultMaven
{
ProjectDependencyGraph projectDependencyGraph = graphResult.get();
session.setProjects( projectDependencyGraph.getSortedProjects() );
-session.setAllProjects( projectDependencyGraph.getSortedProjects()
);
+session.setAllProjects( projectDependencyGraph.getAllProjects() );
session.setProjectDependencyGraph( projectDependencyGraph );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/114ef6c5/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
index 0d5584b..d206d73 100644
---
a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
+++
b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
@@ -33,6 +33,15 @@ public interface ProjectDependencyGraph
{
/**
+ * Gets all collected projects.
+ *
+ * @return All collected projects.
+ *
+ * @since 3.5.0-alpha-2
+ */
+List getAllProjects();
+
+/**
* Gets all projects in their intended build order, i.e. after
topologically sorting the projects according to their
* inter-dependencies.
*
http://git-wip-us.apache.org/repos/asf/maven/blob/114ef6c5/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
index 680d584..2cbea84 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
@@ -28,12 +28,12 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import com.google.common.collect.Lists;
import org.apache.maven.DefaultMaven;
import org.apache.maven.MavenExecutionException;
import org.apache.maven.ProjectCycleException;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.execution.ProjectDependencyGraph;
import org.apache.maven.model.Plugin;
@@ -43,6 +43,7 @@ import org.apache.maven.model.building.ModelProblemUtils;
import
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-5934 [deleted] 8d91726f7
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6150 [deleted] b3848d5b5
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/m6078 [deleted] 13bf55443
maven git commit: [MNG-6170] NPE in cases using Multithreaded -T X versions:set -DnewVersion=1.0-SNAPSHOT o In some cases the code will return a null which should not be scheduled.
Repository: maven
Updated Branches:
refs/heads/master 587317b00 -> 7cdff43ab
[MNG-6170] NPE in cases using Multithreaded -T X versions:set
-DnewVersion=1.0-SNAPSHOT
o In some cases the code will return a null which should
not be scheduled.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7cdff43a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7cdff43a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7cdff43a
Branch: refs/heads/master
Commit: 7cdff43aba436408c79d2b4afc169b9c6909235a
Parents: 587317b
Author: Karl Heinz Marbaise
Authored: Sun Feb 12 12:59:25 2017 +0100
Committer: Karl Heinz Marbaise
Committed: Sat Mar 11 12:00:24 2017 +0100
--
.../multithreaded/MultiThreadedBuilder.java | 27
1 file changed, 16 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/7cdff43a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
index 072aec8..1414a12 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
@@ -55,6 +55,7 @@ import org.codehaus.plexus.logging.Logger;
* @since 3.0
* @author Kristian Rosenvold
* Builds one or more lifecycles for a full module
+ * NOTE: This class is not part of any public api and can be changed
or deleted without prior notice.
*/
@Component( role = Builder.class, hint = "multithreaded" )
public class MultiThreadedBuilder
@@ -67,7 +68,6 @@ public class MultiThreadedBuilder
@Requirement
private LifecycleModuleBuilder lifecycleModuleBuilder;
-
public MultiThreadedBuilder()
{
}
@@ -142,15 +142,20 @@ public class MultiThreadedBuilder
{
break;
}
-final List newItemsThatCanBeBuilt =
-analyzer.markAsFinished( projectBuild.getProject() );
-for ( MavenProject mavenProject : newItemsThatCanBeBuilt )
+
+// MNG-6170: Only schedule other modules from reactor if we
have more modules to build than one.
+if ( analyzer.getNumberOfBuilds() > 1 )
{
-ProjectSegment scheduledDependent = projectBuildList.get(
mavenProject );
-logger.debug( "Scheduling: " + scheduledDependent );
-Callable cb =
-createBuildCallable( rootSession, scheduledDependent,
reactorContext, taskSegment, muxer );
-service.submit( cb );
+final List newItemsThatCanBeBuilt =
+analyzer.markAsFinished( projectBuild.getProject() );
+for ( MavenProject mavenProject : newItemsThatCanBeBuilt )
+{
+ProjectSegment scheduledDependent =
projectBuildList.get( mavenProject );
+logger.debug( "Scheduling: " + scheduledDependent );
+Callable cb =
+createBuildCallable( rootSession,
scheduledDependent, reactorContext, taskSegment, muxer );
+service.submit( cb );
+}
}
}
catch ( InterruptedException e )
@@ -160,13 +165,13 @@ public class MultiThreadedBuilder
}
catch ( ExecutionException e )
{
-// TODO MNG-5766 changes likely made this redundant
+// TODO MNG-5766 changes likely made this redundant
rootSession.getResult().addException( e );
break;
}
}
-// cancel outstanding builds (if any) - this can happen if an
exception is thrown in above block
+// cancel outstanding builds (if any) - this can happen if an
exception is thrown in above block
Future unprocessed;
while ( ( unprocessed = service.poll() ) != null )
maven git commit: fixed typos
Repository: maven
Updated Branches:
refs/heads/master 7cdff43ab -> 24b9ef48f
fixed typos
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/24b9ef48
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/24b9ef48
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/24b9ef48
Branch: refs/heads/master
Commit: 24b9ef48f6045c3cca7297f4b7b94d3ee71b3718
Parents: 7cdff43
Author: Hervé Boutemy
Authored: Sat Mar 11 18:19:02 2017 +0100
Committer: Hervé Boutemy
Committed: Sat Mar 11 18:19:02 2017 +0100
--
.../lifecycle/internal/DefaultLifecycleMappingDelegate.java | 2 +-
.../maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java | 4 ++--
.../src/site/resources/design/2.1-lifecycle-refactor.graffle | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/24b9ef48/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
index 8348530..db974bc 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
@@ -79,7 +79,7 @@ public class DefaultLifecycleMappingDelegate
/*
* Grab plugin executions that are bound to the selected lifecycle
phases from project. The effective model of
* the project already contains the plugin executions induced by the
project's packaging type. Remember, all
- * phases of interest and only those are in the lifecyle mapping, if a
phase has no value in the map, we are not
+ * phases of interest and only those are in the lifecycle mapping, if
a phase has no value in the map, we are not
* interested in any of the executions bound to it.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/24b9ef48/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
index 9e402e6..aec785f 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
@@ -73,7 +73,7 @@ public class DefaultLifecyclePluginAnalyzer
// together and this really shows the problem of constructing a sensible
default configuration but
// it's all encapsulated here so it appears normalized to the POM builder.
-// We are going to take the project packaging and find all plugin in the
default lifecycle and create
+// We are going to take the project packaging and find all plugins in the
default lifecycle and create
// fully populated Plugin objects, including executions with goals and
default configuration taken
// from the plugin.xml inside a plugin.
//
@@ -82,7 +82,7 @@ public class DefaultLifecyclePluginAnalyzer
{
if ( logger.isDebugEnabled() )
{
-logger.debug( "Looking up lifecyle mappings for packaging " +
packaging + " from "
+logger.debug( "Looking up lifecycle mappings for packaging " +
packaging + " from "
+ Thread.currentThread().getContextClassLoader() );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/24b9ef48/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle
--
diff --git
a/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle
b/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle
index 722bc03..58811ba 100755
--- a/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle
+++ b/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle
@@ -3548,7 +3548,7 @@ uses plugin prefix}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-\f0\b\fs24 \cf0 \ul \ulc0 LifecyleBindingManager}
+\f0\b\fs24 \cf0 \ul \ulc0 LifecycleBindingManager}
[08/21] maven git commit: [MNG-6140] maven-core depends on shared-utils (not project-utils)
[MNG-6140] maven-core depends on shared-utils (not project-utils) Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f1cc1d4e Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f1cc1d4e Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f1cc1d4e Branch: refs/heads/MNG-6169 Commit: f1cc1d4e5aec96c9bd54219304e1b6b08855b102 Parents: b66bdb9 Author: Hervé Boutemy Authored: Sat Feb 18 15:15:18 2017 +0100 Committer: Hervé Boutemy Committed: Sat Feb 18 15:15:18 2017 +0100 -- src/site/resources/images/maven-deps.png | Bin 69305 -> 69010 bytes src/site/xdoc/maven-deps.odg | Bin 18602 -> 18600 bytes 2 files changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/f1cc1d4e/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 a7084e8..6eae811 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/f1cc1d4e/src/site/xdoc/maven-deps.odg -- diff --git a/src/site/xdoc/maven-deps.odg b/src/site/xdoc/maven-deps.odg index f95b83f..d9b6cef 100644 Binary files a/src/site/xdoc/maven-deps.odg and b/src/site/xdoc/maven-deps.odg differ
[01/21] maven git commit: [MNG-5934] String handling issues identified by PMD
Repository: maven
Updated Branches:
refs/heads/MNG-6169 6893f1fc2 -> e87637f68
refs/heads/master 24b9ef48f -> ab2e24fe3
[MNG-5934] String handling issues identified by PMD
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8d91726f
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8d91726f
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8d91726f
Branch: refs/heads/MNG-6169
Commit: 8d91726f7872f4462d9fa085ef5b6f32bfd0a2e1
Parents: 0514c1b
Author: Alex Henrie
Authored: Tue Jan 19 20:04:59 2016 +0100
Committer: Michael Osipov
Committed: Sat Feb 11 14:08:24 2017 +0100
--
.../apache/maven/artifact/DefaultArtifact.java | 12 +--
.../repository/ArtifactRepositoryPolicy.java| 2 +-
.../AbstractArtifactResolutionException.java| 10 -
.../MultipleArtifactsNotFoundException.java | 3 ++-
.../versioning/DefaultArtifactVersion.java | 2 +-
.../maven/artifact/versioning/Restriction.java | 6 +++---
.../maven/artifact/versioning/VersionRange.java | 6 +++---
.../apache/maven/building/DefaultProblem.java | 2 +-
.../repository/DefaultArtifactRepository.java | 8 +++
.../artifact/versioning/ManagedVersionMap.java | 4 ++--
.../validation/ModelValidationResult.java | 2 +-
.../repository/MetadataResolutionResult.java| 22 +---
.../repository/metadata/MetadataGraph.java | 6 +++---
.../metadata/MetadataGraphVertex.java | 8 +++
.../project/LegacyLocalRepositoryManager.java | 2 +-
.../AbstractProjectInheritanceTestCase.java | 2 +-
.../repository/MavenArtifactRepository.java | 14 ++---
.../metadata/AbstractRepositoryMetadata.java| 2 +-
.../resolver/ArtifactResolutionResult.java | 8 +++
.../maven/lifecycle/mapping/LifecyclePhase.java | 2 +-
.../org/apache/maven/plugin/MojoExecution.java | 2 +-
.../maven/plugin/PluginParameterException.java | 6 +++---
.../PluginParameterExpressionEvaluator.java | 16 +++---
.../DefaultProjectDependenciesResolver.java | 4 ++--
.../org/apache/maven/project/MavenProject.java | 4 ++--
.../maven/repository/ArtifactTransferEvent.java | 10 -
.../metadata/AbstractArtifactMetadata.java | 2 +-
.../project/LegacyLocalRepositoryManager.java | 2 +-
.../org/apache/maven/cli/CLIReportingUtils.java | 2 +-
.../java/org/apache/maven/cli/MavenCli.java | 2 +-
.../maven/cli/event/ExecutionEventLogger.java | 4 ++--
.../UnsupportedSlf4jBindingConfiguration.java | 2 +-
.../maven/cli/CLIManagerDocumentationTest.java | 2 +-
.../model/building/DefaultModelBuilder.java | 8 +++
.../model/building/DefaultModelProblem.java | 2 +-
.../maven/model/building/ModelProblemUtils.java | 2 +-
.../maven/plugin/MojoNotFoundException.java | 2 +-
.../building/DefaultSettingsProblem.java| 2 +-
38 files changed, 98 insertions(+), 99 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/8d91726f/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
--
diff --git
a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
index 147e88e..bd2e8ed 100644
---
a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
+++
b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
@@ -230,7 +230,7 @@ public class DefaultArtifact
{
StringBuilder sb = new StringBuilder( 128 );
sb.append( getGroupId() );
-sb.append( ":" );
+sb.append( ':' );
appendArtifactTypeClassifierString( sb );
return sb.toString();
}
@@ -238,11 +238,11 @@ public class DefaultArtifact
private void appendArtifactTypeClassifierString( StringBuilder sb )
{
sb.append( getArtifactId() );
-sb.append( ":" );
+sb.append( ':' );
sb.append( getType() );
if ( hasClassifier() )
{
-sb.append( ":" );
+sb.append( ':' );
sb.append( getClassifier() );
}
}
@@ -285,10 +285,10 @@ public class DefaultArtifact
if ( getGroupId() != null )
{
sb.append( getGroupId() );
-sb.append( ":" );
+sb.append( ':' );
}
appendArtifactTypeClassifierString( sb );
-sb.append( ":" );
+sb.append( ':' );
if ( getBaseVersionInternal() != null )
{
sb.append( getBaseVersionInternal() );
@@ -299,7 +299,7 @@ public class DefaultArtifact
}
if ( scope != null )
{
-sb.append( ":" );
+sb.ap
[07/21] maven git commit: [MNG-6150] Javadoc improvements for 3.5.0
[MNG-6150] Javadoc improvements for 3.5.0 * Remove duplicate plugin configuration * Add workaround for Javadoc locale * Clean up errors reported by Javadoc 7 Note: Javadoc 8 fails immediately because Modello generates invalid Javadoc Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b66bdb9c Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b66bdb9c Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b66bdb9c Branch: refs/heads/MNG-6169 Commit: b66bdb9cbc383fd4cc875006afe9fe6d4de26397 Parents: f8ab2a6 Author: Michael Osipov Authored: Sun Feb 12 01:10:50 2017 +0100 Committer: Michael Osipov Committed: Wed Feb 15 17:30:46 2017 +0100 -- .../org/apache/maven/artifact/Artifact.java | 2 +- .../artifact/repository/ArtifactRepository.java | 1 - .../maven/artifact/versioning/VersionRange.java | 4 +-- .../java/org/apache/maven/repository/Proxy.java | 6 ++-- .../legacy/metadata/ArtifactMetadata.java | 8 ++--- .../artifact/versioning/VersionRangeTest.java | 4 +-- .../maven/artifact/ArtifactScopeEnum.java | 2 -- .../artifact/manager/DefaultWagonManager.java | 2 +- .../DefaultRepositoryMetadataManager.java | 10 +++--- .../SnapshotArtifactRepositoryMetadata.java | 2 +- .../resolver/DebugResolutionListener.java | 2 +- .../resolver/DefaultArtifactResolver.java | 2 +- .../maven/project/MavenProjectBuilder.java | 2 +- .../DefaultModelInheritanceAssembler.java | 10 +++--- .../AbstractStringBasedModelInterpolator.java | 6 ++-- .../RegexBasedModelInterpolator.java| 2 +- .../apache/maven/repository/MetadataGraph.java | 5 --- .../repository/MetadataResolutionRequest.java | 2 +- .../repository/MetadataResolutionResult.java| 2 +- .../repository/legacy/DefaultWagonManager.java | 12 .../DefaultArtifactRepositoryFactory.java | 2 +- .../DefaultLegacyArtifactCollector.java | 14 - .../DefaultConflictResolverFactory.java | 2 +- .../conflict/NewestConflictResolver.java| 2 +- .../conflict/OldestConflictResolver.java| 2 +- .../AbstractVersionTransformation.java | 6 ++-- .../resolver/DefaultArtifactCollectorTest.java | 4 +-- .../AbstractMavenLifecycleParticipant.java | 2 +- .../maven/DefaultArtifactFilterManager.java | 2 +- .../DependencyResolutionRequiredException.java | 2 +- .../repository/MavenArtifactRepository.java | 4 +-- .../metadata/AbstractRepositoryMetadata.java| 4 +-- .../repository/metadata/RepositoryMetadata.java | 2 +- .../resolver/ArtifactResolutionResult.java | 4 +-- .../maven/artifact/resolver/ResolutionNode.java | 2 +- .../resolver/filter/ExcludesArtifactFilter.java | 2 +- .../resolver/filter/IncludesArtifactFilter.java | 2 +- .../execution/DefaultMavenExecutionRequest.java | 2 +- .../maven/execution/MavenExecutionRequest.java | 26 .../scope/WeakMojoExecutionListener.java| 5 +-- .../lifecycle/DefaultLifecycleExecutor.java | 4 +-- .../maven/lifecycle/DefaultLifecycles.java | 2 +- .../maven/lifecycle/MavenExecutionPlan.java | 12 ...DefaultLifecycleExecutionPlanCalculator.java | 4 +-- .../lifecycle/internal/DependencyContext.java | 2 +- .../maven/lifecycle/internal/GoalTask.java | 2 +- .../internal/MojoDescriptorCreator.java | 4 +-- .../lifecycle/internal/ProjectBuildList.java| 2 +- .../maven/lifecycle/internal/ProjectIndex.java | 2 +- .../maven/lifecycle/internal/TaskSegment.java | 2 +- .../internal/builder/BuilderCommon.java | 2 +- .../maven/lifecycle/mapping/Lifecycle.java | 8 ++--- .../maven/plugin/DefaultBuildPluginManager.java | 4 +-- .../PluginParameterExpressionEvaluator.java | 14 - .../internal/DefaultMavenPluginManager.java | 4 +-- .../DuplicateArtifactAttachmentException.java | 2 +- .../org/apache/maven/project/MavenProject.java | 32 ++-- .../org/apache/maven/project/ProjectSorter.java | 2 +- .../project/artifact/ActiveProjectArtifact.java | 2 +- .../project/artifact/MavenMetadataSource.java | 6 ++-- .../properties/internal/SystemProperties.java | 6 ++-- .../settings/DefaultMavenSettingsBuilder.java | 2 +- .../toolchain/DefaultToolchainManager.java | 2 +- .../maven/toolchain/ToolchainManager.java | 6 ++-- .../internal/ProjectBuildListTest.java | 2 +- .../apache/maven/plugin/PluginManagerTest.java | 6 ++-- .../artifact/MavenMetadataSourceTest.java | 2 +- .../org/apache/maven/cli/CleanArgument.java | 2 +- .../java/org/apache/maven/cli/MavenCli.java | 8 ++--- .../model/building/DefaultModelBuilder.java | 2 +- .../maven/model/building/ModelBuilder.java | 4 --- .../model/building/ModelBuildingRequest.java| 4
[16/21] maven git commit: [MNG-6078] Perform a proper merge of the two sources of command line arguments
[MNG-6078] Perform a proper merge of the two sources of command line arguments
- Needed to extend Commons CLI's CommandLine just to perform the merged
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/dc9c4db4
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/dc9c4db4
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/dc9c4db4
Branch: refs/heads/MNG-6169
Commit: dc9c4db4494b62e2231bb67b39678decf6329852
Parents: 5885e70
Author: Stephen Connolly
Authored: Tue Feb 21 10:10:21 2017 +
Committer: Stephen Connolly
Committed: Thu Feb 23 12:44:34 2017 +
--
.../java/org/apache/maven/cli/MavenCli.java | 25 +++---
.../org/apache/maven/cli/MergedCommandLine.java | 75 ++
.../java/org/apache/maven/cli/MavenCliTest.java | 83 +++-
3 files changed, 149 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/dc9c4db4/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 f788a5f..8d38ab0 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
@@ -383,7 +383,7 @@ public class MavenCli
CLIManager cliManager = new CLIManager();
List args = new ArrayList<>();
-
+CommandLine mavenConfig = null;
try
{
File configFile = new File(
cliRequest.multiModuleProjectDirectory, MVN_MAVEN_CONFIG );
@@ -398,8 +398,8 @@ public class MavenCli
}
}
-CommandLine config = cliManager.parse( args.toArray( new
String[args.size()] ) );
-List unrecongized = config.getArgList();
+mavenConfig = cliManager.parse( args.toArray( new
String[args.size()] ) );
+List unrecongized = mavenConfig.getArgList();
if ( !unrecongized.isEmpty() )
{
throw new ParseException( "Unrecognized maven.config
entries: " + unrecongized );
@@ -415,21 +415,14 @@ public class MavenCli
try
{
-int index = 0;
-for ( String arg : cliRequest.args )
+if ( mavenConfig == null )
{
-if ( arg.startsWith( "-D" ) )
-{
-// a property definition so needs to come last so that the
last property wins
-args.add( arg );
-}
-else
-{
-// not a property definition so needs to come first to
override maven.config
-args.add( index++, arg );
-}
+cliRequest.commandLine = cliManager.parse( cliRequest.args );
+}
+else
+{
+cliRequest.commandLine = new MergedCommandLine(
cliManager.parse( cliRequest.args ), mavenConfig );
}
-cliRequest.commandLine = cliManager.parse( args.toArray( new
String[args.size()] ) );
}
catch ( ParseException e )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/dc9c4db4/maven-embedder/src/main/java/org/apache/maven/cli/MergedCommandLine.java
--
diff --git
a/maven-embedder/src/main/java/org/apache/maven/cli/MergedCommandLine.java
b/maven-embedder/src/main/java/org/apache/maven/cli/MergedCommandLine.java
new file mode 100644
index 000..cb0a587
--- /dev/null
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MergedCommandLine.java
@@ -0,0 +1,75 @@
+package org.apache.maven.cli;
+
+/*
+ * 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 org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+
+import java.util.ArrayList;
+import java.util.L
[09/21] maven git commit: [MNG-6171] always show WARNING about usage of a non threadsafe plugin
[MNG-6171] always show WARNING about usage of a non threadsafe plugin
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3982c195
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3982c195
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3982c195
Branch: refs/heads/MNG-6169
Commit: 3982c195e91e3ea0f73ce9e61c6ddc57137726e9
Parents: f1cc1d4
Author: Hervé Boutemy
Authored: Sat Feb 18 17:36:38 2017 +0100
Committer: Hervé Boutemy
Committed: Sat Feb 18 17:36:38 2017 +0100
--
.../org/apache/maven/lifecycle/internal/builder/BuilderCommon.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/3982c195/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
index f770670..f5c8e3e 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
@@ -101,7 +101,7 @@ public class BuilderCommon
if ( session.getRequest().getDegreeOfConcurrency() > 1 )
{
final Set unsafePlugins =
executionPlan.getNonThreadSafePlugins();
-if ( !unsafePlugins.isEmpty() && logger.isDebugEnabled() )
+if ( !unsafePlugins.isEmpty() )
{
logger.warn(
"*" );
logger.warn( "* Your build is requesting parallel execution,
but project *" );
[15/21] maven git commit: [MNG-6078] Undo the order reversal hack
[MNG-6078] Undo the order reversal hack
- ca4303031357a7decaee8de770b71fb2c2fedd28 used a hack to reverse the order of
arguments
- The side effect of the hack is that the first named system property value on
the CLI would win
- The side-effect is causing a lot of integration test builds to fail and will
likely have other unintended consequences
- Correct fix is to put system properties at the end.
- If this change passes the integration tests then it will need to be augmented
to correctly round-trip the CLI options
as there is the potential that somebody may legitimately be passing an arg
parameter a value that starts with -D
for example 'mvn -ep -Dsecretpassword' or 'mvn -l -D.log' but given that this
requires a parse and unparse
to handle the escaping, I want to get evidence that the integration tests
pass first
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5885e70e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5885e70e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5885e70e
Branch: refs/heads/MNG-6169
Commit: 5885e70e24a69914da892eb343906658d5463bfa
Parents: 5cce371
Author: Stephen Connolly
Authored: Tue Feb 21 00:11:27 2017 +
Committer: Stephen Connolly
Committed: Thu Feb 23 12:44:34 2017 +
--
.../java/org/apache/maven/cli/MavenCli.java | 26
.../java/org/apache/maven/cli/MavenCliTest.java | 22 +
2 files changed, 38 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/5885e70e/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 4e10b05..f788a5f 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,15 +19,12 @@ package org.apache.maven.cli;
* under the License.
*/
-import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
-
import com.google.common.base.Charsets;
import com.google.common.io.Files;
import com.google.inject.AbstractModule;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.UnrecognizedOptionException;
-import org.apache.commons.lang3.ArrayUtils;
import org.apache.maven.BuildAbort;
import org.apache.maven.InternalErrorException;
import org.apache.maven.Maven;
@@ -102,7 +99,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -115,6 +111,8 @@ import java.util.StringTokenizer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
+
// TODO push all common bits back to plexus cli and prepare for transition to
Guice. We don't need 50 ways to make CLIs
/**
@@ -417,7 +415,20 @@ public class MavenCli
try
{
-args.addAll( 0, Arrays.asList( cliRequest.args ) );
+int index = 0;
+for ( String arg : cliRequest.args )
+{
+if ( arg.startsWith( "-D" ) )
+{
+// a property definition so needs to come last so that the
last property wins
+args.add( arg );
+}
+else
+{
+// not a property definition so needs to come first to
override maven.config
+args.add( index++, arg );
+}
+}
cliRequest.commandLine = cliManager.parse( args.toArray( new
String[args.size()] ) );
}
catch ( ParseException e )
@@ -1587,11 +1598,6 @@ public class MavenCli
if ( defStrs != null )
{
-//The following is needed to get precedence
-//of properties which are defined on command line
-//over properties defined in the .mvn/maven.config.
-ArrayUtils.reverse( defStrs );
-
for ( String defStr : defStrs )
{
setCliProperty( defStr, userProperties );
http://git-wip-us.apache.org/repos/asf/maven/blob/5885e70e/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java
--
diff --git
a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java
b/maven-embedder/src/test/java/org/apache/
[20/21] maven git commit: Merge branch 'MNG-6169' of https://git-wip-us.apache.org/repos/asf/maven into MNG-6169
Merge branch 'MNG-6169' of https://git-wip-us.apache.org/repos/asf/maven into MNG-6169 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e87637f6 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e87637f6 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e87637f6 Branch: refs/heads/MNG-6169 Commit: e87637f681f19da64cd8f549cb9edb75ba7b18ad Parents: bbba3aa 6893f1f Author: Karl Heinz Marbaise Authored: Sat Mar 11 16:36:00 2017 +0100 Committer: Karl Heinz Marbaise Committed: Sat Mar 11 16:36:00 2017 +0100 -- --
[04/21] maven git commit: [MNG-5297] improved explanations on prerequisites.maven in Maven 3
[MNG-5297] improved explanations on prerequisites.maven in Maven 3 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/19d5b9df Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/19d5b9df Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/19d5b9df Branch: refs/heads/MNG-6169 Commit: 19d5b9dfa108a94c0825215a013ac21253cb0a17 Parents: 0284dda Author: Hervé Boutemy Authored: Sun Sep 18 23:57:24 2016 +0200 Committer: Hervé Boutemy Committed: Tue Feb 14 01:37:31 2017 +0100 -- maven-model/src/main/mdo/maven.mdo | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/19d5b9df/maven-model/src/main/mdo/maven.mdo -- diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo index 1187b11..945ae03 100644 --- a/maven-model/src/main/mdo/maven.mdo +++ b/maven-model/src/main/mdo/maven.mdo @@ -3483,12 +3483,12 @@ String 2.0 false
[14/21] maven git commit: Switch to resolveScm so that we get auto linking of matching integration test branches
Switch to resolveScm so that we get auto linking of matching integration test
branches
- Also use short paths when integration testing on windows and clean up
afterwards to ensure disk space does not overflow
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5cce371c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5cce371c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5cce371c
Branch: refs/heads/MNG-6169
Commit: 5cce371c8aee5d957d9b24e46cddc939a15aff40
Parents: e6217a4
Author: Stephen Connolly
Authored: Tue Feb 21 17:33:54 2017 +
Committer: Stephen Connolly
Committed: Thu Feb 23 12:41:52 2017 +
--
Jenkinsfile | 25 ++---
1 file changed, 18 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/5cce371c/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 5b82d78..2ac2644 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,7 +19,7 @@
properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr:
env.BRANCH_NAME=='master'?'10':'5'))])
-def itBranch='master'
+def tests
try {
node('ubuntu') {
@@ -40,6 +40,7 @@ node('ubuntu') {
stash includes: 'apache-maven-dist.zip', name: 'dist'
}
junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml'
+tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '',
excludes: '', gitTool: 'Default', id: '_', ignoreOnPushNotifications: false,
includes: '*', remote:
'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git'],
targets: [BRANCH_NAME, 'master']
}
}
@@ -52,13 +53,14 @@ parallel linuxJava7:{
echo "Running integration tests with Java $JAVA_NIX_J7"
dir('test') {
def WORK_DIR=pwd()
-
git(url:'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git',
branch: itBranch)
+checkout tests
sh "rm -rvf $WORK_DIR/apache-maven-dist.zip
$WORK_DIR/it-local-repo"
unstash 'dist'
withEnv(["PATH+MAVEN=$MAVEN_NIX_J7/bin","PATH+JDK=$JAVA_NIX_J7/bin"]) {
sh "mvn clean install -Prun-its -B -U -V
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo
-DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
}
junit allowEmptyResults: true,
testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml'
+deleteDir() // clean up after ourselves to reduce disk space
}
}
},linuxJava8: {
@@ -69,13 +71,14 @@ parallel linuxJava7:{
echo "Running integration tests with Java $JAVA_NIX_J8"
dir('test') {
def WORK_DIR=pwd()
-
git(url:'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git',
branch: itBranch)
+checkout tests
sh "rm -rvf $WORK_DIR/apache-maven-dist.zip
$WORK_DIR/it-local-repo"
unstash 'dist'
withEnv(["PATH+MAVEN=$MAVEN_NIX_J8/bin","PATH+JDK=$JAVA_NIX_J8/bin"]) {
sh "mvn clean install -Prun-its -B -U -V
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo
-DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
}
junit allowEmptyResults: true,
testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml'
+deleteDir() // clean up after ourselves to reduce disk space
}
}
}, winJava7: {
@@ -90,9 +93,12 @@ parallel linuxJava7:{
JAVA_WIN_J7=pwd()
}
echo "Running integration tests with Java $JAVA_WIN_J7"
-dir('test') {
+// need a short path or we hit 256 character limit for paths
+// using EXECUTOR_NUMBER guarantees that concurrent builds on same
agent
+// will not trample each other
+dir("/mvn-it-${EXECUTOR_NUMBER}.tmp") {
def WORK_DIR=pwd()
-
git(url:'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git',
branch: itBranch)
+checkout tests
bat "if exist it-local-repo rmdir /s /q it-local-repo"
bat "if exist apache-maven-dist.zip del /q
apache-maven-dist.zip"
withEnv(["Path+MAVEN=$MAVEN_WIN_J7\\bin","Path+JDK=$JAVA_WIN_J7\\bin","JAVA_HOME=$JAVA_WIN_J7"])
{
@@ -101,6 +107,7 @@ parallel linuxJava7:{
bat "mvn clean install -Prun-its -B -U -V
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo
-DmavenDist
[03/21] maven git commit: [MNG-5968] Default plugin version updates
[MNG-5968] Default plugin version updates Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0284dda8 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0284dda8 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0284dda8 Branch: refs/heads/MNG-6169 Commit: 0284dda81beb43b54116326f9a6efd439d40c922 Parents: 37fef3d Author: Christian Schulte Authored: Sat Feb 11 19:21:03 2017 +0100 Committer: Michael Osipov Committed: Sun Feb 12 01:14:25 2017 +0100 -- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/0284dda8/pom.xml -- diff --git a/pom.xml b/pom.xml index d4d371b..b16ea59 100644 --- a/pom.xml +++ b/pom.xml @@ -487,7 +487,7 @@ under the License. org.codehaus.mojo buildnumber-maven-plugin - 1.2 + 1.4 org.apache.maven.plugins @@ -544,7 +544,7 @@ under the License. org.codehaus.mojo animal-sniffer-maven-plugin -1.14 +1.15 org.codehaus.mojo.signature @@ -565,7 +565,7 @@ under the License. org.apache.maven.plugins maven-doap-plugin -1.1 +1.2 The mission of the Apache Maven project is to create and maintain software
[18/21] maven git commit: [MNG-6177] The --file command line option of the Windows and Unix launchers does not work for directory names like "Spaces & Special Char"
[MNG-6177] The --file command line option of the Windows and Unix launchers
does not work for directory names like "Spaces & Special Char"
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0b9a30f3
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0b9a30f3
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0b9a30f3
Branch: refs/heads/MNG-6169
Commit: 0b9a30f350f159a190e87c78e520ba7a7ae0642b
Parents: 0db5e32
Author: Christian Schulte
Authored: Thu Feb 23 03:14:21 2017 +0100
Committer: Christian Schulte
Committed: Fri Feb 24 00:55:29 2017 +0100
--
apache-maven/src/bin/mvn | 6 +++---
apache-maven/src/bin/mvn.cmd | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/0b9a30f3/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 95a407d..cfb39b0 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -141,9 +141,9 @@ find_file_argument_basedir() {
found_file_switch=0
for arg in "$@"; do
if [ ${found_file_switch} -eq 1 ]; then
- if [ -f ${arg} ]; then
-basedir=$(dirname $(readlink -f "${arg}"))
-if [ ! -d ${basedir} ]; then
+ if [ -f "${arg}" ]; then
+basedir=$(dirname "$(readlink -f "${arg}")")
+if [ ! -d "${basedir}" ]; then
echo "Directory ${basedir} extracted from the -f/--file command-line
argument ${arg} does not exist" >&2
exit 1
fi
http://git-wip-us.apache.org/repos/asf/maven/blob/0b9a30f3/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index e527188..c86662b 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -120,7 +120,7 @@ if not exist "%FILE_ARG%" (
echo POM file %FILE_ARG% specified the -f/--file command-line argument does
not exist >&2
goto error
)
-call :get_directory_from_file %FILE_ARG%
+call :get_directory_from_file "%FILE_ARG%"
if not exist "%POM_DIR%" (
echo Directory %POM_DIR% extracted from the -f/--file command-line argument
%FILE_ARG% does not exist >&2
goto error
[11/21] maven git commit: Updated doap_Maven.rdf file
Updated doap_Maven.rdf file Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/1407a104 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/1407a104 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/1407a104 Branch: refs/heads/MNG-6169 Commit: 1407a10485e826795db23c114c4c37cf951a2e27 Parents: 60a7f5d Author: Karl Heinz Marbaise Authored: Fri Dec 11 19:43:17 2015 +0100 Committer: Hervé Boutemy Committed: Sat Feb 18 18:09:04 2017 +0100 -- doap_Maven.rdf | 11 +++ 1 file changed, 11 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/1407a104/doap_Maven.rdf -- diff --git a/doap_Maven.rdf b/doap_Maven.rdf index 9a043ce..86fbd1d 100644 --- a/doap_Maven.rdf +++ b/doap_Maven.rdf @@ -33,6 +33,17 @@ under the License. Latest stable release +2015-11-14 +3.3.9 + http://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.zip + http://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz + http://archive.apache.org/dist/maven/maven-3/3.3.9/source/apache-maven-3.3.9-src.zip + http://archive.apache.org/dist/maven/maven-3/3.3.9/source/apache-maven-3.3.9-src.tar.gz + + + + +Apache Maven 3.3.3 2015-04-28 3.3.3 http://archive.apache.org/dist/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.zip
[21/21] maven git commit: Fixed checkstyle reported error.
Fixed checkstyle reported error. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab2e24fe Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab2e24fe Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab2e24fe Branch: refs/heads/master Commit: ab2e24fe3612b4f12c66e698e398fcb2b908f1aa Parents: 24b9ef4 Author: Karl Heinz Marbaise Authored: Sat Mar 11 18:40:24 2017 +0100 Committer: Karl Heinz Marbaise Committed: Sat Mar 11 18:40:24 2017 +0100 -- .../lifecycle/internal/DefaultLifecycleMappingDelegate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/ab2e24fe/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java -- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java index db974bc..c2bf919 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java @@ -79,8 +79,8 @@ public class DefaultLifecycleMappingDelegate /* * Grab plugin executions that are bound to the selected lifecycle phases from project. The effective model of * the project already contains the plugin executions induced by the project's packaging type. Remember, all - * phases of interest and only those are in the lifecycle mapping, if a phase has no value in the map, we are not - * interested in any of the executions bound to it. + * phases of interest and only those are in the lifecycle mapping, if a phase has no value in the map, we are + * not interested in any of the executions bound to it. */ for ( Plugin plugin : project.getBuild().getPlugins() )
[13/21] maven git commit: Fixing misspellings in test names
Fixing misspellings in test names
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e6217a45
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e6217a45
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e6217a45
Branch: refs/heads/MNG-6169
Commit: e6217a455547e5b3bcac310be18daf2a333cd5d1
Parents: 985b598
Author: August Shi
Authored: Wed May 25 14:12:52 2016 -0500
Committer: Hervé Boutemy
Committed: Sat Feb 18 18:29:19 2017 +0100
--
.../apache/maven/repository/DefaultMirrorSelectorTest.java | 2 +-
.../org/apache/maven/cli/transfer/FileSizeFormatTest.java| 8
2 files changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/e6217a45/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
--
diff --git
a/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
b/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
index fb32f0f..4e8cdb0 100644
---
a/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
+++
b/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
@@ -27,7 +27,7 @@ public class DefaultMirrorSelectorTest
extends PlexusTestCase
{
-public void testMirrorWithMirroOfPatternContainingANegationIsNotSelected()
+public void testMirrorWithMirrorOfPatternContainingANegationIsNotSelected()
{
ArtifactRepository repository = new DefaultArtifactRepository(
"snapshots.repo", "http://whatever";, null );
String pattern = "external:*, !snapshots.repo";
http://git-wip-us.apache.org/repos/asf/maven/blob/e6217a45/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
--
diff --git
a/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
b/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
index 43939d1..a870411 100644
---
a/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
+++
b/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
@@ -221,16 +221,16 @@ public class FileSizeFormatTest {
}
@Test( expected = IllegalArgumentException.class )
-public void testNegativeProgessedSize()
+public void testNegativeProgressedSize()
{
FileSizeFormat format = new FileSizeFormat( Locale.ENGLISH );
-long negativeProgessedSize = -100L;
-format.formatProgress( negativeProgessedSize, 10L );
+long negativeProgressedSize = -100L;
+format.formatProgress( negativeProgressedSize, 10L );
}
@Test( expected = IllegalArgumentException.class )
-public void testNegativeProgessedSizeBiggerThanSize()
+public void testNegativeProgressedSizeBiggerThanSize()
{
FileSizeFormat format = new FileSizeFormat( Locale.ENGLISH );
[19/21] maven git commit: [MNG-6169] Lifecycle/binding plugin version updates
[MNG-6169] Lifecycle/binding plugin version updates Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/bbba3aa9 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/bbba3aa9 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/bbba3aa9 Branch: refs/heads/MNG-6169 Commit: bbba3aa986e1abae3a9dd2cec98ab8e57b211cdb Parents: 0b9a30f Author: Christian Schulte Authored: Sat Feb 11 19:19:35 2017 +0100 Committer: Karl Heinz Marbaise Committed: Fri Feb 24 22:58:39 2017 +0100 -- .../resources/META-INF/plexus/components.xml| 7 +- .../META-INF/plexus/default-bindings.xml| 98 ++-- 2 files changed, 53 insertions(+), 52 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/bbba3aa9/maven-core/src/main/resources/META-INF/plexus/components.xml -- diff --git a/maven-core/src/main/resources/META-INF/plexus/components.xml b/maven-core/src/main/resources/META-INF/plexus/components.xml index 3f099cb..ff41c8a 100644 --- a/maven-core/src/main/resources/META-INF/plexus/components.xml +++ b/maven-core/src/main/resources/META-INF/plexus/components.xml @@ -77,8 +77,9 @@ under the License. post-clean + -org.apache.maven.plugins:maven-clean-plugin:2.5:clean +org.apache.maven.plugins:maven-clean-plugin:2.6.1:clean @@ -101,10 +102,10 @@ under the License. -org.apache.maven.plugins:maven-site-plugin:3.3:site +org.apache.maven.plugins:maven-site-plugin:3.6:site -org.apache.maven.plugins:maven-site-plugin:3.3:deploy +org.apache.maven.plugins:maven-site-plugin:3.6:deploy http://git-wip-us.apache.org/repos/asf/maven/blob/bbba3aa9/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml -- diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml index 4a303db..c846fb1 100644 --- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml +++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml @@ -41,10 +41,10 @@ Mappings to default lifecycle, specific for each packaging. -org.apache.maven.plugins:maven-install-plugin:2.4:install +org.apache.maven.plugins:maven-install-plugin:2.5.2:install -org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy +org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy @@ -67,28 +67,28 @@ Mappings to default lifecycle, specific for each packaging. -org.apache.maven.plugins:maven-resources-plugin:2.6:resources +org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources -org.apache.maven.plugins:maven-compiler-plugin:3.1:compile +org.apache.maven.plugins:maven-compiler-plugin:3.6.1:compile - org.apache.maven.plugins:maven-resources-plugin:2.6:testResources + org.apache.maven.plugins:maven-resources-plugin:3.0.2:testResources -org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile + org.apache.maven.plugins:maven-compiler-plugin:3.6.1:testCompile -org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test +org.apache.maven.plugins:maven-surefire-plugin:2.19.1:test -org.apache.maven.plugins:maven-jar-plugin:2.4:jar +org.apache.maven.plugins:maven-jar-plugin:3.0.2:jar -org.apache.maven.plugins:maven-install-plugin:2.4:install +org.apache.maven.plugins:maven-install-plugin:2.5.2:install -org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy +org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy @@ -111,28 +111,28 @@ Mappings to default lifecycle, specific for each packaging. -org.apache.maven.plugins:maven-resources-plugin:2.6:resources +org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources
[02/21] maven git commit: [MNG-5967] Dependency updates
[MNG-5967] Dependency updates
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/37fef3d7
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/37fef3d7
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/37fef3d7
Branch: refs/heads/MNG-6169
Commit: 37fef3d762c8068b876b07b84b83a39cdc3ac5f4
Parents: 8d91726
Author: Christian Schulte
Authored: Mon Jan 25 03:48:14 2016 +0100
Committer: Michael Osipov
Committed: Sat Feb 11 16:36:46 2017 +0100
--
maven-core/pom.xml | 1 -
maven-model-builder/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 1 -
pom.xml | 25 +++--
4 files changed, 16 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/37fef3d7/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 95162bd..0e20235 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -134,7 +134,6 @@ under the License.
org.mockito
mockito-core
- 1.9.5
test
http://git-wip-us.apache.org/repos/asf/maven/blob/37fef3d7/maven-model-builder/pom.xml
--
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index fbfd417..0dd08ac 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -80,7 +80,7 @@ under the License.
xmlunit
xmlunit
- 1.3
+ 1.6
test
http://git-wip-us.apache.org/repos/asf/maven/blob/37fef3d7/maven-resolver-provider/pom.xml
--
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index 7d71e33..e95cc41 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -110,7 +110,6 @@ under the License.
org.mockito
mockito-core
- 1.9.5
test
http://git-wip-us.apache.org/repos/asf/maven/blob/37fef3d7/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 83b7b18..d4d371b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,23 +50,23 @@ under the License.
1.7
1.7
2.5.2
-1.2
-3.4
-4.11
+1.3.1
+3.5
+4.12
+1.10.19
1.7.1
-1.21
-3.0.22
-
-18.0
+1.24
+3.0.24
+20.0
4.0
0.3.3
2.12
-1.3
+1.4
1.7
1.8.3
1.3
1.0.3
-1.7.5
+1.7.22
true
apache-maven
@@ -300,7 +300,7 @@ under the License.
ch.qos.logback
logback-classic
-1.0.7
+1.2.1
true
@@ -393,6 +393,11 @@ under the License.
plexus-cipher
${cipherVersion}
+
+org.mockito
+mockito-core
+${mockitoVersion}
+
[17/21] maven git commit: fixed documentation errors
fixed documentation errors
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0db5e32c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0db5e32c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0db5e32c
Branch: refs/heads/MNG-6169
Commit: 0db5e32cf59851086e895f1f541853b61df38121
Parents: dc9c4db
Author: Hervé Boutemy
Authored: Thu Feb 23 19:07:58 2017 +0100
Committer: Hervé Boutemy
Committed: Thu Feb 23 19:07:58 2017 +0100
--
.../src/main/java/org/apache/maven/cli/CLIManager.java | 8
maven-model-builder/src/site/apt/index.apt | 6 --
2 files changed, 4 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/0db5e32c/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
index 673f52d..a9038bf 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
@@ -108,7 +108,7 @@ public class CLIManager
{
options = new Options();
options.addOption( OptionBuilder.withLongOpt( "help"
).withDescription( "Display help information" ).create( HELP ) );
-options.addOption( OptionBuilder.withLongOpt( "file"
).hasArg().withDescription( "Force the use of an alternate POM file (or
directory with pom.xml, disables output color)" ).create( ALTERNATE_POM_FILE )
);
+options.addOption( OptionBuilder.withLongOpt( "file"
).hasArg().withDescription( "Force the use of an alternate POM file (or
directory with pom.xml)" ).create( ALTERNATE_POM_FILE ) );
options.addOption( OptionBuilder.withLongOpt( "define"
).hasArg().withDescription( "Define a system property" ).create(
SET_SYSTEM_PROPERTY ) );
options.addOption( OptionBuilder.withLongOpt( "offline"
).withDescription( "Work offline" ).create( OFFLINE ) );
options.addOption( OptionBuilder.withLongOpt( "version"
).withDescription( "Display version information" ).create( VERSION ) );
@@ -130,16 +130,16 @@ public class CLIManager
options.addOption( OptionBuilder.withLongOpt( "fail-at-end"
).withDescription( "Only fail the build afterwards; allow all non-impacted
builds to continue" ).create( FAIL_AT_END ) );
options.addOption( OptionBuilder.withLongOpt( "fail-never"
).withDescription( "NEVER fail the build, regardless of project result"
).create( FAIL_NEVER ) );
options.addOption( OptionBuilder.withLongOpt( "resume-from"
).hasArg().withDescription( "Resume reactor from specified project" ).create(
RESUME_FROM ) );
-options.addOption( OptionBuilder.withLongOpt( "projects"
).withDescription( "Comma-delimited list of specified reactor projects to build
instead of all projects. A project can be specified by [groupId]:artifactId or
by its relative path." ).hasArg().create( PROJECT_LIST ) );
+options.addOption( OptionBuilder.withLongOpt( "projects"
).withDescription( "Comma-delimited list of specified reactor projects to build
instead of all projects. A project can be specified by [groupId]:artifactId or
by its relative path" ).hasArg().create( PROJECT_LIST ) );
options.addOption( OptionBuilder.withLongOpt( "also-make"
).withDescription( "If project list is specified, also build projects required
by the list" ).create( ALSO_MAKE ) );
options.addOption( OptionBuilder.withLongOpt( "also-make-dependents"
).withDescription( "If project list is specified, also build projects that
depend on projects on the list" ).create( ALSO_MAKE_DEPENDENTS ) );
-options.addOption( OptionBuilder.withLongOpt( "log-file"
).hasArg().withDescription( "Log file where all build output will go."
).create( LOG_FILE ) );
+options.addOption( OptionBuilder.withLongOpt( "log-file"
).hasArg().withDescription( "Log file where all build output will go (disables
output color)" ).create( LOG_FILE ) );
options.addOption( OptionBuilder.withLongOpt( "show-version"
).withDescription( "Display version information WITHOUT stopping build"
).create( SHOW_VERSION ) );
options.addOption( OptionBuilder.withLongOpt(
"encrypt-master-password" ).hasOptionalArg().withDescription( "Encrypt master
security password" ).create( ENCRYPT_MASTER_PASSWORD ) );
options.addOption( OptionBuilder.withLongOpt( "encrypt-password"
).hasOptionalArg().withDescription( "Encrypt server password" ).create(
ENCRYPT_PASSWORD ) );
options.addOption( OptionBuilder.withLongOpt( "threads"
).hasArg().withDescription( "Thread count, for instance 2.0C where C i
[12/21] maven git commit: fixed link
fixed link
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/985b5985
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/985b5985
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/985b5985
Branch: refs/heads/MNG-6169
Commit: 985b5985f336d30b6b2110dae49dd2a5f5d5750b
Parents: 1407a10
Author: Hervé Boutemy
Authored: Sun Apr 10 20:15:57 2016 +0200
Committer: Hervé Boutemy
Committed: Sat Feb 18 18:13:06 2017 +0100
--
maven-model-builder/src/site/apt/index.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/985b5985/maven-model-builder/src/site/apt/index.apt
--
diff --git a/maven-model-builder/src/site/apt/index.apt
b/maven-model-builder/src/site/apt/index.apt
index 03946e6..280c3b1 100644
--- a/maven-model-builder/src/site/apt/index.apt
+++ b/maven-model-builder/src/site/apt/index.apt
@@ -188,7 +188,7 @@ Maven Model Builder
| <<>>\
<<<*>>> | environment variables | <<<$\{env.PATH\}>>> |
*+--+--+
-| <<>> | Local user settings (see
{{{../maven-settings/settings.xml/settings.html}settings reference}}) |
<<<$\{settings.localRepository\}>>> |
+| <<>> | Local user settings (see
{{{../maven-settings/settings.html}settings reference}}) |
<<<$\{settings.localRepository\}>>> |
*+--+--+
** Notice
[10/21] maven git commit: Fixed links in pom which pointed to shut down codehaus jira.
Fixed links in pom which pointed to shut down codehaus jira.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/60a7f5da
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/60a7f5da
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/60a7f5da
Branch: refs/heads/MNG-6169
Commit: 60a7f5da494216168e4cc2c88c357b1cbdd43ad2
Parents: 3982c19
Author: Karl Heinz Marbaise
Authored: Fri Dec 4 20:59:04 2015 +0100
Committer: Hervé Boutemy
Committed: Sat Feb 18 18:08:45 2017 +0100
--
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/60a7f5da/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9f3204b..a085ffa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,8 +150,8 @@ under the License.
-
-
+
+
${maven.version}
[05/21] maven git commit: [MNG-5889] .mvn directory should be picked when using --file
[MNG-5889] .mvn directory should be picked when using --file
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f8ab2a65
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f8ab2a65
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f8ab2a65
Branch: refs/heads/MNG-6169
Commit: f8ab2a650f32d5d87126d341d9bbfccbf99fd0ca
Parents: 19d5b9d
Author: robert.patrick
Authored: Thu Sep 15 09:53:06 2016 -0500
Committer: Hervé Boutemy
Committed: Tue Feb 14 07:51:20 2017 +0100
--
apache-maven/src/bin/mvn | 31 +++--
apache-maven/src/bin/mvn.cmd | 58 ---
2 files changed, 83 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/f8ab2a65/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 4db1ad6..95a407d 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -121,7 +121,7 @@ fi
# first directory with .mvn subdirectory is considered project base directory
find_maven_basedir() {
(
- basedir="`pwd`"
+ basedir=`find_file_argument_basedir "$@"`
wdir="`pwd`"
while [ "$wdir" != '/' ] ; do
if [ -d "$wdir"/.mvn ] ; then
@@ -134,6 +134,33 @@ find_maven_basedir() {
)
}
+find_file_argument_basedir() {
+(
+ basedir="`pwd`"
+
+ found_file_switch=0
+ for arg in "$@"; do
+if [ ${found_file_switch} -eq 1 ]; then
+ if [ -f ${arg} ]; then
+basedir=$(dirname $(readlink -f "${arg}"))
+if [ ! -d ${basedir} ]; then
+ echo "Directory ${basedir} extracted from the -f/--file command-line
argument ${arg} does not exist" >&2
+ exit 1
+fi
+ else
+echo "POM file ${arg} specified with the -f/--file command line
argument does not exist" >&2
+exit 1
+ fi
+ break
+fi
+if [ "$arg" = "-f" -o "$arg" = "--file" ]; then
+ found_file_switch=1
+fi
+ done
+ echo "${basedir}"
+)
+}
+
# concatenates all lines of a file
concat_lines() {
if [ -f "$1" ]; then
@@ -141,7 +168,7 @@ concat_lines() {
fi
}
-MAVEN_PROJECTBASEDIR="${MAVEN_BASEDIR:-`find_maven_basedir`}"
+MAVEN_PROJECTBASEDIR="${MAVEN_BASEDIR:-`find_maven_basedir "$@"`}"
MAVEN_OPTS="`concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config"` $MAVEN_OPTS"
# For Cygwin, switch project base directory path to Windows format before
http://git-wip-us.apache.org/repos/asf/maven/blob/f8ab2a65/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index ecee20c..e527188 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -83,26 +83,76 @@ set MAVEN_CMD_LINE_ARGS=%*
@REM Find the project basedir, i.e., the directory that contains the folder
".mvn".
@REM Fallback to current working directory if not found.
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+set "MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%"
if not "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
set "EXEC_DIR=%CD%"
set "WDIR=%EXEC_DIR%"
+@REM Look for the --file switch and start the search for the .mvn directory
from the specified
+@REM POM location, if supplied.
+
+set FILE_ARG=
+:arg_loop
+if "%~1" == "-f" (
+ set "FILE_ARG=%~2"
+ shift
+ goto process_file_arg
+)
+if "%~1" == "--file" (
+ set "FILE_ARG=%~2"
+ shift
+ goto process_file_arg
+)
+@REM If none of the above, skip the argument
+shift
+if not "%~1" == "" (
+ goto arg_loop
+) else (
+ goto findBaseDir
+)
+
+:process_file_arg
+if "%FILE_ARG%" == "" (
+ goto findBaseDir
+)
+if not exist "%FILE_ARG%" (
+ echo POM file %FILE_ARG% specified the -f/--file command-line argument does
not exist >&2
+ goto error
+)
+call :get_directory_from_file %FILE_ARG%
+if not exist "%POM_DIR%" (
+ echo Directory %POM_DIR% extracted from the -f/--file command-line argument
%FILE_ARG% does not exist >&2
+ goto error
+)
+set "WDIR=%POM_DIR%"
+goto findBaseDir
+
+:get_directory_from_file
+set "POM_DIR=%~dp1"
+:stripPomDir
+if not "_%POM_DIR:~-1%"=="_\" goto pomDirStripped
+set "POM_DIR=%POM_DIR:~0,-1%"
+goto stripPomDir
+:pomDirStripped
+exit /b
+
:findBaseDir
+cd /d "%WDIR%"
+:findBaseDirLoop
if exist "%WDIR%\.mvn" goto baseDirFound
cd ..
IF "%WDIR%"=="%CD%" goto baseDirNotFound
set "WDIR=%CD%"
-goto findBaseDir
+goto findBaseDirLoop
:baseDirFound
set "MAVEN_PROJECTBASEDIR=%WDIR%"
-cd "%EXEC_DIR%"
+cd /d "%EXEC_DIR%"
goto endDetectBaseDir
:baseDirNotFound
-if "_%EXEC_DIR:~-1%"=="_\" set EXEC_DIR=%EXEC_DIR:~0,-1%
+if "_%EXEC_DIR:~-1%"=="_\" set "EXEC_DIR=%EXEC_DIR:~0,-1%"
set "MAVEN_PROJECTBASEDIR=%EXEC_DIR%"
cd "%EXEC_DIR%"
[06/21] maven git commit: [MNG-6150] Javadoc improvements for 3.5.0
http://git-wip-us.apache.org/repos/asf/maven/blob/b66bdb9c/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
index 77206bd..cc35a57 100644
--- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
+++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
@@ -221,7 +221,7 @@ public class MavenProject
this.artifact = artifact;
}
-// @todo I would like to get rid of this. jvz.
+// TODO I would like to get rid of this. jvz.
public Model getModel()
{
return model;
@@ -352,7 +352,7 @@ public class MavenProject
{
if ( a.getArtifactHandler().isAddedToClasspath() )
{
-// TODO: let the scope handler deal with this
+// TODO let the scope handler deal with this
if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) ||
Artifact.SCOPE_PROVIDED.equals( a.getScope() )
|| Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
{
@@ -364,7 +364,7 @@ public class MavenProject
return list;
}
-// TODO: this checking for file == null happens because the resolver has
been confused about the root
+// TODO this checking for file == null happens because the resolver has
been confused about the root
// artifact or not. things like the stupid dummy artifact coming from
surefire.
public List getTestClasspathElements()
throws DependencyResolutionRequiredException
@@ -408,7 +408,7 @@ public class MavenProject
for ( Artifact a : getArtifacts() )
{
if ( a.getArtifactHandler().isAddedToClasspath()
-// TODO: let the scope handler deal with this
+// TODO let the scope handler deal with this
&& ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) ||
Artifact.SCOPE_RUNTIME.equals( a.getScope() ) ) )
{
addArtifactPath( a, list );
@@ -470,7 +470,7 @@ public class MavenProject
public String getName()
{
-// TODO: this should not be allowed to be null.
+// TODO this should not be allowed to be null.
if ( getModel().getName() != null )
{
return getModel().getName();
@@ -1575,10 +1575,10 @@ public class MavenProject
for ( Artifact a : getArtifacts() )
{
-// TODO: classpath check doesn't belong here - that's the other
method
+// TODO classpath check doesn't belong here - that's the other
method
if ( a.getArtifactHandler().isAddedToClasspath() )
{
-// TODO: let the scope handler deal with this
+// TODO let the scope handler deal with this
if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) ||
Artifact.SCOPE_PROVIDED.equals( a.getScope() )
|| Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
{
@@ -1603,7 +1603,7 @@ public class MavenProject
for ( Artifact a : getArtifacts() )
{
-// TODO: let the scope handler deal with this
+// TODO let the scope handler deal with this
if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) ||
Artifact.SCOPE_PROVIDED.equals( a.getScope() )
|| Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
{
@@ -1629,7 +1629,7 @@ public class MavenProject
for ( Artifact a : getArtifacts() )
{
-// TODO: classpath check doesn't belong here - that's the other
method
+// TODO classpath check doesn't belong here - that's the other
method
if ( a.getArtifactHandler().isAddedToClasspath() )
{
list.add( a );
@@ -1680,7 +1680,7 @@ public class MavenProject
for ( Artifact a : getArtifacts() )
{
-// TODO: let the scope handler deal with this
+// TODO let the scope handler deal with this
if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) ||
Artifact.SCOPE_RUNTIME.equals( a.getScope() ) )
{
Dependency dependency = new Dependency();
@@ -1705,9 +1705,9 @@ public class MavenProject
for ( Artifact a : getArtifacts() )
{
-// TODO: classpath check doesn't belong here - that's the other
method
+// TODO classpath check doesn't belong here - that's the other
method
if ( a.getArtifactHandler().isAddedToClasspath()
-// TODO: let the scope handler deal with this
+// TODO let the scope handler deal with this
&& ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) ||
Artifact.SCOPE_RUNTIME.equals( a.getScope() ) ) )
{
[4/4] maven git commit: [MNG-6090] CI friendly properties break submodule builds [MNG-6057] Problem with CI friendly usage of ${..} reactor order is changed o Based on the missing replacement of the v
[MNG-6090] CI friendly properties break submodule builds
[MNG-6057] Problem with CI friendly usage of ${..} reactor order is changed
o Based on the missing replacement of the versions ${revision}
${changelist} or ${sha1} within the parent element the order
of the reactor changes.
[MNG-5895] Problem with CI friendly usage of ${..} which is already
defined via property in pom file.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/9d1fce53
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9d1fce53
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9d1fce53
Branch: refs/heads/MNG-6057
Commit: 9d1fce536e49fa7492078905957057ca39b92f18
Parents: ab2e24f
Author: Karl Heinz Marbaise
Authored: Tue Sep 29 11:46:48 2015 +0200
Committer: Karl Heinz Marbaise
Committed: Sat Mar 11 18:46:04 2017 +0100
--
.../resolver/DefaultArtifactResolver.java | 46
.../model/building/DefaultModelBuilder.java | 35 +--
.../AbstractStringBasedModelInterpolator.java | 33 +++---
3 files changed, 77 insertions(+), 37 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/9d1fce53/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 b78846b..93a5919 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
@@ -22,10 +22,12 @@ package org.apache.maven.artifact.resolver;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
@@ -149,21 +151,21 @@ public class DefaultArtifactResolver
public void resolve( Artifact artifact, List
remoteRepositories,
ArtifactRepository localRepository, TransferListener
resolutionListener )
- throws ArtifactResolutionException,
ArtifactNotFoundException
+throws ArtifactResolutionException, ArtifactNotFoundException
{
resolve( artifact, remoteRepositories, getSession( localRepository ) );
}
public void resolveAlways( Artifact artifact, List
remoteRepositories,
ArtifactRepository localRepository )
- throws ArtifactResolutionException,
ArtifactNotFoundException
+throws ArtifactResolutionException, ArtifactNotFoundException
{
resolve( artifact, remoteRepositories, getSession( localRepository ) );
}
private void resolve( Artifact artifact, List
remoteRepositories,
RepositorySystemSession session )
- throws ArtifactResolutionException,
ArtifactNotFoundException
+throws ArtifactResolutionException, ArtifactNotFoundException
{
if ( artifact == null )
{
@@ -255,8 +257,7 @@ public class DefaultArtifactResolver
ArtifactRepository
localRepository,
List remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter )
- throws
ArtifactResolutionException,
-
ArtifactNotFoundException
+throws ArtifactResolutionException, ArtifactNotFoundException
{
return resolveTransitively( artifacts, originatingArtifact,
Collections.EMPTY_MAP, localRepository,
remoteRepositories, source, filter );
@@ -268,8 +269,7 @@ public class DefaultArtifactResolver
ArtifactRepository
localRepository,
List remoteRepositories,
ArtifactMetadataSource source )
- throws
ArtifactResolutionException,
-
ArtifactNotFoundException
+throws ArtifactResolutionException, ArtifactNotF
[1/4] maven git commit: [MNG-6170] NPE in cases using Multithreaded -T X versions:set -DnewVersion=1.0-SNAPSHOT o In some cases the code will return a null which should not be scheduled. [Forced Updat
Repository: maven
Updated Branches:
refs/heads/MNG-6057 d45c316b1 -> 9d1fce536 (forced update)
[MNG-6170] NPE in cases using Multithreaded -T X versions:set
-DnewVersion=1.0-SNAPSHOT
o In some cases the code will return a null which should
not be scheduled.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7cdff43a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7cdff43a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7cdff43a
Branch: refs/heads/MNG-6057
Commit: 7cdff43aba436408c79d2b4afc169b9c6909235a
Parents: 587317b
Author: Karl Heinz Marbaise
Authored: Sun Feb 12 12:59:25 2017 +0100
Committer: Karl Heinz Marbaise
Committed: Sat Mar 11 12:00:24 2017 +0100
--
.../multithreaded/MultiThreadedBuilder.java | 27
1 file changed, 16 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/7cdff43a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
index 072aec8..1414a12 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
@@ -55,6 +55,7 @@ import org.codehaus.plexus.logging.Logger;
* @since 3.0
* @author Kristian Rosenvold
* Builds one or more lifecycles for a full module
+ * NOTE: This class is not part of any public api and can be changed
or deleted without prior notice.
*/
@Component( role = Builder.class, hint = "multithreaded" )
public class MultiThreadedBuilder
@@ -67,7 +68,6 @@ public class MultiThreadedBuilder
@Requirement
private LifecycleModuleBuilder lifecycleModuleBuilder;
-
public MultiThreadedBuilder()
{
}
@@ -142,15 +142,20 @@ public class MultiThreadedBuilder
{
break;
}
-final List newItemsThatCanBeBuilt =
-analyzer.markAsFinished( projectBuild.getProject() );
-for ( MavenProject mavenProject : newItemsThatCanBeBuilt )
+
+// MNG-6170: Only schedule other modules from reactor if we
have more modules to build than one.
+if ( analyzer.getNumberOfBuilds() > 1 )
{
-ProjectSegment scheduledDependent = projectBuildList.get(
mavenProject );
-logger.debug( "Scheduling: " + scheduledDependent );
-Callable cb =
-createBuildCallable( rootSession, scheduledDependent,
reactorContext, taskSegment, muxer );
-service.submit( cb );
+final List newItemsThatCanBeBuilt =
+analyzer.markAsFinished( projectBuild.getProject() );
+for ( MavenProject mavenProject : newItemsThatCanBeBuilt )
+{
+ProjectSegment scheduledDependent =
projectBuildList.get( mavenProject );
+logger.debug( "Scheduling: " + scheduledDependent );
+Callable cb =
+createBuildCallable( rootSession,
scheduledDependent, reactorContext, taskSegment, muxer );
+service.submit( cb );
+}
}
}
catch ( InterruptedException e )
@@ -160,13 +165,13 @@ public class MultiThreadedBuilder
}
catch ( ExecutionException e )
{
-// TODO MNG-5766 changes likely made this redundant
+// TODO MNG-5766 changes likely made this redundant
rootSession.getResult().addException( e );
break;
}
}
-// cancel outstanding builds (if any) - this can happen if an
exception is thrown in above block
+// cancel outstanding builds (if any) - this can happen if an
exception is thrown in above block
Future unprocessed;
while ( ( unprocessed = service.poll() ) != null )
[2/4] maven git commit: fixed typos
fixed typos
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/24b9ef48
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/24b9ef48
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/24b9ef48
Branch: refs/heads/MNG-6057
Commit: 24b9ef48f6045c3cca7297f4b7b94d3ee71b3718
Parents: 7cdff43
Author: Hervé Boutemy
Authored: Sat Mar 11 18:19:02 2017 +0100
Committer: Hervé Boutemy
Committed: Sat Mar 11 18:19:02 2017 +0100
--
.../lifecycle/internal/DefaultLifecycleMappingDelegate.java | 2 +-
.../maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java | 4 ++--
.../src/site/resources/design/2.1-lifecycle-refactor.graffle | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/24b9ef48/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
index 8348530..db974bc 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
@@ -79,7 +79,7 @@ public class DefaultLifecycleMappingDelegate
/*
* Grab plugin executions that are bound to the selected lifecycle
phases from project. The effective model of
* the project already contains the plugin executions induced by the
project's packaging type. Remember, all
- * phases of interest and only those are in the lifecyle mapping, if a
phase has no value in the map, we are not
+ * phases of interest and only those are in the lifecycle mapping, if
a phase has no value in the map, we are not
* interested in any of the executions bound to it.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/24b9ef48/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
--
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
index 9e402e6..aec785f 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
@@ -73,7 +73,7 @@ public class DefaultLifecyclePluginAnalyzer
// together and this really shows the problem of constructing a sensible
default configuration but
// it's all encapsulated here so it appears normalized to the POM builder.
-// We are going to take the project packaging and find all plugin in the
default lifecycle and create
+// We are going to take the project packaging and find all plugins in the
default lifecycle and create
// fully populated Plugin objects, including executions with goals and
default configuration taken
// from the plugin.xml inside a plugin.
//
@@ -82,7 +82,7 @@ public class DefaultLifecyclePluginAnalyzer
{
if ( logger.isDebugEnabled() )
{
-logger.debug( "Looking up lifecyle mappings for packaging " +
packaging + " from "
+logger.debug( "Looking up lifecycle mappings for packaging " +
packaging + " from "
+ Thread.currentThread().getContextClassLoader() );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/24b9ef48/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle
--
diff --git
a/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle
b/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle
index 722bc03..58811ba 100755
--- a/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle
+++ b/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle
@@ -3548,7 +3548,7 @@ uses plugin prefix}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-\f0\b\fs24 \cf0 \ul \ulc0 LifecyleBindingManager}
+\f0\b\fs24 \cf0 \ul \ulc0 LifecycleBindingManager}
[3/4] maven git commit: Fixed checkstyle reported error.
Fixed checkstyle reported error. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab2e24fe Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab2e24fe Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab2e24fe Branch: refs/heads/MNG-6057 Commit: ab2e24fe3612b4f12c66e698e398fcb2b908f1aa Parents: 24b9ef4 Author: Karl Heinz Marbaise Authored: Sat Mar 11 18:40:24 2017 +0100 Committer: Karl Heinz Marbaise Committed: Sat Mar 11 18:40:24 2017 +0100 -- .../lifecycle/internal/DefaultLifecycleMappingDelegate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/ab2e24fe/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java -- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java index db974bc..c2bf919 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java @@ -79,8 +79,8 @@ public class DefaultLifecycleMappingDelegate /* * Grab plugin executions that are bound to the selected lifecycle phases from project. The effective model of * the project already contains the plugin executions induced by the project's packaging type. Remember, all - * phases of interest and only those are in the lifecycle mapping, if a phase has no value in the map, we are not - * interested in any of the executions bound to it. + * phases of interest and only those are in the lifecycle mapping, if a phase has no value in the map, we are + * not interested in any of the executions bound to it. */ for ( Plugin plugin : project.getBuild().getPlugins() )
maven git commit: Code improvement.
Repository: maven
Updated Branches:
refs/heads/code-improvements [created] 809ba3405
Code improvement.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/809ba340
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/809ba340
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/809ba340
Branch: refs/heads/code-improvements
Commit: 809ba34055c70eab31876aad03c577e925fa2e6e
Parents: ab2e24f
Author: Karl Heinz Marbaise
Authored: Mon Mar 6 08:24:33 2017 +0100
Committer: Karl Heinz Marbaise
Committed: Sat Mar 11 20:53:18 2017 +0100
--
.../resolver/DefaultArtifactResolver.java | 4 ++--
.../java/org/apache/maven/cli/MavenCli.java | 21
2 files changed, 6 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/809ba340/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 b78846b..fc154cb 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
@@ -258,7 +258,7 @@ public class DefaultArtifactResolver
throws
ArtifactResolutionException,
ArtifactNotFoundException
{
-return resolveTransitively( artifacts, originatingArtifact,
Collections.EMPTY_MAP, localRepository,
+return resolveTransitively( artifacts, originatingArtifact,
Collections.emptyMap(), localRepository,
remoteRepositories, source, filter );
}
@@ -305,7 +305,7 @@ public class DefaultArtifactResolver
throws
ArtifactResolutionException,
ArtifactNotFoundException
{
-return resolveTransitively( artifacts, originatingArtifact,
Collections.EMPTY_MAP, localRepository,
+return resolveTransitively( artifacts, originatingArtifact,
Collections.emptyMap(), localRepository,
remoteRepositories, source, null,
listeners );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/809ba340/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 f3ae923..b3367c1 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
@@ -126,24 +126,11 @@ public class MavenCli
public static final String MULTIMODULE_PROJECT_DIRECTORY =
"maven.multiModuleProjectDirectory";
-@SuppressWarnings( "checkstyle:constantname" )
-public static final String userHome = System.getProperty( "user.home" );
+public static final String USER_HOME = System.getProperty( "user.home" );
-@SuppressWarnings( "checkstyle:constantname" )
-public static final File userMavenConfigurationHome = new File( userHome,
".m2" );
+public static final File USER_MAVEN_CONFIGURATION_HOME = new File(
USER_HOME, ".m2" );
-/**
- * @deprecated use {@link
SettingsXmlConfigurationProcessor#DEFAULT_USER_SETTINGS_FILE}
- */
-public static final File DEFAULT_USER_SETTINGS_FILE =
SettingsXmlConfigurationProcessor.DEFAULT_USER_SETTINGS_FILE;
-
-/**
- * @deprecated use {@link
SettingsXmlConfigurationProcessor#DEFAULT_GLOBAL_SETTINGS_FILE}
- */
-public static final File DEFAULT_GLOBAL_SETTINGS_FILE =
-SettingsXmlConfigurationProcessor.DEFAULT_GLOBAL_SETTINGS_FILE;
-
-public static final File DEFAULT_USER_TOOLCHAINS_FILE = new File(
userMavenConfigurationHome, "toolchains.xml" );
+public static final File DEFAULT_USER_TOOLCHAINS_FILE = new File(
USER_MAVEN_CONFIGURATION_HOME, "toolchains.xml" );
public static final File DEFAULT_GLOBAL_TOOLCHAINS_FILE =
new File( System.getProperty( "maven.conf" ), "toolchains.xml" );
@@ -1257,7 +1244,7 @@ public class MavenCli
//
//
--
-@SuppressWarnings( "unchecked" ) List goals =
commandLine.getArgList();
+List goals = commandLine.getArgList();
boolean recursive = true;
maven git commit: Code improvement.
Repository: maven
Updated Branches:
refs/heads/master ab2e24fe3 -> 809ba3405
Code improvement.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/809ba340
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/809ba340
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/809ba340
Branch: refs/heads/master
Commit: 809ba34055c70eab31876aad03c577e925fa2e6e
Parents: ab2e24f
Author: Karl Heinz Marbaise
Authored: Mon Mar 6 08:24:33 2017 +0100
Committer: Karl Heinz Marbaise
Committed: Sat Mar 11 20:53:18 2017 +0100
--
.../resolver/DefaultArtifactResolver.java | 4 ++--
.../java/org/apache/maven/cli/MavenCli.java | 21
2 files changed, 6 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/809ba340/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 b78846b..fc154cb 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
@@ -258,7 +258,7 @@ public class DefaultArtifactResolver
throws
ArtifactResolutionException,
ArtifactNotFoundException
{
-return resolveTransitively( artifacts, originatingArtifact,
Collections.EMPTY_MAP, localRepository,
+return resolveTransitively( artifacts, originatingArtifact,
Collections.emptyMap(), localRepository,
remoteRepositories, source, filter );
}
@@ -305,7 +305,7 @@ public class DefaultArtifactResolver
throws
ArtifactResolutionException,
ArtifactNotFoundException
{
-return resolveTransitively( artifacts, originatingArtifact,
Collections.EMPTY_MAP, localRepository,
+return resolveTransitively( artifacts, originatingArtifact,
Collections.emptyMap(), localRepository,
remoteRepositories, source, null,
listeners );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/809ba340/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 f3ae923..b3367c1 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
@@ -126,24 +126,11 @@ public class MavenCli
public static final String MULTIMODULE_PROJECT_DIRECTORY =
"maven.multiModuleProjectDirectory";
-@SuppressWarnings( "checkstyle:constantname" )
-public static final String userHome = System.getProperty( "user.home" );
+public static final String USER_HOME = System.getProperty( "user.home" );
-@SuppressWarnings( "checkstyle:constantname" )
-public static final File userMavenConfigurationHome = new File( userHome,
".m2" );
+public static final File USER_MAVEN_CONFIGURATION_HOME = new File(
USER_HOME, ".m2" );
-/**
- * @deprecated use {@link
SettingsXmlConfigurationProcessor#DEFAULT_USER_SETTINGS_FILE}
- */
-public static final File DEFAULT_USER_SETTINGS_FILE =
SettingsXmlConfigurationProcessor.DEFAULT_USER_SETTINGS_FILE;
-
-/**
- * @deprecated use {@link
SettingsXmlConfigurationProcessor#DEFAULT_GLOBAL_SETTINGS_FILE}
- */
-public static final File DEFAULT_GLOBAL_SETTINGS_FILE =
-SettingsXmlConfigurationProcessor.DEFAULT_GLOBAL_SETTINGS_FILE;
-
-public static final File DEFAULT_USER_TOOLCHAINS_FILE = new File(
userMavenConfigurationHome, "toolchains.xml" );
+public static final File DEFAULT_USER_TOOLCHAINS_FILE = new File(
USER_MAVEN_CONFIGURATION_HOME, "toolchains.xml" );
public static final File DEFAULT_GLOBAL_TOOLCHAINS_FILE =
new File( System.getProperty( "maven.conf" ), "toolchains.xml" );
@@ -1257,7 +1244,7 @@ public class MavenCli
//
//
--
-@SuppressWarnings( "unchecked" ) List goals =
commandLine.getArgList();
+List goals = commandLine.getArgList();
boolean recursive = true;
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/code-improvements [deleted] 809ba3405
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/m2 [created] 529e8a620
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/m2 [deleted] 529e8a620
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/temp-experiment [created] 529e8a620
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/temp-experiment [deleted] 529e8a620
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/temp-experiment [created] 529e8a620
maven git commit: dummy change
Repository: maven Updated Branches: refs/heads/temp-experiment 529e8a620 -> ab21ebd16 dummy change Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab21ebd1 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab21ebd1 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab21ebd1 Branch: refs/heads/temp-experiment Commit: ab21ebd16fa2d1255e7a5085e54188b5fc8cf3fc Parents: 529e8a6 Author: Stephen Connolly Authored: Sat Mar 11 23:15:45 2017 + Committer: Stephen Connolly Committed: Sat Mar 11 23:15:45 2017 + -- README.md | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/ab21ebd1/README.md -- diff --git a/README.md b/README.md index 33a4be4..fe4b0a3 100644 --- a/README.md +++ b/README.md @@ -21,3 +21,4 @@ mvn -DdistributionTargetDir="$HOME/app/maven/apache-maven-3.5.x-SNAPSHOT" clean ``` Once the build completes, you should have a new Maven distro ready to roll in that directory! +
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/temp-experiment [deleted] ab21ebd16
maven git commit: dummy change
Repository: maven Updated Branches: refs/heads/temp-experiment [created] ab21ebd16 dummy change Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab21ebd1 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab21ebd1 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab21ebd1 Branch: refs/heads/temp-experiment Commit: ab21ebd16fa2d1255e7a5085e54188b5fc8cf3fc Parents: 529e8a6 Author: Stephen Connolly Authored: Sat Mar 11 23:15:45 2017 + Committer: Stephen Connolly Committed: Sat Mar 11 23:15:45 2017 + -- README.md | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/ab21ebd1/README.md -- diff --git a/README.md b/README.md index 33a4be4..fe4b0a3 100644 --- a/README.md +++ b/README.md @@ -21,3 +21,4 @@ mvn -DdistributionTargetDir="$HOME/app/maven/apache-maven-3.5.x-SNAPSHOT" clean ``` Once the build completes, you should have a new Maven distro ready to roll in that directory! +
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/temp-experiment [deleted] ab21ebd16
maven git commit: dummy change
Repository: maven Updated Branches: refs/heads/temp-experiment [created] ab21ebd16 dummy change Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab21ebd1 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab21ebd1 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab21ebd1 Branch: refs/heads/temp-experiment Commit: ab21ebd16fa2d1255e7a5085e54188b5fc8cf3fc Parents: 529e8a6 Author: Stephen Connolly Authored: Sat Mar 11 23:15:45 2017 + Committer: Stephen Connolly Committed: Sat Mar 11 23:15:45 2017 + -- README.md | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/ab21ebd1/README.md -- diff --git a/README.md b/README.md index 33a4be4..fe4b0a3 100644 --- a/README.md +++ b/README.md @@ -21,3 +21,4 @@ mvn -DdistributionTargetDir="$HOME/app/maven/apache-maven-3.5.x-SNAPSHOT" clean ``` Once the build completes, you should have a new Maven distro ready to roll in that directory! +
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/temp-experiment [deleted] ab21ebd16
maven git commit: dummy change
Repository: maven Updated Branches: refs/heads/temp-experiment2 [created] ab21ebd16 dummy change Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab21ebd1 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab21ebd1 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab21ebd1 Branch: refs/heads/temp-experiment2 Commit: ab21ebd16fa2d1255e7a5085e54188b5fc8cf3fc Parents: 529e8a6 Author: Stephen Connolly Authored: Sat Mar 11 23:15:45 2017 + Committer: Stephen Connolly Committed: Sat Mar 11 23:15:45 2017 + -- README.md | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/ab21ebd1/README.md -- diff --git a/README.md b/README.md index 33a4be4..fe4b0a3 100644 --- a/README.md +++ b/README.md @@ -21,3 +21,4 @@ mvn -DdistributionTargetDir="$HOME/app/maven/apache-maven-3.5.x-SNAPSHOT" clean ``` Once the build completes, you should have a new Maven distro ready to roll in that directory! +
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/temp-experiment2 [deleted] ab21ebd16
maven git commit: dummy change
Repository: maven Updated Branches: refs/heads/temp-experiment2 [created] ab21ebd16 dummy change Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab21ebd1 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab21ebd1 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab21ebd1 Branch: refs/heads/temp-experiment2 Commit: ab21ebd16fa2d1255e7a5085e54188b5fc8cf3fc Parents: 529e8a6 Author: Stephen Connolly Authored: Sat Mar 11 23:15:45 2017 + Committer: Stephen Connolly Committed: Sat Mar 11 23:15:45 2017 + -- README.md | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/ab21ebd1/README.md -- diff --git a/README.md b/README.md index 33a4be4..fe4b0a3 100644 --- a/README.md +++ b/README.md @@ -21,3 +21,4 @@ mvn -DdistributionTargetDir="$HOME/app/maven/apache-maven-3.5.x-SNAPSHOT" clean ``` Once the build completes, you should have a new Maven distro ready to roll in that directory! +
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/temp-experiment2 [deleted] ab21ebd16
maven git commit: dummy change
Repository: maven Updated Branches: refs/heads/temp-experiment2 [created] ab21ebd16 dummy change Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab21ebd1 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab21ebd1 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab21ebd1 Branch: refs/heads/temp-experiment2 Commit: ab21ebd16fa2d1255e7a5085e54188b5fc8cf3fc Parents: 529e8a6 Author: Stephen Connolly Authored: Sat Mar 11 23:15:45 2017 + Committer: Stephen Connolly Committed: Sat Mar 11 23:15:45 2017 + -- README.md | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/ab21ebd1/README.md -- diff --git a/README.md b/README.md index 33a4be4..fe4b0a3 100644 --- a/README.md +++ b/README.md @@ -21,3 +21,4 @@ mvn -DdistributionTargetDir="$HOME/app/maven/apache-maven-3.5.x-SNAPSHOT" clean ``` Once the build completes, you should have a new Maven distro ready to roll in that directory! +
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/temp-experiment2 [deleted] ab21ebd16
[2/3] maven-resolver git commit: o Removed unused dependency on maven-resolver-util.
o Removed unused dependency on maven-resolver-util. Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/3dd893c5 Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/3dd893c5 Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/3dd893c5 Branch: refs/heads/master Commit: 3dd893c5db9d2f4c513b51e1dae8b10d359147fd Parents: fb686ae Author: Christian Schulte Authored: Sun Mar 12 02:37:54 2017 +0100 Committer: Christian Schulte Committed: Sun Mar 12 02:52:43 2017 +0100 -- maven-resolver-transport-file/pom.xml | 4 1 file changed, 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/3dd893c5/maven-resolver-transport-file/pom.xml -- diff --git a/maven-resolver-transport-file/pom.xml b/maven-resolver-transport-file/pom.xml index 6d80bc3..3a487b7 100644 --- a/maven-resolver-transport-file/pom.xml +++ b/maven-resolver-transport-file/pom.xml @@ -45,10 +45,6 @@ maven-resolver-spi - org.apache.maven.resolver - maven-resolver-util - - javax.inject javax.inject provided
[1/3] maven-resolver git commit: o Removed unused test dependency on hamcrest-library. o Added used but undeclared test dependency on hamcrest-core.
Repository: maven-resolver Updated Branches: refs/heads/master 0cce625d1 -> 82acf06ca o Removed unused test dependency on hamcrest-library. o Added used but undeclared test dependency on hamcrest-core. Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/fb686aea Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/fb686aea Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/fb686aea Branch: refs/heads/master Commit: fb686aea49072d849a437bee68b1b36f0fe61356 Parents: 0cce625 Author: Christian Schulte Authored: Sun Mar 12 02:33:59 2017 +0100 Committer: Christian Schulte Committed: Sun Mar 12 02:51:55 2017 +0100 -- maven-resolver-api/pom.xml | 2 +- maven-resolver-connector-basic/pom.xml | 2 +- maven-resolver-impl/pom.xml| 2 +- maven-resolver-spi/pom.xml | 2 +- maven-resolver-test-util/pom.xml | 2 +- maven-resolver-transport-classpath/pom.xml | 2 +- maven-resolver-transport-file/pom.xml | 2 +- maven-resolver-transport-http/pom.xml | 2 +- maven-resolver-transport-wagon/pom.xml | 2 +- maven-resolver-util/pom.xml| 8 pom.xml| 6 -- 11 files changed, 13 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/fb686aea/maven-resolver-api/pom.xml -- diff --git a/maven-resolver-api/pom.xml b/maven-resolver-api/pom.xml index bc5e39e..ae63fe0 100644 --- a/maven-resolver-api/pom.xml +++ b/maven-resolver-api/pom.xml @@ -43,7 +43,7 @@ org.hamcrest - hamcrest-library + hamcrest-core test http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/fb686aea/maven-resolver-connector-basic/pom.xml -- diff --git a/maven-resolver-connector-basic/pom.xml b/maven-resolver-connector-basic/pom.xml index 594d1f3..7f428f6 100644 --- a/maven-resolver-connector-basic/pom.xml +++ b/maven-resolver-connector-basic/pom.xml @@ -67,7 +67,7 @@ org.hamcrest - hamcrest-library + hamcrest-core test http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/fb686aea/maven-resolver-impl/pom.xml -- diff --git a/maven-resolver-impl/pom.xml b/maven-resolver-impl/pom.xml index 06bdaf0..c405dc3 100644 --- a/maven-resolver-impl/pom.xml +++ b/maven-resolver-impl/pom.xml @@ -80,7 +80,7 @@ org.hamcrest - hamcrest-library + hamcrest-core test http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/fb686aea/maven-resolver-spi/pom.xml -- diff --git a/maven-resolver-spi/pom.xml b/maven-resolver-spi/pom.xml index f193070..6295967 100644 --- a/maven-resolver-spi/pom.xml +++ b/maven-resolver-spi/pom.xml @@ -47,7 +47,7 @@ org.hamcrest - hamcrest-library + hamcrest-core test http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/fb686aea/maven-resolver-test-util/pom.xml -- diff --git a/maven-resolver-test-util/pom.xml b/maven-resolver-test-util/pom.xml index 5496507..c4dc1c2 100644 --- a/maven-resolver-test-util/pom.xml +++ b/maven-resolver-test-util/pom.xml @@ -51,7 +51,7 @@ org.hamcrest - hamcrest-library + hamcrest-core test http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/fb686aea/maven-resolver-transport-classpath/pom.xml -- diff --git a/maven-resolver-transport-classpath/pom.xml b/maven-resolver-transport-classpath/pom.xml index 8acf543..e3d9ab4 100644 --- a/maven-resolver-transport-classpath/pom.xml +++ b/maven-resolver-transport-classpath/pom.xml @@ -67,7 +67,7 @@ org.hamcrest - hamcrest-library + hamcrest-core test http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/fb686aea/maven-resolver-transport-file/pom.xml -- diff --git a/maven-resolver-transport-file/pom.xml b/maven-resolver-transport-file/pom.xml index c6f5f9e..6d80bc3 100644 --- a/maven-resolver-transport-file/pom.xml +++ b/maven-resolver-transport-file/pom.xml @@ -67,7 +67,7 @@ org.hamcrest - hamcrest-library + hamcrest-core test http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/fb686aea/maven-resolver-transport-http/pom.xml -
[3/3] maven-resolver git commit: o Added used but undeclared transitive dependencies.
o Added used but undeclared transitive dependencies. Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/82acf06c Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/82acf06c Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/82acf06c Branch: refs/heads/master Commit: 82acf06ca0074601c39a7b99b5a0afb4a8a2dc69 Parents: 3dd893c Author: Christian Schulte Authored: Sun Mar 12 02:50:37 2017 +0100 Committer: Christian Schulte Committed: Sun Mar 12 02:52:44 2017 +0100 -- maven-resolver-transport-http/pom.xml | 22 ++ 1 file changed, 22 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/82acf06c/maven-resolver-transport-http/pom.xml -- diff --git a/maven-resolver-transport-http/pom.xml b/maven-resolver-transport-http/pom.xml index cad2be2..6db8834 100644 --- a/maven-resolver-transport-http/pom.xml +++ b/maven-resolver-transport-http/pom.xml @@ -61,6 +61,11 @@ + org.apache.httpcomponents + httpcore + 4.2.5 + + org.slf4j jcl-over-slf4j 1.6.2 @@ -99,11 +104,28 @@ test + org.eclipse.jetty + jetty-util + 7.6.14.v20131031 + test + + + org.eclipse.jetty.orbit + javax.servlet + 2.5.0.v201103041518 + test + + ch.qos.logback logback-classic 1.0.7 test + + org.slf4j + slf4j-api + test +
