You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/04/23 05:12:09 UTC
svn commit: r164322 - /maven/components/trunk/maven-artifact-ant
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/metadata
/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api
/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner
/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-pluggy
/maven/components/trunk/maven-plugins/maven-deploy-plugin
/maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy
/maven/components/trunk/maven-plugins/maven-idea-plugin
/maven/components/trunk/maven-plugins/maven-install-plugin
/maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install
/maven/components/trunk/maven-plugins/maven-site-plugin
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact
/maven/components/trunk/maven-site
Author: brett
Date: Fri Apr 22 20:12:07 2005
New Revision: 164322
URL: http://svn.apache.org/viewcvs?rev=164322&view=rev
Log:
remove unnecessary maven-core dependencies
Added:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
- copied, changed from r164214, maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/metadata/MavenMetadata.java
Removed:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/metadata/MavenMetadata.java
Modified:
maven/components/trunk/maven-artifact-ant/pom.xml
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/pom.xml
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml
maven/components/trunk/maven-plugins/maven-deploy-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java
maven/components/trunk/maven-plugins/maven-idea-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-install-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml
maven/components/trunk/maven-site/pom.xml
Modified: maven/components/trunk/maven-artifact-ant/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/pom.xml?rev=164322&r1=164321&r2=164322&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/pom.xml (original)
+++ maven/components/trunk/maven-artifact-ant/pom.xml Fri Apr 22 20:12:07 2005
@@ -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>
Modified: maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/pom.xml?rev=164322&r1=164321&r2=164322&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/pom.xml (original)
+++ maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/pom.xml Fri Apr 22 20:12:07 2005
@@ -9,14 +9,19 @@
<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>
Modified: maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java?rev=164322&r1=164321&r2=164322&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java (original)
+++ maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java Fri Apr 22 20:12:07 2005
@@ -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.Map;
import java.util.Set;
-import junit.framework.TestCase;
-
/**
* @author jdcasey
*/
@@ -38,9 +37,9 @@
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() );
}
}
Modified: maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java?rev=164322&r1=164321&r2=164322&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java (original)
+++ maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java Fri Apr 22 20:12:07 2005
@@ -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 @@
desc.setId( "testPluginId" );
desc.setGoal( "testGoal" );
- MavenMojoDescriptor mmDesc = new MavenMojoDescriptor( desc );
-
- return Collections.singleton( mmDesc );
+ return Collections.singleton( desc );
}
}
Modified: maven/components/trunk/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml?rev=164322&r1=164321&r2=164322&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml (original)
+++ maven/components/trunk/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml Fri Apr 22 20:12:07 2005
@@ -10,11 +10,6 @@
<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>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified: maven/components/trunk/maven-plugins/maven-deploy-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-deploy-plugin/pom.xml?rev=164322&r1=164321&r2=164322&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-deploy-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-deploy-plugin/pom.xml Fri Apr 22 20:12:07 2005
@@ -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>
Modified: maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java?rev=164322&r1=164321&r2=164322&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java Fri Apr 22 20:12:07 2005
@@ -21,7 +21,7 @@
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 @@
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 );
}
Modified: maven/components/trunk/maven-plugins/maven-idea-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-idea-plugin/pom.xml?rev=164322&r1=164321&r2=164322&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-idea-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-idea-plugin/pom.xml Fri Apr 22 20:12:07 2005
@@ -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>
Modified: maven/components/trunk/maven-plugins/maven-install-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-install-plugin/pom.xml?rev=164322&r1=164321&r2=164322&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-install-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-install-plugin/pom.xml Fri Apr 22 20:12:07 2005
@@ -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>
Modified: maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java?rev=164322&r1=164321&r2=164322&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java Fri Apr 22 20:12:07 2005
@@ -21,7 +21,7 @@
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 @@
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 );
}
Modified: maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml?rev=164322&r1=164321&r2=164322&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml Fri Apr 22 20:12:07 2005
@@ -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>
Copied: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java (from r164214, maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/metadata/MavenMetadata.java)
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java?p2=maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/metadata/MavenMetadata.java&r1=164214&r2=164322&rev=164322&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/metadata/MavenMetadata.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java Fri Apr 22 20:12:07 2005
@@ -38,12 +38,12 @@
* @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;
Modified: maven/components/trunk/maven-site/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/pom.xml?rev=164322&r1=164321&r2=164322&view=diff
==============================================================================
--- maven/components/trunk/maven-site/pom.xml (original)
+++ maven/components/trunk/maven-site/pom.xml Fri Apr 22 20:12:07 2005
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org