incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r607119 - in /incubator/nmaven/trunk: core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/ core-integration-tests/src/test/resources/MavenITmng-0005-CSharpCompileWithTransitiveDependency/ plugins/maven-compiler-plu...
Date Thu, 27 Dec 2007 20:47:26 GMT
Author: sisbell
Date: Thu Dec 27 12:47:25 2007
New Revision: 607119

URL: http://svn.apache.org/viewvc?rev=607119&view=rev
Log:
Fixed problem with transitive dependency resolution.

Added:
    incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0005CSharpCompileWithTransitiveDependency.java
  (with props)
    incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0005-CSharpCompileWithTransitiveDependency/
    incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0005-CSharpCompileWithTransitiveDependency/It0005.cs
    incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0005-CSharpCompileWithTransitiveDependency/pom.xml
  (with props)
Removed:
    incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/MavenProjectModifierMojo.java
Modified:
    incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java
    incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
    incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/resources/META-INF/plexus/components.xml

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=607119&r1=607118&r2=607119&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
Thu Dec 27 12:47:25 2007
@@ -31,7 +31,8 @@
         suite.addTestSuite( MavenITmng0001CSharpCompileExe.class );
         suite.addTestSuite( MavenITmng0002CSharpCompileModule.class );
         suite.addTestSuite( MavenITmng0003CSharpCompileWinexe.class );
-        suite.addTestSuite( MavenITmng0004CSharpCompileWithDependency.class );        
+        suite.addTestSuite( MavenITmng0004CSharpCompileWithDependency.class );
+        suite.addTestSuite( MavenITmng0005CSharpCompileWithTransitiveDependency.class );
         return suite;
     }
 }

Added: incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0005CSharpCompileWithTransitiveDependency.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0005CSharpCompileWithTransitiveDependency.java?rev=607119&view=auto
==============================================================================
--- incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0005CSharpCompileWithTransitiveDependency.java
(added)
+++ incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0005CSharpCompileWithTransitiveDependency.java
Thu Dec 27 12:47:25 2007
@@ -0,0 +1,25 @@
+package org.apache.maven.dotnet.integrationtests;
+
+import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.dotnet.BuildDirectories;
+
+import java.io.File;
+
+public class MavenITmng0005CSharpCompileWithTransitiveDependency
+    extends AbstractMavenIntegrationTestCase
+{
+    public void testit0005()
+        throws Exception
+    {
+        File testDir =
+            ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0005-CSharpCompileWithTransitiveDependency"
);
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.executeGoal( "install" );
+        verifier.assertFilePresent( "target/" + BuildDirectories.BUILD_SOURCES.getBuildDirectoryName()
+ "/It0005.cs" );
+        verifier.assertFilePresent( "target/NMaven.It.It0005-1.0.0.dll" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+    }
+}

Propchange: incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0005CSharpCompileWithTransitiveDependency.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0005-CSharpCompileWithTransitiveDependency/It0005.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0005-CSharpCompileWithTransitiveDependency/It0005.cs?rev=607119&view=auto
==============================================================================
--- incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0005-CSharpCompileWithTransitiveDependency/It0005.cs
(added)
+++ incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0005-CSharpCompileWithTransitiveDependency/It0005.cs
Thu Dec 27 12:47:25 2007
@@ -0,0 +1,9 @@
+namespace NMaven.IT {
+
+public class It0005 {
+	public static void Main () { 
+		new It0001();
+		new It0004();
+	} 
+}
+}

Added: incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0005-CSharpCompileWithTransitiveDependency/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0005-CSharpCompileWithTransitiveDependency/pom.xml?rev=607119&view=auto
==============================================================================
--- incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0005-CSharpCompileWithTransitiveDependency/pom.xml
(added)
+++ incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0005-CSharpCompileWithTransitiveDependency/pom.xml
Thu Dec 27 12:47:25 2007
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project> 
+  <modelVersion>4.0.0</modelVersion>  
+  <groupId>NMaven.Its</groupId>
+  <artifactId>NMaven.It.It0005</artifactId>
+  <packaging>dotnet:library</packaging>
+  <version>1.0.0</version>
+  <name>NMaven.It.It0005</name>
+  <build> 
+    <sourceDirectory>.</sourceDirectory>  
+    <plugins> 
+      <plugin> 
+        <groupId>org.apache.maven.dotnet.plugins</groupId>  
+        <artifactId>maven-compiler-plugin</artifactId>  
+        <extensions>true</extensions> 
+      </plugin> 
+    </plugins> 
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>NMaven.Its</groupId>
+      <artifactId>NMaven.It.It0004</artifactId>
+      <version>1.0.0</version>
+      <type>dotnet:library</type>
+    </dependency>
+  </dependencies>
+</project>

Propchange: incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0005-CSharpCompileWithTransitiveDependency/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java?rev=607119&r1=607118&r2=607119&view=diff
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
(original)
+++ incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
Thu Dec 27 12:47:25 2007
@@ -49,6 +49,7 @@
  *
  * @goal compile
  * @phase compile
+ * @requiresDependencyResolution
  * @description Maven Mojo for compiling class files to the .NET Intermediate Language
  */
 public class CompilerMojo

Modified: incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/resources/META-INF/plexus/components.xml?rev=607119&r1=607118&r2=607119&view=diff
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++ incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/resources/META-INF/plexus/components.xml
Thu Dec 27 12:47:25 2007
@@ -9,9 +9,6 @@
       </implementation>
       <configuration>
         <phases>
-          <validate>
-            org.apache.maven.dotnet.plugins:maven-compiler-plugin:modify-project
-          </validate>
           <process-sources>
             org.apache.maven.dotnet.plugins:maven-compiler-plugin:process-sources
           </process-sources>
@@ -35,9 +32,6 @@
       </implementation>
       <configuration>
         <phases>
-          <validate>
-            org.apache.maven.dotnet.plugins:maven-compiler-plugin:modify-project
-          </validate>
           <process-sources>
             org.apache.maven.dotnet.plugins:maven-compiler-plugin:process-sources
           </process-sources>
@@ -61,9 +55,6 @@
       </implementation>
       <configuration>
         <phases>
-          <validate>
-            org.apache.maven.dotnet.plugins:maven-compiler-plugin:modify-project
-          </validate>
           <process-sources>
             org.apache.maven.dotnet.plugins:maven-compiler-plugin:process-sources
           </process-sources>
@@ -87,9 +78,6 @@
       </implementation>
       <configuration>
         <phases>
-          <validate>
-            org.apache.maven.dotnet.plugins:maven-compiler-plugin:modify-project
-          </validate>
           <process-sources>
             org.apache.maven.dotnet.plugins:maven-compiler-plugin:process-sources
           </process-sources>



Mime
View raw message