lines = FileUtils.loadFile( apt );
+
+ for ( String line : lines )
+ {
+ if ( line.startsWith( "||" ) )
+ {
+ String[] cols = line.split( "\\|\\|" );
+ String[] expected =
+ new String[] { "", "type", "extension", "packaging", "classifier", "language", "added to classpath",
+ "includesDependencies", "" };
+
+ int i = 0;
+ for ( String col : cols )
+ {
+ assertEquals( "Wrong column header", expected[i++], col.trim() );
+ }
+ }
+ else if ( line.startsWith( "|" ) )
+ {
+ String[] cols = line.split( "\\|" );
+
+ String type = trimApt( cols[1] );
+ String extension = trimApt( cols[2], type );
+ String packaging = trimApt( cols[3], type );
+ String classifier = trimApt( cols[4] );
+ String language = trimApt( cols[5] );
+ String addedToClasspath = trimApt( cols[6] );
+ String includesDependencies = trimApt( cols[7] );
+
+ ArtifactHandler handler = lookup( ArtifactHandler.class, type );
+ assertEquals( type + " extension", handler.getExtension(), extension );
+ assertEquals( type + " packaging", handler.getPackaging(), packaging );
+ assertEquals( type + " classifier", handler.getClassifier(), classifier );
+ assertEquals( type + " language", handler.getLanguage(), language );
+ assertEquals( type + " addedToClasspath", handler.isAddedToClasspath() ? "true" : null, addedToClasspath );
+ assertEquals( type + " includesDependencies", handler.isIncludesDependencies() ? "true" : null, includesDependencies );
+ }
+ }
+ }
+
+ private String trimApt( String content, String type )
+ {
+ String value = trimApt( content );
+ return "= type".equals( value ) ? type : value;
+ }
+
+ private String trimApt( String content )
+ {
+ content = content.replace( '<', ' ' ).replace( '>', ' ' ).trim();
+
+ return ( content.length() == 0 ) ? null : content;
+ }
+}
diff --git a/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java b/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java
index aa81f4642e..9727bdf8a2 100644
--- a/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java
@@ -1,60 +1,60 @@
-package org.apache.maven.exception;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.IOException;
-import java.net.ConnectException;
-
-import org.apache.maven.plugin.MojoExecutionException;
-
-import junit.framework.TestCase;
-
-/**
- * @author Barrie Treloar
- */
-public class DefaultExceptionHandlerTest
- extends TestCase
-{
- /**
- * Running Maven under JDK7 may cause connection issues because IPv6 is used by default.
- *
- * e.g running mvn site:run will cause Jetty to fail.
- *
- *
- * The resolution is to add -Djava.net.preferIPv4Stack=true to the command line as documented in
- * http://cwiki.apache.org/confluence/display/MAVEN/ConnectException
- *
- */
- public void testJdk7ipv6()
- {
- ConnectException connEx = new ConnectException( "Connection refused: connect" );
- IOException ioEx = new IOException( "Unable to establish loopback connection" );
- ioEx.initCause( connEx );
- MojoExecutionException mojoEx =
- new MojoExecutionException( "Error executing Jetty: Unable to establish loopback connection", ioEx );
-
- ExceptionHandler exceptionHandler = new DefaultExceptionHandler();
- ExceptionSummary exceptionSummary = exceptionHandler.handleException( mojoEx );
-
- String expectedReference = "http://cwiki.apache.org/confluence/display/MAVEN/ConnectException";
- assertEquals( expectedReference, exceptionSummary.getReference() );
-
- }
-}
+package org.apache.maven.exception;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.IOException;
+import java.net.ConnectException;
+
+import org.apache.maven.plugin.MojoExecutionException;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Barrie Treloar
+ */
+public class DefaultExceptionHandlerTest
+ extends TestCase
+{
+ /**
+ * Running Maven under JDK7 may cause connection issues because IPv6 is used by default.
+ *
+ * e.g running mvn site:run will cause Jetty to fail.
+ *
+ *
+ * The resolution is to add -Djava.net.preferIPv4Stack=true to the command line as documented in
+ * http://cwiki.apache.org/confluence/display/MAVEN/ConnectException
+ *
+ */
+ public void testJdk7ipv6()
+ {
+ ConnectException connEx = new ConnectException( "Connection refused: connect" );
+ IOException ioEx = new IOException( "Unable to establish loopback connection" );
+ ioEx.initCause( connEx );
+ MojoExecutionException mojoEx =
+ new MojoExecutionException( "Error executing Jetty: Unable to establish loopback connection", ioEx );
+
+ ExceptionHandler exceptionHandler = new DefaultExceptionHandler();
+ ExceptionSummary exceptionSummary = exceptionHandler.handleException( mojoEx );
+
+ String expectedReference = "http://cwiki.apache.org/confluence/display/MAVEN/ConnectException";
+ assertEquals( expectedReference, exceptionSummary.getReference() );
+
+ }
+}
diff --git a/maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java b/maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java
new file mode 100644
index 0000000000..d350770cbc
--- /dev/null
+++ b/maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java
@@ -0,0 +1,74 @@
+package org.apache.maven.plugin.internal;
+/*
+ * 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 junit.framework.TestCase;
+import org.apache.maven.execution.DefaultMavenExecutionRequest;
+import org.apache.maven.execution.MavenExecutionRequest;
+import org.apache.maven.execution.MavenSession;
+
+import java.util.concurrent.CountDownLatch;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class DefaultLegacySupportTest extends TestCase {
+ final CountDownLatch latch = new CountDownLatch(1);
+ final DefaultLegacySupport defaultLegacySupport = new DefaultLegacySupport();
+
+ public void testSetSession() throws Exception {
+
+ MavenExecutionRequest mavenExecutionRequest = new DefaultMavenExecutionRequest();
+ MavenSession m1 = new MavenSession(null, null, mavenExecutionRequest, null);
+ defaultLegacySupport.setSession(m1);
+
+ MyRunnable myRunnable = new MyRunnable();
+ Thread thread = new Thread(myRunnable);
+ thread.start();
+
+ MavenSession m2 = new MavenSession(null, null, mavenExecutionRequest, null);
+ defaultLegacySupport.setSession(m2);
+ latch.countDown();
+ thread.join();
+ assertNull( myRunnable.getSession());
+ }
+
+
+ class MyRunnable implements Runnable {
+
+ private volatile MavenSession session;
+
+ public void run() {
+ try
+ {
+ latch.await();
+ }
+ catch (InterruptedException ingore)
+ {
+ // Test may fail if we get interrupted
+ }
+ session = defaultLegacySupport.getSession();
+ }
+
+ public MavenSession getSession() {
+ return session;
+ }
+ }
+
+}
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 587398f371..49a7b57629 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -74,6 +74,16 @@
org.slf4j
slf4j-api
+
+ org.slf4j
+ slf4j-simple
+ true
+
+
+ ch.qos.logback
+ logback-classic
+ true
+
commons-cli
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 0e7f2b622a..d30a16dcae 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
@@ -97,6 +97,8 @@ public class CLIManager
public static final String THREADS = "T";
+ public static final String LEGACY_LOCAL_REPOSITORY ="llr";
+
protected Options options;
@SuppressWarnings( "static-access" )
@@ -133,9 +135,9 @@ public class CLIManager
options.addOption( OptionBuilder.withLongOpt( "encrypt-master-password" ).hasArg().withDescription( "Encrypt master security password" ).create( ENCRYPT_MASTER_PASSWORD ) );
options.addOption( OptionBuilder.withLongOpt( "encrypt-password" ).hasArg().withDescription( "Encrypt server password" ).create( ENCRYPT_PASSWORD ) );
options.addOption( OptionBuilder.withLongOpt( "threads" ).hasArg().withDescription( "Thread count, for instance 2.0C where C is core multiplied" ).create( THREADS ) );
+ options.addOption( OptionBuilder.withLongOpt( "legacy-local-repository" ).withDescription( "Use Maven 2 Legacy Local Repository behaviour, ie no use of _maven.repositories. Can also be activated by using -Dmaven.legacyLocalRepo=true" ).create( LEGACY_LOCAL_REPOSITORY ) );
// Adding this back in for compatibility with the verifier that hard codes this option.
-
options.addOption( OptionBuilder.withLongOpt( "no-plugin-registry" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "npr" ) );
options.addOption( OptionBuilder.withLongOpt( "check-plugin-updates" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "cpu" ) );
options.addOption( OptionBuilder.withLongOpt( "update-plugins" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "up" ) );
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 0f8262b102..6173959a1f 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
@@ -53,11 +53,15 @@ public final class CLIReportingUtils
Properties properties = getBuildProperties();
StringBuffer version = new StringBuffer();
version.append( createMavenVersionString( properties ) ).append( LS );
- version.append( reduce( properties.getProperty( "distributionShortName" ) + " home: " + System.getProperty( "maven.home", "" ) ) ).append( LS );
- version.append( "Java version: " + System.getProperty( "java.version", "" ) + ", vendor: " + System.getProperty( "java.vendor", "" ) ).append( LS );
+ version.append( reduce( properties.getProperty( "distributionShortName" ) + " home: "
+ + System.getProperty( "maven.home", "" ) ) ).append( LS );
+ version.append( "Java version: " + System.getProperty( "java.version", "" )
+ + ", vendor: " + System.getProperty( "java.vendor", "" ) ).append( LS );
version.append( "Java home: " + System.getProperty( "java.home", "" ) ).append( LS );
- version.append( "Default locale: " + Locale.getDefault() + ", platform encoding: " + System.getProperty( "file.encoding", "" ) ).append( LS );
- version.append( "OS name: \"" + Os.OS_NAME + "\", version: \"" + Os.OS_VERSION + "\", arch: \"" + Os.OS_ARCH + "\", family: \"" + Os.OS_FAMILY + "\"" );
+ version.append( "Default locale: " + Locale.getDefault() + ", platform encoding: "
+ + System.getProperty( "file.encoding", "" ) ).append( LS );
+ version.append( "OS name: \"" + Os.OS_NAME + "\", version: \"" + Os.OS_VERSION + "\", arch: \"" + Os.OS_ARCH
+ + "\", family: \"" + Os.OS_FAMILY + "\"" );
return version.toString();
}
@@ -79,7 +83,7 @@ public final class CLIReportingUtils
if ( rev != null || timestamp != null )
{
msg += " (";
- msg += ( rev != null ? "r" + rev : "" );
+ msg += ( rev != null ? rev : "" );
if ( timestamp != null )
{
SimpleDateFormat fmt = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ssZ" );
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 e2b0e21d12..62999f5a23 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
@@ -39,7 +39,10 @@ import org.apache.maven.InternalErrorException;
import org.apache.maven.Maven;
import org.apache.maven.cli.event.DefaultEventSpyContext;
import org.apache.maven.cli.event.ExecutionEventLogger;
+import org.apache.maven.cli.logging.Slf4jConfiguration;
+import org.apache.maven.cli.logging.Slf4jConfigurationFactory;
import org.apache.maven.cli.logging.Slf4jLoggerManager;
+import org.apache.maven.cli.logging.Slf4jStdoutLogger;
import org.apache.maven.cli.transfer.ConsoleMavenTransferListener;
import org.apache.maven.cli.transfer.QuietMavenTransferListener;
import org.apache.maven.cli.transfer.Slf4jMavenTransferListener;
@@ -207,6 +210,7 @@ public class MavenCli
settings( cliRequest );
populateRequest( cliRequest );
encryption( cliRequest );
+ repository( cliRequest );
return execute( cliRequest );
}
catch ( ExitException e )
@@ -232,7 +236,7 @@ public class MavenCli
}
finally
{
- if (localContainer != null)
+ if ( localContainer != null )
{
localContainer.dispose();
}
@@ -261,6 +265,12 @@ public class MavenCli
private void cli( CliRequest cliRequest )
throws Exception
{
+ //
+ // Parsing errors can happen during the processing of the arguments and we prefer not having to check if the logger is null
+ // and construct this so we can use an SLF4J logger everywhere.
+ //
+ slf4jLogger = new Slf4jStdoutLogger();
+
CLIManager cliManager = new CLIManager();
try
@@ -287,36 +297,40 @@ public class MavenCli
}
}
- //
- // All logging is handled by SFL4J
- //
+ /**
+ * configure logging
+ */
private void logging( CliRequest cliRequest )
{
cliRequest.debug = cliRequest.commandLine.hasOption( CLIManager.DEBUG );
cliRequest.quiet = !cliRequest.debug && cliRequest.commandLine.hasOption( CLIManager.QUIET );
cliRequest.showErrors = cliRequest.debug || cliRequest.commandLine.hasOption( CLIManager.ERRORS );
+ slf4jLoggerFactory = LoggerFactory.getILoggerFactory();
+ Slf4jConfiguration slf4jConfiguration = Slf4jConfigurationFactory.getConfiguration( slf4jLoggerFactory );
+
if ( cliRequest.debug )
{
cliRequest.request.setLoggingLevel( MavenExecutionRequest.LOGGING_LEVEL_DEBUG );
- System.setProperty( "org.slf4j.simpleLogger.defaultLogLevel", "debug" );
+ slf4jConfiguration.setRootLoggerLevel( Slf4jConfiguration.Level.DEBUG );
}
else if ( cliRequest.quiet )
{
cliRequest.request.setLoggingLevel( MavenExecutionRequest.LOGGING_LEVEL_ERROR );
- System.setProperty( "org.slf4j.simpleLogger.defaultLogLevel", "error" );
+ slf4jConfiguration.setRootLoggerLevel( Slf4jConfiguration.Level.ERROR );
}
else
{
cliRequest.request.setLoggingLevel( MavenExecutionRequest.LOGGING_LEVEL_INFO );
- System.setProperty( "org.slf4j.simpleLogger.defaultLogLevel", "info" );
+ slf4jConfiguration.setRootLoggerLevel( Slf4jConfiguration.Level.INFO );
}
if ( cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) )
{
File logFile = new File( cliRequest.commandLine.getOptionValue( CLIManager.LOG_FILE ) );
logFile = resolveFile( logFile, cliRequest.workingDirectory );
- System.setProperty( "org.slf4j.simpleLogger.logFile", logFile.getAbsolutePath() );
+
+ // redirect stdout and stderr to file
try
{
PrintStream ps = new PrintStream( new FileOutputStream( logFile ) );
@@ -331,8 +345,9 @@ public class MavenCli
}
}
+ slf4jConfiguration.activate();
+
plexusLoggerManager = new Slf4jLoggerManager();
- slf4jLoggerFactory = LoggerFactory.getILoggerFactory();
slf4jLogger = slf4jLoggerFactory.getLogger( this.getClass().getName() );
}
@@ -376,29 +391,27 @@ public class MavenCli
DefaultPlexusContainer container = null;
- ContainerConfiguration cc = new DefaultContainerConfiguration()
- .setClassWorld( cliRequest.classWorld )
- .setRealm( setupContainerRealm( cliRequest ) )
- .setClassPathScanning( PlexusConstants.SCANNING_INDEX )
- .setAutoWiring( true )
- .setName( "maven" );
+ ContainerConfiguration cc = new DefaultContainerConfiguration()
+ .setClassWorld( cliRequest.classWorld )
+ .setRealm( setupContainerRealm( cliRequest ) )
+ .setClassPathScanning( PlexusConstants.SCANNING_INDEX )
+ .setAutoWiring( true )
+ .setName( "maven" );
- container = new DefaultPlexusContainer( cc, new AbstractModule()
+ container = new DefaultPlexusContainer( cc, new AbstractModule()
+ {
+ protected void configure()
{
+ bind( ILoggerFactory.class ).toInstance( slf4jLoggerFactory );
+ }
+ } );
- protected void configure()
- {
- bind( ILoggerFactory.class ).toInstance( slf4jLoggerFactory );
- }
+ // NOTE: To avoid inconsistencies, we'll use the TCCL exclusively for lookups
+ container.setLookupRealm( null );
- } );
+ container.setLoggerManager( plexusLoggerManager );
- // NOTE: To avoid inconsistencies, we'll use the TCCL exclusively for lookups
- container.setLookupRealm( null );
-
- container.setLoggerManager( plexusLoggerManager );
-
- customizeContainer( container );
+ customizeContainer( container );
container.getLoggerManager().setThresholds( cliRequest.request.getLoggingLevel() );
@@ -526,6 +539,15 @@ public class MavenCli
}
}
+ private void repository( CliRequest cliRequest )
+ throws Exception
+ {
+ if ( cliRequest.commandLine.hasOption( CLIManager.LEGACY_LOCAL_REPOSITORY ) || Boolean.getBoolean( "maven.legacyLocalRepo" ) )
+ {
+ cliRequest.request.setUseLegacyLocalRepository( true );
+ }
+ }
+
private int execute( CliRequest cliRequest )
{
eventSpyDispatcher.onEvent( cliRequest.request );
@@ -887,7 +909,7 @@ public class MavenCli
transferListener = getBatchTransferListener();
}
- ExecutionListener executionListener = new ExecutionEventLogger( slf4jLogger );
+ ExecutionListener executionListener = new ExecutionEventLogger();
executionListener = eventSpyDispatcher.chainListener( executionListener );
String alternatePomFile = null;
@@ -1153,7 +1175,7 @@ public class MavenCli
protected TransferListener getBatchTransferListener()
{
- return new Slf4jMavenTransferListener( slf4jLogger );
+ return new Slf4jMavenTransferListener();
}
protected void customizeContainer( PlexusContainer container )
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 819f179e12..f55141d4c3 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
@@ -31,9 +31,10 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.project.MavenProject;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
- * Logs execution events to a user-supplied logger.
+ * Logs execution events to logger, eventually user-supplied.
*
* @author Benjamin Bentmann
*/
@@ -44,6 +45,12 @@ public class ExecutionEventLogger
private static final int LINE_LENGTH = 72;
+ public ExecutionEventLogger()
+ {
+ logger = LoggerFactory.getLogger( ExecutionEventLogger.class );
+ }
+
+ // TODO should we deprecate?
public ExecutionEventLogger( Logger logger )
{
if ( logger == null )
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java
new file mode 100644
index 0000000000..a6961848db
--- /dev/null
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java
@@ -0,0 +1,44 @@
+package org.apache.maven.cli.logging;
+
+/*
+ * 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Abstract implementation.
+ *
+ * @author Hervé Boutemy
+ */
+public class BaseSlf4jConfiguration
+ implements Slf4jConfiguration
+{
+ private final Logger logger = LoggerFactory.getLogger( BaseSlf4jConfiguration.class );
+
+ public void setRootLoggerLevel( Level level )
+ {
+ logger.warn( "setRootLoggerLevel: operation not supported" );
+ }
+
+ public void activate()
+ {
+ logger.warn( "reset(): operation not supported" );
+ }
+}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/PrintStreamLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/PrintStreamLogger.java
deleted file mode 100644
index 53025a0daa..0000000000
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/PrintStreamLogger.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package org.apache.maven.cli.logging;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.PrintStream;
-
-import org.apache.maven.Maven;
-import org.codehaus.plexus.logging.AbstractLogger;
-import org.codehaus.plexus.logging.Logger;
-
-/**
- * Logs to a user-supplied {@link PrintStream}.
- *
- * @author Benjamin Bentmann
- */
-public class PrintStreamLogger
- extends AbstractLogger
-{
-
- public interface Provider
- {
- PrintStream getStream();
- }
-
- private Provider provider;
-
- private static final String FATAL_ERROR = "[FATAL] ";
-
- private static final String ERROR = "[ERROR] ";
-
- private static final String WARNING = "[WARNING] ";
-
- private static final String INFO = "[INFO] ";
-
- private static final String DEBUG = "[DEBUG] ";
-
- public PrintStreamLogger( Provider provider )
- {
- super( Logger.LEVEL_INFO, Maven.class.getName() );
-
- if ( provider == null )
- {
- throw new IllegalArgumentException( "output stream provider missing" );
- }
- this.provider = provider;
- }
-
- public PrintStreamLogger( PrintStream out )
- {
- super( Logger.LEVEL_INFO, Maven.class.getName() );
-
- setStream( out );
- }
-
- public void setStream( final PrintStream out )
- {
- if ( out == null )
- {
- throw new IllegalArgumentException( "output stream missing" );
- }
-
- this.provider = new Provider()
- {
- public PrintStream getStream()
- {
- return out;
- }
- };
- }
-
- public void debug( String message, Throwable throwable )
- {
- if ( isDebugEnabled() )
- {
- PrintStream out = provider.getStream();
-
- out.print( DEBUG );
- out.println( message );
-
- if ( null != throwable )
- {
- throwable.printStackTrace( out );
- }
- }
- }
-
- public void info( String message, Throwable throwable )
- {
- if ( isInfoEnabled() )
- {
- PrintStream out = provider.getStream();
-
- out.print( INFO );
- out.println( message );
-
- if ( null != throwable )
- {
- throwable.printStackTrace( out );
- }
- }
- }
-
- public void warn( String message, Throwable throwable )
- {
- if ( isWarnEnabled() )
- {
- PrintStream out = provider.getStream();
-
- out.print( WARNING );
- out.println( message );
-
- if ( null != throwable )
- {
- throwable.printStackTrace( out );
- }
- }
- }
-
- public void error( String message, Throwable throwable )
- {
- if ( isErrorEnabled() )
- {
- PrintStream out = provider.getStream();
-
- out.print( ERROR );
- out.println( message );
-
- if ( null != throwable )
- {
- throwable.printStackTrace( out );
- }
- }
- }
-
- public void fatalError( String message, Throwable throwable )
- {
- if ( isFatalErrorEnabled() )
- {
- PrintStream out = provider.getStream();
-
- out.print( FATAL_ERROR );
- out.println( message );
-
- if ( null != throwable )
- {
- throwable.printStackTrace( out );
- }
- }
- }
-
- public void close()
- {
- PrintStream out = provider.getStream();
-
- if ( out == System.out || out == System.err )
- {
- out.flush();
- }
- else
- {
- out.close();
- }
- }
-
- public Logger getChildLogger( String arg0 )
- {
- return this;
- }
-
-}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
new file mode 100644
index 0000000000..661c9e3eb4
--- /dev/null
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
@@ -0,0 +1,43 @@
+package org.apache.maven.cli.logging;
+
+/*
+ * 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.
+ */
+
+/**
+ * Interface for configuration operations on loggers, which are not available in slf4j, then require per-slf4f-binding
+ * implementation.
+ *
+ * @author Hervé Boutemy
+ */
+public interface Slf4jConfiguration
+{
+ public static enum Level { DEBUG, INFO, ERROR }
+
+ /**
+ * Set root logging level.
+ *
+ * @param level the level
+ */
+ void setRootLoggerLevel( Level level );
+
+ /**
+ * Activate logging implementation configuration (if necessary).
+ */
+ void activate();
+}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfigurationFactory.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfigurationFactory.java
new file mode 100644
index 0000000000..2442a835f5
--- /dev/null
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfigurationFactory.java
@@ -0,0 +1,81 @@
+package org.apache.maven.cli.logging;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Properties;
+
+import org.codehaus.plexus.util.PropertyUtils;
+import org.slf4j.ILoggerFactory;
+
+/**
+ * Slf4jConfiguration factory, loading implementations from META-INF/maven/slf4j-configuration.properties
+ * configuration files in class loader.
+ *
+ * @author Hervé Boutemy
+ */
+public class Slf4jConfigurationFactory
+{
+ public static final String RESOURCE = "META-INF/maven/slf4j-configuration.properties";
+
+ public static Slf4jConfiguration getConfiguration( ILoggerFactory loggerFactory )
+ {
+ try
+ {
+ Enumeration resources = Slf4jConfigurationFactory.class.getClassLoader().getResources( RESOURCE );
+
+ String key = loggerFactory.getClass().getCanonicalName();
+
+ while ( resources.hasMoreElements() )
+ {
+ URL resource = resources.nextElement();
+
+ Properties conf = PropertyUtils.loadProperties( resource.openStream() );
+
+ String impl = conf.getProperty( key );
+
+ if ( impl != null )
+ {
+ return (Slf4jConfiguration) Class.forName( impl ).newInstance();
+ }
+ }
+ }
+ catch ( IOException e )
+ {
+ e.printStackTrace();
+ }
+ catch ( InstantiationException e )
+ {
+ e.printStackTrace();
+ }
+ catch ( IllegalAccessException e )
+ {
+ e.printStackTrace();
+ }
+ catch ( ClassNotFoundException e )
+ {
+ e.printStackTrace();
+ }
+
+ return new BaseSlf4jConfiguration();
+ }
+}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
index a2b9bca5be..fa59a1275a 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
@@ -114,7 +114,7 @@ public class Slf4jLogger
}
/**
- * Warning : ignored (always return 0).
+ * Warning : ignored (always return 0 == Logger.LEVEL_DEBUG).
*/
public int getThreshold()
{
@@ -129,7 +129,7 @@ public class Slf4jLogger
}
/**
- * Warning : ignored (always return 0).
+ * Warning : ignored (always return null).
*/
public Logger getChildLogger( String name )
{
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java
new file mode 100644
index 0000000000..2b1d782c31
--- /dev/null
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java
@@ -0,0 +1,303 @@
+package org.apache.maven.cli.logging;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.PrintStream;
+
+import org.slf4j.Logger;
+import org.slf4j.Marker;
+
+public class Slf4jStdoutLogger
+ implements Logger
+{
+ private static final String ERROR = "[ERROR] ";
+
+ private PrintStream out = System.out;
+
+ //
+ // These are the only methods we need in our primordial logger
+ //
+ public void error( String msg )
+ {
+ out.print( ERROR );
+ out.println( msg );
+ }
+
+ public void error( String msg, Throwable t )
+ {
+ error( msg );
+
+ if ( null != t )
+ {
+ t.printStackTrace( out );
+ }
+ }
+
+ //
+ // Don't need any of this
+ //
+ public String getName()
+ {
+ return null;
+ }
+
+ public boolean isTraceEnabled()
+ {
+ return false;
+ }
+
+ public void trace( String msg )
+ {
+ }
+
+ public void trace( String format, Object arg )
+ {
+ }
+
+ public void trace( String format, Object arg1, Object arg2 )
+ {
+ }
+
+ public void trace( String format, Object... arguments )
+ {
+ }
+
+ public void trace( String msg, Throwable t )
+ {
+ }
+
+ public boolean isTraceEnabled( Marker marker )
+ {
+ return false;
+ }
+
+ public void trace( Marker marker, String msg )
+ {
+ }
+
+ public void trace( Marker marker, String format, Object arg )
+ {
+ }
+
+ public void trace( Marker marker, String format, Object arg1, Object arg2 )
+ {
+ }
+
+ public void trace( Marker marker, String format, Object... argArray )
+ {
+ }
+
+ public void trace( Marker marker, String msg, Throwable t )
+ {
+ }
+
+ public boolean isDebugEnabled()
+ {
+ return false;
+ }
+
+ public void debug( String msg )
+ {
+ }
+
+ public void debug( String format, Object arg )
+ {
+ }
+
+ public void debug( String format, Object arg1, Object arg2 )
+ {
+ }
+
+ public void debug( String format, Object... arguments )
+ {
+ }
+
+ public void debug( String msg, Throwable t )
+ {
+ }
+
+ public boolean isDebugEnabled( Marker marker )
+ {
+ return false;
+ }
+
+ public void debug( Marker marker, String msg )
+ {
+ }
+
+ public void debug( Marker marker, String format, Object arg )
+ {
+ }
+
+ public void debug( Marker marker, String format, Object arg1, Object arg2 )
+ {
+ }
+
+ public void debug( Marker marker, String format, Object... arguments )
+ {
+ }
+
+ public void debug( Marker marker, String msg, Throwable t )
+ {
+ }
+
+ public boolean isInfoEnabled()
+ {
+ return false;
+ }
+
+ public void info( String msg )
+ {
+ }
+
+ public void info( String format, Object arg )
+ {
+ }
+
+ public void info( String format, Object arg1, Object arg2 )
+ {
+ }
+
+ public void info( String format, Object... arguments )
+ {
+ }
+
+ public void info( String msg, Throwable t )
+ {
+ }
+
+ public boolean isInfoEnabled( Marker marker )
+ {
+ return false;
+ }
+
+ public void info( Marker marker, String msg )
+ {
+ }
+
+ public void info( Marker marker, String format, Object arg )
+ {
+ }
+
+ public void info( Marker marker, String format, Object arg1, Object arg2 )
+ {
+ }
+
+ public void info( Marker marker, String format, Object... arguments )
+ {
+ }
+
+ public void info( Marker marker, String msg, Throwable t )
+ {
+ }
+
+ public boolean isWarnEnabled()
+ {
+ return false;
+ }
+
+ public void warn( String msg )
+ {
+ }
+
+ public void warn( String format, Object arg )
+ {
+ }
+
+ public void warn( String format, Object... arguments )
+ {
+ }
+
+ public void warn( String format, Object arg1, Object arg2 )
+ {
+ }
+
+ public void warn( String msg, Throwable t )
+ {
+ }
+
+ public boolean isWarnEnabled( Marker marker )
+ {
+ return false;
+ }
+
+ public void warn( Marker marker, String msg )
+ {
+ }
+
+ public void warn( Marker marker, String format, Object arg )
+ {
+ }
+
+ public void warn( Marker marker, String format, Object arg1, Object arg2 )
+ {
+ }
+
+ public void warn( Marker marker, String format, Object... arguments )
+ {
+ }
+
+ public void warn( Marker marker, String msg, Throwable t )
+ {
+ }
+
+ public boolean isErrorEnabled()
+ {
+ return false;
+ }
+
+ public void error( String format, Object arg )
+ {
+ }
+
+ public void error( String format, Object arg1, Object arg2 )
+ {
+ }
+
+ public void error( String format, Object... arguments )
+ {
+ }
+
+ public boolean isErrorEnabled( Marker marker )
+ {
+ return false;
+ }
+
+ public void error( Marker marker, String msg )
+ {
+ }
+
+ public void error( Marker marker, String format, Object arg )
+ {
+ }
+
+ public void error( Marker marker, String format, Object arg1, Object arg2 )
+ {
+ }
+
+ public void error( Marker marker, String format, Object... arguments )
+ {
+ }
+
+ public void error( Marker marker, String msg, Throwable t )
+ {
+ }
+
+}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java
new file mode 100644
index 0000000000..9cec3ccb80
--- /dev/null
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java
@@ -0,0 +1,58 @@
+package org.apache.maven.cli.logging.impl;
+
+/*
+ * 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.maven.cli.logging.BaseSlf4jConfiguration;
+
+/**
+ * Configuration for slf4j-log4j2.
+ *
+ * @author Hervé Boutemy
+ */
+public class Log4j2Configuration
+ extends BaseSlf4jConfiguration
+{
+ @Override
+ public void setRootLoggerLevel( Level level )
+ {
+ String value = "info";
+ switch ( level )
+ {
+ case DEBUG:
+ value = "debug";
+ break;
+
+ case INFO:
+ value = "info";
+ break;
+
+ case ERROR:
+ value = "error";
+ break;
+ }
+ System.setProperty( "maven.logging.root.level", value );
+ }
+
+ @Override
+ public void activate()
+ {
+ // no op
+ }
+}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
new file mode 100644
index 0000000000..b72940a3a7
--- /dev/null
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
@@ -0,0 +1,60 @@
+package org.apache.maven.cli.logging.impl;
+
+/*
+ * 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.maven.cli.logging.BaseSlf4jConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Configuration for slf4j-logback.
+ *
+ * @author Hervé Boutemy
+ */
+public class LogbackConfiguration
+ extends BaseSlf4jConfiguration
+{
+ @Override
+ public void setRootLoggerLevel( Level level )
+ {
+ ch.qos.logback.classic.Level value = ch.qos.logback.classic.Level.INFO;
+ switch ( level )
+ {
+ case DEBUG:
+ value = ch.qos.logback.classic.Level.DEBUG;
+ break;
+
+ case INFO:
+ value = ch.qos.logback.classic.Level.INFO;
+ break;
+
+ case ERROR:
+ value = ch.qos.logback.classic.Level.ERROR;
+ break;
+ }
+ ( (ch.qos.logback.classic.Logger) LoggerFactory.getLogger( Logger.ROOT_LOGGER_NAME ) ).setLevel( value );
+ }
+
+ @Override
+ public void activate()
+ {
+ // no op
+ }
+}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java
new file mode 100644
index 0000000000..6a7f38518e
--- /dev/null
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java
@@ -0,0 +1,62 @@
+package org.apache.maven.cli.logging.impl;
+
+/*
+ * 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.maven.cli.logging.BaseSlf4jConfiguration;
+import org.slf4j.MavenSlf4jFriend;
+import org.slf4j.impl.MavenSlf4jSimpleFriend;
+
+/**
+ * Configuration for slf4j-simple.
+ *
+ * @author Hervé Boutemy
+ */
+public class Slf4jSimpleConfiguration
+ extends BaseSlf4jConfiguration
+{
+ @Override
+ public void setRootLoggerLevel( Level level )
+ {
+ String value = "info";
+ switch ( level )
+ {
+ case DEBUG:
+ value = "debug";
+ break;
+
+ case INFO:
+ value = "info";
+ break;
+
+ case ERROR:
+ value = "error";
+ break;
+ }
+ System.setProperty( "org.slf4j.simpleLogger.defaultLogLevel", value );
+ }
+
+ @Override
+ public void activate()
+ {
+ // property for root logger level or System.out redirection need to be taken into account
+ MavenSlf4jFriend.reset();
+ MavenSlf4jSimpleFriend.init();
+ }
+}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
index a2b21a3007..6560fe5231 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
@@ -28,13 +28,20 @@ import org.eclipse.aether.transfer.TransferCancelledException;
import org.eclipse.aether.transfer.TransferEvent;
import org.eclipse.aether.transfer.TransferResource;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class Slf4jMavenTransferListener
extends AbstractTransferListener
{
- protected Logger out;
+ protected final Logger out;
+ public Slf4jMavenTransferListener()
+ {
+ this.out = LoggerFactory.getLogger( Slf4jMavenTransferListener.class );
+ }
+
+ // TODO should we deprecate?
public Slf4jMavenTransferListener( Logger out )
{
this.out = out;
diff --git a/maven-embedder/src/main/java/org/slf4j/MavenSlf4jFriend.java b/maven-embedder/src/main/java/org/slf4j/MavenSlf4jFriend.java
new file mode 100644
index 0000000000..8a43053708
--- /dev/null
+++ b/maven-embedder/src/main/java/org/slf4j/MavenSlf4jFriend.java
@@ -0,0 +1,35 @@
+package org.slf4j;
+
+/*
+ * 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.
+ */
+
+/**
+ * Utility for Maven to access Slf4j internals through package access.
+ * Use with precaution, since this is not normally intended for production use.
+ */
+public class MavenSlf4jFriend
+{
+ /**
+ * Reset Slf4j internal state.
+ */
+ public static void reset()
+ {
+ LoggerFactory.reset();
+ }
+}
diff --git a/maven-embedder/src/main/java/org/slf4j/impl/MavenSlf4jSimpleFriend.java b/maven-embedder/src/main/java/org/slf4j/impl/MavenSlf4jSimpleFriend.java
new file mode 100644
index 0000000000..097ad68879
--- /dev/null
+++ b/maven-embedder/src/main/java/org/slf4j/impl/MavenSlf4jSimpleFriend.java
@@ -0,0 +1,32 @@
+package org.slf4j.impl;
+
+/*
+ * 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.
+ */
+
+/**
+ * Utility for Maven to access Slf4j-Simple internals through package access.
+ * Use with precaution, since this is not normally intended for production use.
+ */
+public class MavenSlf4jSimpleFriend
+{
+ public static void init()
+ {
+ SimpleLogger.init();
+ }
+}
diff --git a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
new file mode 100644
index 0000000000..5a6a12f765
--- /dev/null
+++ b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
@@ -0,0 +1,5 @@
+# key = Slf4j effective logger factory implementation
+# value = corresponding o.a.m.cli.logging.Slf4jConfiguration class
+org.slf4j.impl.SimpleLoggerFactory org.apache.maven.cli.logging.impl.Slf4jSimpleConfiguration
+org.slf4j.helpers.Log4JLoggerFactory org.apache.maven.cli.logging.impl.Log4j2Configuration
+ch.qos.logback.classic.LoggerContext org.apache.maven.cli.logging.impl.LogbackConfiguration
diff --git a/maven-embedder/src/site/apt/logging.apt b/maven-embedder/src/site/apt/logging.apt
index 22fa1ac25a..bdab9b2d57 100644
--- a/maven-embedder/src/site/apt/logging.apt
+++ b/maven-embedder/src/site/apt/logging.apt
@@ -22,7 +22,7 @@ Maven Logging
* Getting Logger Instance
- Plexus Logger can be injected in Plexus component using Plexus annotations
+ Plexus Logger and LoggerManager can be injected in Plexus component using Plexus annotations
<<<<<<< HEAD
+------
@@ -39,6 +39,9 @@ public class DefaultMyComponent
{
@Requirement
private Logger logger;
+
+ @Requirement
+ private LoggerManager loggerManager;
}
<<<<<<< HEAD
+------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index e075f7b0e6..25d9eab957 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -278,6 +278,8 @@ public class DefaultModelBuilder
modelNormalizer.mergeDuplicates( tmpModel, request, problems );
+ profileActivationContext.setProjectProperties( tmpModel.getProperties() );
+
List activePomProfiles =
profileSelector.getActiveProfiles( rawModel.getProfiles(), profileActivationContext, problems );
currentData.setActiveProfiles( activePomProfiles );
@@ -317,7 +319,7 @@ public class DefaultModelBuilder
}
message += currentData.getId();
- problems.add( new ModelProblemCollectorRequest(ModelProblem.Severity.FATAL, ModelProblem.Version.BASE).setMessage(message));
+ problems.add( new ModelProblemCollectorRequest( ModelProblem.Severity.FATAL, ModelProblem.Version.BASE ).setMessage( message ) );
throw problems.newModelBuildingException();
}
}
@@ -409,7 +411,7 @@ public class DefaultModelBuilder
modelValidator.validateEffectiveModel( resultModel, request, problems );
- if ( hasModelErrors(problems) )
+ if ( hasModelErrors( problems ) )
{
throw problems.newModelBuildingException();
}
@@ -471,15 +473,15 @@ public class DefaultModelBuilder
if ( pomFile != null )
{
- problems.add( new ModelProblemCollectorRequest(Severity.ERROR, Version.V20)
- .setMessage("Malformed POM " + modelSource.getLocation() + ": " + e.getMessage())
- .setException(e ));
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.V20 )
+ .setMessage( "Malformed POM " + modelSource.getLocation() + ": " + e.getMessage() )
+ .setException( e ) );
}
else
{
- problems.add( new ModelProblemCollectorRequest(Severity.WARNING, Version.V20)
- .setMessage("Malformed POM " + modelSource.getLocation() + ": " + e.getMessage())
- .setException(e));
+ problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.V20 )
+ .setMessage( "Malformed POM " + modelSource.getLocation() + ": " + e.getMessage() )
+ .setException( e ) );
}
}
@@ -491,9 +493,9 @@ public class DefaultModelBuilder
}
catch ( ModelParseException e )
{
- problems.add( new ModelProblemCollectorRequest(Severity.FATAL, Version.BASE)
- .setMessage("Non-parseable POM " + modelSource.getLocation() + ": " + e.getMessage())
- .setException(e));
+ problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.BASE )
+ .setMessage( "Non-parseable POM " + modelSource.getLocation() + ": " + e.getMessage() )
+ .setException( e ) );
throw problems.newModelBuildingException();
}
catch ( IOException e )
@@ -511,9 +513,9 @@ public class DefaultModelBuilder
msg = e.getClass().getSimpleName();
}
}
- problems.add( new ModelProblemCollectorRequest(Severity.FATAL, Version.BASE)
- .setMessage("Non-readable POM " + modelSource.getLocation() + ": " + msg)
- .setException(e ));
+ problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.BASE )
+ .setMessage( "Non-readable POM " + modelSource.getLocation() + ": " + msg )
+ .setException( e ) );
throw problems.newModelBuildingException();
}
@@ -522,7 +524,7 @@ public class DefaultModelBuilder
problems.setSource( model );
modelValidator.validateRawModel( model, request, problems );
- if ( hasFatalErrors(problems) )
+ if ( hasFatalErrors( problems ) )
{
throw problems.newModelBuildingException();
}
@@ -562,10 +564,10 @@ public class DefaultModelBuilder
}
catch ( InvalidRepositoryException e )
{
- problems.add( new ModelProblemCollectorRequest(Severity.ERROR, Version.BASE)
- .setMessage( "Invalid repository " + repository.getId() + ": " + e.getMessage())
- .setLocation(repository.getLocation( "" ))
- .setException(e) );
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
+ .setMessage( "Invalid repository " + repository.getId() + ": " + e.getMessage() )
+ .setLocation( repository.getLocation( "" ) )
+ .setException( e ) );
}
}
}
@@ -617,9 +619,9 @@ public class DefaultModelBuilder
if ( versions.get( key ) == null && managedVersions.get( key ) == null )
{
InputLocation location = plugins.get( key ).getLocation( "" );
- problems.add( new ModelProblemCollectorRequest(Severity.WARNING, Version.V20)
- .setMessage( "'build.plugins.plugin.version' for " + key + " is missing.")
- .setLocation(location));
+ problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.V20 )
+ .setMessage( "'build.plugins.plugin.version' for " + key + " is missing." )
+ .setLocation( location ) );
}
}
}
@@ -694,10 +696,10 @@ public class DefaultModelBuilder
if ( !"pom".equals( parentModel.getPackaging() ) )
{
- problems.add( new ModelProblemCollectorRequest(Severity.ERROR, Version.BASE)
- .setMessage( "Invalid packaging for parent POM " + ModelProblemUtils.toSourceHint( parentModel ) + ", must be \"pom\" but is \""
- + parentModel.getPackaging() + "\"")
- .setLocation(parentModel.getLocation( "packaging" )));
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
+ .setMessage( "Invalid packaging for parent POM " + ModelProblemUtils.toSourceHint( parentModel )
+ + ", must be \"pom\" but is \"" + parentModel.getPackaging() + "\"" )
+ .setLocation( parentModel.getLocation( "packaging" ) ) );
}
}
else
@@ -749,9 +751,9 @@ public class DefaultModelBuilder
buffer.append( ", please verify your project structure" );
problems.setSource( childModel );
- problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.BASE)
- .setMessage( buffer.toString())
- .setLocation( parent.getLocation( "" )));
+ problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.BASE )
+ .setMessage( buffer.toString() )
+ .setLocation( parent.getLocation( "" ) ) );
return null;
}
if ( version == null || !version.equals( parent.getVersion() ) )
@@ -843,10 +845,10 @@ public class DefaultModelBuilder
}
}
- problems.add( new ModelProblemCollectorRequest(Severity.FATAL, Version.BASE)
- .setMessage( buffer.toString())
- .setLocation(parent.getLocation( "" ))
- .setException(e));
+ problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.BASE )
+ .setMessage( buffer.toString() )
+ .setLocation( parent.getLocation( "" ) )
+ .setException( e ) );
throw problems.newModelBuildingException();
}
@@ -912,23 +914,26 @@ public class DefaultModelBuilder
if ( groupId == null || groupId.length() <= 0 )
{
- problems.add( new ModelProblemCollectorRequest(Severity.ERROR, Version.BASE)
- .setMessage( "'dependencyManagement.dependencies.dependency.groupId' for " + dependency.getManagementKey() + " is missing.")
- .setLocation( dependency.getLocation( "" )));
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
+ .setMessage( "'dependencyManagement.dependencies.dependency.groupId' for "
+ + dependency.getManagementKey() + " is missing." )
+ .setLocation( dependency.getLocation( "" ) ) );
continue;
}
if ( artifactId == null || artifactId.length() <= 0 )
{
- problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE)
- .setMessage( "'dependencyManagement.dependencies.dependency.artifactId' for " + dependency.getManagementKey() + " is missing.")
- .setLocation( dependency.getLocation( "" )));
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
+ .setMessage( "'dependencyManagement.dependencies.dependency.artifactId' for "
+ + dependency.getManagementKey() + " is missing." )
+ .setLocation( dependency.getLocation( "" ) ) );
continue;
}
if ( version == null || version.length() <= 0 )
{
- problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE)
- .setMessage( "'dependencyManagement.dependencies.dependency.version' for " + dependency.getManagementKey() + " is missing.")
- .setLocation( dependency.getLocation( "" )));
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
+ .setMessage( "'dependencyManagement.dependencies.dependency.version' for "
+ + dependency.getManagementKey() + " is missing." )
+ .setLocation( dependency.getLocation( "" ) ) );
continue;
}
@@ -942,7 +947,7 @@ public class DefaultModelBuilder
message += modelId + " -> ";
}
message += imported;
- problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).setMessage( message ));
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).setMessage( message ) );
continue;
}
@@ -976,8 +981,8 @@ public class DefaultModelBuilder
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
.setMessage( buffer.toString() )
- .setLocation( dependency.getLocation( "" ))
- .setException( e ));
+ .setLocation( dependency.getLocation( "" ) )
+ .setException( e ) );
continue;
}
@@ -1076,24 +1081,31 @@ public class DefaultModelBuilder
&& ( version == null || message.contains( version ) );
}
- protected boolean hasModelErrors(ModelProblemCollectorExt problems) {
- if (problems instanceof DefaultModelProblemCollector) {
- return ((DefaultModelProblemCollector)problems).hasErrors();
- } else {
- //the default execution path only knows the DefaultModelProblemCollector,
- // only reason it's not in signature is because it's package private
- throw new IllegalStateException();
+ protected boolean hasModelErrors( ModelProblemCollectorExt problems )
+ {
+ if ( problems instanceof DefaultModelProblemCollector )
+ {
+ return ( (DefaultModelProblemCollector) problems ).hasErrors();
+ }
+ else
+ {
+ // the default execution path only knows the DefaultModelProblemCollector,
+ // only reason it's not in signature is because it's package private
+ throw new IllegalStateException();
}
-
}
- protected boolean hasFatalErrors(ModelProblemCollectorExt problems) {
- if (problems instanceof DefaultModelProblemCollector) {
- return ((DefaultModelProblemCollector)problems).hasFatalErrors();
- } else {
- //the default execution path only knows the DefaultModelProblemCollector,
+ protected boolean hasFatalErrors( ModelProblemCollectorExt problems )
+ {
+ if ( problems instanceof DefaultModelProblemCollector )
+ {
+ return ( (DefaultModelProblemCollector) problems ).hasFatalErrors();
+ }
+ else
+ {
+ // the default execution path only knows the DefaultModelProblemCollector,
// only reason it's not in signature is because it's package private
- throw new IllegalStateException();
+ throw new IllegalStateException();
}
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
index e0effac17f..0d68aaeb5d 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
@@ -146,7 +146,8 @@ public class DefaultModelProblem
return severity;
}
- public Version getVersion() {
+ public Version getVersion()
+ {
return version;
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
index e2573eb69d..114afeb2de 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
@@ -23,10 +23,7 @@ import java.util.EnumSet;
import java.util.List;
import java.util.Set;
-import org.apache.maven.model.InputLocation;
import org.apache.maven.model.Model;
-import org.apache.maven.model.building.ModelProblem.Severity;
-import org.apache.maven.model.building.ModelProblem.Version;
import org.apache.maven.model.io.ModelParseException;
/**
@@ -174,7 +171,9 @@ class DefaultModelProblemCollector
column = e.getColumnNumber();
}
- ModelProblem problem = new DefaultModelProblem( req.getMessage(), req.getSeverity(), req.getVersion(), source, line, column, modelId, req.getException() );
+ ModelProblem problem =
+ new DefaultModelProblem( req.getMessage(), req.getSeverity(), req.getVersion(), source, line, column,
+ modelId, req.getException() );
add( problem );
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java
index 811f2e0a16..555f033c92 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java
@@ -41,7 +41,8 @@ public interface ModelProblem
}
- enum Version {
+ enum Version
+ {
//based on ModeBuildingResult.validationLevel
BASE,
V20,
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollector.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollector.java
index b2321037fc..961d40abdf 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollector.java
@@ -19,9 +19,6 @@ package org.apache.maven.model.building;
* under the License.
*/
-import java.util.List;
-import org.apache.maven.model.InputLocation;
-
/**
* Collects problems that are encountered during model building. The primary purpose of this component is to account for
* the fact that the problem reporter has/should not have information about the calling context and hence cannot provide
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java
index d91c5c2ed5..60bfdde207 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java
@@ -1,20 +1,24 @@
-/*
- * Copyright 2012 The Apache Software Foundation.
- *
- * Licensed 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.
- */
package org.apache.maven.model.building;
+/*
+ * 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.maven.model.InputLocation;
import org.apache.maven.model.building.ModelProblem.Severity;
import org.apache.maven.model.building.ModelProblem.Version;
@@ -38,17 +42,17 @@ public final class ModelProblemCollectorRequest
* @param severity
* @param version
*/
- public ModelProblemCollectorRequest(Severity severity, Version version)
+ public ModelProblemCollectorRequest( Severity severity, Version version )
{
this.severity = severity;
this.version = version;
- if (severity == null)
+ if ( severity == null )
{
- throw new IllegalStateException("No severity declared");
+ throw new IllegalStateException( "No severity declared" );
}
- if (version == null)
+ if ( version == null )
{
- throw new IllegalStateException("No version declared.");
+ throw new IllegalStateException( "No version declared." );
}
}
@@ -67,7 +71,7 @@ public final class ModelProblemCollectorRequest
return exception;
}
- public ModelProblemCollectorRequest setException(Exception exception)
+ public ModelProblemCollectorRequest setException( Exception exception )
{
this.exception = exception;
return this;
@@ -78,7 +82,7 @@ public final class ModelProblemCollectorRequest
return message;
}
- public ModelProblemCollectorRequest setMessage(String message)
+ public ModelProblemCollectorRequest setMessage( String message )
{
this.message = message;
return this;
@@ -89,7 +93,7 @@ public final class ModelProblemCollectorRequest
return location;
}
- public ModelProblemCollectorRequest setLocation(InputLocation location)
+ public ModelProblemCollectorRequest setLocation( InputLocation location )
{
this.location = location;
return this;
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
index a66be04dea..01ff9d71a6 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
@@ -58,12 +58,17 @@ public class DefaultInheritanceAssembler
/**
* Calculates the relative path from the base directory of the parent to the parent directory of the base directory
- * of the child. The general idea is to adjust inherited URLs to match the project layout (in SCM). This calculation
- * is only a heuristic based on our conventions. In detail, the algo relies on the following assumptions. The parent
- * uses aggregation and refers to the child via the modules section. The module path to the child is considered to
- * point at the POM rather than its base directory if the path ends with ".xml" (ignoring case). The name of the
- * child's base directory matches the artifact id of the child. Note that for the sake of independence from the user
- * environment, the filesystem is intentionally not used for the calculation.
+ * of the child. The general idea is to adjust inherited URLs to match the project layout (in SCM).
+ *
+ * This calculation is only a heuristic based on our conventions.
+ * In detail, the algo relies on the following assumptions:
+ * The parent uses aggregation and refers to the child via the modules section
+ * The module path to the child is considered to
+ * point at the POM rather than its base directory if the path ends with ".xml" (ignoring case)
+ * The name of the child's base directory matches the artifact id of the child.
+ *
+ * Note that for the sake of independence from the user
+ * environment, the filesystem is intentionally not used for the calculation.
*
* @param child The child model, must not be null.
* @param parent The parent model, may be null.
@@ -119,7 +124,7 @@ public class DefaultInheritanceAssembler
return adjustment;
}
- private static class InheritanceModelMerger
+ protected static class InheritanceModelMerger
extends MavenModelMerger
{
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
index dc8b41b6ad..57e11c3c21 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
@@ -45,7 +45,6 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Properties;
-import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.model.building.ModelProblem.Version;
import org.apache.maven.model.building.ModelProblemCollectorRequest;
@@ -244,7 +243,8 @@ public abstract class AbstractStringBasedModelInterpolator
}
catch ( InterpolationException e )
{
- problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).setMessage( e.getMessage() ).setException( e ));
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
+ .setMessage( e.getMessage() ).setException( e ) );
}
interpolator.clearFeedback();
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java
index 106414eaf5..8167baf7ec 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java
@@ -20,7 +20,6 @@ package org.apache.maven.model.interpolation;
*/
import java.util.List;
-import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.model.building.ModelProblemCollector;
import org.apache.maven.model.building.ModelProblem.Severity;
@@ -65,7 +64,7 @@ class ProblemDetectingValueSource
{
msg += " Please use ${" + newPrefix + expression.substring( bannedPrefix.length() ) + "} instead.";
}
- problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.V20 ).setMessage( msg ));
+ problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.V20 ).setMessage( msg ) );
}
return value;
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
index d4bc534618..2ef7eb1333 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
@@ -49,7 +49,7 @@ public class StringSearchModelInterpolator
extends AbstractStringBasedModelInterpolator
{
- private static final Map, InterpolateObjectAction.CacheItem> cachedEntries =
+ private static final Map, InterpolateObjectAction.CacheItem> CACHED_ENTRIES =
new ConcurrentHashMap, InterpolateObjectAction.CacheItem>( 80, 0.75f, 2 );
// Empirical data from 3.x, actual =40
@@ -161,11 +161,11 @@ public class StringSearchModelInterpolator
private CacheItem getCacheEntry( Class cls )
{
- CacheItem cacheItem = cachedEntries.get( cls );
+ CacheItem cacheItem = CACHED_ENTRIES.get( cls );
if ( cacheItem == null )
{
cacheItem = new CacheItem( cls );
- cachedEntries.put( cls, cacheItem );
+ CACHED_ENTRIES.put( cls, cacheItem );
}
return cacheItem;
}
@@ -247,7 +247,7 @@ public class StringSearchModelInterpolator
}
else if ( Collection.class.isAssignableFrom( type ) )
{
- throw new RuntimeException("We dont interpolate into collections, use a list instead");
+ throw new RuntimeException( "We dont interpolate into collections, use a list instead" );
}
else if ( Map.class.isAssignableFrom( type ) )
{
@@ -278,7 +278,7 @@ public class StringSearchModelInterpolator
}
}
- static abstract class CacheField
+ abstract static class CacheField
{
protected final Field field;
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
index fbfd4b8132..a13dcca6c5 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
@@ -50,7 +50,7 @@ public class DefaultDependencyManagementInjector
merger.mergeManagedDependencies( model );
}
- private static class ManagementModelMerger
+ protected static class ManagementModelMerger
extends MavenModelMerger
{
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java
index 1d5809d9a7..ba9f060aeb 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java
@@ -53,7 +53,7 @@ public class DefaultPluginManagementInjector
merger.mergeManagedBuildPlugins( model );
}
- private static class ManagementModelMerger
+ protected static class ManagementModelMerger
extends MavenModelMerger
{
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java b/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
index 92c0ee6a94..568bbcb2a0 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
@@ -52,7 +52,8 @@ import org.apache.maven.model.Scm;
import org.apache.maven.model.Site;
/**
- * The domain-specific model merger for the Maven POM.
+ * The domain-specific model merger for the Maven POM, overriding generic code from parent class when necessary with
+ * more adapted algorithms.
*
* @author Benjamin Bentmann
*/
@@ -631,45 +632,45 @@ public class MavenModelMerger
}
@Override
- protected Object getPluginKey( Plugin object )
+ protected Object getPluginKey( Plugin plugin )
{
- return object.getKey();
+ return plugin.getKey();
}
@Override
- protected Object getPluginExecutionKey( PluginExecution object )
+ protected Object getPluginExecutionKey( PluginExecution pluginExecution )
{
- return object.getId();
+ return pluginExecution.getId();
}
@Override
- protected Object getReportPluginKey( ReportPlugin object )
+ protected Object getReportPluginKey( ReportPlugin reportPlugin )
{
- return object.getKey();
+ return reportPlugin.getKey();
}
@Override
- protected Object getReportSetKey( ReportSet object )
+ protected Object getReportSetKey( ReportSet reportSet )
{
- return object.getId();
+ return reportSet.getId();
}
@Override
- protected Object getRepositoryBaseKey( RepositoryBase object )
+ protected Object getRepositoryBaseKey( RepositoryBase repositoryBase )
{
- return object.getId();
+ return repositoryBase.getId();
}
@Override
- protected Object getExtensionKey( Extension object )
+ protected Object getExtensionKey( Extension extension )
{
- return object.getGroupId() + ':' + object.getArtifactId();
+ return extension.getGroupId() + ':' + extension.getArtifactId();
}
@Override
- protected Object getExclusionKey( Exclusion object )
+ protected Object getExclusionKey( Exclusion exclusion )
{
- return object.getGroupId() + ':' + object.getArtifactId();
+ return exclusion.getGroupId() + ':' + exclusion.getArtifactId();
}
private String appendPath( String parentPath, Map context )
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
index df7ae5b2ca..9163286a85 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
@@ -93,7 +93,7 @@ public class DefaultModelNormalizer
}
}
- private static class DuplicateMerger
+ protected static class DuplicateMerger
extends MavenModelMerger
{
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
index 6a95b97cf3..f8a2a93ba9 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
@@ -108,9 +108,9 @@ public class DefaultReportingConverter
&& request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_1 )
{
- problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.V31)
- .setMessage( "The section is deprecated, please move the reports to the section of the new Maven Site Plugin.")
- .setLocation( reporting.getLocation( "" ) ));
+ problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.V31 )
+ .setMessage( "The section is deprecated, please move the reports to the section of the new Maven Site Plugin." )
+ .setLocation( reporting.getLocation( "" ) ) );
}
for ( ReportPlugin plugin : reporting.getPlugins() )
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java
index 7258b8ba2f..5bd1c58383 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java
@@ -21,13 +21,15 @@ package org.apache.maven.model.profile;
import java.io.File;
import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
/**
* Describes the environmental context used to determine the activation status of profiles.
- *
+ *
* @author Benjamin Bentmann
*/
public class DefaultProfileActivationContext
@@ -42,6 +44,8 @@ public class DefaultProfileActivationContext
private Map userProperties = Collections.emptyMap();
+ private Map projectProperties = Collections.emptyMap();
+
private File projectDirectory;
public List getActiveProfileIds()
@@ -51,7 +55,7 @@ public class DefaultProfileActivationContext
/**
* Sets the identifiers of those profiles that should be activated by explicit demand.
- *
+ *
* @param activeProfileIds The identifiers of those profiles to activate, may be {@code null}.
* @return This context, never {@code null}.
*/
@@ -76,7 +80,7 @@ public class DefaultProfileActivationContext
/**
* Sets the identifiers of those profiles that should be deactivated by explicit demand.
- *
+ *
* @param inactiveProfileIds The identifiers of those profiles to deactivate, may be {@code null}.
* @return This context, never {@code null}.
*/
@@ -102,11 +106,11 @@ public class DefaultProfileActivationContext
/**
* Sets the system properties to use for interpolation and profile activation. The system properties are collected
* from the runtime environment like {@link System#getProperties()} and environment variables.
- *
+ *
* @param systemProperties The system properties, may be {@code null}.
* @return This context, never {@code null}.
*/
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
public DefaultProfileActivationContext setSystemProperties( Properties systemProperties )
{
if ( systemProperties != null )
@@ -124,7 +128,7 @@ public class DefaultProfileActivationContext
/**
* Sets the system properties to use for interpolation and profile activation. The system properties are collected
* from the runtime environment like {@link System#getProperties()} and environment variables.
- *
+ *
* @param systemProperties The system properties, may be {@code null}.
* @return This context, never {@code null}.
*/
@@ -151,11 +155,11 @@ public class DefaultProfileActivationContext
* Sets the user properties to use for interpolation and profile activation. The user properties have been
* configured directly by the user on his discretion, e.g. via the {@code -Dkey=value} parameter on the command
* line.
- *
+ *
* @param userProperties The user properties, may be {@code null}.
* @return This context, never {@code null}.
*/
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
public DefaultProfileActivationContext setUserProperties( Properties userProperties )
{
if ( userProperties != null )
@@ -174,7 +178,7 @@ public class DefaultProfileActivationContext
* Sets the user properties to use for interpolation and profile activation. The user properties have been
* configured directly by the user on his discretion, e.g. via the {@code -Dkey=value} parameter on the command
* line.
- *
+ *
* @param userProperties The user properties, may be {@code null}.
* @return This context, never {@code null}.
*/
@@ -199,9 +203,9 @@ public class DefaultProfileActivationContext
/**
* Sets the base directory of the current project.
- *
+ *
* @param projectDirectory The base directory of the current project, may be {@code null} if profile activation
- * happens in the context of metadata retrieval rather than project building.
+ * happens in the context of metadata retrieval rather than project building.
* @return This context, never {@code null}.
*/
public DefaultProfileActivationContext setProjectDirectory( File projectDirectory )
@@ -211,4 +215,39 @@ public class DefaultProfileActivationContext
return this;
}
+ public Map getProjectProperties()
+ {
+ return projectProperties;
+ }
+
+ public DefaultProfileActivationContext setProjectProperties( Properties projectProperties )
+ {
+ if ( projectProperties != null )
+ {
+
+ this.projectProperties = Collections.unmodifiableMap( toMap( projectProperties ) );
+ }
+ else
+ {
+ this.projectProperties = Collections.emptyMap();
+ }
+
+ return this;
+ }
+
+ private Map toMap( Properties properties )
+ {
+ if ( properties == null )
+ {
+ return Collections.emptyMap();
+ }
+ Map map = new HashMap();
+ Enumeration keys = properties.keys();
+ while ( keys.hasMoreElements() )
+ {
+ String key = (String) keys.nextElement();
+ map.put( key, properties.getProperty( key ) );
+ }
+ return map;
+ }
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java
index b7c8b1985f..38421bc4e9 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java
@@ -71,7 +71,7 @@ public class DefaultProfileInjector
}
}
- private static class ProfileModelMerger
+ protected static class ProfileModelMerger
extends MavenModelMerger
{
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java
index dc004105fb..c376c999e3 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java
@@ -115,10 +115,10 @@ public class DefaultProfileSelector
}
catch ( RuntimeException e )
{
- problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE)
- .setMessage( "Failed to determine activation for profile " + profile.getId())
- .setLocation( profile.getLocation( "" ))
- .setException( e ));
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
+ .setMessage( "Failed to determine activation for profile " + profile.getId() )
+ .setLocation( profile.getLocation( "" ) )
+ .setException( e ) );
return false;
}
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileActivationContext.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileActivationContext.java
index 63540f23e7..fb9ea0cd89 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileActivationContext.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileActivationContext.java
@@ -69,4 +69,11 @@ public interface ProfileActivationContext
*/
File getProjectDirectory();
+ /**
+ * Gets current calculated project properties
+ *
+ * @return The project properties, never {@code null}.
+ */
+ Map getProjectProperties();
+
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
index aa35bcc120..b4ecf26177 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
@@ -118,6 +118,8 @@ public class FileProfileActivator
return false;
}
+ interpolator.addValueSource( new MapBasedValueSource( context.getProjectProperties() ) );
+
interpolator.addValueSource( new MapBasedValueSource( context.getUserProperties() ) );
interpolator.addValueSource( new MapBasedValueSource( context.getSystemProperties() ) );
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java
index 7fa55378a2..62b6cfb7b5 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java
@@ -65,7 +65,7 @@ public class JdkVersionProfileActivator
{
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
.setMessage( "Failed to determine Java version for profile " + profile.getId() )
- .setLocation(activation.getLocation( "jdk" ) ) );
+ .setLocation( activation.getLocation( "jdk" ) ) );
return false;
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
index ff084f7201..77219a7b04 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
@@ -62,7 +62,7 @@ public class DefaultModelValidator
implements ModelValidator
{
- private static final Pattern ID_REGEX = Pattern.compile("[A-Za-z0-9_\\-.]+");
+ private static final Pattern ID_REGEX = Pattern.compile( "[A-Za-z0-9_\\-.]+" );
private static final String ILLEGAL_FS_CHARS = "\\/:\"<>|?*";
@@ -230,8 +230,9 @@ public class DefaultModelValidator
{
if ( !"pom".equals( model.getPackaging() ) )
{
- addViolation( problems, Severity.ERROR, Version.BASE,"packaging", null, "with value '" + model.getPackaging()
- + "' is invalid. Aggregator projects " + "require 'pom' as packaging.", model );
+ addViolation( problems, Severity.ERROR, Version.BASE, "packaging", null,
+ "with value '" + model.getPackaging() + "' is invalid. Aggregator projects "
+ + "require 'pom' as packaging.", model );
}
for ( int i = 0, n = model.getModules().size(); i < n; i++ )
@@ -850,7 +851,8 @@ public class DefaultModelValidator
buffer.append( ' ' ).append( message );
- problems.add( new ModelProblemCollectorRequest( severity, version ).setMessage( buffer.toString() ).setLocation( getLocation( fieldName, tracker )));
+ problems.add( new ModelProblemCollectorRequest( severity, version )
+ .setMessage( buffer.toString() ).setLocation( getLocation( fieldName, tracker ) ) );
}
private static InputLocation getLocation( String fieldName, InputLocationTracker tracker )
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 1e70e8a016..3501f39063 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
@@ -56,7 +56,7 @@ under the License.
${project.artifactId}-${project.version}
${project.build.directory}/test-classes
${project.basedir}/src/main/java
- src/main/scripts
+ ${project.basedir}/src/main/scripts
${project.basedir}/src/test/java
@@ -82,11 +82,11 @@ under the License.
maven-dependency-plugin
- 2.1
+ 2.5
maven-release-plugin
- 2.0
+ 2.3.2
diff --git a/maven-model-builder/src/site/apt/index.apt b/maven-model-builder/src/site/apt/index.apt
index ed3930c4d4..1943d7bded 100644
--- a/maven-model-builder/src/site/apt/index.apt
+++ b/maven-model-builder/src/site/apt/index.apt
@@ -24,23 +24,31 @@ Maven Model Builder
** profile activation (see {{{./apidocs/org/apache/maven/model/profile/activation/package-summary.html}available activators}})
- ** model normalization
+ ** model normalization: <<>> ({{{./apidocs/org/apache/maven/model/normalization/ModelNormalizer.html}javadoc}}),
+ with its <<>> implementation
+ ({{{./xref/org/apache/maven/model/normalization/DefaultModelNormalizer.html}source}})
** profile injection
** parent resolution until {{{./super-pom.html}super-pom}}
- ** inheritance assembly
+ ** inheritance assembly: <<>> ({{{./apidocs/org/apache/maven/model/inheritance/InheritanceAssembler.html}javadoc}}),
+ with its <<>> implementation
+ ({{{./xref/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.html}source}})
** model interpolation (see below)
- ** url normalization
+ ** url normalization: <<>> ({{{./apidocs/org/apache/maven/model/path/UrlNormalizer.html}javadoc}}),
+ with its <<>> implementation
+ ({{{./xref/org/apache/maven/model/path/DefaultUrlNormalizer.html}source}})
[]
* phase 2
- ** model path translation
+ ** model path translation: <<>> ({{{./apidocs/org/apache/maven/model/path/ModelPathTranslator.html}javadoc}}),
+ with its <<>> implementation
+ ({{{./xref/org/apache/maven/model/path/DefaultModelPathTranslator.html}source}})
** plugin management injection
@@ -56,7 +64,9 @@ Maven Model Builder
** <(optional)> plugins configuration
- ** effective model validation
+ ** effective model validation: <<>> ({{{./apidocs/org/apache/maven/model/validation/ModelValidator.html}javadoc}}),
+ with its <<>> implementation
+ ({{{./xref/org/apache/maven/model/validation/DefaultModelValidator.html}source}})
[]
@@ -78,12 +88,12 @@ Maven Model Builder
<<>> ()\
<<<*>>> () | POM content (see {{{../maven-model/maven.html}POM reference}}) | <<<$\{project.version\}>>>\
| | <<<$\{project.build.finalName\}>>>\
- | | <<<$\{project.build.artifactId\}>>>\
+ | | <<<$\{project.artifactId\}>>>\
| | <<<$\{project.build.directory\}>>> |
*----+------+------+
-| <<>>\
-<<>>\
-<<>> () | the directory containing the <<>> file | <<<$\{project.basedir\}>>> |
+| <<>>\
+<<>> ()\
+<<>> () | the directory containing the <<>> file | <<<$\{project.basedir\}>>> |
*----+------+------+
| <<>>\
<<>> () | the directory containing the <<>> file as URI | <<<$\{project.baseUri\}>>> |
diff --git a/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java b/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
index 3c9e749e90..88e866b0b2 100644
--- a/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
+++ b/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
@@ -71,7 +71,16 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
* This is a hand-crafted prototype of the default model merger that should eventually be generated by Modello by a new
- * Java plugin.
+ * Java plugin. Code structure to merge source (read-only) object into the target object is:
+ * mergeClassname ( Classname target, Classname source, boolean sourceDominant,
+ * Map context ) for each model classmergeClassname _FieldName ( Classname target, Classname source, boolean
+ * sourceDominant, Map context ) for each field of each model classObject getClassname Key( Classname classname ) for each class that is used in a list
+ * Code is written like it could be generated, with default behaviour to be overridden when necessary.
+ * This is particularly the case for Object getClassname Key( Classname classname ) method,
+ * which by default return the object itself and is expected to be overridden to calculate better suited key value.
*
* @author Benjamin Bentmann
*/
@@ -2834,79 +2843,79 @@ public class ModelMerger
return dependency;
}
- protected Object getPluginKey( Plugin object )
+ protected Object getPluginKey( Plugin plugin )
{
- return object;
+ return plugin;
}
- protected Object getPluginExecutionKey( PluginExecution object )
+ protected Object getPluginExecutionKey( PluginExecution pluginExecution )
{
- return object;
+ return pluginExecution;
}
- protected Object getReportPluginKey( ReportPlugin object )
+ protected Object getReportPluginKey( ReportPlugin reportPlugin )
{
- return object;
+ return reportPlugin;
}
- protected Object getReportSetKey( ReportSet object )
+ protected Object getReportSetKey( ReportSet reportSet )
{
- return object;
+ return reportSet;
}
- protected Object getLicenseKey( License object )
+ protected Object getLicenseKey( License license )
{
- return object;
+ return license;
}
- protected Object getMailingListKey( MailingList object )
+ protected Object getMailingListKey( MailingList mailingList )
{
- return object;
+ return mailingList;
}
- protected Object getDeveloperKey( Developer object )
+ protected Object getDeveloperKey( Developer developer )
{
- return object;
+ return developer;
}
- protected Object getContributorKey( Contributor object )
+ protected Object getContributorKey( Contributor contributor )
{
- return object;
+ return contributor;
}
- protected Object getProfileKey( Profile object )
+ protected Object getProfileKey( Profile profile )
{
- return object;
+ return profile;
}
- protected Object getRepositoryKey( Repository object )
+ protected Object getRepositoryKey( Repository repository )
{
- return getRepositoryBaseKey( object );
+ return getRepositoryBaseKey( repository );
}
- protected Object getRepositoryBaseKey( RepositoryBase object )
+ protected Object getRepositoryBaseKey( RepositoryBase repositoryBase )
{
- return object;
+ return repositoryBase;
}
- protected Object getNotifierKey( Notifier object )
+ protected Object getNotifierKey( Notifier notifier )
{
- return object;
+ return notifier;
}
- protected Object getResourceKey( Resource object )
+ protected Object getResourceKey( Resource resource )
{
- return object;
+ return resource;
}
- protected Object getExtensionKey( Extension object )
+ protected Object getExtensionKey( Extension extension )
{
- return object;
+ return extension;
}
- protected Object getExclusionKey( Exclusion object )
+ protected Object getExclusionKey( Exclusion exclusion )
{
- return object;
+ return exclusion;
}
}
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
index d73f66d5f4..8c3d9da894 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
@@ -108,7 +108,10 @@ public class MojoDescriptor
/** Specify the required dependencies in a specified scope */
private String dependencyResolutionRequired = null;
- /** The scope of (transitive) dependencies that should be collected but not resolved. */
+ /**
+ * The scope of (transitive) dependencies that should be collected but not resolved.
+ * @since 3.0-alpha-3
+ */
private String dependencyCollectionRequired;
/** By default, the Mojo needs a Maven project to be executed */
@@ -132,7 +135,10 @@ public class MojoDescriptor
/** By default, the Mojo don't need reports to run */
private boolean requiresReports = false;
- /** By default, mojos are not threadsafe */
+ /**
+ * By default, mojos are not threadsafe
+ * @since 3.0-beta-2
+ */
private boolean threadSafe = false;
/**
@@ -271,6 +277,9 @@ public class MojoDescriptor
return dependencyResolutionRequired;
}
+ /**
+ * @since 3.0-alpha-3
+ */
public void setDependencyCollectionRequired( String requiresDependencyCollection )
{
this.dependencyCollectionRequired = requiresDependencyCollection;
@@ -284,6 +293,7 @@ public class MojoDescriptor
* full dependency resolution might fail due to projects which haven't been built yet.
*
* @return The scope of (transitive) dependencies that should be collected or {@code null} if none.
+ * @since 3.0-alpha-3
*/
public String getDependencyCollectionRequired()
{
@@ -664,6 +674,7 @@ public class MojoDescriptor
/**
* @return True if the Mojo is thread-safe and can be run safely in parallel
+ * @since 3.0-beta-2
*/
public boolean isThreadSafe()
{
@@ -672,6 +683,7 @@ public class MojoDescriptor
/**
* @param threadSafe indicates that the mojo is thread-safe and can be run safely in parallel
+ * @since 3.0-beta-2
*/
public void setThreadSafe( boolean threadSafe )
{
diff --git a/pom.xml b/pom.xml
index c631354cd8..22a0162e15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
org.apache.maven
maven-parent
- 22
+ 23
../pom/maven/pom.xml
@@ -30,7 +30,7 @@
pom
Apache Maven
- Maven is a project development management and
+ Maven is a software build management and
comprehension tool. Based on the concept of a project object model:
builds, dependency management, documentation creation, site
publication, and distribution publication are all controlled from
@@ -38,19 +38,19 @@
number of other development tools for reporting or the build
process.
- ${siteUrl}
+ http://maven.apache.org/ref/${project.version}
2001
- 2.4
+ 2.4.2
1.2
1.2_Java1.3
3.8.2
1.5.5
- 1.14
- 3.0.9
+ 1.16
+ 3.0.10
2.3.0
- 2.3
+ 2.4
1.3
1.7
1.6
@@ -64,6 +64,7 @@
Apache Maven
scp://people.apache.org/www/maven.apache.org/ref/${project.version}/
http://maven.apache.org/ref/${project.version}/
+ ref/3-LATEST
@@ -82,9 +83,10 @@
- scm:svn:http://svn.apache.org/repos/asf/maven/maven-3/trunk
- scm:svn:https://svn.apache.org/repos/asf/maven/maven-3/trunk
- http://svn.apache.org/viewvc/maven/maven-3/trunk
+ scm:git:https://git-wip-us.apache.org/repos/asf/maven.git
+ scm:git:https://git-wip-us.apache.org/repos/asf/maven.git
+ https://git-wip-us.apache.org/repos/asf?p=maven.git
+ HEAD
jira
@@ -92,12 +94,12 @@
Jenkins
- https://builds.apache.org/job/maven-3.0.x/
+ https://builds.apache.org/job/maven-3.x/
apache.website
- ${siteDeployUrl}
+ scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}
@@ -220,7 +222,13 @@
org.slf4j
slf4j-simple
${slf4jVersion}
- runtime
+ true
+
+
+ ch.qos.logback
+ logback-classic
+ 1.0.7
+ true
@@ -393,12 +401,12 @@
org.apache.maven.plugins
maven-assembly-plugin
- 2.2-beta-5
+ 2.4
org.codehaus.mojo
buildnumber-maven-plugin
- 1.0
+ 1.2
org.apache.maven.plugins
@@ -412,6 +420,16 @@
+
+ org.apache.maven.plugins
+ maven-scm-publish-plugin
+ 1.0-beta-2
+
+ ${project.build.directory}/staging/${maven.site.path}
+ ${maven.site.cache}/${maven.site.path}
+ true
+
+
@@ -439,16 +457,6 @@
-
-
-
- org.apache.maven.plugins
- maven-project-info-reports-plugin
- 2.6
-
-
-
-
apache-release
@@ -473,29 +481,18 @@
reporting
-
- org.apache.maven.plugins
- maven-project-info-reports-plugin
- 2.6
-
org.apache.maven.plugins
maven-javadoc-plugin
true
+ true
-
- non-aggregate
-
- javadoc
- test-javadoc
-
-
aggregate
false
@@ -510,13 +507,6 @@
maven-jxr-plugin
2.3
-
- non-aggregate
-
- jxr
- test-jxr
-
-
aggregate
false
diff --git a/src/site/site.xml b/src/site/site.xml
index cdaacd9826..291d8ced9f 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -35,11 +35,7 @@ under the License.
org.apache.maven.skins
maven-fluido-skin
-<<<<<<< HEAD
1.3.0
-=======
- 1.0
->>>>>>> 4fdcdbd26244ff81e242054fd38cf415d92499be