You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2016/06/29 03:25:21 UTC
[1/7] maven git commit: [MNG-3507] use new maven-shared-utils styled
messages API [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-6006 b14478659 -> 499c975db (forced update)
[MNG-3507] use new maven-shared-utils styled messages API
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d0d5303d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d0d5303d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d0d5303d
Branch: refs/heads/MNG-6006
Commit: d0d5303dfaaee58859d8cf088f7ff6e7bcfd9527
Parents: 934e030
Author: Herv� Boutemy <hb...@apache.org>
Authored: Tue Jun 28 23:53:45 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Tue Jun 28 23:53:45 2016 +0200
----------------------------------------------------------------------
apache-maven/pom.xml | 4 +
maven-core/pom.xml | 8 +-
.../lifecycle/LifecycleExecutionException.java | 6 +-
maven-embedder/pom.xml | 4 -
.../org/apache/maven/cli/CLIReportingUtils.java | 4 +-
.../java/org/apache/maven/cli/MavenCli.java | 21 +++--
.../maven/cli/event/ExecutionEventLogger.java | 88 ++++++++++----------
.../cli/logging/impl/gossip/ColorRenderer.java | 24 +++---
pom.xml | 9 +-
9 files changed, 83 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/d0d5303d/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 37751cc..ec11cc2 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -95,6 +95,10 @@ under the License.
<groupId>com.planet57.gossip</groupId>
<artifactId>gossip-slf4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/maven/blob/d0d5303d/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 0728886..adf63a6 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -94,13 +94,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-project-utils</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>maven-shared-utils</artifactId>
</dependency>
<!-- Plexus -->
<dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/d0d5303d/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 5645abd..0578cd1 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
@@ -19,11 +19,11 @@ package org.apache.maven.lifecycle;
* under the License.
*/
-import static org.apache.maven.shared.project.utils.AnsiUtils.ansi;
+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.project.utils.AnsiUtils;
+import org.apache.maven.shared.utils.logging.MessageBuffer;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -78,7 +78,7 @@ public class LifecycleExecutionException
private static String createMessage( MojoExecution execution, MavenProject project, Throwable cause )
{
- AnsiUtils buffer = ansi( 256 );
+ MessageBuffer buffer = buffer( 256 );
buffer.a( "Failed to execute goal" );
http://git-wip-us.apache.org/repos/asf/maven/blob/d0d5303d/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 95504c7..f9973c5 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -113,10 +113,6 @@ under the License.
<artifactId>plexus-cipher</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-project-utils</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/d0d5303d/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
index aa28b27..75da4f3 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
@@ -19,7 +19,7 @@ package org.apache.maven.cli;
* under the License.
*/
-import static org.apache.maven.shared.project.utils.AnsiUtils.ansi;
+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
import java.io.IOException;
import java.io.InputStream;
@@ -57,7 +57,7 @@ public final class CLIReportingUtils
final String ls = System.getProperty( "line.separator" );
Properties properties = getBuildProperties();
StringBuilder version = new StringBuilder( 256 );
- version.append( ansi().strong( createMavenVersionString( properties ) ) ).append( ls );
+ version.append( buffer().strong( createMavenVersionString( properties ) ) ).append( ls );
version.append( reduce(
properties.getProperty( "distributionShortName" ) + " home: " + System.getProperty( "maven.home",
"<unknown Maven "
http://git-wip-us.apache.org/repos/asf/maven/blob/d0d5303d/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 a0e09f2..3e1194b 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,7 +19,7 @@ package org.apache.maven.cli;
* under the License.
*/
-import static org.apache.maven.shared.project.utils.AnsiUtils.ansi;
+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
import java.io.BufferedInputStream;
import java.io.Console;
@@ -91,7 +91,7 @@ import org.apache.maven.model.profile.ProfileSelector;
import org.apache.maven.project.MavenProject;
import org.apache.maven.properties.internal.EnvironmentUtils;
import org.apache.maven.properties.internal.SystemProperties;
-import org.apache.maven.shared.project.utils.AnsiUtils;
+import org.apache.maven.shared.utils.logging.MessageUtils;
import org.apache.maven.toolchain.building.DefaultToolchainsBuildingRequest;
import org.apache.maven.toolchain.building.ToolchainsBuilder;
import org.apache.maven.toolchain.building.ToolchainsBuildingResult;
@@ -211,10 +211,9 @@ public class MavenCli
{
MavenCli cli = new MavenCli();
- AnsiUtils.systemInstall();
- AnsiUtils.setEnabled( true ); // activate colors by default: will be deactivated later if necessary
+ MessageUtils.systemInstall();
int result = cli.doMain( new CliRequest( args, classWorld ) );
- AnsiUtils.systemUninstall();
+ MessageUtils.systemUninstall();
return result;
}
@@ -476,7 +475,7 @@ public class MavenCli
if ( cliRequest.commandLine.hasOption( CLIManager.BATCH_MODE ) )
{
- AnsiUtils.setEnabled( false );
+ MessageUtils.setColor( false );
}
if ( cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) )
@@ -484,7 +483,7 @@ public class MavenCli
File logFile = new File( cliRequest.commandLine.getOptionValue( CLIManager.LOG_FILE ) );
logFile = resolveFile( logFile, cliRequest.workingDirectory );
- AnsiUtils.setEnabled( false );
+ MessageUtils.setColor( false );
// redirect stdout and stderr to file
try
@@ -1021,11 +1020,11 @@ public class MavenCli
if ( !cliRequest.showErrors )
{
slf4jLogger.error( "To see the full stack trace of the errors, re-run Maven with the "
- + ansi().strong( "-e" ) + " switch." );
+ + buffer().strong( "-e" ) + " switch." );
}
if ( !slf4jLogger.isDebugEnabled() )
{
- slf4jLogger.error( "Re-run Maven using the " + ansi().strong( "-X" )
+ slf4jLogger.error( "Re-run Maven using the " + buffer().strong( "-X" )
+ " switch to enable full debug logging." );
}
@@ -1037,7 +1036,7 @@ public class MavenCli
for ( Map.Entry<String, String> entry : references.entrySet() )
{
- slf4jLogger.error( ansi().strong( entry.getValue() ) + " " + entry.getKey() );
+ slf4jLogger.error( buffer().strong( entry.getValue() ) + " " + entry.getKey() );
}
}
@@ -1045,7 +1044,7 @@ public class MavenCli
{
slf4jLogger.error( "" );
slf4jLogger.error( "After correcting the problems, you can resume the build with the command" );
- slf4jLogger.error( ansi().strong().a( " mvn <goals> -rf :" )
+ slf4jLogger.error( buffer().strong().a( " mvn <goals> -rf :" )
.a( project.getArtifactId() ).reset().toString() );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/d0d5303d/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
index 911f605..2c2e4c2 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
@@ -21,7 +21,7 @@ package org.apache.maven.cli.event;
import static org.apache.maven.cli.CLIReportingUtils.formatDuration;
import static org.apache.maven.cli.CLIReportingUtils.formatTimestamp;
-import static org.apache.maven.shared.project.utils.AnsiUtils.ansi;
+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
import org.apache.commons.lang3.Validate;
import org.apache.maven.execution.AbstractExecutionListener;
@@ -34,7 +34,7 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.project.utils.AnsiUtils;
+import org.apache.maven.shared.utils.logging.MessageBuffer;
import org.codehaus.plexus.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -83,7 +83,7 @@ public class ExecutionEventLogger
private void infoMain( String msg )
{
- logger.info( ansi().strong( msg ).toString() );
+ logger.info( buffer().strong( msg ).toString() );
}
@Override
@@ -161,11 +161,11 @@ public class ExecutionEventLogger
if ( buildSummary == null )
{
- buffer.append( ansi().warning( "SKIPPED" ) );
+ buffer.append( buffer().warning( "SKIPPED" ) );
}
else if ( buildSummary instanceof BuildSuccess )
{
- buffer.append( ansi().success( "SUCCESS" ) );
+ buffer.append( buffer().success( "SUCCESS" ) );
buffer.append( " [" );
String buildTimeDuration = formatDuration( buildSummary.getTime() );
int padSize = MAX_PADDED_BUILD_TIME_DURATION_LENGTH - buildTimeDuration.length();
@@ -178,7 +178,7 @@ public class ExecutionEventLogger
}
else if ( buildSummary instanceof BuildFailure )
{
- buffer.append( ansi().failure( "FAILURE" ) );
+ buffer.append( buffer().failure( "FAILURE" ) );
buffer.append( " [" );
String buildTimeDuration = formatDuration( buildSummary.getTime() );
int padSize = MAX_PADDED_BUILD_TIME_DURATION_LENGTH - buildTimeDuration.length();
@@ -197,17 +197,17 @@ public class ExecutionEventLogger
private void logResult( MavenSession session )
{
infoLine( '-' );
- AnsiUtils ansi = ansi();
+ MessageBuffer buffer = buffer();
if ( session.getResult().hasExceptions() )
{
- ansi.failure( "BUILD FAILURE" );
+ buffer.failure( "BUILD FAILURE" );
}
else
{
- ansi.success( "BUILD SUCCESS" );
+ buffer.success( "BUILD SUCCESS" );
}
- logger.info( ansi.toString() );
+ logger.info( buffer.toString() );
}
private void logStats( MavenSession session )
@@ -282,12 +282,12 @@ public class ExecutionEventLogger
{
logger.info( "" );
- AnsiUtils ansi = ansi().strong( "--- " );
- append( ansi, event.getMojoExecution() );
- append( ansi, event.getProject() );
- ansi.strong( " ---" );
+ MessageBuffer buffer = buffer().strong( "--- " );
+ append( buffer, event.getMojoExecution() );
+ append( buffer, event.getProject() );
+ buffer.strong( " ---" );
- logger.info( ansi.toString() );
+ logger.info( buffer.toString() );
}
}
@@ -302,14 +302,14 @@ public class ExecutionEventLogger
{
logger.info( "" );
- AnsiUtils ansi = ansi().strong( ">>> " );
- append( ansi, event.getMojoExecution() );
- ansi.strong( " > " );
- appendForkInfo( ansi, event.getMojoExecution().getMojoDescriptor() );
- append( ansi, event.getProject() );
- ansi.strong( " >>>" );
+ MessageBuffer buffer = buffer().strong( ">>> " );
+ append( buffer, event.getMojoExecution() );
+ buffer.strong( " > " );
+ appendForkInfo( buffer, event.getMojoExecution().getMojoDescriptor() );
+ append( buffer, event.getProject() );
+ buffer.strong( " >>>" );
- logger.info( ansi.toString() );
+ logger.info( buffer.toString() );
}
}
@@ -326,53 +326,53 @@ public class ExecutionEventLogger
{
logger.info( "" );
- AnsiUtils ansi = ansi().strong( "<<< " );
- append( ansi, event.getMojoExecution() );
- ansi.strong( " < " );
- appendForkInfo( ansi, event.getMojoExecution().getMojoDescriptor() );
- append( ansi, event.getProject() );
- ansi.strong( " <<<" );
+ MessageBuffer buffer = buffer().strong( "<<< " );
+ append( buffer, event.getMojoExecution() );
+ buffer.strong( " < " );
+ appendForkInfo( buffer, event.getMojoExecution().getMojoDescriptor() );
+ append( buffer, event.getProject() );
+ buffer.strong( " <<<" );
- logger.info( ansi.toString() );
+ logger.info( buffer.toString() );
}
}
- private void append( AnsiUtils ansi, MojoExecution me )
+ private void append( MessageBuffer buffer, MojoExecution me )
{
- ansi.mojo().a( me.getArtifactId() ).a( ':' ).a( me.getVersion() );
- ansi.a( ':' ).a( me.getGoal() ).reset();
+ buffer.mojo().a( me.getArtifactId() ).a( ':' ).a( me.getVersion() );
+ buffer.a( ':' ).a( me.getGoal() ).reset();
if ( me.getExecutionId() != null )
{
- ansi.strong().a( " (" ).a( me.getExecutionId() ).a( ')' ).reset();
+ buffer.strong().a( " (" ).a( me.getExecutionId() ).a( ')' ).reset();
}
}
- private void appendForkInfo( AnsiUtils ansi, MojoDescriptor md )
+ private void appendForkInfo( MessageBuffer buffer, MojoDescriptor md )
{
- ansi.strong();
+ buffer.strong();
if ( StringUtils.isNotEmpty( md.getExecutePhase() ) )
{
// forked phase
if ( StringUtils.isNotEmpty( md.getExecuteLifecycle() ) )
{
- ansi.a( '[' );
- ansi.a( md.getExecuteLifecycle() );
- ansi.a( ']' );
+ buffer.a( '[' );
+ buffer.a( md.getExecuteLifecycle() );
+ buffer.a( ']' );
}
- ansi.a( md.getExecutePhase() );
+ buffer.a( md.getExecutePhase() );
}
else
{
// forked goal
- ansi.a( ':' );
- ansi.a( md.getExecuteGoal() );
+ buffer.a( ':' );
+ buffer.a( md.getExecuteGoal() );
}
- ansi.reset();
+ buffer.reset();
}
- private void append( AnsiUtils ansi, MavenProject project )
+ private void append( MessageBuffer buffer, MavenProject project )
{
- ansi.a( " @ " ).project( project.getArtifactId() );
+ buffer.a( " @ " ).project( project.getArtifactId() );
}
@Override
http://git-wip-us.apache.org/repos/asf/maven/blob/d0d5303d/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
index ba0c20a..a21d89d 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
@@ -19,7 +19,7 @@ package org.apache.maven.cli.logging.impl.gossip;
* under the License.
*/
-import static org.apache.maven.shared.project.utils.AnsiUtils.ansi;
+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
import com.planet57.gossip.Event;
import com.planet57.gossip.Level;
@@ -46,20 +46,20 @@ extends com.planet57.gossip.render.PatternRenderer
{
case TRACE:
case DEBUG:
- buff.append( ansi().debug().a( level.name() ).reset() );
+ buff.append( buffer().debug().a( level.name() ).reset() );
break;
case INFO:
- buff.append( ansi().info().a( level.name() ).reset() );
+ buff.append( buffer().info().a( level.name() ).reset() );
break;
case WARN:
// Maven uses WARNING instead of WARN
- buff.append( ansi().warning().a( WARNING ).reset() );
+ buff.append( buffer().warning().a( WARNING ).reset() );
break;
case ERROR:
- buff.append( ansi().error().a( level.name() ).reset() );
+ buff.append( buffer().error().a( level.name() ).reset() );
break;
default:
@@ -72,7 +72,7 @@ extends com.planet57.gossip.render.PatternRenderer
{
StringBuilder tmp = new StringBuilder();
super.renderName( event, tmp, shortName );
- buff.append( ansi().success( tmp ) );
+ buff.append( buffer().success( tmp ) );
}
@@ -88,11 +88,11 @@ extends com.planet57.gossip.render.PatternRenderer
return;
}
- buff.append( ansi().failure( cause.getClass().getName() ) );
+ buff.append( buffer().failure( cause.getClass().getName() ) );
if ( cause.getMessage() != null )
{
buff.append( ": " );
- buff.append( ansi().failure( cause.getMessage() ) );
+ buff.append( buffer().failure( cause.getMessage() ) );
}
renderNewLine( buff );
@@ -101,19 +101,19 @@ extends com.planet57.gossip.render.PatternRenderer
for ( StackTraceElement e : cause.getStackTrace() )
{
buff.append( " " );
- buff.append( ansi().strong( "at" ).a( " " ).a( e.getClassName() ).a( "." ).a( e.getMethodName() ) );
- buff.append( ansi().a( " (" ).strong( getLocation( e ) ).a( ")" ) );
+ buff.append( buffer().strong( "at" ).a( " " ).a( e.getClassName() ).a( "." ).a( e.getMethodName() ) );
+ buff.append( buffer().a( " (" ).strong( getLocation( e ) ).a( ")" ) );
renderNewLine( buff );
}
cause = cause.getCause();
if ( cause != null )
{
- buff.append( ansi().strong( "Caused by" ).a( ": " ).a( cause.getClass().getName() ) );
+ buff.append( buffer().strong( "Caused by" ).a( ": " ).a( cause.getClass().getName() ) );
if ( cause.getMessage() != null )
{
buff.append( ": " );
- buff.append( ansi().failure( cause.getMessage() ) );
+ buff.append( buffer().failure( cause.getMessage() ) );
}
renderNewLine( buff );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/d0d5303d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a3ea2c2..c447507 100644
--- a/pom.xml
+++ b/pom.xml
@@ -288,8 +288,13 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-project-utils</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <artifactId>maven-shared-utils</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
+ <version>1.13</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
[3/7] maven git commit: [MNG-4645] Move central repo definition out
of Maven's core so it can be more easily changed
Posted by sc...@apache.org.
[MNG-4645] Move central repo definition out of Maven's core so it can be more easily changed
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/1b00a9e1
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/1b00a9e1
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/1b00a9e1
Branch: refs/heads/MNG-6006
Commit: 1b00a9e1591fe0f7c14b251126d9326e9a6bd401
Parents: 96630be
Author: Christian Schulte <sc...@apache.org>
Authored: Wed Jun 29 04:34:44 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Jun 29 04:34:44 2016 +0200
----------------------------------------------------------------------
apache-maven/src/conf/settings.xml | 38 ++++++++++++++++++--
.../org/apache/maven/model/pom-4.0.0.xml | 27 --------------
2 files changed, 36 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/1b00a9e1/apache-maven/src/conf/settings.xml
----------------------------------------------------------------------
diff --git a/apache-maven/src/conf/settings.xml b/apache-maven/src/conf/settings.xml
index 19d7a97..81f3560 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -244,14 +244,48 @@ under the License.
</properties>
</profile>
-->
+
+ <profile>
+ <id>default</id>
+
+ <repositories>
+ <repository>
+ <id>central</id>
+ <name>Central Repository</name>
+ <url>https://repo.maven.apache.org/maven2</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>central</id>
+ <name>Central Repository</name>
+ <url>https://repo.maven.apache.org/maven2</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
</profiles>
<!-- activeProfiles
| List of profiles that are active for all builds.
- |
+ |-->
<activeProfiles>
+ <!--
<activeProfile>alwaysActiveProfile</activeProfile>
<activeProfile>anotherAlwaysActiveProfile</activeProfile>
+ -->
+ <activeProfile>default</activeProfile>
</activeProfiles>
- -->
+
</settings>
http://git-wip-us.apache.org/repos/asf/maven/blob/1b00a9e1/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index cc55dac..7565dfb 100644
--- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -23,33 +23,6 @@ under the License.
<project>
<modelVersion>4.0.0</modelVersion>
- <repositories>
- <repository>
- <id>central</id>
- <name>Central Repository</name>
- <url>https://repo.maven.apache.org/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>central</id>
- <name>Central Repository</name>
- <url>https://repo.maven.apache.org/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <updatePolicy>never</updatePolicy>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
<build>
<directory>${project.basedir}/target</directory>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
[2/7] maven git commit: [MNG-6054] Removal of super pom plugin
management.
Posted by sc...@apache.org.
[MNG-6054] Removal of super pom plugin management.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/96630be4
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/96630be4
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/96630be4
Branch: refs/heads/MNG-6006
Commit: 96630be42ef7cd7b108883b3b2ab913e548c368e
Parents: d0d5303
Author: Christian Schulte <sc...@apache.org>
Authored: Wed Jun 29 04:04:36 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Jun 29 04:04:36 2016 +0200
----------------------------------------------------------------------
.../org/apache/maven/model/pom-4.0.0.xml | 22 --------------------
1 file changed, 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/96630be4/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index d1ccd1f..cc55dac 100644
--- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -76,28 +76,6 @@ under the License.
<filtering>true</filtering>
</testResource>
</testResources>
- <pluginManagement>
- <!-- NOTE: These plugins will be removed from future versions of the super POM -->
- <!-- They are kept for the moment as they are very unlikely to conflict with lifecycle mappings (MNG-4453) -->
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.6</version>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.5.3</version>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<reporting>
[5/7] maven git commit: [MNG-5968] Default plugin version updates.
Posted by sc...@apache.org.
[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/5077f221
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5077f221
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5077f221
Branch: refs/heads/MNG-6006
Commit: 5077f22166357cfc91e597bb715a12755aa44aec
Parents: 6460063
Author: Christian Schulte <sc...@apache.org>
Authored: Wed Jun 29 05:23:56 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Jun 29 05:23:56 2016 +0200
----------------------------------------------------------------------
.../META-INF/plexus/default-bindings.xml | 30 ++++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/5077f221/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 f7ebe8d..9a30353 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
@@ -67,13 +67,13 @@ Mappings to default lifecycle, specific for each packaging.
<!-- START SNIPPET: jar-lifecycle -->
<phases>
<process-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.7:resources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.1:resources
</process-resources>
<compile>
org.apache.maven.plugins:maven-compiler-plugin:3.5.1:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.7:testResources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.1:testResources
</process-test-resources>
<test-compile>
org.apache.maven.plugins:maven-compiler-plugin:3.5.1:testCompile
@@ -82,7 +82,7 @@ Mappings to default lifecycle, specific for each packaging.
org.apache.maven.plugins:maven-surefire-plugin:2.19.1:test
</test>
<package>
- org.apache.maven.plugins:maven-jar-plugin:2.6:jar
+ org.apache.maven.plugins:maven-jar-plugin:3.0.2:jar
</package>
<install>
org.apache.maven.plugins:maven-install-plugin:2.5.2:install
@@ -111,13 +111,13 @@ Mappings to default lifecycle, specific for each packaging.
<!-- START SNIPPET: ejb-lifecycle -->
<phases>
<process-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.7:resources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.1:resources
</process-resources>
<compile>
org.apache.maven.plugins:maven-compiler-plugin:3.5.1:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.7:testResources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.1:testResources
</process-test-resources>
<test-compile>
org.apache.maven.plugins:maven-compiler-plugin:3.5.1:testCompile
@@ -155,16 +155,16 @@ Mappings to default lifecycle, specific for each packaging.
<!-- START SNIPPET: maven-plugin-lifecycle -->
<phases>
<process-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.7:resources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.1:resources
</process-resources>
<compile>
org.apache.maven.plugins:maven-compiler-plugin:3.5.1:compile
</compile>
<process-classes>
- org.apache.maven.plugins:maven-plugin-plugin:3.3:descriptor
+ org.apache.maven.plugins:maven-plugin-plugin:3.4:descriptor
</process-classes>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.7:testResources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.1:testResources
</process-test-resources>
<test-compile>
org.apache.maven.plugins:maven-compiler-plugin:3.5.1:testCompile
@@ -173,8 +173,8 @@ Mappings to default lifecycle, specific for each packaging.
org.apache.maven.plugins:maven-surefire-plugin:2.19.1:test
</test>
<package>
- org.apache.maven.plugins:maven-jar-plugin:2.6:jar,
- org.apache.maven.plugins:maven-plugin-plugin:3.3:addPluginArtifactMetadata
+ org.apache.maven.plugins:maven-jar-plugin:3.0.2:jar,
+ org.apache.maven.plugins:maven-plugin-plugin:3.4:addPluginArtifactMetadata
</package>
<install>
org.apache.maven.plugins:maven-install-plugin:2.5.2:install
@@ -203,13 +203,13 @@ Mappings to default lifecycle, specific for each packaging.
<!-- START SNIPPET: war-lifecycle -->
<phases>
<process-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.7:resources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.1:resources
</process-resources>
<compile>
org.apache.maven.plugins:maven-compiler-plugin:3.5.1:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.7:testResources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.1:testResources
</process-test-resources>
<test-compile>
org.apache.maven.plugins:maven-compiler-plugin:3.5.1:testCompile
@@ -250,7 +250,7 @@ Mappings to default lifecycle, specific for each packaging.
org.apache.maven.plugins:maven-ear-plugin:2.9.1:generate-application-xml
</generate-resources>
<process-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.7:resources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.1:resources
</process-resources>
<package>
org.apache.maven.plugins:maven-ear-plugin:2.9.1:ear
@@ -282,13 +282,13 @@ Mappings to default lifecycle, specific for each packaging.
<!-- START SNIPPET: rar-lifecycle -->
<phases>
<process-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.7:resources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.1:resources
</process-resources>
<compile>
org.apache.maven.plugins:maven-compiler-plugin:3.5.1:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.7:testResources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.1:testResources
</process-test-resources>
<test-compile>
org.apache.maven.plugins:maven-compiler-plugin:3.5.1:testCompile
[6/7] maven git commit: [MNG-6006] Import Aether to Maven codebase
Posted by sc...@apache.org.
[MNG-6006] Import Aether to Maven codebase
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3118657e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3118657e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3118657e
Branch: refs/heads/MNG-6006
Commit: 3118657e34ec21e14549199649f1982fa11e1665
Parents: 5077f22
Author: Christian Schulte <sc...@apache.org>
Authored: Fri Jun 10 16:50:33 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Jun 29 05:24:57 2016 +0200
----------------------------------------------------------------------
apache-maven/pom.xml | 6 +++---
maven-aether-provider/pom.xml | 14 +++++++-------
maven-artifact/pom.xml | 2 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 12 ++++++------
maven-core/pom.xml | 10 +++++-----
maven-embedder/pom.xml | 6 +++---
maven-model-builder/pom.xml | 2 +-
maven-model/pom.xml | 2 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
pom.xml | 16 ++++++++--------
14 files changed, 40 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index ec11cc2..75fe35b 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>apache-maven</artifactId>
@@ -84,11 +84,11 @@ under the License.
<artifactId>wagon-file</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-transport-wagon</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/maven-aether-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 9d7cfd5..7a77ed9 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-aether-provider</artifactId>
@@ -47,19 +47,19 @@ under the License.
<artifactId>maven-repository-metadata</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-api</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-util</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-impl</artifactId>
</dependency>
<dependency>
@@ -104,12 +104,12 @@ under the License.
</dependency>
<!-- Testing -->
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-transport-wagon</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/maven-artifact/pom.xml
----------------------------------------------------------------------
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index 503e097..e3943c9 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-artifact</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/maven-builder-support/pom.xml
----------------------------------------------------------------------
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 5cc3d8d..2ecb87e 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-builder-support</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 9588dd2..2bcecf8 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-compat</artifactId>
@@ -71,15 +71,15 @@ under the License.
<artifactId>maven-aether-provider</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-api</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-util</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-impl</artifactId>
</dependency>
<dependency>
@@ -109,12 +109,12 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-transport-wagon</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index adf63a6..e5df796 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-core</artifactId>
@@ -77,19 +77,19 @@ under the License.
<artifactId>maven-aether-provider</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-impl</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-api</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-util</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index f9973c5..87372e8 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-embedder</artifactId>
@@ -63,11 +63,11 @@ under the License.
<artifactId>maven-model-builder</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-api</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-util</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/maven-model-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index b6ea3cd..0dd08ac 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-model-builder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/maven-model/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 29c454c..41cf168 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-model</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/maven-plugin-api/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index d4fc9af..a8ca3d0 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-plugin-api</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/maven-repository-metadata/pom.xml
----------------------------------------------------------------------
diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml
index 1bef9ef..7480de7 100644
--- a/maven-repository-metadata/pom.xml
+++ b/maven-repository-metadata/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-repository-metadata</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/maven-settings-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml
index 886031c..2d415c9 100644
--- a/maven-settings-builder/pom.xml
+++ b/maven-settings-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-settings-builder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/maven-settings/pom.xml
----------------------------------------------------------------------
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index 39b1791..133ee32 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-settings</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/3118657e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c447507..f850b31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Maven</name>
@@ -64,7 +64,7 @@ under the License.
<cipherVersion>1.7</cipherVersion>
<modelloVersion>1.8.3</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
- <aetherVersion>1.0.2.v20150114</aetherVersion>
+ <aetherVersion>1.2.0-SNAPSHOT</aetherVersion>
<!-- Upgrade of SLF4J blocked by SLF4J-370 (MNG-6023). -->
<!-- https://issues.apache.org/jira/browse/MNG-6023 -->
<!-- http://jira.qos.ch/browse/SLF4J-370 -->
@@ -356,32 +356,32 @@ under the License.
</dependency>
<!-- Repository -->
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-api</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-spi</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-impl</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-util</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
+ <groupId>org.apache.maven.aether</groupId>
<artifactId>aether-transport-wagon</artifactId>
<version>${aetherVersion}</version>
</dependency>
[7/7] maven git commit: [MNG-5761] Dependency management is not
transitive.
Posted by sc...@apache.org.
[MNG-5761] Dependency management is not transitive.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/499c975d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/499c975d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/499c975d
Branch: refs/heads/MNG-6006
Commit: 499c975db4c5cc2a8ba4331ed64dead40c4f206e
Parents: 3118657
Author: Christian Schulte <sc...@apache.org>
Authored: Fri Jun 10 16:55:30 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Jun 29 05:24:57 2016 +0200
----------------------------------------------------------------------
.../maven/repository/internal/MavenRepositorySystemUtils.java | 4 ++--
.../apache/maven/artifact/AbstractArtifactComponentTestCase.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/499c975d/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
index 3a98b2a..b0b0a8d 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
@@ -33,7 +33,7 @@ import org.eclipse.aether.impl.MetadataGeneratorFactory;
import org.eclipse.aether.impl.VersionRangeResolver;
import org.eclipse.aether.impl.VersionResolver;
import org.eclipse.aether.util.artifact.DefaultArtifactTypeRegistry;
-import org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
+import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager;
import org.eclipse.aether.util.graph.selector.AndDependencySelector;
import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector;
import org.eclipse.aether.util.graph.selector.OptionalDependencySelector;
@@ -95,7 +95,7 @@ public final class MavenRepositorySystemUtils
DependencyTraverser depTraverser = new FatArtifactTraverser();
session.setDependencyTraverser( depTraverser );
- DependencyManager depManager = new ClassicDependencyManager();
+ DependencyManager depManager = new TransitiveDependencyManager();
session.setDependencyManager( depManager );
DependencySelector depFilter =
http://git-wip-us.apache.org/repos/asf/maven/blob/499c975d/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
index 365acc4..73780c1 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
@@ -39,7 +39,7 @@ import org.eclipse.aether.collection.DependencySelector;
import org.eclipse.aether.collection.DependencyTraverser;
import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
import org.eclipse.aether.repository.LocalRepository;
-import org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
+import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager;
import org.eclipse.aether.util.graph.selector.AndDependencySelector;
import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector;
import org.eclipse.aether.util.graph.selector.OptionalDependencySelector;
@@ -349,7 +349,7 @@ public abstract class AbstractArtifactComponentTestCase
DependencyTraverser depTraverser = new FatArtifactTraverser();
session.setDependencyTraverser( depTraverser );
- DependencyManager depManager = new ClassicDependencyManager();
+ DependencyManager depManager = new TransitiveDependencyManager();
session.setDependencyManager( depManager );
DependencySelector depFilter = new AndDependencySelector( new ScopeDependencySelector( "test", "provided" ),
[4/7] maven git commit: [MNG-4645] Move central repo definition out
of Maven's core so it can be more easily changed [MNG-6054] Removal of super
pom plugin management.
Posted by sc...@apache.org.
[MNG-4645] Move central repo definition out of Maven's core so it can be more easily changed
[MNG-6054] Removal of super pom plugin management.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/6460063c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6460063c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6460063c
Branch: refs/heads/MNG-6006
Commit: 6460063c3527031c2366365b1d29edc2cab3e093
Parents: 1b00a9e
Author: Christian Schulte <sc...@apache.org>
Authored: Wed Jun 29 05:12:33 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Jun 29 05:12:33 2016 +0200
----------------------------------------------------------------------
.../apache/maven/project/DefaultMavenProjectBuilderTest.java | 4 ++--
.../java/org/apache/maven/project/PomConstructionTest.java | 8 +++-----
2 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/6460063c/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
index 3959cdd..2d6f903 100644
--- a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
@@ -121,10 +121,10 @@ public class DefaultMavenProjectBuilderTest
assertNotNull( project.getArtifactId() );
assertNotNull( project.getRemoteArtifactRepositories() );
- assertFalse( project.getRemoteArtifactRepositories().isEmpty() );
+ assertTrue( project.getRemoteArtifactRepositories().isEmpty() );
assertNotNull( project.getPluginArtifactRepositories() );
- assertFalse( project.getPluginArtifactRepositories().isEmpty() );
+ assertTrue( project.getPluginArtifactRepositories().isEmpty() );
assertNull( project.getParent() );
assertNull( project.getParentArtifact() );
http://git-wip-us.apache.org/repos/asf/maven/blob/6460063c/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
index 988df76..0c5c715 100644
--- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
@@ -393,7 +393,7 @@ public class PomConstructionTest
throws Exception
{
PomTestWrapper pom = buildPom( "multiple-repos/sub" );
- assertEquals( 3, ( (List<?>) pom.getValue( "repositories" ) ).size() );
+ assertEquals( 2, ( (List<?>) pom.getValue( "repositories" ) ).size() );
}
/** MNG-3965 */
@@ -1261,12 +1261,10 @@ public class PomConstructionTest
assertEquals( "org.apache.maven.its", pom.getValue( "dependencies[1]/exclusions[1]/groupId" ) );
assertEquals( "excluded-dep", pom.getValue( "dependencies[1]/exclusions[1]/artifactId" ) );
- assertEquals( 2, ( (List<?>) pom.getValue( "repositories" ) ).size() );
+ assertEquals( 1, ( (List<?>) pom.getValue( "repositories" ) ).size() );
assertEquals( "project-remote-repo", pom.getValue( "repositories[1]/id" ) );
assertEquals( "http://project.url/remote", pom.getValue( "repositories[1]/url" ) );
assertEquals( "repo", pom.getValue( "repositories[1]/name" ) );
- assertEquals( RepositorySystem.DEFAULT_REMOTE_REPO_ID, pom.getValue( "repositories[2]/id" ) );
- assertEquals( RepositorySystem.DEFAULT_REMOTE_REPO_URL, pom.getValue( "repositories[2]/url" ) );
assertEquals( "test", pom.getValue( "build/defaultGoal" ) );
assertEquals( "coreit", pom.getValue( "build/finalName" ) );
@@ -1482,7 +1480,7 @@ public class PomConstructionTest
throws Exception
{
PomTestWrapper pom = this.buildPom( "plugin-management-duplicate/sub" );
- assertEquals( 12, ( (List<?>) pom.getValue( "build/pluginManagement/plugins" ) ).size() );
+ assertEquals( 8, ( (List<?>) pom.getValue( "build/pluginManagement/plugins" ) ).size() );
}
public void testDistributionManagement()