You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nmaven-commits@incubator.apache.org by si...@apache.org on 2007/07/12 19:08:06 UTC

svn commit: r555722 [4/4] - in /incubator/nmaven/branches/SI_GAC: ./ archetypes/ archetypes/maven-archetype-dotnet-simple/ archetypes/maven-archetype-netexecutable/ assemblies/ assemblies/NMaven.Artifact/ assemblies/NMaven.Artifact/src/main/csharp/NMav...

Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-embedder-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-embedder-plugin/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-embedder-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-embedder-plugin/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
          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-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>maven-dotnet-plugins</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java Thu Jul 12 12:07:57 2007
@@ -113,7 +113,7 @@
      */
     private String frameworkVersion;
 
-    private String pomVersion = "0.14-SNAPSHOT";
+    private String pomVersion = "0.14";
 
     /**
      * File logger: needed for creating logs when the IDE starts because the console output and thrown exceptions are

Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/pom.xml Thu Jul 12 12:07:57 2007
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>maven-dotnet-plugins</artifactId>
     <groupId>org.apache.maven.dotnet.plugins</groupId>
-    <version>0.14-SNAPSHOT</version>
+    <version>0.14</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.dotnet.plugins</groupId>

Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
          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-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>maven-dotnet-plugins</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -31,6 +31,12 @@
   <description>
     Maven Plugin for .NET: Installs compiled artifacts into the local repository.
   </description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+    </dependency>
+  </dependencies>
   <distributionManagement>
     <site>
       <id>nmaven-apache-site</id>

Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java Thu Jul 12 12:07:57 2007
@@ -25,6 +25,7 @@
 import java.io.File;
 
 import org.apache.maven.dotnet.artifact.ArtifactContext;
+import org.apache.maven.dotnet.dao.ProjectDao;
 import org.apache.maven.artifact.installer.ArtifactInstallationException;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -89,11 +90,6 @@
     private String packaging;
 
     /**
-     * @parameter expression = "${generatePom}" default-value = "true"
-     */
-    private boolean generatePom;
-
-    /**
      * @component
      */
     private ArtifactContext artifactContext;
@@ -110,29 +106,42 @@
      */
     private ArtifactFactory artifactFactory;
 
+    /**
+     * @component
+     */
+    private org.apache.maven.dotnet.registry.DataAccessObjectRegistry daoRegistry;
+
+    /**
+     * @component
+     */
+    private org.apache.maven.artifact.manager.WagonManager wagonManager;
+
     public void execute()
         throws MojoExecutionException
     {
+        ProjectDao dao = (ProjectDao) daoRegistry.find( "dao:project" );
+        dao.init( artifactFactory, wagonManager );
+
         artifactContext.init( project, project.getRemoteArtifactRepositories(), localRepository );
         if ( pomFile != null && !pomFile.exists() )
         {
             throw new MojoExecutionException(
                 "NMAVEN-1000-002: Pom  File is missing: File = " + pomFile.getAbsolutePath() );
         }
-        else if ( generatePom && pomFile == null )
+        else if ( pomFile == null )
         {
             try
             {
                 this.getLog().info( "NMAVEN-xxx-000: Installing file with generated pom" );
-                artifactContext.getArtifactInstaller().installFileWithGeneratedPom( groupId, artifactId, version,
-                                                                                    packaging, artifactFile );
+                artifactContext.getArtifactInstaller().installFileWithoutPom( groupId, artifactId, version, packaging,
+                                                                              artifactFile );
             }
             catch ( org.apache.maven.artifact.installer.ArtifactInstallationException e )
             {
                 throw new MojoExecutionException( "NMAVEN-1000-000: Failed to install artifact file", e );
             }
         }
-        else if ( pomFile != null )
+        else
         {
             Artifact sourceArtifact =
                 artifactFactory.createArtifact( groupId, artifactId, version, "compile", packaging );
@@ -140,24 +149,11 @@
             this.getLog().info( "NMAVEN-xxx-000: Installing file with specified pom" );
             try
             {
-                artifactContext.getArtifactInstaller().installArtifact( sourceArtifact, pomFile, false );
+                artifactContext.getArtifactInstaller().installArtifactWithPom( sourceArtifact, pomFile, false );
             }
             catch ( ArtifactInstallationException e )
             {
                 throw new MojoExecutionException( "NMAVEN-1000-003: Failed to install artifact file", e );
-            }
-        }
-        else
-        {
-            try
-            {
-                this.getLog().info( "NMAVEN-xxx-000: Installing file with no pom" );
-                artifactContext.getArtifactInstaller().installFileWithNoPom( groupId, artifactId, version,
-                                                                             artifactFile );
-            }
-            catch ( org.apache.maven.artifact.installer.ArtifactInstallationException e )
-            {
-                throw new MojoExecutionException( "NMAVEN-1000-001: Failed to install artifact file", e );
             }
         }
     }

Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java Thu Jul 12 12:07:57 2007
@@ -24,12 +24,20 @@
 import org.apache.maven.artifact.installer.ArtifactInstaller;
 import org.apache.maven.artifact.installer.ArtifactInstallationException;
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.dotnet.artifact.ArtifactContext;
-import org.apache.maven.dotnet.artifact.ArtifactType;
+import org.apache.maven.dotnet.executable.NetExecutable;
+import org.apache.maven.dotnet.executable.ExecutionException;
+import org.apache.maven.dotnet.PlatformUnsupportedException;
+import org.apache.maven.dotnet.repository.Project;
+import org.apache.maven.dotnet.repository.ProjectDependency;
+import org.apache.maven.dotnet.dao.ProjectDao;
 import org.apache.maven.model.Dependency;
 
 import java.io.File;
 import java.util.List;
+import java.util.ArrayList;
 
 /**
  * @goal install
@@ -68,6 +76,54 @@
      */
     private ArtifactContext artifactContext;
 
+    /**
+     * Install into the GAC?
+     *
+     * @parameter expression="${isGacInstall}" default-value = "false"
+     */
+    private boolean isGacInstall;
+
+    /**
+     * @component
+     */
+    private org.apache.maven.dotnet.executable.NetExecutableFactory netExecutableFactory;
+
+    /**
+     * The Vendor for the executable.
+     *
+     * @parameter expression="${vendor}"
+     */
+    private String vendor;
+
+    /**
+     * @parameter expression = "${frameworkVersion}"
+     */
+    private String frameworkVersion;
+
+    /**
+     * The profile that the executable should use.
+     *
+     * @parameter expression = "${profile}" default-value = "GACUTIL"
+     */
+    private String profile;
+
+    /**
+     * @component
+     */
+    private org.apache.maven.dotnet.registry.DataAccessObjectRegistry daoRegistry;
+
+    /**
+     * @component
+     */
+    private org.apache.maven.artifact.manager.WagonManager wagonManager;
+
+    /**
+     * The artifact factory component, which is used for creating artifacts.
+     *
+     * @component
+     */
+    private ArtifactFactory artifactFactory;    
+
     public void execute()
         throws MojoExecutionException
     {
@@ -77,19 +133,55 @@
         {
             localRepository = new File( System.getProperty( "user.home" ), ".m2/repository" );
         }
+
+        ProjectDao dao = (ProjectDao) daoRegistry.find( "dao:project" );
+        dao.init( artifactFactory, wagonManager );
+
+
         artifactContext.init( project, project.getRemoteArtifactRepositories(), localRepository );
-        
-        Artifact artifact = project.getArtifact();       
-        try
+        if ( project.getPackaging().equals( "pom" ) )
         {
-            artifactContext.getArtifactInstaller().installArtifact( artifact, pomFile, true );
+            storeMavenProject( project );
         }
-        catch ( ArtifactInstallationException e )
+        else if ( isGacInstall )
         {
-            throw new MojoExecutionException( "NMAVEN-1001-000: Failed to install artifacts", e );
+            try
+            {
+                NetExecutable netExecutable =
+                    netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion, profile, getCommands(), null );
+                netExecutable.execute();
+                getLog().info( "NMAVEN-xxx-003: Installed Assembly into GAC: Assembly = " +
+                    project.getArtifact().getFile() + ",  Vendor = " + netExecutable.getVendor().getVendorName() );
+            }
+            catch ( ExecutionException e )
+            {
+                throw new MojoExecutionException( "NMAVEN-1400-000: Unable to execute gacutil: Vendor " + vendor +
+                    ", frameworkVersion = " + frameworkVersion + ", Profile = " + profile, e );
+            }
+            catch ( PlatformUnsupportedException e )
+            {
+                throw new MojoExecutionException( "NMAVEN-1400-001: Platform Unsupported: Vendor " + vendor +
+                    ", frameworkVersion = " + frameworkVersion + ", Profile = " + profile, e );
+            }
+            storeMavenProject( project );
         }
+        else //UAC install
+        {
+            Artifact artifact = project.getArtifact();
+            try
+            {
+                artifactContext.getArtifactInstaller().installArtifactWithPom( artifact, pomFile, true );
+            }
+            catch ( ArtifactInstallationException e )
+            {
+                throw new MojoExecutionException( "NMAVEN-1001-000: Failed to install artifacts", e );
+            }
 
-        //To allow executables to be runnable from the repo
+        }
+
+        //Use Private Application Base
+/*
+       // To allow executables to be runnable from the repo
         if ( artifact.getType().equals( ArtifactType.EXE.getPackagingType() ) ||
             artifact.getType().equals( ArtifactType.NETPLUGIN.getPackagingType() ) ||
             artifact.getType().equals( ArtifactType.VISUAL_STUDIO_ADDIN.getPackagingType() ) ||
@@ -105,7 +197,51 @@
                 throw new MojoExecutionException( "NMAVEN-1001-002: Failed to install artifact file", e );
             }
         }
+        */
+
         long endTime = System.currentTimeMillis();
         getLog().info( "Mojo Execution Time = " + ( endTime - startTime ) );
+    }
+
+    public List<String> getCommands()
+        throws MojoExecutionException
+    {
+        List<String> commands = new ArrayList<String>();
+        commands.add( "/i" );
+        commands.add( project.getArtifact().getFile().getAbsolutePath() );
+        return commands;
+    }
+
+    //TODO: Handle parent poms
+    private void storeMavenProject( MavenProject project )
+        throws MojoExecutionException
+    {
+        ProjectDao dao = (ProjectDao) daoRegistry.find( "dao:project" );
+        Project proj = new Project();
+        proj.setGroupId( project.getGroupId() );
+        proj.setArtifactId( project.getArtifactId() );
+        proj.setVersion( project.getVersion() );
+        proj.setPublicKeyTokenId( project.getArtifact().getClassifier() );
+        proj.setArtifactType( project.getArtifact().getType() );
+        proj.setResolved( true );
+        for ( Dependency dependency : (List<Dependency>) project.getDependencies() )
+        {
+            ProjectDependency projectDependency = new ProjectDependency();
+            projectDependency.setGroupId( dependency.getGroupId() );
+            projectDependency.setArtifactId( dependency.getArtifactId() );
+            projectDependency.setVersion( dependency.getVersion() );
+            projectDependency.setPublicKeyTokenId( dependency.getClassifier() );
+            projectDependency.setArtifactType( dependency.getType() );
+            proj.addProjectDependency( projectDependency );
+        }
+
+        try
+        {
+            dao.storeProjectAndResolveDependencies( proj, new ArrayList<ArtifactRepository>() );
+        }
+        catch ( java.io.IOException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-1001-001: Failed to install artifacts", e );
+        }
     }
 }

Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-link-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-link-plugin/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-link-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-link-plugin/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
          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-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>maven-dotnet-plugins</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-mojo-generator-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-mojo-generator-plugin/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-mojo-generator-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-mojo-generator-plugin/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
          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-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>maven-dotnet-plugins</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-repository-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-repository-plugin/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-repository-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-repository-plugin/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
          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-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>maven-dotnet-plugins</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-resgen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-resgen-plugin/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-resgen-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-resgen-plugin/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
          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-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>maven-dotnet-plugins</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-resolver-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-resolver-plugin/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-resolver-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-resolver-plugin/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
          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-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>maven-dotnet-plugins</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-test-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-test-plugin/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-test-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-test-plugin/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
          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-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>maven-dotnet-plugins</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-vsinstaller-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-vsinstaller-plugin/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-vsinstaller-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-vsinstaller-plugin/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,13 +20,13 @@
          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-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>maven-dotnet-plugins</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.dotnet.plugins</groupId>
   <artifactId>maven-vsinstaller-plugin</artifactId>
-  <version>0.14-SNAPSHOT</version>
+  <version>0.14</version>
   <packaging>maven-plugin</packaging>
   <name>maven-vsinstaller-plugin</name>
   <description>

Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-vsinstaller-plugin/src/main/resources/template/NMaven.VisualStudio.AddIn
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-vsinstaller-plugin/src/main/resources/template/NMaven.VisualStudio.AddIn?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-vsinstaller-plugin/src/main/resources/template/NMaven.VisualStudio.AddIn (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-vsinstaller-plugin/src/main/resources/template/NMaven.VisualStudio.AddIn Thu Jul 12 12:07:57 2007
@@ -5,7 +5,7 @@
     <Version>8.0</Version>
   </HostApplication>
   <Addin>
-    <Assembly>${localRepository}\NMaven\VisualStudio\NMaven.VisualStudio.Addin\0.14-SNAPSHOT\NMaven.VisualStudio.Addin.dll</Assembly>
+    <Assembly>${localRepository}\NMaven\VisualStudio\NMaven.VisualStudio.Addin\0.14\NMaven.VisualStudio.Addin.dll</Assembly>
     <FullClassName>NMaven.VisualStudio.Addin.Connect</FullClassName>
     <FriendlyName>NMaven.VisualStudio.Addin</FriendlyName>
     <Description>NMaven provides Maven 2.x plugins to support building of .NET applications</Description>

Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-vstudio-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-vstudio-plugin/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-vstudio-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-vstudio-plugin/pom.xml Thu Jul 12 12:07:57 2007
@@ -19,7 +19,7 @@
 <project>
   <parent>
     <groupId>org.apache.maven.dotnet.plugins</groupId>
-    <version>0.14-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>maven-dotnet-plugins</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-webapp-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-webapp-plugin/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-webapp-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-webapp-plugin/pom.xml Thu Jul 12 12:07:57 2007
@@ -2,7 +2,7 @@
          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-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>maven-dotnet-plugins</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-wsdl-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-wsdl-plugin/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-wsdl-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-wsdl-plugin/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
          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-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>maven-dotnet-plugins</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-xsd-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-xsd-plugin/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-xsd-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-xsd-plugin/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
          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-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>maven-dotnet-plugins</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-xsp-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-xsp-plugin/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-xsp-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-xsp-plugin/pom.xml Thu Jul 12 12:07:57 2007
@@ -20,7 +20,7 @@
          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-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>maven-dotnet-plugins</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/nmaven/branches/SI_GAC/plugins/net-exe.bat
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/net-exe.bat?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/net-exe.bat (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/net-exe.bat Thu Jul 12 12:07:57 2007
@@ -1 +1 @@
-mvn archetype:create -DpackageName=org.apache.maven.dotnet.plugin.%1 -DartifactId=maven-%1-plugin -DgroupId=org.apache.maven.dotnet.plugins -Dversion=0.14-SNAPSHOT -DarchetypeArtifactId=maven-archetype-netexecutable -DarchetypeGroupId=org.apache.maven.dotnet -DarchetypeVersion=0.14-SNAPSHOT
+mvn archetype:create -DpackageName=org.apache.maven.dotnet.plugin.%1 -DartifactId=maven-%1-plugin -DgroupId=org.apache.maven.dotnet.plugins -Dversion=0.14 -DarchetypeArtifactId=maven-archetype-netexecutable -DarchetypeGroupId=org.apache.maven.dotnet -DarchetypeVersion=0.14

Modified: incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Addin/javabinding/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Addin/javabinding/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Addin/javabinding/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Addin/javabinding/pom.xml Thu Jul 12 12:07:57 2007
@@ -2,7 +2,7 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://maven.apache.org/POM/4.0.0">
     <parent>
     <groupId>org.apache.maven.dotnet.plugins</groupId>
-    <version>0.14-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>maven-dotnet-plugins</artifactId>
     <relativePath>../../../pom.xml</relativePath>
   </parent>

Modified: incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Addin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Addin/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Addin/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Addin/pom.xml Thu Jul 12 12:07:57 2007
@@ -19,7 +19,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0">
   <parent>
     <groupId>NMaven.Plugins</groupId>
-    <version>0.14-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>NMaven.Plugins</artifactId>
   </parent>  
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/pom.xml Thu Jul 12 12:07:57 2007
@@ -3,7 +3,7 @@
          xmlns="http://maven.apache.org/POM/4.0.0">
   <parent>
     <groupId>org.apache.maven.dotnet.plugins</groupId>
-    <version>0.14-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>maven-dotnet-plugins</artifactId>
     <relativePath>../../../pom.xml</relativePath>
   </parent>

Modified: incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Devenv/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Devenv/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Devenv/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Devenv/pom.xml Thu Jul 12 12:07:57 2007
@@ -19,7 +19,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0">
   <parent>
     <groupId>NMaven.Plugins</groupId>
-    <version>0.14-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>NMaven.Plugins</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Resx/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Resx/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Resx/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Resx/pom.xml Thu Jul 12 12:07:57 2007
@@ -19,7 +19,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0">
   <parent>
     <groupId>NMaven.Plugins</groupId>
-    <version>0.14-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>NMaven.Plugins</artifactId>
   </parent>  
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Settings/javabinding/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Settings/javabinding/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Settings/javabinding/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Settings/javabinding/pom.xml Thu Jul 12 12:07:57 2007
@@ -2,7 +2,7 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://maven.apache.org/POM/4.0.0">
   <parent>
     <groupId>org.apache.maven.dotnet.plugins</groupId>
-    <version>0.14-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>maven-dotnet-plugins</artifactId>
     <relativePath>../../../pom.xml</relativePath>
   </parent>

Modified: incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Settings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Settings/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Settings/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Settings/pom.xml Thu Jul 12 12:07:57 2007
@@ -19,7 +19,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0">
   <parent>
     <groupId>NMaven.Plugins</groupId>
-    <version>0.14-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>NMaven.Plugins</artifactId>
   </parent>  
   <modelVersion>4.0.0</modelVersion>
@@ -32,7 +32,7 @@
       <groupId>NMaven.Plugin</groupId>
       <artifactId>NMaven.Plugin</artifactId>
       <type>library</type>
-      <version>0.14-SNAPSHOT</version>
+      <version>0.14</version>
     </dependency>
   </dependencies>
   <profiles>

Modified: incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/javabinding/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/javabinding/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/javabinding/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/javabinding/pom.xml Thu Jul 12 12:07:57 2007
@@ -2,7 +2,7 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://maven.apache.org/POM/4.0.0">
   <parent>
     <groupId>org.apache.maven.dotnet.plugins</groupId>
-    <version>0.14-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>maven-dotnet-plugins</artifactId>
     <relativePath>../../../pom.xml</relativePath>
   </parent>  

Modified: incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/pom.xml Thu Jul 12 12:07:57 2007
@@ -19,7 +19,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0">
   <parent>
     <groupId>NMaven.Plugins</groupId>
-    <version>0.14-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>NMaven.Plugins</artifactId>
   </parent>  
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/nmaven/branches/SI_GAC/plugins/netplugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/netplugins/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/netplugins/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/netplugins/pom.xml Thu Jul 12 12:07:57 2007
@@ -21,7 +21,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
     <groupId>NMaven.Project</groupId>
-    <version>0.14-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>NMaven.Project</artifactId>
     <relativePath>../../pom-dotnet.xml</relativePath>
   </parent>

Modified: incubator/nmaven/branches/SI_GAC/plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/pom.xml Thu Jul 12 12:07:57 2007
@@ -21,13 +21,13 @@
          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-SNAPSHOT</version>
+    <version>0.14</version>
     <artifactId>dotnet-project</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.dotnet.plugins</groupId>
   <artifactId>maven-dotnet-plugins</artifactId>
-  <version>0.14-SNAPSHOT</version>
+  <version>0.14</version>
   <packaging>pom</packaging>
   <name>maven-dotnet-plugins</name>
   <modules>
@@ -60,6 +60,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.dotnet</groupId>
+      <artifactId>dotnet-dao-project</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.dotnet</groupId>
       <artifactId>dotnet-executable</artifactId>
       <version>${pom.version}</version>
     </dependency>
@@ -77,7 +82,7 @@
       <groupId>org.apache.maven.dotnet</groupId>
       <artifactId>dotnet-jetty</artifactId>
       <version>${pom.version}</version>
-    </dependency>
+    </dependency>  
   </dependencies>
   <build>
     <pluginManagement>

Modified: incubator/nmaven/branches/SI_GAC/pom-dotnet.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/pom-dotnet.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/pom-dotnet.xml (original)
+++ incubator/nmaven/branches/SI_GAC/pom-dotnet.xml Thu Jul 12 12:07:57 2007
@@ -22,7 +22,7 @@
   <groupId>NMaven.Project</groupId>
   <artifactId>NMaven.Project</artifactId>
   <packaging>pom</packaging>
-  <version>0.14-SNAPSHOT</version>
+  <version>0.14</version>
   <name>NMaven.Project</name>
   <url>http://incubator.apache.org/nmaven</url>
   <description>
@@ -163,37 +163,43 @@
         <groupId>Microsoft.Build.Engine</groupId>
         <artifactId>Microsoft.Build.Engine</artifactId>
         <type>gac_msil</type>
-        <version>2.0.0.0__b03f5f7f11d50a3a</version>
+        <version>2.0.0.0</version>
+        <classifier>b03f5f7f11d50a3a</classifier>
       </dependency>
       <dependency>
         <groupId>EnvDTE</groupId>
         <artifactId>EnvDTE</artifactId>
         <type>gac</type>
-        <version>8.0.0.0__b03f5f7f11d50a3a</version>
+        <version>8.0.0.0</version>
+        <classifier>b03f5f7f11d50a3a</classifier>
       </dependency>
       <dependency>
         <groupId>EnvDTE80</groupId>
         <artifactId>EnvDTE80</artifactId>
         <type>gac</type>
-        <version>8.0.0.0__b03f5f7f11d50a3a</version>
+        <version>8.0.0.0</version>
+        <classifier>b03f5f7f11d50a3a</classifier>
       </dependency>
       <dependency>
         <groupId>Microsoft.VisualStudio.CommandBars</groupId>
         <artifactId>Microsoft.VisualStudio.CommandBars</artifactId>
-        <version>8.0.0.0__b03f5f7f11d50a3a</version>
+        <version>8.0.0.0</version>
+        <classifier>b03f5f7f11d50a3a</classifier>
         <type>gac</type>
       </dependency>
       <dependency>
         <groupId>Microsoft.VisualStudio.TemplateWizardInterface</groupId>
         <artifactId>Microsoft.VisualStudio.TemplateWizardInterface</artifactId>
-        <version>8.0.0.0__b03f5f7f11d50a3a</version>
+        <version>8.0.0.0</version>
+        <classifier>b03f5f7f11d50a3a</classifier>
         <type>gac_msil</type>
       </dependency>
       <dependency>
         <groupId>Extensibility</groupId>
         <artifactId>Extensibility</artifactId>
         <type>gac</type>
-        <version>7.0.3300.0__b03f5f7f11d50a3a</version>
+        <version>7.0.3300.0</version>
+        <classifier>b03f5f7f11d50a3a</classifier>
       </dependency>
       <dependency>
         <groupId>NUnit</groupId>

Modified: incubator/nmaven/branches/SI_GAC/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/pom.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/pom.xml Thu Jul 12 12:07:57 2007
@@ -22,7 +22,7 @@
   <groupId>org.apache.maven.dotnet</groupId>
   <artifactId>dotnet-project</artifactId>
   <packaging>pom</packaging>
-  <version>0.14-SNAPSHOT</version>
+  <version>0.14</version>
   <name>dotnet</name>
   <mailingLists>
     <mailingList>

Modified: incubator/nmaven/branches/SI_GAC/site/conventions.apt
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/site/conventions.apt?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/site/conventions.apt (original)
+++ incubator/nmaven/branches/SI_GAC/site/conventions.apt Thu Jul 12 12:07:57 2007
@@ -27,7 +27,7 @@
   <groupId>NMaven.Artifact</groupId>
   <artifactId>NMaven.Artifact</artifactId>
   <packaging>library</packaging>
-  <version>0.14-SNAPSHOT</version>
+  <version>0.14</version>
   <name>NMaven.Artifact</name>
 </project>
 +------+
@@ -48,7 +48,7 @@
   <groupId>NMaven.Plugins</groupId>
   <artifactId>NMaven.Plugins</artifactId>
   <packaging>pom</packaging>
-  <version>0.14-SNAPSHOT</version>
+  <version>0.14</version>
   <name>NMaven.Plugins</name>
   <build>
     <sourceDirectory>src/main/csharp</sourceDirectory>

Modified: incubator/nmaven/branches/SI_GAC/site/src/site/apt/adding-executables.apt
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/site/src/site/apt/adding-executables.apt?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/site/src/site/apt/adding-executables.apt (original)
+++ incubator/nmaven/branches/SI_GAC/site/src/site/apt/adding-executables.apt Thu Jul 12 12:07:57 2007
@@ -95,7 +95,7 @@
                       -DartifactId=<<myArtifactId>>                         \
                       -DarchetypeArtifactId=maven-archetype-netexecutable   \
                       -DarchetypeGroupId=org.apache.maven.dotnet            \
-                      -DarchetypeVersion=0.14-SNAPSHOT
+                      -DarchetypeVersion=0.14
 +----+
 
  [[2]] Make sure to add an entry in the executable-plugins.xml file, located within the dotnet-core module. Replace each

Modified: incubator/nmaven/branches/SI_GAC/site/src/site/apt/getting-started.apt
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/site/src/site/apt/getting-started.apt?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/site/src/site/apt/getting-started.apt (original)
+++ incubator/nmaven/branches/SI_GAC/site/src/site/apt/getting-started.apt Thu Jul 12 12:07:57 2007
@@ -269,7 +269,7 @@
                       -DartifactId=<<myArtifactId>>                         \
                       -DarchetypeArtifactId=maven-archetype-dotnet-simple \
                       -DarchetypeGroupId=org.apache.maven.dotnet          \
-                      -DarchetypeVersion=0.14-SNAPSHOT
+                      -DarchetypeVersion=0.14
 +----+
 
  You will see the following project generated:

Modified: incubator/nmaven/branches/SI_GAC/site/src/site/apt/ide/visual-studio.apt
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/site/src/site/apt/ide/visual-studio.apt?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/site/src/site/apt/ide/visual-studio.apt (original)
+++ incubator/nmaven/branches/SI_GAC/site/src/site/apt/ide/visual-studio.apt Thu Jul 12 12:07:57 2007
@@ -34,7 +34,7 @@
   </HostApplication>
   <Addin>
     <Assembly>
-        C:\Documents and Settings\shane\.m2\repository\NMaven\VisualStudio\NMaven.VisualStudio.Addin\0.14-SNAPSHOT\NMaven.VisualStudio.Addin.dll
+        C:\Documents and Settings\shane\.m2\repository\NMaven\VisualStudio\NMaven.VisualStudio.Addin\0.14\NMaven.VisualStudio.Addin.dll
     </Assembly>
     <FullClassName>NMaven.VisualStudio.Addin.Connect</FullClassName>
     <FriendlyName>NMaven.VisualStudio.Addin</FriendlyName>
@@ -55,7 +55,7 @@
                       -DartifactId=<<myArtifactId>>                         \
                       -DarchetypeArtifactId=maven-archetype-dotnet-simple   \
                       -DarchetypeGroupId=org.apache.maven.dotnet            \
-                      -DarchetypeVersion=0.14-SNAPSHOT
+                      -DarchetypeVersion=0.14
 +----+
 
   You will see the following project generated:

Modified: incubator/nmaven/branches/SI_GAC/site/src/site/apt/net-plugins.apt
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/site/src/site/apt/net-plugins.apt?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/site/src/site/apt/net-plugins.apt (original)
+++ incubator/nmaven/branches/SI_GAC/site/src/site/apt/net-plugins.apt Thu Jul 12 12:07:57 2007
@@ -54,20 +54,20 @@
   <groupId>NMaven.Plugins</groupId>
   <artifactId>NMaven.Plugins.Test</artifactId>
   <packaging>netplugin</packaging>
-  <version>0.14-SNAPSHOT</version>
+  <version>0.14</version>
   <name>NMaven.Plugins.Test</name>
   <dependencies>
     <dependency>
       <groupId>NMaven.Plugin</groupId>
       <artifactId>NMaven.Plugin</artifactId>
       <type>library</type>
-      <version>0.14-SNAPSHOT</version>
+      <version>0.14</version>
     </dependency>
     <dependency>
       <groupId>NMaven.Model</groupId>
       <artifactId>NMaven.Model.Pom</artifactId>
       <type>library</type>
-      <version>0.14-SNAPSHOT</version>
+      <version>0.14</version>
     </dependency>
   </dependencies>
 </project>

Modified: incubator/nmaven/branches/SI_GAC/site/src/site/xdoc/conventions.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/site/src/site/xdoc/conventions.xml?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/site/src/site/xdoc/conventions.xml (original)
+++ incubator/nmaven/branches/SI_GAC/site/src/site/xdoc/conventions.xml Thu Jul 12 12:07:57 2007
@@ -25,7 +25,7 @@
   &lt;groupId&gt;NMaven.Artifact&lt;/groupId&gt;
   &lt;artifactId&gt;<font size = "+1"><b>NMaven.Artifact</b></font>&lt;artifactId&gt;
   &lt;packaging&gt;library&lt;/packaging&gt;
-  &lt;version&gt;0.14-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.14&lt;/version&gt;
   &lt;name&gt;NMaven.Artifact&lt;/name&gt;
 &lt;/project&gt;
 </pre>
@@ -40,7 +40,7 @@
   &lt;groupId&gt;<font size = "+1"><b>NMaven.Artifact</b></font>&lt;/groupId&gt;
   &lt;artifactId&gt;<font size = "+1"><b>NMaven.Artifact</b></font>&lt;artifactId&gt;
   &lt;packaging&gt;library&lt;/packaging&gt;
-  &lt;version&gt;0.14-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.14&lt;/version&gt;
   &lt;name&gt;NMaven.Artifact&lt;/name&gt;
 &lt;/project&gt;
 </pre>
@@ -75,7 +75,7 @@
   &lt;groupId&gt;NMaven.Artifact&lt;/groupId&gt;
   &lt;artifactId&gt;<font size = "+1"><b>NMaven.Artifact</b></font>&lt;artifactId&gt;
   &lt;packaging&gt;library&lt;/packaging&gt;
-  &lt;version&gt;0.14-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.14&lt;/version&gt;
   &lt;name&gt;NMaven.Artifact&lt;/name&gt;
 &lt;/project&gt;
 </pre>
@@ -89,7 +89,7 @@
   &lt;groupId&gt;NMaven.Plugins&lt;/groupId&gt;
   &lt;artifactId&gt;NMaven.Plugins&lt;/artifactId&gt;
   &lt;packaging&gt;pom&lt;/packaging&gt;
-  &lt;version&gt;0.14-SNAPSHOT&lt;/version&gt;
+  &lt;version&gt;0.14&lt;/version&gt;
   &lt;name&gt;NMaven.Plugins&lt;/name&gt;
   &lt;build&gt;
     &lt;sourceDirectory&gt;src/main/csharp&lt;/sourceDirectory&gt;

Modified: incubator/nmaven/branches/SI_GAC/thirdparty/Castle/Castle.DynamicProxy-2.0-rc2.pom
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/thirdparty/Castle/Castle.DynamicProxy-2.0-rc2.pom?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/thirdparty/Castle/Castle.DynamicProxy-2.0-rc2.pom (original)
+++ incubator/nmaven/branches/SI_GAC/thirdparty/Castle/Castle.DynamicProxy-2.0-rc2.pom Thu Jul 12 12:07:57 2007
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>Castle</groupId>
-  <artifactId>Castle.DynamicProxy-2.0-rc2</artifactId>
+  <artifactId>Castle.DynamicProxy</artifactId>
   <packaging>library</packaging>
   <version>2.0-rc2</version>
 </project>

Modified: incubator/nmaven/branches/SI_GAC/thirdparty/Castle/Castle.MicroKernel-2.0-rc2.pom
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/thirdparty/Castle/Castle.MicroKernel-2.0-rc2.pom?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/thirdparty/Castle/Castle.MicroKernel-2.0-rc2.pom (original)
+++ incubator/nmaven/branches/SI_GAC/thirdparty/Castle/Castle.MicroKernel-2.0-rc2.pom Thu Jul 12 12:07:57 2007
@@ -8,7 +8,7 @@
     <dependency>
       <groupId>Castle</groupId>
       <artifactId>Castle.Core</artifactId>
-      <version>${pom.version}</version>
+      <version>2.0-rc2</version>
       <type>library</type>
     </dependency>
   </dependencies>

Modified: incubator/nmaven/branches/SI_GAC/thirdparty/Castle/Castle.Windsor-2.0-rc2.pom
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/thirdparty/Castle/Castle.Windsor-2.0-rc2.pom?view=diff&rev=555722&r1=555721&r2=555722
==============================================================================
--- incubator/nmaven/branches/SI_GAC/thirdparty/Castle/Castle.Windsor-2.0-rc2.pom (original)
+++ incubator/nmaven/branches/SI_GAC/thirdparty/Castle/Castle.Windsor-2.0-rc2.pom Thu Jul 12 12:07:57 2007
@@ -8,19 +8,19 @@
     <dependency>
       <groupId>Castle</groupId>
       <artifactId>Castle.Core</artifactId>
-      <version>${pom.version}</version>
+      <version>2.0-rc2</version>
       <type>library</type>
     </dependency>
     <dependency>
       <groupId>Castle</groupId>
       <artifactId>Castle.DynamicProxy</artifactId>
-      <version>${pom.version}</version>
+      <version>2.0-rc2</version>
       <type>library</type>
     </dependency>
     <dependency>
       <groupId>Castle</groupId>
       <artifactId>Castle.MicroKernel</artifactId>
-      <version>${pom.version}</version>
+      <version>2.0-rc2</version>
       <type>library</type>
     </dependency>
   </dependencies>