incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ewor...@apache.org
Subject svn commit: r659023 - in /incubator/nmaven/branches/NMAVEN_0.14: components/pom.xml misc/dotnet-repository-builder/pom.xml plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java pom.xml
Date Thu, 22 May 2008 06:57:11 GMT
Author: eworley
Date: Wed May 21 23:57:10 2008
New Revision: 659023

URL: http://svn.apache.org/viewvc?rev=659023&view=rev
Log:
Appling NMAVEN-123.patch, http://jira.codehaus.org/browse/NMAVEN-123

Modified:
    incubator/nmaven/branches/NMAVEN_0.14/components/pom.xml
    incubator/nmaven/branches/NMAVEN_0.14/misc/dotnet-repository-builder/pom.xml
    incubator/nmaven/branches/NMAVEN_0.14/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
    incubator/nmaven/branches/NMAVEN_0.14/pom.xml

Modified: incubator/nmaven/branches/NMAVEN_0.14/components/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN_0.14/components/pom.xml?rev=659023&r1=659022&r2=659023&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN_0.14/components/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN_0.14/components/pom.xml Wed May 21 23:57:10 2008
@@ -36,14 +36,12 @@
     <module>dotnet-assembler</module>  
     <module>dotnet-core</module>  
     <module>dotnet-dao/project</module>  
-    <module>dotnet-embedder</module>  
     <module>dotnet-executable</module>  
     <module>dotnet-jetty</module>  
     <module>dotnet-model</module>  
     <module>dotnet-plugin</module>  
     <module>dotnet-registry</module>  
     <module>dotnet-repository</module>  
-    <module>dotnet-service/embedder</module>  
     <module>dotnet-vendor</module> 
   </modules>  
   <profiles> 

Modified: incubator/nmaven/branches/NMAVEN_0.14/misc/dotnet-repository-builder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN_0.14/misc/dotnet-repository-builder/pom.xml?rev=659023&r1=659022&r2=659023&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN_0.14/misc/dotnet-repository-builder/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN_0.14/misc/dotnet-repository-builder/pom.xml Wed May 21
23:57:10 2008
@@ -25,7 +25,7 @@
   <artifactId>dotnet-repository-builder</artifactId>  
   <packaging>pom</packaging>  
   <properties> 
-    <mavenVersion>2.1-SNAPSHOT</mavenVersion>  
+    <mavenVersion>2.0.8</mavenVersion>
     <nmavenVersion>${pom.version}</nmavenVersion>  
     <jettyVersion>6.1.5</jettyVersion>  
     <xfireVersion>1.2.5</xfireVersion> 
@@ -69,11 +69,6 @@
     </dependency>  
     <dependency> 
       <groupId>org.apache.maven.dotnet</groupId>  
-      <artifactId>dotnet-embedder</artifactId>  
-      <version>0.14-incubating-SNAPSHOT</version> 
-    </dependency>  
-    <dependency> 
-      <groupId>org.apache.maven.dotnet</groupId>  
       <artifactId>dotnet-executable</artifactId>  
       <version>0.14-incubating-SNAPSHOT</version> 
     </dependency>  
@@ -108,12 +103,6 @@
       <artifactId>dotnet-vendor</artifactId>  
       <version>0.14-incubating-SNAPSHOT</version> 
     </dependency>  
-    <dependency> 
-      <groupId>org.apache.maven.dotnet</groupId>  
-      <artifactId>dotnet-service-embedder</artifactId>  
-      <type>war</type>  
-      <version>0.14-incubating-SNAPSHOT</version> 
-    </dependency>  
     <!--plugins-->  
     <dependency> 
       <groupId>org.apache.maven.dotnet.plugins</groupId>  
@@ -233,11 +222,6 @@
       <version>${mavenVersion}</version> 
     </dependency>  
     <dependency> 
-      <groupId>org.apache.maven</groupId>  
-      <artifactId>maven-embedder</artifactId>  
-      <version>${mavenVersion}</version> 
-    </dependency>  
-    <dependency> 
       <groupId>org.codehaus.xfire</groupId>  
       <artifactId>xfire-plexus</artifactId>  
       <version>${xfireVersion}</version> 

Modified: incubator/nmaven/branches/NMAVEN_0.14/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN_0.14/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java?rev=659023&r1=659022&r2=659023&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN_0.14/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
(original)
+++ incubator/nmaven/branches/NMAVEN_0.14/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
Wed May 21 23:57:10 2008
@@ -141,23 +141,6 @@
                                                                    new DefaultRepositoryLayout()
) );
         }
         artifactContext.init( null, remoteRepositories, new File( localRepository ) );
-        List<Dependency> javaDependencies = new ArrayList<Dependency>();
-        Dependency warFile = new Dependency();
-        warFile.setGroupId( "org.apache.maven.dotnet" );
-        warFile.setArtifactId( "dotnet-service-embedder" );
-        warFile.setVersion( pomVersion );
-        warFile.setType( "war" );
-        javaDependencies.add( warFile );
-
-        try
-        {
-            artifactContext.getArtifactInstaller().resolveAndInstallNetDependenciesForProfile(
"VisualStudio2005", null,
-                                                                                        
      javaDependencies );
-        }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( e.getMessage() );
-        }
 
         //GAC Installs
 

Modified: incubator/nmaven/branches/NMAVEN_0.14/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN_0.14/pom.xml?rev=659023&r1=659022&r2=659023&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN_0.14/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN_0.14/pom.xml Wed May 21 23:57:10 2008
@@ -258,11 +258,6 @@
         <version>${mavenVersion}</version> 
       </dependency>  
       <dependency> 
-        <groupId>org.apache.maven</groupId>  
-        <artifactId>maven-embedder</artifactId>  
-        <version>${mavenVersion}</version> 
-      </dependency>  
-      <dependency> 
         <groupId>org.codehaus.xfire</groupId>  
         <artifactId>xfire-plexus</artifactId>  
         <version>${xfireVersion}</version> 



Mime
View raw message