From nmaven-commits-return-hmurphy@example.net Wed Oct 01 02:07:43 2008 Return-Path: <nmaven-commits-return-hmurphy@example.net> Delivered-To: hmurphy@example.net Received: (qmail 5060 invoked from network); 1 Oct 2008 02:07:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Oct 2008 02:07:43 -0000 Received: (qmail 1321 invoked by uid 500); 1 Oct 2008 02:07:42 -0000 Delivered-To: hmurphy@example.net Received: (qmail 1303 invoked by uid 500); 1 Oct 2008 02:07:42 -0000 Mailing-List: contact hmurphy@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:hmurphy@example.net> List-Unsubscribe: <mailto:hmurphy@example.net> List-Post: <mailto:hmurphy@example.net> List-Id: <nmaven-commits.incubator.apache.org> Reply-To: hmurphy@example.net Delivered-To: mailing list hmurphy@example.net Received: (qmail 1294 invoked by uid 99); 1 Oct 2008 02:07:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Sep 2008 19:07:41 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 02:06:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 76C3123889A0; Tue, 30 Sep 2008 19:07:22 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r700658 - in /incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests: MavenITNUnit24Features.java MavenITmng0007CSharpCompileTestLibrary.java Date: Wed, 01 Oct 2008 02:07:22 -0000 To: hmurphy@example.net From: hmurphy@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <hmurphy@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Tue Sep 30 19:07:21 2008 New Revision: 700658 URL: http://svn.apache.org/viewvc?rev=700658&view=rev Log: tests that pass on 0.14 Modified: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITNUnit24Features.java incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java Modified: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITNUnit24Features.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITNUnit24Features.java?rev=700658&r1=700657&r2=700658&view=diff ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITNUnit24Features.java (original) +++ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITNUnit24Features.java Tue Sep 30 19:07:21 2008 @@ -29,7 +29,8 @@ { public MavenITNUnit24Features() { - super( "(0.15-incubating,)" ); + // 0.14 and 0.16+ only + super( "(,0.15-incubating),(0.15-incubating,)" ); } public void testNUnit24Features() Modified: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java?rev=700658&r1=700657&r2=700658&view=diff ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java (original) +++ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java Tue Sep 30 19:07:21 2008 @@ -28,7 +28,8 @@ { public MavenITmng0007CSharpCompileTestLibrary() { - super( "(0.15-incubating,)" ); + // 0.14 and 0.16+ only + super( "(,0.15-incubating),(0.15-incubating,)" ); } public void testit0007() From nmaven-commits-return-hmurphy@example.net Wed Oct 01 03:34:49 2008 Return-Path: <nmaven-commits-return-hmurphy@example.net> Delivered-To: hmurphy@example.net Received: (qmail 62854 invoked from network); 1 Oct 2008 03:34:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Oct 2008 03:34:49 -0000 Received: (qmail 42405 invoked by uid 500); 1 Oct 2008 03:34:48 -0000 Delivered-To: hmurphy@example.net Received: (qmail 42384 invoked by uid 500); 1 Oct 2008 03:34:48 -0000 Mailing-List: contact hmurphy@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:hmurphy@example.net> List-Unsubscribe: <mailto:hmurphy@example.net> List-Post: <mailto:hmurphy@example.net> List-Id: <nmaven-commits.incubator.apache.org> Reply-To: hmurphy@example.net Delivered-To: mailing list hmurphy@example.net Received: (qmail 42375 invoked by uid 99); 1 Oct 2008 03:34:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Sep 2008 20:34:48 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 03:33:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D43C723889A0; Tue, 30 Sep 2008 20:33:58 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r700669 - in /incubator/nmaven/branches/NMAVEN-8-nunit: ./ components/maven-dotnet-assembler/ components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/ components/maven-dotnet-toolchain/ Date: Wed, 01 Oct 2008 03:33:58 -0000 To: hmurphy@example.net From: hmurphy@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <hmurphy@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Tue Sep 30 20:33:58 2008 New Revision: 700669 URL: http://svn.apache.org/viewvc?rev=700669&view=rev Log: switch to using Plexus logging. Remove the component-api references to stop Plexus getting confused Modified: incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-assembler/pom.xml incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetArtifactLocatorImpl.java incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-toolchain/pom.xml incubator/nmaven/branches/NMAVEN-8-nunit/pom.xml Modified: incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-assembler/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-assembler/pom.xml?rev=700669&r1=700668&r2=700669&view=diff ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-assembler/pom.xml (original) +++ incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-assembler/pom.xml Tue Sep 30 20:33:58 2008 @@ -45,10 +45,6 @@ </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-api</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> </dependency> </dependencies> Modified: incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetArtifactLocatorImpl.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetArtifactLocatorImpl.java?rev=700669&r1=700668&r2=700669&view=diff ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetArtifactLocatorImpl.java (original) +++ incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetArtifactLocatorImpl.java Tue Sep 30 20:33:58 2008 @@ -21,7 +21,6 @@ import java.io.File; import java.io.IOException; import java.util.Collections; -import java.util.logging.Logger; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; @@ -30,6 +29,8 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.project.ProjectBuildingException; +import org.codehaus.plexus.logging.LogEnabled; +import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.util.FileUtils; /** @@ -38,12 +39,11 @@ * inefficient to make repetitively. */ public final class DotnetArtifactLocatorImpl - implements DotnetArtifactLocator + implements DotnetArtifactLocator, LogEnabled { private MavenProjectBuilder projectBuilder; - // TODO: plexus logger? - private Logger logger = Logger.getAnonymousLogger(); + private Logger logger; public String getAssemblyFileName( Artifact artifact, ArtifactRepository localRepository ) { @@ -59,7 +59,7 @@ if ( build.getFinalName().indexOf( "${" ) < 0 ) { finalName = build.getFinalName() + "." + artifact.getArtifactHandler().getExtension(); - logger.fine( "Using alternate final name for artifact: '" + artifact + "' = '" + finalName + "'" ); + logger.debug( "Using alternate final name for artifact: '" + artifact + "' = '" + finalName + "'" ); } } } @@ -101,4 +101,9 @@ return artifact.getFile(); } + + public void enableLogging( Logger logger ) + { + this.logger = logger; + } } Modified: incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-toolchain/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-toolchain/pom.xml?rev=700669&r1=700668&r2=700669&view=diff ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-toolchain/pom.xml (original) +++ incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-toolchain/pom.xml Tue Sep 30 20:33:58 2008 @@ -51,10 +51,6 @@ </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-api</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-container-default</artifactId> </dependency> </dependencies> Modified: incubator/nmaven/branches/NMAVEN-8-nunit/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/pom.xml?rev=700669&r1=700668&r2=700669&view=diff ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/pom.xml (original) +++ incubator/nmaven/branches/NMAVEN-8-nunit/pom.xml Tue Sep 30 20:33:58 2008 @@ -195,6 +195,27 @@ </pluginManagement> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.0-alpha-3</version> + <executions> + <execution> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <excludes> + <exclude>org.codehaus.plexus:plexus-component-api</exclude> + </excludes> + </bannedDependencies> + </rules> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>2.3</version> </plugin> @@ -277,13 +298,8 @@ </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-api</artifactId> - <version>1.0-alpha-32</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-container-default</artifactId> - <version>1.0-alpha-32</version> + <version>1.0-alpha-9-stable-1</version> </dependency> </dependencies> </dependencyManagement> From nmaven-commits-return-hmurphy@example.net Wed Oct 01 04:45:38 2008 Return-Path: <nmaven-commits-return-hmurphy@example.net> Delivered-To: hmurphy@example.net Received: (qmail 96089 invoked from network); 1 Oct 2008 04:45:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Oct 2008 04:45:38 -0000 Received: (qmail 75043 invoked by uid 500); 1 Oct 2008 04:45:36 -0000 Delivered-To: hmurphy@example.net Received: (qmail 75019 invoked by uid 500); 1 Oct 2008 04:45:36 -0000 Mailing-List: contact hmurphy@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:hmurphy@example.net> List-Unsubscribe: <mailto:hmurphy@example.net> List-Post: <mailto:hmurphy@example.net> List-Id: <nmaven-commits.incubator.apache.org> Reply-To: hmurphy@example.net Delivered-To: mailing list hmurphy@example.net Received: (qmail 75010 invoked by uid 99); 1 Oct 2008 04:45:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Sep 2008 21:45:36 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 04:44:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3F15923889B7; Tue, 30 Sep 2008 21:45:17 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r700679 - /incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/pom.xml Date: Wed, 01 Oct 2008 04:45:16 -0000 To: hmurphy@example.net From: hmurphy@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <hmurphy@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Tue Sep 30 21:45:16 2008 New Revision: 700679 URL: http://svn.apache.org/viewvc?rev=700679&view=rev Log: profile is not needed, it is excluded in the parent modules by the profile Modified: incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/pom.xml Modified: incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/pom.xml?rev=700679&r1=700678&r2=700679&view=diff ============================================================================== --- incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/pom.xml (original) +++ incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/pom.xml Tue Sep 30 21:45:16 2008 @@ -49,28 +49,23 @@ <version>${pom.version}</version> </dependency> </dependencies> - <profiles> - <profile> - <id>run-its</id> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> - <configuration> - <includes> - <include>**/IntegrationTestSuite.*</include> - </includes> - <systemProperties> - <property> - <name>nmaven.version</name> - <value>${project.version}</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <includes> + <include>**/IntegrationTestSuite.*</include> + </includes> + <systemProperties> + <property> + <name>nmaven.version</name> + <value>${project.version}</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> </project> From nmaven-commits-return-hmurphy@example.net Wed Oct 01 07:10:25 2008 Return-Path: <nmaven-commits-return-hmurphy@example.net> Delivered-To: hmurphy@example.net Received: (qmail 70987 invoked from network); 1 Oct 2008 07:10:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Oct 2008 07:10:25 -0000 Received: (qmail 50699 invoked by uid 500); 1 Oct 2008 07:10:24 -0000 Delivered-To: hmurphy@example.net Received: (qmail 50675 invoked by uid 500); 1 Oct 2008 07:10:24 -0000 Mailing-List: contact hmurphy@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:hmurphy@example.net> List-Unsubscribe: <mailto:hmurphy@example.net> List-Post: <mailto:hmurphy@example.net> List-Id: <nmaven-commits.incubator.apache.org> Reply-To: hmurphy@example.net Delivered-To: mailing list hmurphy@example.net Received: (qmail 50665 invoked by uid 99); 1 Oct 2008 07:10:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 00:10:24 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 07:09:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B43F2238889E; Wed, 1 Oct 2008 00:09:34 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r700698 - /incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/src/test/dotnet/It0007.cs Date: Wed, 01 Oct 2008 07:09:34 -0000 To: hmurphy@example.net From: hmurphy@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <hmurphy@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Wed Oct 1 00:09:34 2008 New Revision: 700698 URL: http://svn.apache.org/viewvc?rev=700698&view=rev Log: update assertions as the obsolete message comes out as error, so even on success the IT fails Modified: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/src/test/dotnet/It0007.cs Modified: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/src/test/dotnet/It0007.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/src/test/dotnet/It0007.cs?rev=700698&r1=700697&r2=700698&view=diff ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/src/test/dotnet/It0007.cs (original) +++ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/src/test/dotnet/It0007.cs Wed Oct 1 00:09:34 2008 @@ -27,18 +27,18 @@ public class It0007 { [Test] public void testSimple1() { - Assertion.AssertEquals(1, 1); + Assert.AreEqual(1, 1); } [Test] public void testSimple2() { - Assertion.AssertEquals(2, 2); + Assert.AreEqual(2, 2); } [Test] public void testTakesSomeTime() { for (int i=0; i < 9999999; i++) { - Assertion.AssertEquals(i+1, i+1); + Assert.AreEqual(i+1, i+1); } } } From nmaven-commits-return-hmurphy@example.net Wed Oct 01 07:11:00 2008 Return-Path: <nmaven-commits-return-hmurphy@example.net> Delivered-To: hmurphy@example.net Received: (qmail 71211 invoked from network); 1 Oct 2008 07:11:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Oct 2008 07:11:00 -0000 Received: (qmail 50899 invoked by uid 500); 1 Oct 2008 07:10:58 -0000 Delivered-To: hmurphy@example.net Received: (qmail 50859 invoked by uid 500); 1 Oct 2008 07:10:58 -0000 Mailing-List: contact hmurphy@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:hmurphy@example.net> List-Unsubscribe: <mailto:hmurphy@example.net> List-Post: <mailto:hmurphy@example.net> List-Id: <nmaven-commits.incubator.apache.org> Reply-To: hmurphy@example.net Delivered-To: mailing list hmurphy@example.net Received: (qmail 50850 invoked by uid 99); 1 Oct 2008 07:10:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 00:10:58 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 07:10:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4B17F238898F; Wed, 1 Oct 2008 00:10:39 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r700700 - /incubator/nmaven/branches/NMAVEN-8-nunit/plugins/maven-dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java Date: Wed, 01 Oct 2008 07:10:39 -0000 To: hmurphy@example.net From: hmurphy@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <hmurphy@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Wed Oct 1 00:10:38 2008 New Revision: 700700 URL: http://svn.apache.org/viewvc?rev=700700&view=rev Log: it is not always nunit-console2 on mono, and nunit-console is still available (SDK 1.1). Best to use toolchains / platform matching for this, but keep it simple to start with Modified: incubator/nmaven/branches/NMAVEN-8-nunit/plugins/maven-dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java Modified: incubator/nmaven/branches/NMAVEN-8-nunit/plugins/maven-dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/plugins/maven-dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java?rev=700700&r1=700699&r2=700700&view=diff ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/plugins/maven-dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java (original) +++ incubator/nmaven/branches/NMAVEN-8-nunit/plugins/maven-dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java Wed Oct 1 00:10:38 2008 @@ -108,18 +108,7 @@ getLog().debug( "NMaven-test: workingDirectory(" + testAssemblies.getAbsolutePath() + ")" ); commandline.setWorkingDirectory( testAssemblies.getAbsolutePath() ); - if ( vendor.equals( Vendor.MICROSOFT ) ) - { - commandline.setExecutable( "nunit-console" ); - } - else if ( vendor.equals( Vendor.NOVELL ) ) - { - commandline.setExecutable( "nunit-console2" ); - } - else - { - throw new MojoExecutionException("Vendor not found."); - } + commandline.setExecutable( "nunit-console" ); commandline.addArguments( getNUnitArguments() ); NUnitStreamConsumer systemOut = new NUnitStreamConsumer( getLog() ); From nmaven-commits-return-hmurphy@example.net Wed Oct 01 08:54:41 2008 Return-Path: <nmaven-commits-return-hmurphy@example.net> Delivered-To: hmurphy@example.net Received: (qmail 23501 invoked from network); 1 Oct 2008 08:54:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Oct 2008 08:54:41 -0000 Received: (qmail 45443 invoked by uid 500); 1 Oct 2008 08:54:39 -0000 Delivered-To: hmurphy@example.net Received: (qmail 45423 invoked by uid 500); 1 Oct 2008 08:54:39 -0000 Mailing-List: contact hmurphy@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:hmurphy@example.net> List-Unsubscribe: <mailto:hmurphy@example.net> List-Post: <mailto:hmurphy@example.net> List-Id: <nmaven-commits.incubator.apache.org> Reply-To: hmurphy@example.net Delivered-To: mailing list hmurphy@example.net Received: (qmail 45414 invoked by uid 99); 1 Oct 2008 08:54:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 01:54:39 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 08:53:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E26C22388988; Wed, 1 Oct 2008 01:53:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r700718 - in /incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test: java/org/apache/maven/dotnet/integrationtests/ resources/VersionedAssemblies/ resources/VersionedAssemblies/A-1.0/ resources/VersionedAssemblies/A-1.0/s... Date: Wed, 01 Oct 2008 08:53:48 -0000 To: hmurphy@example.net From: hmurphy@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <hmurphy@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Wed Oct 1 01:53:46 2008 New Revision: 700718 URL: http://svn.apache.org/viewvc?rev=700718&view=rev Log: add a test case for version mediation Added: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITVersionedAssemblies.java (with props) incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/pom.xml (with props) incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/main/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/main/dotnet/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/main/dotnet/A.cs incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/pom.xml (with props) incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/main/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/main/dotnet/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/main/dotnet/A.cs incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/pom.xml (with props) incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/main/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/main/dotnet/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/main/dotnet/B.cs incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/test/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/test/dotnet/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/test/dotnet/BTest.cs incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/pom.xml (with props) incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/main/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/main/dotnet/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/main/dotnet/C.cs incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/test/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/test/dotnet/ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/test/dotnet/CTest.cs Added: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITVersionedAssemblies.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITVersionedAssemblies.java?rev=700718&view=auto ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITVersionedAssemblies.java (added) +++ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITVersionedAssemblies.java Wed Oct 1 01:53:46 2008 @@ -0,0 +1,67 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.maven.dotnet.integrationtests; + +import java.io.File; + +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; + +public class MavenITVersionedAssemblies + extends AbstractNMavenIntegrationTestCase +{ + public MavenITVersionedAssemblies() + { + super(); + // super( "(0.15-incubating,)" ); + } + + public void testVersionedAssemblies() + throws Exception + { + File testDir = extractAndTranslateResources( "/VersionedAssemblies/A-1.0" ); + Verifier verifier = getVerifier( testDir ); + verifier.executeGoal( "install" ); + verifier.assertFilePresent( "target/NMaven.It.VersionedAssembly.A.dll" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + testDir = extractAndTranslateResources( "/VersionedAssemblies/A-2.0" ); + verifier = getVerifier( testDir ); + verifier.executeGoal( "install" ); + verifier.assertFilePresent( "target/NMaven.It.VersionedAssembly.A.dll" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + testDir = extractAndTranslateResources( "/VersionedAssemblies/B" ); + verifier = getVerifier( testDir ); + verifier.executeGoal( "install" ); + verifier.assertFilePresent( getAssemblyFile( "NMaven.It.VersionedAssembly.B", "1.0.0", "dll" ) ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + testDir = extractAndTranslateResources( "/VersionedAssemblies/C" ); + verifier = getVerifier( testDir ); + verifier.executeGoal( "install" ); + verifier.assertFilePresent( getAssemblyFile( "NMaven.It.VersionedAssembly.C", "1.0.0", "dll" ) ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + } +} Propchange: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITVersionedAssemblies.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITVersionedAssemblies.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/pom.xml?rev=700718&view=auto ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/pom.xml (added) +++ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/pom.xml Wed Oct 1 01:53:46 2008 @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + 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"> + <modelVersion>4.0.0</modelVersion> + <groupId>NMaven.Its.VersionedAssembly</groupId> + <artifactId>NMaven.It.VersionedAssembly.A</artifactId> + <packaging>dotnet:library</packaging> + <version>1.0.0</version> + <build> + <sourceDirectory>src/main/dotnet</sourceDirectory> + <finalName>NMaven.It.VersionedAssembly.A</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.dotnet.plugins</groupId> + <artifactId>maven-dotnet-compiler-plugin</artifactId> + <version>${nmaven.version}</version> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.apache.maven.dotnet.plugins</groupId> + <artifactId>maven-dotnet-test-plugin</artifactId> + <version>${nmaven.version}</version> + </plugin> + </plugins> + </build> +</project> Propchange: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/main/dotnet/A.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/main/dotnet/A.cs?rev=700718&view=auto ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/main/dotnet/A.cs (added) +++ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/main/dotnet/A.cs Wed Oct 1 01:53:46 2008 @@ -0,0 +1,28 @@ +#region Apache License, Version 2.0 +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// +#endregion +namespace NMaven.IT { + +public class A { + public int version() { + return 1; + } +} +} Added: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/pom.xml?rev=700718&view=auto ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/pom.xml (added) +++ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/pom.xml Wed Oct 1 01:53:46 2008 @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + 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"> + <modelVersion>4.0.0</modelVersion> + <groupId>NMaven.Its.VersionedAssembly</groupId> + <artifactId>NMaven.It.VersionedAssembly.A</artifactId> + <packaging>dotnet:library</packaging> + <version>2.0.0</version> + <build> + <sourceDirectory>src/main/dotnet</sourceDirectory> + <finalName>NMaven.It.VersionedAssembly.A</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.dotnet.plugins</groupId> + <artifactId>maven-dotnet-compiler-plugin</artifactId> + <version>${nmaven.version}</version> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.apache.maven.dotnet.plugins</groupId> + <artifactId>maven-dotnet-test-plugin</artifactId> + <version>${nmaven.version}</version> + </plugin> + </plugins> + </build> +</project> Propchange: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/main/dotnet/A.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/main/dotnet/A.cs?rev=700718&view=auto ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/main/dotnet/A.cs (added) +++ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/main/dotnet/A.cs Wed Oct 1 01:53:46 2008 @@ -0,0 +1,28 @@ +#region Apache License, Version 2.0 +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// +#endregion +namespace NMaven.IT { + +public class A { + public int version() { + return 2; + } +} +} Added: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/pom.xml?rev=700718&view=auto ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/pom.xml (added) +++ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/pom.xml Wed Oct 1 01:53:46 2008 @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + 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"> + <modelVersion>4.0.0</modelVersion> + <groupId>NMaven.Its.VersionedAssembly</groupId> + <artifactId>NMaven.It.VersionedAssembly.B</artifactId> + <packaging>dotnet:library</packaging> + <version>1.0.0</version> + <build> + <sourceDirectory>src/main/dotnet</sourceDirectory> + <testSourceDirectory>src/test/dotnet</testSourceDirectory> + <plugins> + <plugin> + <groupId>org.apache.maven.dotnet.plugins</groupId> + <artifactId>maven-dotnet-compiler-plugin</artifactId> + <version>${nmaven.version}</version> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.apache.maven.dotnet.plugins</groupId> + <artifactId>maven-dotnet-test-plugin</artifactId> + <version>${nmaven.version}</version> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>NMaven.It.VersionedAssembly.A</artifactId> + <version>1.0.0</version> + <type>dotnet:library</type> + </dependency> + <dependency> + <groupId>NUnit</groupId> + <artifactId>NUnit.Framework</artifactId> + <version>83.161.120.155</version> + <type>dotnet:library</type> + <scope>test</scope> + </dependency> + </dependencies> +</project> Propchange: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/main/dotnet/B.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/main/dotnet/B.cs?rev=700718&view=auto ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/main/dotnet/B.cs (added) +++ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/main/dotnet/B.cs Wed Oct 1 01:53:46 2008 @@ -0,0 +1,28 @@ +#region Apache License, Version 2.0 +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// +#endregion +namespace NMaven.IT { + +public class B { + public int versionOfA() { + return new A().version(); + } +} +} Added: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/test/dotnet/BTest.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/test/dotnet/BTest.cs?rev=700718&view=auto ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/test/dotnet/BTest.cs (added) +++ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/test/dotnet/BTest.cs Wed Oct 1 01:53:46 2008 @@ -0,0 +1,34 @@ +#region Apache License, Version 2.0 +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// +#endregion +using System; +using NUnit.Framework; + +namespace NMaven.IT { + + [TestFixture] + public class BTest { + [Test] + public void testSimple1() { + Assert.AreEqual(1, new A().version()); + Assert.AreEqual(1, new B().versionOfA()); + } + } +} Added: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/pom.xml?rev=700718&view=auto ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/pom.xml (added) +++ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/pom.xml Wed Oct 1 01:53:46 2008 @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + 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"> + <modelVersion>4.0.0</modelVersion> + <groupId>NMaven.Its.VersionedAssembly</groupId> + <artifactId>NMaven.It.VersionedAssembly.C</artifactId> + <packaging>dotnet:library</packaging> + <version>1.0.0</version> + <build> + <sourceDirectory>src/main/dotnet</sourceDirectory> + <testSourceDirectory>src/test/dotnet</testSourceDirectory> + <plugins> + <plugin> + <groupId>org.apache.maven.dotnet.plugins</groupId> + <artifactId>maven-dotnet-compiler-plugin</artifactId> + <version>${nmaven.version}</version> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.apache.maven.dotnet.plugins</groupId> + <artifactId>maven-dotnet-test-plugin</artifactId> + <version>${nmaven.version}</version> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>NMaven.It.VersionedAssembly.A</artifactId> + <version>2.0.0</version> + <type>dotnet:library</type> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>NMaven.It.VersionedAssembly.B</artifactId> + <version>1.0.0</version> + <type>dotnet:library</type> + </dependency> + <dependency> + <groupId>NUnit</groupId> + <artifactId>NUnit.Framework</artifactId> + <version>83.161.120.155</version> + <type>dotnet:library</type> + <scope>test</scope> + </dependency> + </dependencies> +</project> Propchange: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/main/dotnet/C.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/main/dotnet/C.cs?rev=700718&view=auto ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/main/dotnet/C.cs (added) +++ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/main/dotnet/C.cs Wed Oct 1 01:53:46 2008 @@ -0,0 +1,28 @@ +#region Apache License, Version 2.0 +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// +#endregion +namespace NMaven.IT { + +public class C { + public int versionOfAFromB() { + return new B().versionOfA(); + } +} +} Added: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/test/dotnet/CTest.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/test/dotnet/CTest.cs?rev=700718&view=auto ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/test/dotnet/CTest.cs (added) +++ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/test/dotnet/CTest.cs Wed Oct 1 01:53:46 2008 @@ -0,0 +1,35 @@ +#region Apache License, Version 2.0 +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// +#endregion +using System; +using NUnit.Framework; + +namespace NMaven.IT { + + [TestFixture] + public class CTest { + [Test] + public void testSimple1() { + Assert.AreEqual(2, new A().version()); + Assert.AreEqual(2, new B().versionOfA()); + Assert.AreEqual(2, new C().versionOfAFromB()); + } + } +} From nmaven-commits-return-hmurphy@example.net Wed Oct 01 12:26:53 2008 Return-Path: <nmaven-commits-return-hmurphy@example.net> Delivered-To: hmurphy@example.net Received: (qmail 39687 invoked from network); 1 Oct 2008 12:26:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Oct 2008 12:26:53 -0000 Received: (qmail 61378 invoked by uid 500); 1 Oct 2008 12:26:49 -0000 Delivered-To: hmurphy@example.net Received: (qmail 61339 invoked by uid 500); 1 Oct 2008 12:26:49 -0000 Mailing-List: contact hmurphy@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:hmurphy@example.net> List-Unsubscribe: <mailto:hmurphy@example.net> List-Post: <mailto:hmurphy@example.net> List-Id: <nmaven-commits.incubator.apache.org> Reply-To: hmurphy@example.net Delivered-To: mailing list hmurphy@example.net Received: (qmail 61117 invoked by uid 99); 1 Oct 2008 12:26:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 05:26:47 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 12:25:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 81D9B2388988; Wed, 1 Oct 2008 05:25:57 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r700750 - /incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java Date: Wed, 01 Oct 2008 12:25:57 -0000 To: hmurphy@example.net From: hmurphy@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <hmurphy@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Wed Oct 1 05:25:56 2008 New Revision: 700750 URL: http://svn.apache.org/viewvc?rev=700750&view=rev Log: add new test to suite Modified: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java Modified: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java?rev=700750&r1=700749&r2=700750&view=diff ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java (original) +++ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java Wed Oct 1 05:25:56 2008 @@ -39,6 +39,7 @@ // Currently requiring library in $M2_HOME/lib when extension should be enough // suite.addTestSuite( MavenITDotNetToolchain.class ); + suite.addTestSuite( MavenITVersionedAssemblies.class ); suite.addTestSuite( MavenITNUnit24Features.class ); suite.addTestSuite( MavenITmng0000CSharpCompileLibrary.class ); From nmaven-commits-return-hmurphy@example.net Wed Oct 01 14:09:45 2008 Return-Path: <nmaven-commits-return-hmurphy@example.net> Delivered-To: hmurphy@example.net Received: (qmail 17991 invoked from network); 1 Oct 2008 14:09:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Oct 2008 14:09:45 -0000 Received: (qmail 80933 invoked by uid 500); 1 Oct 2008 14:09:43 -0000 Delivered-To: hmurphy@example.net Received: (qmail 80917 invoked by uid 500); 1 Oct 2008 14:09:43 -0000 Mailing-List: contact hmurphy@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:hmurphy@example.net> List-Unsubscribe: <mailto:hmurphy@example.net> List-Post: <mailto:hmurphy@example.net> List-Id: <nmaven-commits.incubator.apache.org> Reply-To: hmurphy@example.net Delivered-To: mailing list hmurphy@example.net Received: (qmail 80908 invoked by uid 99); 1 Oct 2008 14:09:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 07:09:43 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 14:08:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 646A723889FD; Wed, 1 Oct 2008 07:08:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r700773 - in /incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies: B/pom.xml C/pom.xml Date: Wed, 01 Oct 2008 14:08:54 -0000 To: hmurphy@example.net From: hmurphy@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <hmurphy@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Wed Oct 1 07:08:53 2008 New Revision: 700773 URL: http://svn.apache.org/viewvc?rev=700773&view=rev Log: use the actual group ID Modified: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/pom.xml incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/pom.xml Modified: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/pom.xml?rev=700773&r1=700772&r2=700773&view=diff ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/pom.xml (original) +++ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/pom.xml Wed Oct 1 07:08:53 2008 @@ -44,7 +44,7 @@ </build> <dependencies> <dependency> - <groupId>${project.groupId}</groupId> + <groupId>NMaven.Its.VersionedAssembly</groupId> <artifactId>NMaven.It.VersionedAssembly.A</artifactId> <version>1.0.0</version> <type>dotnet:library</type> Modified: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/pom.xml?rev=700773&r1=700772&r2=700773&view=diff ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/pom.xml (original) +++ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/pom.xml Wed Oct 1 07:08:53 2008 @@ -44,13 +44,13 @@ </build> <dependencies> <dependency> - <groupId>${project.groupId}</groupId> + <groupId>NMaven.Its.VersionedAssembly</groupId> <artifactId>NMaven.It.VersionedAssembly.A</artifactId> <version>2.0.0</version> <type>dotnet:library</type> </dependency> <dependency> - <groupId>${project.groupId}</groupId> + <groupId>NMaven.Its.VersionedAssembly</groupId> <artifactId>NMaven.It.VersionedAssembly.B</artifactId> <version>1.0.0</version> <type>dotnet:library</type> From nmaven-commits-return-hmurphy@example.net Wed Oct 01 14:10:59 2008 Return-Path: <nmaven-commits-return-hmurphy@example.net> Delivered-To: hmurphy@example.net Received: (qmail 18716 invoked from network); 1 Oct 2008 14:10:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Oct 2008 14:10:59 -0000 Received: (qmail 85067 invoked by uid 500); 1 Oct 2008 14:10:57 -0000 Delivered-To: hmurphy@example.net Received: (qmail 85048 invoked by uid 500); 1 Oct 2008 14:10:57 -0000 Mailing-List: contact hmurphy@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:hmurphy@example.net> List-Unsubscribe: <mailto:hmurphy@example.net> List-Post: <mailto:hmurphy@example.net> List-Id: <nmaven-commits.incubator.apache.org> Reply-To: hmurphy@example.net Delivered-To: mailing list hmurphy@example.net Received: (qmail 85000 invoked by uid 99); 1 Oct 2008 14:10:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 07:10:57 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 14:10:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 89CC02388A01; Wed, 1 Oct 2008 07:10:07 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r700774 - /incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITVersionedAssemblies.java Date: Wed, 01 Oct 2008 14:10:07 -0000 To: hmurphy@example.net From: hmurphy@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <hmurphy@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Wed Oct 1 07:10:07 2008 New Revision: 700774 URL: http://svn.apache.org/viewvc?rev=700774&view=rev Log: set the correct execution version range. This fails on 0.14. Modified: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITVersionedAssemblies.java Modified: incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITVersionedAssemblies.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITVersionedAssemblies.java?rev=700774&r1=700773&r2=700774&view=diff ============================================================================== --- incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITVersionedAssemblies.java (original) +++ incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITVersionedAssemblies.java Wed Oct 1 07:10:07 2008 @@ -29,8 +29,8 @@ { public MavenITVersionedAssemblies() { - super(); - // super( "(0.15-incubating,)" ); + // Only supported in 0.16+ + super( "(0.15-incubating,)" ); } public void testVersionedAssemblies() From nmaven-commits-return-hmurphy@example.net Wed Oct 01 14:37:16 2008 Return-Path: <nmaven-commits-return-hmurphy@example.net> Delivered-To: hmurphy@example.net Received: (qmail 36229 invoked from network); 1 Oct 2008 14:37:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Oct 2008 14:37:15 -0000 Received: (qmail 51214 invoked by uid 500); 1 Oct 2008 14:37:14 -0000 Delivered-To: hmurphy@example.net Received: (qmail 51197 invoked by uid 500); 1 Oct 2008 14:37:14 -0000 Mailing-List: contact hmurphy@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:hmurphy@example.net> List-Unsubscribe: <mailto:hmurphy@example.net> List-Post: <mailto:hmurphy@example.net> List-Id: <nmaven-commits.incubator.apache.org> Reply-To: hmurphy@example.net Delivered-To: mailing list hmurphy@example.net Received: (qmail 51179 invoked by uid 99); 1 Oct 2008 14:37:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 07:37:14 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 14:36:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1692E2388882; Wed, 1 Oct 2008 07:36:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r700791 - in /incubator/nmaven/trunk: ./ components/maven-dotnet-assembler/ components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/ components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/imp... Date: Wed, 01 Oct 2008 14:36:53 -0000 To: hmurphy@example.net From: hmurphy@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <hmurphy@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Wed Oct 1 07:36:50 2008 New Revision: 700791 URL: http://svn.apache.org/viewvc?rev=700791&view=rev Log: [NMAVEN-8] correct multiple issues related to running NUnit tests. It is now possible to use the original release binaries unmodified. Add necessary tools for any plugin to be able to map artifacts to their final name for reuse. Merged from: r700374:700774 on branch NMAVEN-8-nunit Added: incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetArtifactLocator.java - copied unchanged from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetArtifactLocator.java incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetArtifactLocatorImpl.java - copied unchanged from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetArtifactLocatorImpl.java incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITNUnit24Features.java - copied unchanged from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITNUnit24Features.java incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITVersionedAssemblies.java - copied unchanged from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITVersionedAssemblies.java incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/pom.xml - copied unchanged from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/pom.xml incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/src/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/src/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/src/test/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/src/test/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/src/test/dotnet/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/src/test/dotnet/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/src/test/dotnet/AppTest.cs - copied unchanged from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/src/test/dotnet/AppTest.cs incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/pom.xml - copied unchanged from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/pom.xml incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/src/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/src/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/src/test/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/src/test/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/src/test/dotnet/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/src/test/dotnet/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/src/test/dotnet/AppTest.cs - copied unchanged from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/src/test/dotnet/AppTest.cs incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/pom.xml - copied unchanged from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/pom.xml incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/main/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/main/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/main/dotnet/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/main/dotnet/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/main/dotnet/A.cs - copied unchanged from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/main/dotnet/A.cs incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/pom.xml - copied unchanged from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/pom.xml incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/main/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/main/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/main/dotnet/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/main/dotnet/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/main/dotnet/A.cs - copied unchanged from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/main/dotnet/A.cs incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/B/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/B/pom.xml - copied unchanged from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/pom.xml incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/main/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/main/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/main/dotnet/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/main/dotnet/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/main/dotnet/B.cs - copied unchanged from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/main/dotnet/B.cs incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/test/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/test/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/test/dotnet/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/test/dotnet/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/test/dotnet/BTest.cs - copied unchanged from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/test/dotnet/BTest.cs incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/C/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/C/pom.xml - copied unchanged from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/pom.xml incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/main/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/main/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/main/dotnet/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/main/dotnet/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/main/dotnet/C.cs - copied unchanged from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/main/dotnet/C.cs incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/test/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/test/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/test/dotnet/ - copied from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/test/dotnet/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/test/dotnet/CTest.cs - copied unchanged from r700774, incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/test/dotnet/CTest.cs Removed: incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/resource/ Modified: incubator/nmaven/trunk/components/maven-dotnet-assembler/pom.xml incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/NetCompilerConfigTest.java incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java incubator/nmaven/trunk/components/maven-dotnet-core/src/main/java/org/apache/maven/dotnet/CommandExecutor.java incubator/nmaven/trunk/components/maven-dotnet-extensions/src/main/java/org/apache/maven/dotnet/extensions/compiler/CSharpClassCompiler.java incubator/nmaven/trunk/components/maven-dotnet-toolchain/pom.xml incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0019BuildFailureOnNUnitFailure.java incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/src/test/dotnet/It0007.cs incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/A/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/TestCompilerMojo.java incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/resources/META-INF/plexus/components.xml incubator/nmaven/trunk/plugins/maven-dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java 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=700791&r1=700790&r2=700791&view=diff ============================================================================== --- incubator/nmaven/trunk/components/maven-dotnet-assembler/pom.xml (original) +++ incubator/nmaven/trunk/components/maven-dotnet-assembler/pom.xml Wed Oct 1 07:36:50 2008 @@ -45,10 +45,6 @@ </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-api</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> </dependency> </dependencies> Modified: incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java?rev=700791&r1=700790&r2=700791&view=diff ============================================================================== --- incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java (original) +++ incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java Wed Oct 1 07:36:50 2008 @@ -18,6 +18,7 @@ */ package org.apache.maven.dotnet.compiler; +import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.dotnet.ProgrammingLanguage; import org.apache.maven.dotnet.Vendor; import org.apache.maven.dotnet.ArtifactType; @@ -48,7 +49,7 @@ * * @return local repository */ - File getLocalRepository(); + ArtifactRepository getLocalRepository(); /** * Sets the artifact type for the compiler plugin: library, module, exe, winexe or nar @@ -69,7 +70,7 @@ * * @param localRepository */ - void setLocalRepository( File localRepository ); + void setLocalRepository( ArtifactRepository localRepository ); void setCompilerSourceDirectory( File sourceDirectory ); Modified: incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java?rev=700791&r1=700790&r2=700791&view=diff ============================================================================== --- incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java (original) +++ incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java Wed Oct 1 07:36:50 2008 @@ -18,13 +18,14 @@ */ package org.apache.maven.dotnet.compiler; +import java.io.File; + +import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.dotnet.ArtifactType; import org.apache.maven.dotnet.ProgrammingLanguage; import org.apache.maven.dotnet.Vendor; -import org.apache.maven.dotnet.ArtifactType; import org.apache.maven.toolchain.Toolchain; -import java.io.File; - public interface DotnetCompilerConfig extends CompilerConfig { @@ -73,7 +74,7 @@ private boolean isTestCompile; - private File localRepository; + private ArtifactRepository localRepository; private File compileSourceDirectory; @@ -147,12 +148,12 @@ isTestCompile = testCompile; } - public File getLocalRepository() + public ArtifactRepository getLocalRepository() { return localRepository; } - public void setLocalRepository( File localRepository ) + public void setLocalRepository( ArtifactRepository localRepository ) { this.localRepository = localRepository; } @@ -210,7 +211,7 @@ throw new IllegalArgumentException( "compilerPlatformVersion" ); } - if ( localRepository == null || !localRepository.exists() ) + if ( localRepository == null || localRepository.getUrl() == null ) { throw new IllegalArgumentException( "localRepository" ); } Modified: incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java?rev=700791&r1=700790&r2=700791&view=diff ============================================================================== --- incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java (original) +++ incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java Wed Oct 1 07:36:50 2008 @@ -85,4 +85,10 @@ */ Set<File> getWin32Resources(); + /** + * The artifact locator, responsible for creating shadow copies of artifacts if needed. + * @return artifact locator + */ + DotnetArtifactLocator getArtifactLocator(); + } Modified: incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java?rev=700791&r1=700790&r2=700791&view=diff ============================================================================== --- incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java (original) +++ incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java Wed Oct 1 07:36:50 2008 @@ -34,6 +34,7 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.dotnet.compiler.ClassCompiler; import org.apache.maven.dotnet.compiler.CompilerConfig; +import org.apache.maven.dotnet.compiler.DotnetArtifactLocator; import org.apache.maven.dotnet.compiler.DotnetCompilerConfig; import org.apache.maven.dotnet.compiler.DotnetCompilerContext; import org.apache.maven.dotnet.InitializationException; @@ -84,6 +85,8 @@ private Toolchain toolchain; + private DotnetArtifactLocator artifactLocator; + public Set<String> getCoreAssemblyNames() { return null; @@ -413,4 +416,9 @@ { return value.replaceAll( "[/\\\\]+", "\\" + File.separator ); } + + public DotnetArtifactLocator getArtifactLocator() + { + return artifactLocator; + } } Modified: incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/NetCompilerConfigTest.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/NetCompilerConfigTest.java?rev=700791&r1=700790&r2=700791&view=diff ============================================================================== --- incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/NetCompilerConfigTest.java (original) +++ incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/NetCompilerConfigTest.java Wed Oct 1 07:36:50 2008 @@ -18,12 +18,16 @@ */ package org.apache.maven.dotnet.compiler; +import org.junit.Assert; import org.junit.Test; +import org.apache.maven.artifact.repository.DefaultArtifactRepository; +import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; import org.apache.maven.dotnet.ProgrammingLanguage; import org.apache.maven.dotnet.Vendor; import org.apache.maven.dotnet.ArtifactType; import java.io.File; +import java.net.MalformedURLException; public class NetCompilerConfigTest { @@ -129,7 +133,15 @@ DotnetCompilerConfig config = DotnetCompilerConfig.Factory.createDefaultCompilerConfig(); config.setArtifactType( ArtifactType.LIBRARY ); config.setCompilerPlatformVersion( DotnetCompilerPlatformVersion.VERSION_2_0_50727 ); - config.setLocalRepository( new File( "." ) ); + try + { + config.setLocalRepository( new DefaultArtifactRepository( "local", new File( "." ).toURL().toExternalForm(), + new DefaultRepositoryLayout() ) ); + } + catch ( MalformedURLException e ) + { + Assert.fail( e.getMessage() ); + } config.setProgrammingLanguage( ProgrammingLanguage.C_SHARP ); config.setCompilerSourceDirectory( new File( "." ) ); config.setTargetDirectory( new File( "." ) ); Modified: incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java?rev=700791&r1=700790&r2=700791&view=diff ============================================================================== --- incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java (original) +++ incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java Wed Oct 1 07:36:50 2008 @@ -18,32 +18,34 @@ */ package org.apache.maven.dotnet.compiler.impl; -import java.util.HashSet; -import java.util.Set; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertThat; + import java.io.File; import java.io.IOException; +import java.net.MalformedURLException; +import java.util.HashSet; +import java.util.Set; -import org.apache.maven.project.MavenProject; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.DefaultArtifact; import org.apache.maven.artifact.handler.DefaultArtifactHandler; +import org.apache.maven.artifact.repository.DefaultArtifactRepository; +import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; import org.apache.maven.artifact.versioning.VersionRange; -import org.apache.maven.model.Build; - -import org.apache.maven.dotnet.compiler.DotnetCompilerConfig; +import org.apache.maven.dotnet.ArtifactScope; import org.apache.maven.dotnet.ArtifactType; -import org.apache.maven.dotnet.compiler.DotnetCompilerPlatformVersion; +import org.apache.maven.dotnet.InitializationException; import org.apache.maven.dotnet.ProgrammingLanguage; import org.apache.maven.dotnet.Vendor; -import org.apache.maven.dotnet.InitializationException; -import org.apache.maven.dotnet.ArtifactScope; import org.apache.maven.dotnet.compiler.ClassCompiler; - -import org.junit.Test; -import static org.hamcrest.CoreMatchers.equalTo; +import org.apache.maven.dotnet.compiler.DotnetCompilerConfig; +import org.apache.maven.dotnet.compiler.DotnetCompilerPlatformVersion; +import org.apache.maven.model.Build; +import org.apache.maven.project.MavenProject; import org.hamcrest.BaseMatcher; import org.hamcrest.CoreMatchers; -import static org.junit.Assert.*; +import org.junit.Test; public class DotnetCompilerContextImplTest { @@ -325,12 +327,13 @@ ClassCompiler compiler = ctx.getClassCompiler(); } - private static DotnetCompilerConfig getDefaultDotnetCompilerConfig() + private static DotnetCompilerConfig getDefaultDotnetCompilerConfig() throws MalformedURLException { DotnetCompilerConfig config = DotnetCompilerConfig.Factory.createDefaultCompilerConfig(); config.setArtifactType( ArtifactType.LIBRARY ); config.setCompilerPlatformVersion( DotnetCompilerPlatformVersion.VERSION_2_0_50727 ); - config.setLocalRepository( new File( "." ) ); + config.setLocalRepository( new DefaultArtifactRepository( "local", new File( "." ).toURL().toExternalForm(), + new DefaultRepositoryLayout() ) ); config.setProgrammingLanguage( ProgrammingLanguage.C_SHARP ); config.setCompilerSourceDirectory( new File( "." ) ); config.setTargetDirectory( new File( "." ) ); Modified: incubator/nmaven/trunk/components/maven-dotnet-core/src/main/java/org/apache/maven/dotnet/CommandExecutor.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-core/src/main/java/org/apache/maven/dotnet/CommandExecutor.java?rev=700791&r1=700790&r2=700791&view=diff ============================================================================== --- incubator/nmaven/trunk/components/maven-dotnet-core/src/main/java/org/apache/maven/dotnet/CommandExecutor.java (original) +++ incubator/nmaven/trunk/components/maven-dotnet-core/src/main/java/org/apache/maven/dotnet/CommandExecutor.java Wed Oct 1 07:36:50 2008 @@ -18,17 +18,17 @@ */ package org.apache.maven.dotnet; +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; + import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.util.cli.StreamConsumer; -import org.codehaus.plexus.util.cli.Commandline; -import org.codehaus.plexus.util.cli.CommandLineUtils; import org.codehaus.plexus.util.cli.CommandLineException; +import org.codehaus.plexus.util.cli.CommandLineUtils; +import org.codehaus.plexus.util.cli.Commandline; import org.codehaus.plexus.util.cli.DefaultConsumer; - -import java.util.List; -import java.util.ArrayList; -import java.util.logging.Level; -import java.io.File; +import org.codehaus.plexus.util.cli.StreamConsumer; /** * Provides services for executing commands such as compilers or executables. A <code>ClassCompiler</code> implementation can use the Modified: incubator/nmaven/trunk/components/maven-dotnet-extensions/src/main/java/org/apache/maven/dotnet/extensions/compiler/CSharpClassCompiler.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-extensions/src/main/java/org/apache/maven/dotnet/extensions/compiler/CSharpClassCompiler.java?rev=700791&r1=700790&r2=700791&view=diff ============================================================================== --- incubator/nmaven/trunk/components/maven-dotnet-extensions/src/main/java/org/apache/maven/dotnet/extensions/compiler/CSharpClassCompiler.java (original) +++ incubator/nmaven/trunk/components/maven-dotnet-extensions/src/main/java/org/apache/maven/dotnet/extensions/compiler/CSharpClassCompiler.java Wed Oct 1 07:36:50 2008 @@ -96,8 +96,10 @@ { for ( Artifact artifact : references ) { - String path = artifact.getFile().getAbsolutePath(); - commands.add( "/reference:" + path ); + // It isn't necessary to rename the file for compilation, even if it was compiled with a different one, + // so use it straight from the repository + File file = artifact.getFile(); + commands.add( "/reference:" + file.getAbsolutePath() ); } } Modified: incubator/nmaven/trunk/components/maven-dotnet-toolchain/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-toolchain/pom.xml?rev=700791&r1=700790&r2=700791&view=diff ============================================================================== --- incubator/nmaven/trunk/components/maven-dotnet-toolchain/pom.xml (original) +++ incubator/nmaven/trunk/components/maven-dotnet-toolchain/pom.xml Wed Oct 1 07:36:50 2008 @@ -51,10 +51,6 @@ </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-api</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-container-default</artifactId> </dependency> </dependencies> Modified: incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java?rev=700791&r1=700790&r2=700791&view=diff ============================================================================== --- incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java (original) +++ incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java Wed Oct 1 07:36:50 2008 @@ -29,27 +29,26 @@ { TestSuite suite = new TestSuite(); - // NMAVEN-8 - //suite.addTestSuite( MavenITmng0007CSharpCompileTestLibrary.class ); - //suite.addTestSuite( MavenITmng0019BuildFailureOnNUnitFailure.class ); - //suite.addTestSuite( MavenITmng0020ShareTestSource.class ); - // Fails occasionally with: // error CS1548: Cryptographic failure while signing assembly ... The process cannot access the file because it is being used by another process. ' // suite.addTestSuite( MavenITmng0017CSharpStrongNamedAssembly.class ); - // Neeed to be able to locate the GAC root, perhaps using the toolchain + // Need to be able to locate the GAC root, perhaps using the toolchain // suite.addTestSuite( MavenITmng0009CSharpCompileWithProvidedGacDependency.class ); // Currently requiring library in $M2_HOME/lib when extension should be enough // suite.addTestSuite( MavenITDotNetToolchain.class ); + suite.addTestSuite( MavenITVersionedAssemblies.class ); + suite.addTestSuite( MavenITNUnit24Features.class ); + suite.addTestSuite( MavenITmng0000CSharpCompileLibrary.class ); suite.addTestSuite( MavenITmng0001CSharpCompileExe.class ); suite.addTestSuite( MavenITmng0002CSharpCompileModule.class ); suite.addTestSuite( MavenITmng0003CSharpCompileWinexe.class ); suite.addTestSuite( MavenITmng0004CSharpCompileWithDependency.class ); suite.addTestSuite( MavenITmng0005CSharpCompileWithTransitiveDependency.class ); + suite.addTestSuite( MavenITmng0007CSharpCompileTestLibrary.class ); suite.addTestSuite( MavenITmng0008CSharpCompileWithProvidedDependency.class ); suite.addTestSuite( MavenITmng0010DeployLibrary.class ); suite.addTestSuite( MavenITmng0011DeployExe.class ); @@ -59,6 +58,11 @@ suite.addTestSuite( MavenITmng0015DeployLibraryAsSnapshot.class ); suite.addTestSuite( MavenITmng0016CSharpAssemblyInfoGeneration.class ); suite.addTestSuite( MavenITmng0018CSharpSynchronizeTargetWithSource.class ); + suite.addTestSuite( MavenITmng0019BuildFailureOnNUnitFailure.class ); + + // Looks to link to NMaven.Its.It0020B-1.0.0-test 83.161.120.155 instead of the correct version + //suite.addTestSuite( MavenITmng0020ShareTestSource.class ); + return suite; } } Modified: incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java?rev=700791&r1=700790&r2=700791&view=diff ============================================================================== --- incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java (original) +++ incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java Wed Oct 1 07:36:50 2008 @@ -26,6 +26,12 @@ public class MavenITmng0007CSharpCompileTestLibrary extends AbstractNMavenIntegrationTestCase { + public MavenITmng0007CSharpCompileTestLibrary() + { + // 0.14 and 0.16+ only + super( "(,0.15-incubating),(0.15-incubating,)" ); + } + public void testit0007() throws Exception { Modified: incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0019BuildFailureOnNUnitFailure.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0019BuildFailureOnNUnitFailure.java?rev=700791&r1=700790&r2=700791&view=diff ============================================================================== --- incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0019BuildFailureOnNUnitFailure.java (original) +++ incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0019BuildFailureOnNUnitFailure.java Wed Oct 1 07:36:50 2008 @@ -31,11 +31,10 @@ { File testDir = extractAndTranslateResources( "/MavenITmng-0019-BuildFailureOnNUnitFailure" ); Verifier verifier = getVerifier( testDir ); - verifier.executeGoal( "test" ); try { - verifier.verifyErrorFreeLog(); + verifier.executeGoal( "test" ); fail( "Log has no errors, expected test failure" ); } catch ( VerificationException e ) Modified: incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/src/test/dotnet/It0007.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/src/test/dotnet/It0007.cs?rev=700791&r1=700790&r2=700791&view=diff ============================================================================== --- incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/src/test/dotnet/It0007.cs (original) +++ incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/src/test/dotnet/It0007.cs Wed Oct 1 07:36:50 2008 @@ -27,18 +27,18 @@ public class It0007 { [Test] public void testSimple1() { - Assertion.AssertEquals(1, 1); + Assert.AreEqual(1, 1); } [Test] public void testSimple2() { - Assertion.AssertEquals(2, 2); + Assert.AreEqual(2, 2); } [Test] public void testTakesSomeTime() { for (int i=0; i < 9999999; i++) { - Assertion.AssertEquals(i+1, i+1); + Assert.AreEqual(i+1, i+1); } } } Modified: incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/A/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/A/pom.xml?rev=700791&r1=700790&r2=700791&view=diff ============================================================================== --- incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/A/pom.xml (original) +++ incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/A/pom.xml Wed Oct 1 07:36:50 2008 @@ -57,9 +57,9 @@ </build> <dependencies> <dependency> - <groupId>org.apache.maven.dotnet</groupId> + <groupId>NUnit</groupId> <artifactId>NUnit.Framework</artifactId> - <version>83.161.120.155</version> + <version>83.161.120.155</version> <type>dotnet:library</type> <scope>test</scope> </dependency> @@ -68,6 +68,7 @@ <groupId>NMaven.Its</groupId> <artifactId>NMaven.It.It0020B</artifactId> <scope>test</scope> + <classifier>test</classifier> <version>1.0.0</version> <type>dotnet:library</type> </dependency> 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=700791&r1=700790&r2=700791&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 Oct 1 07:36:50 2008 @@ -21,6 +21,7 @@ import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.dotnet.compiler.DotnetCompilerContext; import org.apache.maven.dotnet.compiler.DotnetCompilerConfig; import org.apache.maven.dotnet.compiler.DotnetCompilerPlatformVersion; @@ -61,9 +62,10 @@ /** * The location of the local Maven repository. * - * @parameter expression="${settings.localRepository}" + * @parameter expression="${localRepository}" + * @readonly */ - private File localRepository; + private ArtifactRepository localRepository; /** * Specify a strong name key file. Modified: incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java?rev=700791&r1=700790&r2=700791&view=diff ============================================================================== --- incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java (original) +++ incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java Wed Oct 1 07:36:50 2008 @@ -28,6 +28,7 @@ import org.apache.maven.dotnet.ProgrammingLanguage; import org.apache.maven.dotnet.Vendor; import org.apache.maven.dotnet.ArtifactScope; +import org.apache.maven.dotnet.compiler.DotnetArtifactLocator; import org.apache.maven.dotnet.compiler.DotnetCompilerConfig; import org.apache.maven.dotnet.compiler.DotnetCompilerContext; import org.apache.maven.dotnet.compiler.DotnetCompilerPlatformVersion; @@ -36,7 +37,10 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProject; +import org.apache.maven.project.MavenProjectHelper; import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.metadata.ArtifactMetadataSource; +import org.apache.maven.artifact.repository.ArtifactRepository; import org.codehaus.plexus.util.FileUtils; /** @@ -59,13 +63,6 @@ private MavenProject project; /** - * The location of the local Maven repository. - * - * @parameter expression="${settings.localRepository}" - */ - private File localRepository; - - /** * The framework version to compile under: 1.1, 2.0, 3.0 * * @parameter expression = "${frameworkVersion}" default-value="2.0.50727" @@ -92,6 +89,21 @@ */ private DotnetCompilerContext compilerContext; + /** + * @component + */ + private DotnetArtifactLocator artifactLocator; + + /** + * @parameter expression="${localRepository}" + * @readonly + */ + private ArtifactRepository localRepository; + + /** + * @component + */ + private MavenProjectHelper projectHelper; public void execute() throws MojoExecutionException, MojoFailureException @@ -154,6 +166,7 @@ try { testAssembly = compilerContext.getClassCompiler().compile(); + projectHelper.attachArtifact( project, "dotnet:library", "test", testAssembly ); } catch ( InvalidArtifactException e ) { @@ -169,14 +182,15 @@ throw new MojoExecutionException( "Unable to create test assemblies directory: " + testAssemblies ); } - Set<Artifact> testDependencies = compilerContext.getLibraryDependenciesFor( ArtifactScope.TEST ); + Set<Artifact> testDependencies = compilerContext.getLibraryDependenciesFor( ArtifactScope.TEST ); try { for ( Artifact testDependency : testDependencies ) { File testDependencyFile = testDependency.getFile(); - File testAssembliesFile = new File( testAssemblies, testDependencyFile.getName() ); + File testAssembliesFile = + new File( testAssemblies, artifactLocator.getAssemblyFileName( testDependency, localRepository ) ); FileUtils.copyFile( testDependencyFile, testAssembliesFile ); } Modified: incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/resources/META-INF/plexus/components.xml?rev=700791&r1=700790&r2=700791&view=diff ============================================================================== --- incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/resources/META-INF/plexus/components.xml (original) +++ incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/resources/META-INF/plexus/components.xml Wed Oct 1 07:36:50 2008 @@ -288,6 +288,21 @@ <component> <role>org.apache.maven.dotnet.compiler.DotnetCompilerContext</role> <implementation>org.apache.maven.dotnet.compiler.impl.DotnetCompilerContextImpl</implementation> + <requirements> + <requirement> + <role>org.apache.maven.dotnet.compiler.DotnetArtifactLocator</role> + </requirement> + </requirements> + </component> + <component> + <role>org.apache.maven.dotnet.compiler.DotnetArtifactLocator</role> + <implementation>org.apache.maven.dotnet.compiler.impl.DotnetArtifactLocatorImpl</implementation> + <requirements> + <requirement> + <role>org.apache.maven.project.MavenProjectBuilder</role> + <fieldName>projectBuilder</fieldName> + </requirement> + </requirements> </component> <component> <role>org.apache.maven.toolchain.ToolchainFactory</role> Modified: incubator/nmaven/trunk/plugins/maven-dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java?rev=700791&r1=700790&r2=700791&view=diff ============================================================================== --- incubator/nmaven/trunk/plugins/maven-dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java (original) +++ incubator/nmaven/trunk/plugins/maven-dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java Wed Oct 1 07:36:50 2008 @@ -108,18 +108,7 @@ getLog().debug( "NMaven-test: workingDirectory(" + testAssemblies.getAbsolutePath() + ")" ); commandline.setWorkingDirectory( testAssemblies.getAbsolutePath() ); - if ( vendor.equals( Vendor.MICROSOFT ) ) - { - commandline.setExecutable( "nunit-console" ); - } - else if ( vendor.equals( Vendor.NOVELL ) ) - { - commandline.setExecutable( "nunit-console2" ); - } - else - { - throw new MojoExecutionException("Vendor not found."); - } + commandline.setExecutable( "nunit-console" ); commandline.addArguments( getNUnitArguments() ); NUnitStreamConsumer systemOut = new NUnitStreamConsumer( getLog() ); Modified: incubator/nmaven/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/pom.xml?rev=700791&r1=700790&r2=700791&view=diff ============================================================================== --- incubator/nmaven/trunk/pom.xml (original) +++ incubator/nmaven/trunk/pom.xml Wed Oct 1 07:36:50 2008 @@ -195,6 +195,27 @@ </pluginManagement> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.0-alpha-3</version> + <executions> + <execution> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <excludes> + <exclude>org.codehaus.plexus:plexus-component-api</exclude> + </excludes> + </bannedDependencies> + </rules> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>2.3</version> </plugin> @@ -277,13 +298,8 @@ </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-api</artifactId> - <version>1.0-alpha-32</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-container-default</artifactId> - <version>1.0-alpha-32</version> + <version>1.0-alpha-9-stable-1</version> </dependency> </dependencies> </dependencyManagement> From nmaven-commits-return-hmurphy@example.net Wed Oct 01 14:57:28 2008 Return-Path: <nmaven-commits-return-hmurphy@example.net> Delivered-To: hmurphy@example.net Received: (qmail 56352 invoked from network); 1 Oct 2008 14:57:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Oct 2008 14:57:27 -0000 Received: (qmail 9516 invoked by uid 500); 1 Oct 2008 14:57:26 -0000 Delivered-To: hmurphy@example.net Received: (qmail 9500 invoked by uid 500); 1 Oct 2008 14:57:26 -0000 Mailing-List: contact hmurphy@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:hmurphy@example.net> List-Unsubscribe: <mailto:hmurphy@example.net> List-Post: <mailto:hmurphy@example.net> List-Id: <nmaven-commits.incubator.apache.org> Reply-To: hmurphy@example.net Delivered-To: mailing list hmurphy@example.net Received: (qmail 9491 invoked by uid 99); 1 Oct 2008 14:57:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 07:57:26 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 14:56:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1A7D82388A01; Wed, 1 Oct 2008 07:57:07 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r700802 - /incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java Date: Wed, 01 Oct 2008 14:57:06 -0000 To: hmurphy@example.net From: hmurphy@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <hmurphy@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Wed Oct 1 07:57:06 2008 New Revision: 700802 URL: http://svn.apache.org/viewvc?rev=700802&view=rev Log: reverse order for most recent first, as with Maven's ITs Modified: incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java Modified: incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java?rev=700802&r1=700801&r2=700802&view=diff ============================================================================== --- incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java (original) +++ incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java Wed Oct 1 07:57:06 2008 @@ -29,39 +29,41 @@ { TestSuite suite = new TestSuite(); - // Fails occasionally with: - // error CS1548: Cryptographic failure while signing assembly ... The process cannot access the file because it is being used by another process. ' - // suite.addTestSuite( MavenITmng0017CSharpStrongNamedAssembly.class ); - - // Need to be able to locate the GAC root, perhaps using the toolchain - // suite.addTestSuite( MavenITmng0009CSharpCompileWithProvidedGacDependency.class ); - - // Currently requiring library in $M2_HOME/lib when extension should be enough + // TODO: Currently requiring library in $M2_HOME/lib when extension should be enough // suite.addTestSuite( MavenITDotNetToolchain.class ); suite.addTestSuite( MavenITVersionedAssemblies.class ); suite.addTestSuite( MavenITNUnit24Features.class ); - suite.addTestSuite( MavenITmng0000CSharpCompileLibrary.class ); - suite.addTestSuite( MavenITmng0001CSharpCompileExe.class ); - suite.addTestSuite( MavenITmng0002CSharpCompileModule.class ); - suite.addTestSuite( MavenITmng0003CSharpCompileWinexe.class ); - suite.addTestSuite( MavenITmng0004CSharpCompileWithDependency.class ); - suite.addTestSuite( MavenITmng0005CSharpCompileWithTransitiveDependency.class ); - suite.addTestSuite( MavenITmng0007CSharpCompileTestLibrary.class ); - suite.addTestSuite( MavenITmng0008CSharpCompileWithProvidedDependency.class ); - suite.addTestSuite( MavenITmng0010DeployLibrary.class ); - suite.addTestSuite( MavenITmng0011DeployExe.class ); - suite.addTestSuite( MavenITmng0012DeployModule.class ); - suite.addTestSuite( MavenITmng0013DeployWinexe.class ); - suite.addTestSuite( MavenITmng0014ResolveLibraryDependency.class ); - suite.addTestSuite( MavenITmng0015DeployLibraryAsSnapshot.class ); - suite.addTestSuite( MavenITmng0016CSharpAssemblyInfoGeneration.class ); - suite.addTestSuite( MavenITmng0018CSharpSynchronizeTargetWithSource.class ); + // TODO: Looks to link to NMaven.Its.It0020B-1.0.0-test 83.161.120.155 instead of the correct version + //suite.addTestSuite( MavenITmng0020ShareTestSource.class ); + suite.addTestSuite( MavenITmng0019BuildFailureOnNUnitFailure.class ); + suite.addTestSuite( MavenITmng0018CSharpSynchronizeTargetWithSource.class ); - // Looks to link to NMaven.Its.It0020B-1.0.0-test 83.161.120.155 instead of the correct version - //suite.addTestSuite( MavenITmng0020ShareTestSource.class ); + // TODO: Fails occasionally with: + // error CS1548: Cryptographic failure while signing assembly ... The process cannot access the file because it is being used by another process. ' + // suite.addTestSuite( MavenITmng0017CSharpStrongNamedAssembly.class ); + + suite.addTestSuite( MavenITmng0016CSharpAssemblyInfoGeneration.class ); + suite.addTestSuite( MavenITmng0015DeployLibraryAsSnapshot.class ); + suite.addTestSuite( MavenITmng0014ResolveLibraryDependency.class ); + suite.addTestSuite( MavenITmng0013DeployWinexe.class ); + suite.addTestSuite( MavenITmng0012DeployModule.class ); + suite.addTestSuite( MavenITmng0011DeployExe.class ); + suite.addTestSuite( MavenITmng0010DeployLibrary.class ); + + // TODO: Need to be able to locate the GAC root, perhaps using the toolchain + // suite.addTestSuite( MavenITmng0009CSharpCompileWithProvidedGacDependency.class ); + + suite.addTestSuite( MavenITmng0008CSharpCompileWithProvidedDependency.class ); + suite.addTestSuite( MavenITmng0007CSharpCompileTestLibrary.class ); + suite.addTestSuite( MavenITmng0005CSharpCompileWithTransitiveDependency.class ); + suite.addTestSuite( MavenITmng0004CSharpCompileWithDependency.class ); + suite.addTestSuite( MavenITmng0003CSharpCompileWinexe.class ); + suite.addTestSuite( MavenITmng0002CSharpCompileModule.class ); + suite.addTestSuite( MavenITmng0001CSharpCompileExe.class ); + suite.addTestSuite( MavenITmng0000CSharpCompileLibrary.class ); return suite; } From nmaven-commits-return-hmurphy@example.net Fri Oct 03 09:19:21 2008 Return-Path: <nmaven-commits-return-hmurphy@example.net> Delivered-To: hmurphy@example.net Received: (qmail 83090 invoked from network); 3 Oct 2008 09:19:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Oct 2008 09:19:21 -0000 Received: (qmail 2003 invoked by uid 500); 3 Oct 2008 09:19:19 -0000 Delivered-To: hmurphy@example.net Received: (qmail 1980 invoked by uid 500); 3 Oct 2008 09:19:19 -0000 Mailing-List: contact hmurphy@example.net; run
{'source': 'Apache Software Foundation Public Mail Archives'}