Author: sisbell
Date: Wed Feb 6 11:30:56 2008
New Revision: 619119
URL: http://svn.apache.org/viewvc?rev=619119&view=rev
Log:
Cleanup of poms.
Modified:
incubator/nmaven/trunk/components/maven-dotnet-assembler/pom.xml
incubator/nmaven/trunk/components/maven-dotnet-compiler/pom.xml
incubator/nmaven/trunk/components/maven-dotnet-extensions/pom.xml
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/SourceProcessorMojo.java
incubator/nmaven/trunk/plugins/maven-dotnet-test-plugin/pom.xml
incubator/nmaven/trunk/pom.xml
Modified: incubator/nmaven/trunk/components/maven-dotnet-assembler/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-assembler/pom.xml?rev=619119&r1=619118&r2=619119&view=diff
==============================================================================
--- incubator/nmaven/trunk/components/maven-dotnet-assembler/pom.xml (original)
+++ incubator/nmaven/trunk/components/maven-dotnet-assembler/pom.xml Wed Feb 6
11:30:56 2008
@@ -38,15 +38,19 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
+ <artifactId>plexus-component-api</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
+ <artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>
</project>
Modified: incubator/nmaven/trunk/components/maven-dotnet-compiler/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-compiler/pom.xml?rev=619119&r1=619118&r2=619119&view=diff
==============================================================================
--- incubator/nmaven/trunk/components/maven-dotnet-compiler/pom.xml (original)
+++ incubator/nmaven/trunk/components/maven-dotnet-compiler/pom.xml Wed Feb 6
11:30:56 2008
@@ -30,7 +30,6 @@
<artifactId>maven-dotnet-compiler</artifactId>
<name>maven-dotnet-compiler</name>
<description>NMaven</description>
-
<dependencies>
<dependency>
<groupId>org.apache.maven.dotnet</groupId>
@@ -51,11 +50,11 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
+ <artifactId>plexus-container-default</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
+ <artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>
</project>
Modified: incubator/nmaven/trunk/components/maven-dotnet-extensions/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-extensions/pom.xml?rev=619119&r1=619118&r2=619119&view=diff
==============================================================================
--- incubator/nmaven/trunk/components/maven-dotnet-extensions/pom.xml (original)
+++ incubator/nmaven/trunk/components/maven-dotnet-extensions/pom.xml Wed Feb
6 11:30:56 2008
@@ -18,32 +18,37 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <parent>
- <groupId>org.apache.maven.dotnet</groupId>
- <version>0.15-incubating-SNAPSHOT</version>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <parent>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <version>0.15-incubating-SNAPSHOT</version>
<artifactId>maven-dotnet-components</artifactId>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.dotnet</groupId>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.dotnet</groupId>
<artifactId>maven-dotnet-extensions</artifactId>
<name>maven-dotnet-extensions</name>
<description>NMaven</description>
<dependencies>
<dependency>
<groupId>org.apache.maven.dotnet</groupId>
- <artifactId>maven-dotnet-compiler</artifactId>
+ <artifactId>maven-dotnet-assembler</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.dotnet</groupId>
- <artifactId>maven-dotnet-assembler</artifactId>
+ <artifactId>maven-dotnet-core</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.dotnet</groupId>
- <artifactId>maven-dotnet-core</artifactId>
+ <artifactId>maven-dotnet-compiler</artifactId>
<version>${pom.version}</version>
</dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified: incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/pom.xml?rev=619119&r1=619118&r2=619119&view=diff
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/pom.xml
(original)
+++ incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/pom.xml Wed Feb
6 11:30:56 2008
@@ -34,12 +34,12 @@
<dependencies>
<dependency>
<groupId>org.apache.maven.dotnet</groupId>
- <artifactId>maven-dotnet-compiler</artifactId>
+ <artifactId>maven-dotnet-assembler</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.dotnet</groupId>
- <artifactId>maven-dotnet-assembler</artifactId>
+ <artifactId>maven-dotnet-compiler</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
@@ -51,14 +51,23 @@
<groupId>org.apache.maven.dotnet</groupId>
<artifactId>maven-dotnet-extensions</artifactId>
<version>${pom.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>
<distributionManagement>
Modified:
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java?rev=619119&r1=619118&r2=619119&view=diff
==============================================================================
---
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
Wed Feb 6 11:30:56 2008
@@ -32,14 +32,9 @@
import org.apache.maven.dotnet.ArtifactType;
import org.apache.maven.dotnet.InitializationException;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.artifact.handler.ArtifactHandler;
-import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import java.io.File;
import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
/**
* Maven Mojo for compiling Class files to the .NET Intermediate Language.
Modified:
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/SourceProcessorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/SourceProcessorMojo.java?rev=619119&r1=619118&r2=619119&view=diff
==============================================================================
---
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/SourceProcessorMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/SourceProcessorMojo.java
Wed Feb 6 11:30:56 2008
@@ -23,7 +23,6 @@
import java.util.ArrayList;
import org.apache.maven.dotnet.BuildDirectories;
-import org.apache.maven.dotnet.ProgrammingLanguage;
import org.apache.maven.plugin.MojoExecutionException;
/**
@@ -33,7 +32,6 @@
* @phase process-sources
* @description Copies source files to target directory.
*/
-
public class SourceProcessorMojo
extends AbstractSourceProcessorMojo
{
Modified: incubator/nmaven/trunk/plugins/maven-dotnet-test-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-dotnet-test-plugin/pom.xml?rev=619119&r1=619118&r2=619119&view=diff
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-dotnet-test-plugin/pom.xml (original)
+++ incubator/nmaven/trunk/plugins/maven-dotnet-test-plugin/pom.xml Wed Feb 6
11:30:56 2008
@@ -29,12 +29,13 @@
<groupId>org.apache.maven.dotnet.plugins</groupId>
<artifactId>maven-dotnet-test-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <name>dotnet-test-plugin</name>
+ <name>maven-dotnet-test-plugin</name>
<description>Maven Plugin for .NET: Handles nunit test execution and
reporting</description>
<dependencies>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
+ <groupId>org.apache.maven.dotnet</groupId>
+ <artifactId>maven-dotnet-core</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -45,9 +46,8 @@
<artifactId>maven-plugin-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.dotnet</groupId>
- <artifactId>maven-dotnet-core</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>
<distributionManagement>
Modified: incubator/nmaven/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/pom.xml?rev=619119&r1=619118&r2=619119&view=diff
==============================================================================
--- incubator/nmaven/trunk/pom.xml (original)
+++ incubator/nmaven/trunk/pom.xml Wed Feb 6 11:30:56 2008
@@ -30,7 +30,8 @@
<artifactId>maven-dotnet-parent</artifactId>
<packaging>pom</packaging>
<version>0.15-incubating-SNAPSHOT</version>
- <name>NMaven</name>
+ <name>Apache NMaven</name>
+ <url>http://incubator.apache.org/nmaven</url>
<mailingLists>
<mailingList>
<name>NMaven Dev List</name>
@@ -59,8 +60,8 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/nmaven/trunk</developerConnection>
</scm>
<organization>
- <name>NMaven</name>
- <url>http://incubator.apache.org/nmaven</url>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
</organization>
<issueManagement>
<system>JIRA Bugtracking</system>
@@ -142,7 +143,7 @@
</developer>
</developers>
<modules>
- <module>archetypes</module>
+ <module>archetypes</module>
<module>components</module>
<module>plugins</module>
</modules>
@@ -183,7 +184,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-artifact</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
@@ -193,12 +194,17 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
+ <artifactId>maven-model</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
