incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r603747 - in /incubator/nmaven/branches/SI_MAVEN_INTEGRATION: ./ components/dotnet-assembler/ components/dotnet-compiler/ components/dotnet-extensions-maven/ plugins/maven-compiler-plugin/ plugins/maven-compiler-plugin/src/main/java/org/apa...
Date Wed, 12 Dec 2007 21:22:29 GMT
Author: sisbell
Date: Wed Dec 12 13:22:29 2007
New Revision: 603747

URL: http://svn.apache.org/viewvc?rev=603747&view=rev
Log:
Pom cleanup.

Modified:
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/pom.xml
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-compiler/pom.xml
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-extensions-maven/pom.xml
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-compiler-plugin/pom.xml
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
    incubator/nmaven/branches/SI_MAVEN_INTEGRATION/pom.xml

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/pom.xml?rev=603747&r1=603746&r2=603747&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/pom.xml (original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-assembler/pom.xml Wed
Dec 12 13:22:29 2007
@@ -43,12 +43,10 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.4.6</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-component-api</artifactId>
-      <version>1.0-alpha-32</version>
     </dependency>
   </dependencies>
 </project>

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-compiler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-compiler/pom.xml?rev=603747&r1=603746&r2=603747&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-compiler/pom.xml (original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-compiler/pom.xml Wed
Dec 12 13:22:29 2007
@@ -18,53 +18,44 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">  
-  <parent> 
-    <groupId>org.apache.maven.dotnet</groupId>  
-    <version>0.14-incubating-SNAPSHOT</version>  
-    <artifactId>dotnet-components</artifactId> 
-  </parent>  
-  <modelVersion>4.0.0</modelVersion>  
-  <groupId>org.apache.maven.dotnet</groupId>  
-  <artifactId>dotnet-compiler</artifactId>  
-  <name>dotnet-compiler</name>  
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.maven.dotnet</groupId>
+    <version>0.14-incubating-SNAPSHOT</version>
+    <artifactId>dotnet-components</artifactId>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.dotnet</groupId>
+  <artifactId>dotnet-compiler</artifactId>
+  <name>dotnet-compiler</name>
   <description>NMaven</description>
 
-  <!-- The version of maven components/plugins that we depend on -->
-  <properties>
-    <mavenVersion>2.0.8</mavenVersion>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.dotnet</groupId>
       <artifactId>dotnet-core</artifactId>
       <version>${pom.version}</version>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>${mavenVersion}</version>
     </dependency>
-    <dependency> 
-      <groupId>org.apache.maven</groupId>  
-      <artifactId>maven-core</artifactId>  
-      <version>${mavenVersion}</version> 
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
-      <version>${mavenVersion}</version>
     </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-utils</artifactId>
-        <version>1.4.6</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-container-default</artifactId>
-        <version>1.0-alpha-40</version>
-      </dependency>
-  </dependencies> 
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+    </dependency>
+  </dependencies>
 </project>

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-extensions-maven/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-extensions-maven/pom.xml?rev=603747&r1=603746&r2=603747&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-extensions-maven/pom.xml
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/components/dotnet-extensions-maven/pom.xml
Wed Dec 12 13:22:29 2007
@@ -30,11 +30,6 @@
   <name>dotnet-extensions-maven</name>  
   <description>NMaven</description>
 
-  <!-- The version of maven components/plugins that we depend on -->
-  <properties>
-    <mavenVersion>2.0.8</mavenVersion>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.dotnet</groupId>

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-compiler-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-compiler-plugin/pom.xml?rev=603747&r1=603746&r2=603747&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-compiler-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-compiler-plugin/pom.xml Wed
Dec 12 13:22:29 2007
@@ -18,18 +18,19 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">  
-  <parent> 
-    <groupId>org.apache.maven.dotnet.plugins</groupId>  
-    <version>0.14-incubating-SNAPSHOT</version>  
-    <artifactId>maven-dotnet-plugins</artifactId> 
-  </parent>  
-  <modelVersion>4.0.0</modelVersion>  
-  <groupId>org.apache.maven.dotnet.plugins</groupId>  
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.maven.dotnet.plugins</groupId>
+    <version>0.14-incubating-SNAPSHOT</version>
+    <artifactId>maven-dotnet-plugins</artifactId>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.dotnet.plugins</groupId>
   <artifactId>maven-compiler-plugin</artifactId>
-  <packaging>maven-plugin</packaging>  
+  <packaging>maven-plugin</packaging>
   <name>maven-compiler-plugin</name>
-  <description>Maven Plugin for .NET: Handles source and test compiles</description>
 
+  <description>Maven Plugin for .NET: Handles source and test compiles</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.dotnet</groupId>
@@ -51,12 +52,20 @@
       <artifactId>dotnet-extensions-maven</artifactId>
       <version>${parent.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+    </dependency>
   </dependencies>
-  <distributionManagement> 
-    <site> 
-      <id>nmaven-apache-site</id>  
-      <name>NMaven Site</name>  
-      <url>file://${basedir}/../../../www/plugins/maven-compile-plugin</url>

-    </site> 
-  </distributionManagement> 
+  <distributionManagement>
+    <site>
+      <id>nmaven-apache-site</id>
+      <name>NMaven Site</name>
+      <url>file://${basedir}/../../../www/plugins/maven-compile-plugin</url>
+    </site>
+  </distributionManagement>
 </project>

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java?rev=603747&r1=603746&r2=603747&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
(original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
Wed Dec 12 13:22:29 2007
@@ -38,9 +38,6 @@
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.List;
-import java.util.Set;
-import java.util.HashSet;
 
 /**
  * Maven Mojo for compiling Class files to the .NET Intermediate Language.
@@ -135,7 +132,7 @@
         compilerConfig.setTargetDirectory( new File( project.getBuild().getDirectory() )
);
         compilerConfig.setArtifactFileName(
             project.getBuild().getFinalName() + "." + compilerConfig.getArtifactType().getExtension()
);
-        
+
         DotnetCompilerContext ctx = new DotnetCompilerContextImpl();
         try
         {

Modified: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/pom.xml?rev=603747&r1=603746&r2=603747&view=diff
==============================================================================
--- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/pom.xml (original)
+++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/pom.xml Wed Dec 12 13:22:29 2007
@@ -18,7 +18,8 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.dotnet</groupId>
   <artifactId>dotnet-project</artifactId>
@@ -186,6 +187,21 @@
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-api</artifactId>
         <version>${mavenVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-utils</artifactId>
+        <version>1.4.6</version>
+      </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-40</version>
       </dependency>
     </dependencies>
   </dependencyManagement>



Mime
View raw message