[maven2] Print plugin collector debug output only when maven2.jpp.debug mode is on
Stanislav Ochotnicky
sochotni at fedoraproject.org
Tue Jan 18 10:12:11 UTC 2011
commit bd3f09cf9c937ce6177093586dd08ffbd29581cc
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue Jan 18 11:11:29 2011 +0100
Print plugin collector debug output only when maven2.jpp.debug mode is on
maven2-2.2.1-jpp.patch | 144 +++++++++++++++++++++++++++++++-----------------
maven2.spec | 7 ++-
2 files changed, 99 insertions(+), 52 deletions(-)
---
diff --git a/maven2-2.2.1-jpp.patch b/maven2-2.2.1-jpp.patch
index 62db592..8b676f8 100644
--- a/maven2-2.2.1-jpp.patch
+++ b/maven2-2.2.1-jpp.patch
@@ -1,7 +1,30 @@
-diff -up ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java.sav ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
---- ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java.sav 2009-08-06 15:11:34.000000000 -0400
-+++ ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java 2009-11-19 14:17:42.000000000 -0500
-@@ -58,6 +58,8 @@ import org.codehaus.plexus.util.FileUtil
+From 1633026ab5ef24701ce8617db283079a185d6205 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Tue, 18 Jan 2011 10:40:00 +0100
+Subject: [PATCH 2/7] Maven JPP mode patch
+
+---
+ .../artifact/manager/DefaultWagonManager.java | 31 ++++++++++++++++++++
+ .../metadata/DefaultRepositoryMetadataManager.java | 2 +-
+ .../artifact/resolver/DefaultArtifactResolver.java | 3 +-
+ maven-artifact/pom.xml | 5 +++
+ .../repository/layout/DefaultRepositoryLayout.java | 17 ++++++++++-
+ .../resolver/DefaultArtifactCollector.java | 9 ++++-
+ .../main/resources/META-INF/plexus/components.xml | 6 ++++
+ .../apache/maven/plugin/MavenPluginCollector.java | 18 +++++++++++
+ .../apache/maven/plugin/MavenPluginValidator.java | 6 ++-
+ .../java/org/apache/maven/plugin/PluginUtils.java | 8 ++++-
+ .../version/DefaultPluginVersionManager.java | 8 ++++-
+ .../project/validation/DefaultModelValidator.java | 10 +++++-
+ .../org/apache/maven/project/pom-4.0.0.xml | 22 ++++++++++++++
+ pom.xml | 5 +++
+ 14 files changed, 139 insertions(+), 11 deletions(-)
+
+diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
+index 6318435..e4f8bb1 100644
+--- a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
++++ b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
+@@ -58,6 +58,8 @@ import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -63,10 +86,11 @@ diff -up ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/manage
getLogger().debug( "Trying repository " + repository.getId() );
getRemoteFile( getMirrorRepository( repository ), artifact.getFile(), remotePath, downloadMonitor,
policy.getChecksumPolicy(), false );
-diff -up ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java.sav ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
---- ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java.sav 2009-08-06 15:11:34.000000000 -0400
-+++ ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java 2009-11-18 16:54:39.000000000 -0500
-@@ -85,7 +85,7 @@ public class DefaultRepositoryMetadataMa
+diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
+index 22cb0ec..edc79a5 100644
+--- a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
++++ b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
+@@ -85,7 +85,7 @@ public class DefaultRepositoryMetadataManager
boolean checkForUpdates =
!file.exists() || policy.checkOutOfDate( new Date( file.lastModified() ) );
@@ -75,9 +99,10 @@ diff -up ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/reposi
{
if ( wagonManager.isOnline() )
{
-diff -up ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java.sav ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
---- ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java.sav 2009-08-06 15:11:34.000000000 -0400
-+++ ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java 2009-11-18 16:54:39.000000000 -0500
+diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+index d8c3629..19d702b 100644
+--- a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
++++ b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -206,7 +206,8 @@ public class DefaultArtifactResolver
try
{
@@ -88,9 +113,10 @@ diff -up ./maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolv
{
// the transformations discovered the artifact - so use it exclusively
wagonManager.getArtifact( artifact, artifact.getRepository() );
-diff -up ./maven-artifact/pom.xml.sav ./maven-artifact/pom.xml
---- ./maven-artifact/pom.xml.sav 2009-08-06 15:11:32.000000000 -0400
-+++ ./maven-artifact/pom.xml 2009-11-19 14:54:43.000000000 -0500
+diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
+index c77eabc..5b3b2e7 100644
+--- a/maven-artifact/pom.xml
++++ b/maven-artifact/pom.xml
@@ -39,5 +39,10 @@ under the License.
<artifactId>plexus-container-default</artifactId>
<scope>test</scope>
@@ -102,10 +128,11 @@ diff -up ./maven-artifact/pom.xml.sav ./maven-artifact/pom.xml
+ </dependency>
</dependencies>
</project>
-diff -up ./maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java.sav ./maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
---- ./maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java.sav 2009-08-06 15:11:31.000000000 -0400
-+++ ./maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java 2009-11-19 14:15:45.000000000 -0500
-@@ -23,6 +23,9 @@ import org.apache.maven.artifact.Artifac
+diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
+index 4a8bc0f..d8cb4e7 100644
+--- a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
++++ b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
+@@ -23,6 +23,9 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -143,9 +170,10 @@ diff -up ./maven-artifact/src/main/java/org/apache/maven/artifact/repository/lay
}
}
-diff -up ./maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java.sav ./maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
---- ./maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java.sav 2009-08-06 15:11:32.000000000 -0400
-+++ ./maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java 2009-11-18 16:54:39.000000000 -0500
+diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
+index d10b795..c945ee5 100644
+--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
++++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
@@ -341,7 +341,7 @@ public class DefaultArtifactCollector
// set the recommended version
// TODO: maybe its better to just pass the range through to retrieval and use a transformation?
@@ -169,9 +197,10 @@ diff -up ./maven-artifact/src/main/java/org/apache/maven/artifact/resolver/Defau
fireEvent( ResolutionListener.SELECT_VERSION_FROM_RANGE, listeners, child );
}
-diff -up ./maven-artifact/src/main/resources/META-INF/plexus/components.xml.sav ./maven-artifact/src/main/resources/META-INF/plexus/components.xml
---- ./maven-artifact/src/main/resources/META-INF/plexus/components.xml.sav 2009-08-06 15:11:32.000000000 -0400
-+++ ./maven-artifact/src/main/resources/META-INF/plexus/components.xml 2009-11-18 16:54:39.000000000 -0500
+diff --git a/maven-artifact/src/main/resources/META-INF/plexus/components.xml b/maven-artifact/src/main/resources/META-INF/plexus/components.xml
+index b27fc3c..346adf1 100644
+--- a/maven-artifact/src/main/resources/META-INF/plexus/components.xml
++++ b/maven-artifact/src/main/resources/META-INF/plexus/components.xml
@@ -31,6 +31,12 @@ under the License.
<implementation>org.apache.maven.artifact.repository.layout.LegacyRepositoryLayout</implementation>
</component>
@@ -185,23 +214,29 @@ diff -up ./maven-artifact/src/main/resources/META-INF/plexus/components.xml.sav
<!--
|
| ArtifactHandlerManager
-diff -up ./maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java.sav ./maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
-diff -up ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java.sav ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java
---- ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java.sav 2009-11-19 11:36:53.000000000 -0500
-+++ ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java 2009-11-19 11:47:25.000000000 -0500
-@@ -60,6 +60,7 @@ public class MavenPluginCollector
+diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java
+index 93d61fa..68232c6 100644
+--- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java
++++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java
+@@ -60,6 +60,10 @@ public class MavenPluginCollector
{
pluginsInProcess.add( key );
-+ System.err.println("*DEBUG*: Putting in plugin descriptor list " + key + " and goal prefix is " + pluginDescriptor.getGoalPrefix());
++ if ( System.getProperty("maven2.jpp.debug") != null )
++ {
++ System.err.println("*DEBUG*: Putting in plugin descriptor list " + key + " and goal prefix is " + pluginDescriptor.getGoalPrefix());
++ }
pluginDescriptors.put( key, pluginDescriptor );
// TODO: throw an (not runtime) exception if there is a prefix overlap - means doing so elsewhere
-@@ -75,6 +76,17 @@ public class MavenPluginCollector
+@@ -75,6 +79,20 @@ public class MavenPluginCollector
public PluginDescriptor getPluginDescriptor( Plugin plugin )
{
String key = PluginUtils.constructVersionedKey( plugin );
-+ System.err.println("*DEBUG*: Constructed plugin version key is " + key);
++ if ( System.getProperty("maven2.jpp.debug") != null )
++ {
++ System.err.println("*DEBUG*: Constructed plugin version key is " + key);
++ }
+
+ PluginDescriptor descriptor = (PluginDescriptor) pluginDescriptors.get( key );
+
@@ -215,9 +250,10 @@ diff -up ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector
return (PluginDescriptor) pluginDescriptors.get( key );
}
-diff -up ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java.sav ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
---- ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java.sav 2009-11-19 11:08:06.000000000 -0500
-+++ ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java 2009-11-19 11:08:29.000000000 -0500
+diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
+index dc8e6e1..b8cd650 100644
+--- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
++++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java
@@ -57,8 +57,10 @@ public class MavenPluginValidator
{
errors.add( "Plugin's descriptor contains the wrong artifact ID: " + pluginDescriptor.getArtifactId() );
@@ -231,9 +267,10 @@ diff -up ./maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator
{
errors.add( "Plugin's descriptor contains the wrong version: " + pluginDescriptor.getVersion() );
}
-diff -up ./maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java.sav ./maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java
---- ./maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java.sav 2009-11-19 11:51:04.000000000 -0500
-+++ ./maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java 2009-11-19 12:00:15.000000000 -0500
+diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java
+index 0b1e9a5..21a4af7 100644
+--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java
++++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java
@@ -72,7 +72,13 @@ class PluginUtils
String baseVersion = ArtifactUtils.toSnapshotVersion( version );
@@ -249,9 +286,10 @@ diff -up ./maven-core/src/main/java/org/apache/maven/plugin/PluginUtils.java.sav
return key.toString();
}
-diff -up ./maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java.sav ./maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
---- ./maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java.sav 2009-08-06 15:11:28.000000000 -0400
-+++ ./maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java 2009-11-18 16:54:39.000000000 -0500
+diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java b/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
+index 5a484bc..6dd6dbb 100644
+--- a/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
++++ b/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
@@ -224,9 +224,15 @@ public class DefaultPluginVersionManager
}
@@ -269,9 +307,10 @@ diff -up ./maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPlugi
}
// if the plugin registry is inactive, then the rest of this goop is useless...
-diff -up ./maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java.sav ./maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
---- ./maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java.sav 2009-08-06 15:11:37.000000000 -0400
-+++ ./maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java 2009-11-18 16:54:39.000000000 -0500
+diff --git a/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java b/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
+index ede61f4..dba7bca 100644
+--- a/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
++++ b/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
@@ -43,7 +43,7 @@ import java.util.List;
public class DefaultModelValidator
implements ModelValidator
@@ -296,9 +335,10 @@ diff -up ./maven-project/src/main/java/org/apache/maven/project/validation/Defau
if ( Artifact.SCOPE_SYSTEM.equals( d.getScope() ) )
{
-diff -up ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
---- ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav 2009-08-06 15:11:38.000000000 -0400
-+++ ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml 2009-11-19 13:12:23.000000000 -0500
+diff --git a/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml b/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
+index 00e84c1..b0e4289 100644
+--- a/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
++++ b/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
@@ -32,6 +32,15 @@ under the License.
<enabled>false</enabled>
</snapshots>
@@ -335,9 +375,10 @@ diff -up ./maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.x
</pluginRepositories>
<build>
-diff -up ./pom.xml.sav ./pom.xml
---- ./pom.xml.sav 2009-08-06 15:11:38.000000000 -0400
-+++ ./pom.xml 2009-11-19 14:54:29.000000000 -0500
+diff --git a/pom.xml b/pom.xml
+index e2fde29..3fe31f5 100644
+--- a/pom.xml
++++ b/pom.xml
@@ -481,6 +481,11 @@ under the License.
<artifactId>classworlds</artifactId>
<version>1.1</version>
@@ -350,3 +391,6 @@ diff -up ./pom.xml.sav ./pom.xml
</dependencies>
<!--start-->
</dependencyManagement>
+--
+1.7.3.4
+
diff --git a/maven2.spec b/maven2.spec
index d21f45f..eb3b679 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -3,7 +3,7 @@
Name: maven2
Version: 2.2.1
-Release: 18%{?dist}
+Release: 19%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Build Tools
@@ -236,7 +236,7 @@ build, reporting and documentation from a central piece of information.
%setup -q -n apache-maven-2.2.1
%patch0 -b .antbuild
-%patch1 -b .jpp
+%patch1 -p1 -b .jpp
%patch2 -b .update-tests
%if ! %{bootstrap}
@@ -518,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT
%doc
%changelog
+* Tue Jan 18 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.2.1-19
+- Print plugin collector debug output only when maven2.jpp.debug mode is on
+
* Wed Dec 22 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.2.1-18
- Add xml-commons-apis to lib directory
- fixes NoClassDefFoundError org/w3c/dom/ElementTraversal
More information about the scm-commits
mailing list