Author: brett
Date: Tue Mar 17 12:52:54 2009
New Revision: 755225
URL: http://svn.apache.org/viewvc?rev=755225&view=rev
Log:
[MNG-4075][MNG-4077] Modifying log-levels for new warnings, and adding TODOs
for MNG-4081 in DefaultLifecycleExecutor.
Merged from: r752168 | jdcasey
Modified:
maven/components/branches/maven-2.1.x/ (props changed)
maven/components/branches/maven-2.1.x/apache-maven/ (props changed)
maven/components/branches/maven-2.1.x/apache-maven/src/test/ (props
changed)
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
(props changed)
maven/components/branches/maven-2.1.x/maven-integration-tests/ (props
changed)
maven/components/branches/maven-2.1.x/maven-model/src/test/ (props
changed)
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/artifact/VersionExpressionTransformation.java
maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java
(props changed)
Propchange: maven/components/branches/maven-2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 17 12:52:54 2009
@@ -1,7 +1,7 @@
/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882,708790-728809,728834
/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060,729738,729785,730461,730631,734502,734803,736543,746381
/maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
-/maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990,752428,753089-753090,755086,755199,755215
+/maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990,752168,752428,753089-753090,755086,755199,755215
/maven/components/branches/maven-2.1.x:751686
/maven/components/trunk:572229,720001,721902,726845,729292
/maven/sandbox/branches/maven/MNG-3379:678167
Propchange: maven/components/branches/maven-2.1.x/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 17 12:52:54 2009
@@ -1,7 +1,7 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven:679193-679867,680477-688882,708790-728809,728834
/maven/components/branches/maven-2.0.x/apache-maven:533160,636838,649903,657432,659677,679552-679867,693956-728820,728836,728940,736543,746038
/maven/components/branches/maven-2.1.0-M1-RC/apache-maven:690315,691793-694304
-/maven/components/branches/maven-2.1.0-RC/apache-maven:688883,689695,689976,689990,752428,753089-753090,755086,755199,755215
+/maven/components/branches/maven-2.1.0-RC/apache-maven:688883,689695,689976,689990,752168,752428,753089-753090,755086,755199,755215
/maven/components/branches/maven-2.1.x/apache-maven:751686
/maven/components/trunk/apache-maven:720001,721902,726845,727688
/maven/components/trunk/maven-distribution:727688
Propchange: maven/components/branches/maven-2.1.x/apache-maven/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 17 12:52:54 2009
@@ -1,4 +1,4 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven/src/test:728834
/maven/components/branches/maven-2.0.x/apache-maven/src/test:736543
-/maven/components/branches/maven-2.1.0-RC/apache-maven/src/test:752428,753089-753090,755086,755199,755215
+/maven/components/branches/maven-2.1.0-RC/apache-maven/src/test:752168,752428,753089-753090,755086,755199,755215
/maven/components/branches/maven-2.1.x/apache-maven/src/test:751686
Modified:
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=755225&r1=755224&r2=755225&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Tue Mar 17 12:52:54 2009
@@ -184,6 +184,7 @@
private void findExtensions( MavenSession session )
throws LifecycleExecutionException
{
+ // TODO: MNG-4081. What about extensions within the current reactor??
for ( Iterator i = session.getSortedProjects().iterator();
i.hasNext(); )
{
MavenProject project = (MavenProject) i.next();
@@ -1511,6 +1512,8 @@
PluginDescriptor pluginDescriptor;
try
{
+ // TODO: MNG-4081...need to flush this plugin once we look at it,
to avoid using an external
+ // version of a plugin when a newer version will be created in the
current reactor...
pluginDescriptor = pluginManager.verifyPlugin( plugin, project,
settings, localRepository );
}
catch ( PluginManagerException e )
Propchange:
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 17 12:52:54 2009
@@ -2,7 +2,7 @@
/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java:679552-679867,693956-728820,728836,728940,729060,729738,729785,730461,730631,734502,734803,736543,746381
/maven/components/branches/maven-2.1.0-M1-RC/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java:688883,689695,689976,689990
-/maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java:755199,755215
+/maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java:752168,755199,755215
/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java:751686,753648,754505,754542
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java:572229,720001,721902,726845,729292
/maven/sandbox/branches/maven/MNG-3379/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java:678167
Propchange: maven/components/branches/maven-2.1.x/maven-integration-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 17 12:52:54 2009
@@ -1,4 +1,4 @@
/maven/components/branches/maven-2.0.10-RC/maven-integration-tests:728834
/maven/components/branches/maven-2.0.x/maven-integration-tests:736543
-/maven/components/branches/maven-2.1.0-RC/maven-integration-tests:752428,753089-753090,755086,755199,755215
+/maven/components/branches/maven-2.1.0-RC/maven-integration-tests:752168,752428,753089-753090,755086,755199,755215
/maven/components/branches/maven-2.1.x/maven-integration-tests:751686
Propchange: maven/components/branches/maven-2.1.x/maven-model/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 17 12:52:54 2009
@@ -1,4 +1,4 @@
/maven/components/branches/maven-2.0.10-RC/maven-model/src/test:728834
/maven/components/branches/maven-2.0.x/maven-model/src/test:736543
-/maven/components/branches/maven-2.1.0-RC/maven-model/src/test:752428,753089-753090,755086,755199,755215
+/maven/components/branches/maven-2.1.0-RC/maven-model/src/test:752168,752428,753089-753090,755086,755199,755215
/maven/components/branches/maven-2.1.x/maven-model/src/test:751686
Modified:
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=755225&r1=755224&r2=755225&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Tue Mar 17 12:52:54 2009
@@ -1875,20 +1875,27 @@
private void logMissingSiblingProjectArtifact( Artifact artifact )
{
- if ( logger == null )
+ if ( logger == null || !logger.isDebugEnabled() )
{
return;
}
- StringBuffer message = new StringBuffer();
- message.append( "A dependency of the current project (or of one the
plugins used in its build) was found in the reactor, " );
- message.append( "\nbut had not been built at the time it was
requested. It will be resolved from the repository instead." );
- message.append( "\n\nCurrent Project: " ).append( getName() );
- message.append( "\nRequested Dependency: " ).append( artifact.getId()
);
- message.append( "\n\nNOTE: You may need to run this build to the
'compile' lifecycle phase, or farther, in order to build the dependency
artifact." );
- message.append( "\n" );
-
- logger.warn( message.toString() );
+ if ( logger.isDebugEnabled() )
+ {
+ StringBuffer message = new StringBuffer();
+ message.append( "WARNING: A dependency of the current project (or
of one the plugins used in its build) was found in the reactor, " );
+ message.append( "\nbut had not been built at the time it was
requested. It will be resolved from the repository instead." );
+ message.append( "\n\nCurrent Project: " ).append( getName() );
+ message.append( "\nRequested Dependency: " ).append(
artifact.getId() );
+ message.append( "\n\nNOTE: You may need to run this build to the
'compile' lifecycle phase, or farther, in order to build the dependency
artifact." );
+ message.append( "\n" );
+
+ logger.debug( message.toString() );
+ }
+ else
+ {
+ logger.warn( "Requested project artifact: " + artifact.getId() + "
is not available at this time. Resolving externally." );
+ }
}
private void addArtifactPath(Artifact a, List list) throws
DependencyResolutionRequiredException
Modified:
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/artifact/VersionExpressionTransformation.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/artifact/VersionExpressionTransformation.java?rev=755225&r1=755224&r2=755225&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/artifact/VersionExpressionTransformation.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/artifact/VersionExpressionTransformation.java
Tue Mar 17 12:52:54 2009
@@ -67,7 +67,10 @@
boolean pomArtifact = false;
if ( "pom".equals( artifact.getType() ) )
{
- getLogger().debug( "On Deploy: Using artifact file for POM: " +
artifact );
+ if ( getLogger().isDebugEnabled() )
+ {
+ getLogger().debug( "On Deploy: Using artifact file for POM: "
+ artifact );
+ }
pomFile = artifact.getFile();
pomArtifact = true;
}
@@ -126,7 +129,10 @@
boolean pomArtifact = false;
if ( "pom".equals( artifact.getType() ) )
{
- getLogger().debug( "On Install: Using artifact file for POM: " +
artifact );
+ if ( getLogger().isDebugEnabled() )
+ {
+ getLogger().debug( "On Install: Using artifact file for POM: "
+ artifact );
+ }
pomFile = artifact.getFile();
pomArtifact = true;
}
@@ -199,10 +205,13 @@
}
else
{
- getLogger().info(
- "Artifact: " + artifact
- + " does not have project-builder metadata
(ProjectBuilderConfiguration) associated with it.\n"
- + "Cannot access CLI properties for version
transformation." );
+ if ( getLogger().isDebugEnabled() )
+ {
+ getLogger().debug(
+ "WARNING: Artifact: " + artifact
+ + " does not have project-builder
metadata (ProjectBuilderConfiguration) associated with it.\n"
+ + "Cannot access CLI properties for
version transformation." );
+ }
pbConfig = new
DefaultProjectBuilderConfiguration().setLocalRepository( localRepository );
projectDir = pomFile.getAbsoluteFile().getParentFile();
Propchange:
maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 17 12:52:54 2009
@@ -1,4 +1,4 @@
/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:688259,725329-725330,725342,725349,725359
/maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:690315,691793
-/maven/components/branches/maven-2.1.0-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:688883,689695,689976,689990,752428,753089-753090,755086,755199,755215
+/maven/components/branches/maven-2.1.0-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:688883,689695,689976,689990,752168,752428,753089-753090,755086,755199,755215
/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:751686
