svn commit: r762209 - /maven/doxia/doxia/trunk/pom.xml
Author: ltheussl Date: Mon Apr 6 04:44:30 2009 New Revision: 762209 URL: http://svn.apache.org/viewvc?rev=762209view=rev Log: forkMode never does not work with cobertura, see MCOBERTURA-70 Modified: maven/doxia/doxia/trunk/pom.xml Modified: maven/doxia/doxia/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=762209r1=762208r2=762209view=diff == --- maven/doxia/doxia/trunk/pom.xml (original) +++ maven/doxia/doxia/trunk/pom.xml Mon Apr 6 04:44:30 2009 @@ -263,12 +263,6 @@ tagBasehttps://svn.apache.org/repos/asf/maven/doxia/doxia/tags/tagBase /configuration /plugin -plugin - artifactIdmaven-surefire-plugin/artifactId - configuration -forkModenever/forkMode - /configuration -/plugin !-- TODO need to upgrade to last version or Maven parent version -- plugin groupIdorg.codehaus.plexus/groupId
svn commit: r762044 - in /maven/scm/trunk: ./ maven-scm-managers/ maven-scm-providers/ maven-scm-providers/maven-scm-providers-cvs/ maven-scm-providers/maven-scm-providers-git/ maven-scm-providers/mav
Author: olamy Date: Sun Apr 5 06:33:07 2009 New Revision: 762044 URL: http://svn.apache.org/viewvc?rev=762044view=rev Log: ignore eclipse files Modified: maven/scm/trunk/ (props changed) maven/scm/trunk/maven-scm-managers/ (props changed) maven/scm/trunk/maven-scm-providers/ (props changed) maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/ (props changed) maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/ (props changed) maven/scm/trunk/maven-scm-providers/maven-scm-providers-standard/ (props changed) maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/ (props changed) Propchange: maven/scm/trunk/ -- --- svn:ignore (original) +++ svn:ignore Sun Apr 5 06:33:07 2009 @@ -7,3 +7,4 @@ *.iws *.iml .metadata +.settings Propchange: maven/scm/trunk/maven-scm-managers/ -- --- svn:ignore (original) +++ svn:ignore Sun Apr 5 06:33:07 2009 @@ -2,3 +2,6 @@ target *.ipr *.iws +.settings +.classpath +.project Propchange: maven/scm/trunk/maven-scm-providers/ -- --- svn:ignore (original) +++ svn:ignore Sun Apr 5 06:33:07 2009 @@ -6,3 +6,4 @@ *.ipr *.iws *.iml +.settings Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/ -- --- svn:ignore (original) +++ svn:ignore Sun Apr 5 06:33:07 2009 @@ -2,3 +2,6 @@ maven-scm-providers-cvs.iws maven-scm-providers-cvs.iml target +.settings +.classpath +.project Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/ -- --- svn:ignore (original) +++ svn:ignore Sun Apr 5 06:33:07 2009 @@ -6,3 +6,4 @@ *.ipr *.iws *.iml +.settings Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-providers-standard/ -- --- svn:ignore (original) +++ svn:ignore Sun Apr 5 06:33:07 2009 @@ -1,2 +1,4 @@ target .project +.settings +.classpath Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/ -- --- svn:ignore (original) +++ svn:ignore Sun Apr 5 06:33:07 2009 @@ -2,3 +2,6 @@ maven-scm-providers-svn.iml maven-scm-providers-svn.ipr target +.settings +.classpath +.project
svn commit: r762080 - /maven/plugins/trunk/maven-source-plugin/pom.xml
Author: dennisl Date: Sun Apr 5 13:22:49 2009 New Revision: 762080 URL: http://svn.apache.org/viewvc?rev=762080view=rev Log: o Use version 2.4 of maven-archiver. Modified: maven/plugins/trunk/maven-source-plugin/pom.xml Modified: maven/plugins/trunk/maven-source-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/pom.xml?rev=762080r1=762079r2=762080view=diff == --- maven/plugins/trunk/maven-source-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-source-plugin/pom.xml Sun Apr 5 13:22:49 2009 @@ -73,7 +73,7 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-archiver/artifactId - version2.3/version + version2.4/version /dependency dependency groupIdorg.codehaus.plexus/groupId
svn commit: r762110 - /maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
Author: rafale
Date: Sun Apr 5 15:43:32 2009
New Revision: 762110
URL: http://svn.apache.org/viewvc?rev=762110view=rev
Log:
Added some traces in order to help creating archetypes by hand.
(ARCHETYPE-236)
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java?rev=762110r1=762109r2=762110view=diff
==
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
Sun Apr 5 15:43:32 2009
@@ -57,9 +57,8 @@
* @plexus.component
*/
public class DefaultArchetypeArtifactManager
-extends AbstractLogEnabled
-implements ArchetypeArtifactManager
-{
+extends AbstractLogEnabled
+implements ArchetypeArtifactManager {
/**
* @plexus.requirement
*/
@@ -77,7 +76,7 @@
private Map archetypeCache = new TreeMap();
-public File getArchetypeFile (
+public File getArchetypeFile(
final String groupId,
final String artifactId,
final String version,
@@ -85,18 +84,15 @@
final ArtifactRepository localRepository,
final List repositories
)
-throws UnknownArchetype
-{
-try
-{
+throws UnknownArchetype {
+try {
File archetype = getArchetype(
-groupId,
-artifactId,
-version);
-if (archetype==null)
-{
+groupId,
+artifactId,
+version );
+if( archetype == null ) {
archetype =
-downloader.download (
+downloader.download(
groupId,
artifactId,
version,
@@ -105,142 +101,117 @@
repositories
);
setArchetype(
-groupId,
-artifactId,
-version,
-archetype);
+groupId,
+artifactId,
+version,
+archetype );
}
return archetype;
}
-catch ( DownloadNotFoundException ex )
-{
-throw new UnknownArchetype ( ex );
+catch( DownloadNotFoundException ex ) {
+throw new UnknownArchetype( ex );
}
-catch ( DownloadException ex )
-{
-throw new UnknownArchetype ( ex );
+catch( DownloadException ex ) {
+throw new UnknownArchetype( ex );
}
}
-public ClassLoader getArchetypeJarLoader ( File archetypeFile )
-throws UnknownArchetype
-{
-try
-{
+public ClassLoader getArchetypeJarLoader( File archetypeFile )
+throws UnknownArchetype {
+try {
URL[] urls = new URL[1];
-urls[0] = archetypeFile.toURI ().toURL ();
+urls[0] = archetypeFile.toURI().toURL();
-return new URLClassLoader ( urls );
+return new URLClassLoader( urls );
}
-catch ( MalformedURLException e )
-{
-throw new UnknownArchetype ( e );
+catch( MalformedURLException e ) {
+throw new UnknownArchetype( e );
}
}
-public Model getArchetypePom ( File jar )
-throws XmlPullParserException, UnknownArchetype, IOException
-{
+public Model getArchetypePom( File jar )
+throws XmlPullParserException, UnknownArchetype, IOException {
String pomFileName = null;
ZipFile zipFile = null;
-try
-{
-zipFile = getArchetypeZipFile ( jar );
-Enumeration enumeration = zipFile.entries ();
-while ( enumeration.hasMoreElements () )
-{
-ZipEntry el = (ZipEntry) enumeration.nextElement ();
-
-String entry = el.getName ();
-if ( entry.startsWith ( META-INF ) entry.endsWith (
pom.xml ) )
-{
+try {
+zipFile = getArchetypeZipFile( jar );
+Enumeration enumeration = zipFile.entries();
+while( enumeration.hasMoreElements() ) {
+ZipEntry el = (ZipEntry) enumeration.nextElement();
+
+String entry = el.getName();
+if( entry.startsWith( META-INF ) entry.endsWith(
svn commit: r762142 - in /maven/components/branches/MNG-2766: ./ maven-core/src/main/java/org/apache/maven/lifecycle/ maven-core/src/main/java/org/apache/maven/plugin/ maven-core/src/test/java/org/apa
Author: jvanzyl
Date: Sun Apr 5 19:55:14 2009
New Revision: 762142
URL: http://svn.apache.org/viewvc?rev=762142view=rev
Log:
o roll up all the plugin manager capability into one class. having a manager, a
component discoverer, and component discovery listener is too complicated.
o using the a looking to set the discoverer and discovery listener. in plexus
this can be rolled into one extender
Added:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java
(with props)
Removed:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/branches/MNG-2766/pom.xml
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=762142r1=762141r2=762142view=diff
==
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Sun Apr 5 19:55:14 2009
@@ -265,6 +265,8 @@
for( Plugin plugin : project.getBuild().getPlugins() )
{
+System.out.println( plugin -- + plugin );
+
for( PluginExecution execution : plugin.getExecutions() )
{
// if the phase is specified then I don't have to go fetch the
plugin yet and pull it down
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=762142r1=762141r2=762142view=diff
==
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Sun Apr 5 19:55:14 2009
@@ -15,9 +15,17 @@
* the License.
*/
+import java.io.IOException;
+import java.io.Reader;
import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
@@ -26,6 +34,7 @@
import org.apache.maven.ArtifactFilterManager;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
@@ -45,6 +54,7 @@
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
import org.apache.maven.project.DuplicateArtifactAttachmentException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
@@ -61,25 +71,39 @@
import org.codehaus.plexus.component.configurator.ConfigurationListener;
import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
+import org.codehaus.plexus.component.discovery.ComponentDiscoverer;
+import org.codehaus.plexus.component.discovery.ComponentDiscovererManager;
+import org.codehaus.plexus.component.discovery.ComponentDiscoveryEvent;
+import org.codehaus.plexus.component.discovery.ComponentDiscoveryListener;
+import org.codehaus.plexus.component.repository.ComponentDescriptor;
+import org.codehaus.plexus.component.repository.ComponentSetDescriptor;
import
