Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove unnecessary maven-core dependencies 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164322 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-04-23 03:12:07 +00:00
parent a36f061af8
commit 23b8cd0e46
13 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maven-artifact-ant/pom.xml
View File

@ -13,13 +13,12 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.0-alpha-1</version>
<version>2.0-SNAPSHOT</version>
</dependency>
<!-- for project loading... -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>2.0-alpha-1</version>
<artifactId>maven-project</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>

13
maven-plugin-tools/maven-plugin-tools-api/pom.xml
View File

@ -9,15 +9,20 @@
<name>Maven Plugin Tools APIs</name>
<dependencies>
<dependency>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-core</artifactId>
<version>1.0-alpha-1</version>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-descriptor</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<artifactId>maven-project</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-core</artifactId>
<version>1.0-alpha-1</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>

11
maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java
View File

@ -1,8 +1,9 @@
package org.apache.maven.tools.plugin.scanner;
import junit.framework.TestCase;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.plugin.MavenMojoDescriptor;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.project.MavenProject;
import java.io.File;
@ -10,8 +11,6 @@ import java.util.Collections;
import java.util.Map;
import java.util.Set;
import junit.framework.TestCase;
/**
* @author jdcasey
*/
@ -38,9 +37,9 @@ public class DefaultMojoScannerTest
assertEquals( 1, descriptors.size() );
MavenMojoDescriptor mmDesc = (MavenMojoDescriptor) descriptors.iterator().next();
assertEquals( "testPluginId", mmDesc.getMojoDescriptor().getId() );
assertEquals( "testGoal", mmDesc.getMojoDescriptor().getGoal() );
MojoDescriptor desc = (MojoDescriptor) descriptors.iterator().next();
assertEquals( "testPluginId", desc.getId() );
assertEquals( "testGoal", desc.getGoal() );
}
}

5
maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java
View File

@ -1,6 +1,5 @@
package org.apache.maven.tools.plugin.scanner;
import org.apache.maven.plugin.MavenMojoDescriptor;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.project.MavenProject;
import org.apache.maven.tools.plugin.extractor.MojoDescriptorExtractor;
@ -22,9 +21,7 @@ public class TestExtractor
desc.setId( "testPluginId" );
desc.setGoal( "testGoal" );
MavenMojoDescriptor mmDesc = new MavenMojoDescriptor( desc );
return Collections.singleton( mmDesc );
return Collections.singleton( desc );
}
}

5
maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml
View File

@ -8,11 +8,6 @@
<artifactId>maven-plugin-tools-pluggy</artifactId>
<name>Maven Pluggy Simplistic Plugin Generator</name>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>

2
maven-plugins/maven-deploy-plugin/pom.xml
View File

@ -13,7 +13,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<artifactId>maven-project</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>

4
maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java
View File

@ -21,7 +21,7 @@ import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.deployer.ArtifactDeployer;
import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.metadata.MavenMetadata;
import org.apache.maven.artifact.metadata.ProjectArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.AbstractPlugin;
import org.apache.maven.plugin.PluginExecutionException;
@ -87,7 +87,7 @@ public class DeployMojo
File pom = new File( project.getFile().getParentFile(), "pom.xml" );
if ( !isPomArtifact )
{
ArtifactMetadata metadata = new MavenMetadata( artifact, pom );
ArtifactMetadata metadata = new ProjectArtifactMetadata( artifact, pom );
artifact.addMetadata( metadata );
}

2
maven-plugins/maven-idea-plugin/pom.xml
View File

@ -12,7 +12,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<artifactId>maven-project</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
</dependencies>

2
maven-plugins/maven-install-plugin/pom.xml
View File

@ -13,7 +13,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<artifactId>maven-project</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>

4
maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
View File

@ -21,7 +21,7 @@ import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.installer.ArtifactInstallationException;
import org.apache.maven.artifact.installer.ArtifactInstaller;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.metadata.MavenMetadata;
import org.apache.maven.artifact.metadata.ProjectArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.AbstractPlugin;
import org.apache.maven.plugin.PluginExecutionException;
@ -72,7 +72,7 @@ public class InstallMojo
File pom = new File( project.getFile().getParentFile(), "pom.xml" );
if ( !isPomArtifact )
{
ArtifactMetadata metadata = new MavenMetadata( artifact, pom );
ArtifactMetadata metadata = new ProjectArtifactMetadata( artifact, pom );
artifact.addMetadata( metadata );
}

2
maven-plugins/maven-site-plugin/pom.xml
View File

@ -12,7 +12,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<artifactId>maven-project</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>

4
maven-core/src/main/java/org/apache/maven/artifact/metadata/MavenMetadata.java → maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
View File

@ -38,12 +38,12 @@ import java.io.IOException;
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @version $Id$
*/
public class MavenMetadata
public class ProjectArtifactMetadata
extends AbstractArtifactMetadata
{
private final File file;
public MavenMetadata( Artifact artifact, File file )
public ProjectArtifactMetadata( Artifact artifact, File file )
{
super( artifact, null );
this.file = file;

2
maven-site/pom.xml
View File

@ -5,7 +5,7 @@
<version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-core</artifactId>
<artifactId>maven-site</artifactId>
<name>Maven</name>
<version>2.0-SNAPSHOT</version>
<inceptionYear>2001</inceptionYear>