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/05/12 04:51:33 UTC
svn commit: r537335 - in /incubator/nmaven/branches/SI_XPT: ./ assemblies/
assemblies/NMaven.Artifact/ assemblies/NMaven.Core/ assemblies/NMaven.IDE/
assemblies/NMaven.Logging/ assemblies/NMaven.Model/AutomationExtensibility/
assemblies/NMaven.Model/Po...
Author: sisbell
Date: Fri May 11 21:51:30 2007
New Revision: 537335
URL: http://svn.apache.org/viewvc?view=rev&rev=537335
Log:
Applied patch for snapshots and deploy plugin. Updated the NMaven poms to include snapshot within the version.
Added:
incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/
incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/pom.xml (with props)
incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/
incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/
incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/
incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/
incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/
incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/
incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/
incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/
incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java (with props)
Modified:
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Artifact/pom.xml
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/pom.xml
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/pom.xml
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/pom.xml
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/pom.xml
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/Pom/pom.xml
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/pom.xml
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/pom.xml
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Runner/pom.xml
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/pom.xml
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/pom.xml
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/pom.xml
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio/pom.xml
incubator/nmaven/branches/SI_XPT/assemblies/pom.xml
incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java
incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java
incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml
incubator/nmaven/branches/SI_XPT/integration-tests/tests/README.txt
incubator/nmaven/branches/SI_XPT/integration-tests/tests/integration-tests.txt
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom-java.xml
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom.xml
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/java/NMaven/Plugin/Addin/AutomationExtensibilityMojo.java
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/pom-java.xml
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/pom.xml
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/src/main/java/NMaven/Plugin/Devenv/DevenvMojo.java
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Resx/pom.xml
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/pom-java.xml
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/pom.xml
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/src/main/java/NMaven/Plugin/Settings/SettingsGeneratorMojo.java
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom-java.xml
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom.xml
incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
incubator/nmaven/branches/SI_XPT/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
incubator/nmaven/branches/SI_XPT/plugins/pom-netplugins.xml
incubator/nmaven/branches/SI_XPT/plugins/pom.xml
incubator/nmaven/branches/SI_XPT/pom.xml
Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Artifact/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Artifact/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Artifact/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Artifact/pom.xml Fri May 11 21:51:30 2007
@@ -19,21 +19,21 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Artifact</groupId>
<artifactId>NMaven.Artifact</artifactId>
<packaging>library</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.Artifact</name>
<dependencies>
<dependency>
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.Pom</artifactId>
<type>library</type>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/pom.xml Fri May 11 21:51:30 2007
@@ -19,21 +19,21 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Core</groupId>
<artifactId>NMaven.Core</artifactId>
<packaging>library</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.Core</name>
<dependencies>
<dependency>
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.Pom</artifactId>
<type>library</type>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>Microsoft.Build.Engine</groupId>
Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/pom.xml Fri May 11 21:51:30 2007
@@ -19,26 +19,26 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.IDE</groupId>
<artifactId>NMaven.IDE</artifactId>
<packaging>library</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.IDE</name>
<dependencies>
<dependency>
<groupId>NMaven.Service</groupId>
<artifactId>NMaven.Service.Embedder</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>NMaven.Logging</groupId>
<artifactId>NMaven.Logging</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
</dependency>
</dependencies>
Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/pom.xml Fri May 11 21:51:30 2007
@@ -19,13 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Logging</groupId>
<artifactId>NMaven.Logging</artifactId>
<packaging>library</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.Library</name>
</project>
Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/pom.xml Fri May 11 21:51:30 2007
@@ -19,7 +19,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
<relativePath>..\..\pom.xml</relativePath>
</parent>
@@ -27,7 +27,7 @@
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.AutomationExtensibility</artifactId>
<packaging>library</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.Model.AutomationExtensibility</name>
<!--
<build>
Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/Pom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/Pom/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/Pom/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/Pom/pom.xml Fri May 11 21:51:30 2007
@@ -19,7 +19,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
<relativePath>..\..\pom.xml</relativePath>
</parent>
@@ -27,7 +27,7 @@
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.Pom</artifactId>
<packaging>library</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.Model.Pom</name>
<build>
<plugins>
Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/pom.xml Fri May 11 21:51:30 2007
@@ -19,21 +19,21 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin.Loader</artifactId>
<packaging>exe</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.Plugin.Loader</name>
<dependencies>
<dependency>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin</artifactId>
<type>library</type>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/pom.xml Fri May 11 21:51:30 2007
@@ -19,21 +19,21 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin.MojoGenerator</artifactId>
<packaging>exe</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.Plugin.MojoGenerator</name>
<dependencies>
<dependency>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin</artifactId>
<type>library</type>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Runner/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Runner/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Runner/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Runner/pom.xml Fri May 11 21:51:30 2007
@@ -19,13 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin.Runner</artifactId>
<packaging>exe</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.Plugin.Runner</name>
</project>
Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/pom.xml Fri May 11 21:51:30 2007
@@ -19,21 +19,21 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin</artifactId>
<packaging>library</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.Plugin</name>
<dependencies>
<dependency>
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.Pom</artifactId>
<type>library</type>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/pom.xml Fri May 11 21:51:30 2007
@@ -19,7 +19,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
<relativePath>..\..\pom.xml</relativePath>
</parent>
@@ -27,7 +27,7 @@
<groupId>NMaven.Service</groupId>
<artifactId>NMaven.Service.Embedder</artifactId>
<packaging>library</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.Service.Embedder</name>
<build>
<sourceDirectory>src/main/csharp</sourceDirectory>
Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/pom.xml Fri May 11 21:51:30 2007
@@ -19,44 +19,44 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.VisualStudio</groupId>
<artifactId>NMaven.VisualStudio.Addin</artifactId>
<packaging>visual-studio-addin</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.VisualStudio.Addin</name>
<dependencies>
<dependency>
<groupId>NMaven.IDE</groupId>
<artifactId>NMaven.IDE</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>NMaven.Logging</groupId>
<artifactId>NMaven.Logging</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>NMaven.VisualStudio</groupId>
<artifactId>NMaven.VisualStudio</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>NMaven.Service</groupId>
<artifactId>NMaven.Service.Embedder</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
<scope>runtime</scope>
</dependency>
@@ -95,7 +95,7 @@
<build>
<plugins>
<plugin>
- <groupId>NMaven.Plugin</groupId>
+ <groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugin.Devenv.JavaBinding</artifactId>
<executions>
<execution>
Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio/pom.xml Fri May 11 21:51:30 2007
@@ -19,20 +19,20 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.VisualStudio</groupId>
<artifactId>NMaven.VisualStudio</artifactId>
<packaging>library</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.VisualStudio</name>
<dependencies>
<dependency>
<groupId>NMaven.Logging</groupId>
<artifactId>NMaven.Logging</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
Modified: incubator/nmaven/branches/SI_XPT/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/pom.xml Fri May 11 21:51:30 2007
@@ -22,7 +22,7 @@
<groupId>NMaven</groupId>
<artifactId>NMaven.Assemblies</artifactId>
<packaging>pom</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.Assemblies</name>
<url>http://incubator.apache.org/nmaven</url>
<description>
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java Fri May 11 21:51:30 2007
@@ -316,82 +316,4 @@
}
return true;
}
-
- private class Handler
- implements ArtifactHandler
- {
- private String extension, directory, classifier, packaging, language;
-
- private boolean includesDependencies, addedToClasspath;
-
- public void setExtension( String extension )
- {
- this.extension = extension;
- }
-
- public String getExtension()
- {
- return extension;
- }
-
- public void setDirectory( String directory )
- {
- this.directory = directory;
- }
-
- public String getDirectory()
- {
- return directory;
- }
-
- public void setClassifier( String classifier )
- {
- this.classifier = classifier;
- }
-
- public String getClassifier()
- {
- return classifier;
- }
-
- public void setPackaging( String packaging )
- {
- this.packaging = packaging;
- }
-
- public String getPackaging()
- {
- return packaging;
- }
-
- public void setIncludesDependencies( boolean includesDependencies )
- {
- this.includesDependencies = includesDependencies;
- }
-
- public boolean isIncludesDependencies()
- {
- return includesDependencies;
- }
-
- public void setLanguage( String language )
- {
- this.language = language;
- }
-
- public String getLanguage()
- {
- return language;
- }
-
- public void setAddedToClasspath( boolean addedToClasspath )
- {
- this.addedToClasspath = addedToClasspath;
- }
-
- public boolean isAddedToClasspath()
- {
- return addedToClasspath;
- }
- }
}
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java Fri May 11 21:51:30 2007
@@ -30,7 +30,6 @@
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Dependency;
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblyInfo.java Fri May 11 21:51:30 2007
@@ -32,6 +32,11 @@
* Artifact version
*/
private String version;
+
+ /**
+ * Informational version (used for snapshot)
+ */
+ private String informationalVersion;
/**
* Artifact description
@@ -88,6 +93,7 @@
{
StringBuffer sb = new StringBuffer();
sb.append( "Version: " ).append( version )
+ .append( "\r\nInformationalVersion: " ).append( informationalVersion )
.append( "\r\nDescription: " ).append( description )
.append( "\r\nTitle: " ).append( title )
.append( "\r\nCompany; " ).append( company )
@@ -133,6 +139,17 @@
{
this.version = version;
}
+
+ public String getInformationalVersion()
+ {
+ return ( informationalVersion != null ) ? informationalVersion : "";
+ }
+
+ public void setInformationalVersion( String informationalVersion )
+ {
+ this.informationalVersion = informationalVersion;
+ }
+
public String getDescription()
{
@@ -272,6 +289,7 @@
{
int result;
result = ( version != null ? version.hashCode() : 0 );
+ result = 29 * result + ( informationalVersion != null ? informationalVersion.hashCode() : 0 );
result = 29 * result + ( description != null ? description.hashCode() : 0 );
result = 29 * result + ( title != null ? title.hashCode() : 0 );
result = 29 * result + ( company != null ? company.hashCode() : 0 );
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java Fri May 11 21:51:30 2007
@@ -18,6 +18,7 @@
*/
package org.apache.maven.dotnet.assembler.impl;
+import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.dotnet.assembler.AssemblerContext;
import org.apache.maven.dotnet.assembler.AssemblyInfo;
import org.apache.maven.dotnet.assembler.AssemblyInfoMarshaller;
@@ -44,6 +45,8 @@
public final class AssemblerContextImpl
implements AssemblerContext, LogEnabled
{
+
+ private static final String SNAPSHOT_SUFFIX = "SNAPSHOT";
/**
* A registry component of repository (config) files
@@ -93,7 +96,10 @@
String name = mavenProject.getName();
Organization org = mavenProject.getOrganization();
String company = ( org != null ) ? org.getName() : "";
- String copyright = "";
+ String copyright = null;
+ String informationalVersion = "";
+ String configuration = "";
+
File file = new File( basedir + "/COPYRIGHT.txt" );
if ( file.exists() )
{
@@ -116,6 +122,14 @@
}
}
}
+
+ // Check if the version if a snapshot, if so we need to mangle the version and configuration
+ if (ArtifactUtils.isSnapshot(version)) {
+ logger.debug( "NMAVEN-020-999: Detected SNAPSHOT version: " + version);
+ informationalVersion = version;
+ version = version.replace( "-" + SNAPSHOT_SUFFIX, "" );
+ }
+
assemblyInfo.setCompany( company );
assemblyInfo.setCopyright( copyright );
@@ -124,8 +138,9 @@
assemblyInfo.setProduct( company + "-" + name );
assemblyInfo.setTitle( name );
assemblyInfo.setTrademark( "" );
+ assemblyInfo.setInformationalVersion( informationalVersion );
assemblyInfo.setVersion( version );
- assemblyInfo.setConfiguration( "" );
+ assemblyInfo.setConfiguration( configuration );
return assemblyInfo;
}
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoMarshaller.java Fri May 11 21:51:30 2007
@@ -65,6 +65,7 @@
.append( createEntry( "Trademark", assemblyInfo.getTrademark() ) )
.append( createEntry( "Culture", assemblyInfo.getCulture() ) )
.append( createEntry( "Version", assemblyInfo.getVersion() ) )
+ .append( createEntry( "InformationalVersion", assemblyInfo.getInformationalVersion() ) )
.append( createEntry( "Configuration", assemblyInfo.getConfiguration() ) );
if ( assemblyInfo.getKeyName() != null )
{
@@ -149,6 +150,10 @@
if ( name.equals( "AssemblyDescription" ) )
{
assemblyInfo.setDescription( value );
+ }
+ else if ( name.equals( "AssemblyInformationalVersion" ) )
+ {
+ assemblyInfo.setInformationalVersion( value );
}
else if ( name.equals( "AssemblyTitle" ) )
{
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml Fri May 11 21:51:30 2007
@@ -1,33 +1,33 @@
<netDependencies>
<!--Plugins-->
<netDependency>
- <groupId>NMaven.Plugin</groupId>
+ <groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugin.Resx</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>exe</type>
</netDependency>
<netDependency>
- <groupId>NMaven.Plugin</groupId>
+ <groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugin.Settings</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>netplugin</type>
</netDependency>
<netDependency>
- <groupId>NMaven.Plugin</groupId>
+ <groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugin.Solution</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>netplugin</type>
</netDependency>
<netDependency>
- <groupId>NMaven.Plugin</groupId>
+ <groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugin.Devenv</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>netplugin</type>
</netDependency>
<netDependency>
- <groupId>NMaven.Plugin</groupId>
+ <groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugin.Addin</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>netplugin</type>
</netDependency>
@@ -35,14 +35,14 @@
<netDependency>
<groupId>NMaven.VisualStudio</groupId>
<artifactId>NMaven.VisualStudio.Addin</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>visual-studio-addin</type>
<profile>VisualStudio2005</profile>
</netDependency>
<netDependency>
<groupId>NMaven.VisualStudio</groupId>
<artifactId>NMaven.VisualStudio</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
<profile>VisualStudio2005</profile>
</netDependency>
@@ -51,31 +51,31 @@
<netDependency>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
</netDependency>
<netDependency>
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.Pom</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
</netDependency>
<netDependency>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin.Runner</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>exe</type>
</netDependency>
<netDependency>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin.Loader</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>exe</type>
</netDependency>
<netDependency>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin.MojoGenerator</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>exe</type>
</netDependency>
</netDependencies>
Modified: incubator/nmaven/branches/SI_XPT/integration-tests/tests/README.txt
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/integration-tests/tests/README.txt?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/integration-tests/tests/README.txt (original)
+++ incubator/nmaven/branches/SI_XPT/integration-tests/tests/README.txt Fri May 11 21:51:30 2007
@@ -22,4 +22,7 @@
it0022: Signing of an assembly (verify manually by looking for the signature in the manifest)
it0023: CS-MS: .NET 3.0 compiling
it0024: CS-MS: .NET 3.0 NUnit
-it0027: Compiling CS with flat directory structure
\ No newline at end of file
+it0027: Compiling CS with flat directory structure
+it0028: Deploys a snapshot dll to a remote repo
+it0029: Deploys a non-snapshot dll to a remote repo
+it0030: Pulls a snapshot dll and non-snapshot dll from a remote repo
\ No newline at end of file
Modified: incubator/nmaven/branches/SI_XPT/integration-tests/tests/integration-tests.txt
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/integration-tests/tests/integration-tests.txt?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/integration-tests/tests/integration-tests.txt (original)
+++ incubator/nmaven/branches/SI_XPT/integration-tests/tests/integration-tests.txt Fri May 11 21:51:30 2007
@@ -7,12 +7,12 @@
it0007
it0010
it0011
-it0012
-it0015
-it0016
-it0017
it0018
it0019
it0020
it0021
-it0022
\ No newline at end of file
+it0022
+it0026
+it0028
+it0029
+it0030
\ No newline at end of file
Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom-java.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom-java.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom-java.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom-java.xml Fri May 11 21:51:30 2007
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<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>
+ <artifactId>maven-dotnet-plugins</artifactId>
+ <relativePath>..\pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>NMaven.Plugin</groupId>
+ <groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugin.Addin.JavaBinding</artifactId>
<packaging>maven-plugin</packaging>
<name>NMaven.Plugin.Addin.JavaBinding</name>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<build>
<plugins>
<plugin>
Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom.xml Fri May 11 21:51:30 2007
@@ -19,34 +19,34 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven.Plugins</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Plugins</artifactId>
<relativePath>..\pom-netplugins.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>NMaven.Plugin</groupId>
+ <groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugin.Addin</artifactId>
<packaging>netplugin</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.Plugin.Addin</name>
<dependencies>
<dependency>
<groupId>NMaven.Artifact</groupId>
<artifactId>NMaven.Artifact</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.AutomationExtensibility</artifactId>
<type>library</type>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin</artifactId>
<type>library</type>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/java/NMaven/Plugin/Addin/AutomationExtensibilityMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/java/NMaven/Plugin/Addin/AutomationExtensibilityMojo.java?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/java/NMaven/Plugin/Addin/AutomationExtensibilityMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/java/NMaven/Plugin/Addin/AutomationExtensibilityMojo.java Fri May 11 21:51:30 2007
@@ -63,7 +63,7 @@
public String getMojoGroupId()
{
- return "NMaven.Plugin";
+ return "NMaven.Plugins";
}
public String getClassName()
Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/pom-java.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/pom-java.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/pom-java.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/pom-java.xml Fri May 11 21:51:30 2007
@@ -8,7 +8,7 @@
<relativePath>..\pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>NMaven.Plugin</groupId>
+ <groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugin.Devenv.JavaBinding</artifactId>
<packaging>maven-plugin</packaging>
<name>NMaven.Plugin.Devenv.JavaBinding</name>
Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/pom.xml Fri May 11 21:51:30 2007
@@ -19,22 +19,22 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven.Plugins</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Plugins</artifactId>
<relativePath>..\pom-netplugins.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>NMaven.Plugin</groupId>
+ <groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugin.Devenv</artifactId>
<packaging>netplugin</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.Plugin.Devenv</name>
<dependencies>
<dependency>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin</artifactId>
<type>library</type>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/src/main/java/NMaven/Plugin/Devenv/DevenvMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/src/main/java/NMaven/Plugin/Devenv/DevenvMojo.java?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/src/main/java/NMaven/Plugin/Devenv/DevenvMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/src/main/java/NMaven/Plugin/Devenv/DevenvMojo.java Fri May 11 21:51:30 2007
@@ -63,7 +63,7 @@
public String getMojoGroupId()
{
- return "NMaven.Plugin";
+ return "NMaven.Plugins";
}
public String getClassName()
Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Resx/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Resx/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Resx/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Resx/pom.xml Fri May 11 21:51:30 2007
@@ -19,14 +19,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven.Plugins</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Plugins</artifactId>
<relativePath>..\pom-netplugins.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>NMaven.Plugin</groupId>
+ <groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugin.Resx</artifactId>
<packaging>exe</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.Plugin.ResX</name>
</project>
Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/pom-java.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/pom-java.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/pom-java.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/pom-java.xml Fri May 11 21:51:30 2007
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<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>
+ <artifactId>maven-dotnet-plugins</artifactId>
+ <relativePath>..\pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>NMaven.Plugin</groupId>
+ <groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugin.Settings.JavaBinding</artifactId>
<packaging>maven-plugin</packaging>
<name>NMaven.Plugin.Settings.JavaBinding</name>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<build>
<plugins>
<plugin>
Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/pom.xml Fri May 11 21:51:30 2007
@@ -19,22 +19,22 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven.Plugins</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Plugins</artifactId>
<relativePath>..\pom-netplugins.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>NMaven.Plugin</groupId>
+ <groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugin.Settings</artifactId>
<packaging>netplugin</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.Plugin.Settings</name>
<dependencies>
<dependency>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin</artifactId>
<type>library</type>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/src/main/java/NMaven/Plugin/Settings/SettingsGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/src/main/java/NMaven/Plugin/Settings/SettingsGeneratorMojo.java?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/src/main/java/NMaven/Plugin/Settings/SettingsGeneratorMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/src/main/java/NMaven/Plugin/Settings/SettingsGeneratorMojo.java Fri May 11 21:51:30 2007
@@ -55,7 +55,7 @@
public String getMojoGroupId()
{
- return "NMaven.Plugin";
+ return "NMaven.Plugins";
}
public String getClassName()
Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom-java.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom-java.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom-java.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom-java.xml Fri May 11 21:51:30 2007
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<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">
<modelVersion>4.0.0</modelVersion>
- <groupId>NMaven.Plugin</groupId>
+ <groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugin.Solution.JavaBinding</artifactId>
<packaging>maven-plugin</packaging>
<name>NMaven.Plugin.Solution.JavaBinding</name>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<build>
<plugins>
<plugin>
Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom.xml Fri May 11 21:51:30 2007
@@ -19,15 +19,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven.Plugins</groupId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<artifactId>NMaven.Plugins</artifactId>
<relativePath>..\pom-netplugins.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>NMaven.Plugin</groupId>
+ <groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugin.Solution</artifactId>
<packaging>netplugin</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.Plugin.Solution</name>
<dependencies>
<dependency>
@@ -39,20 +39,20 @@
<dependency>
<groupId>NMaven.Core</groupId>
<artifactId>NMaven.Core</artifactId>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.Pom</artifactId>
<type>library</type>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin</artifactId>
<type>library</type>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml Fri May 11 21:51:30 2007
@@ -15,7 +15,7 @@
<validate>
org.apache.maven.dotnet.plugins:maven-compile-plugin:initialize,
org.apache.maven.dotnet.plugins:maven-resolver-plugin:resolve,
- NMaven.Plugin:NMaven.Plugin.Settings.JavaBinding:generate-settings
+ NMaven.Plugins:NMaven.Plugin.Settings.JavaBinding:generate-settings
</validate>
<generate-sources>
org.apache.maven.dotnet.plugins:maven-compile-plugin:generate-assembly-info
@@ -55,7 +55,7 @@
<validate>
org.apache.maven.dotnet.plugins:maven-compile-plugin:initialize,
org.apache.maven.dotnet.plugins:maven-resolver-plugin:resolve,
- NMaven.Plugin:NMaven.Plugin.Settings.JavaBinding:generate-settings
+ NMaven.Plugins:NMaven.Plugin.Settings.JavaBinding:generate-settings
</validate>
<process-sources>
org.apache.maven.dotnet.plugins:maven-compile-plugin:process-sources,
@@ -91,7 +91,7 @@
<validate>
org.apache.maven.dotnet.plugins:maven-compile-plugin:initialize,
org.apache.maven.dotnet.plugins:maven-resolver-plugin:resolve ,
- NMaven.Plugin:NMaven.Plugin.Settings.JavaBinding:generate-settings
+ NMaven.Plugins:NMaven.Plugin.Settings.JavaBinding:generate-settings
</validate>
<generate-sources>
org.apache.maven.dotnet.plugins:maven-compile-plugin:generate-assembly-info
@@ -130,7 +130,7 @@
<validate>
org.apache.maven.dotnet.plugins:maven-compile-plugin:initialize,
org.apache.maven.dotnet.plugins:maven-resolver-plugin:resolve,
- NMaven.Plugin:NMaven.Plugin.Settings.JavaBinding:generate-settings
+ NMaven.Plugins:NMaven.Plugin.Settings.JavaBinding:generate-settings
</validate>
<generate-sources>
org.apache.maven.dotnet.plugins:maven-compile-plugin:generate-assembly-info
@@ -168,7 +168,7 @@
<validate>
org.apache.maven.dotnet.plugins:maven-compile-plugin:initialize,
org.apache.maven.dotnet.plugins:maven-resolver-plugin:resolve,
- NMaven.Plugin:NMaven.Plugin.Settings.JavaBinding:generate-settings
+ NMaven.Plugins:NMaven.Plugin.Settings.JavaBinding:generate-settings
</validate>
<generate-sources>
org.apache.maven.dotnet.plugins:maven-compile-plugin:generate-assembly-info
@@ -208,7 +208,7 @@
<validate>
org.apache.maven.dotnet.plugins:maven-compile-plugin:initialize,
org.apache.maven.dotnet.plugins:maven-resolver-plugin:resolve,
- NMaven.Plugin:NMaven.Plugin.Settings.JavaBinding:generate-settings
+ NMaven.Plugins:NMaven.Plugin.Settings.JavaBinding:generate-settings
</validate>
<generate-sources>
org.apache.maven.dotnet.plugins:maven-compile-plugin:generate-assembly-info
@@ -246,7 +246,7 @@
<validate>
org.apache.maven.dotnet.plugins:maven-compile-plugin:initialize,
org.apache.maven.dotnet.plugins:maven-resolver-plugin:resolve,
- NMaven.Plugin:NMaven.Plugin.Settings.JavaBinding:generate-settings
+ NMaven.Plugins:NMaven.Plugin.Settings.JavaBinding:generate-settings
</validate>
<generate-sources>
org.apache.maven.dotnet.plugins:maven-compile-plugin:generate-assembly-info
Added: incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/pom.xml?view=auto&rev=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/pom.xml (added)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/pom.xml Fri May 11 21:51:30 2007
@@ -0,0 +1,47 @@
+<?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">
+ <parent>
+ <groupId>org.apache.maven.dotnet.plugins</groupId>
+ <version>0.14-SNAPSHOT</version>
+ <artifactId>maven-dotnet-plugins</artifactId>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.dotnet.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <version>0.14-SNAPSHOT</version>
+ <name>maven-deploy-plugin</name>
+ <description>
+ Maven Plugin for .NET
+ </description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange: incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java?view=auto&rev=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java (added)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java Fri May 11 21:51:30 2007
@@ -0,0 +1,57 @@
+package org.apache.maven.dotnet.plugins;
+
+import java.io.File;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.deployer.ArtifactDeployer;
+import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
+
+/**
+ * Deploy's dlls
+ * @goal deploy-dotnet
+ * @phase deploy
+ *
+ * @author Evan Worley
+ * @author Zak Jacobson
+ */
+public class DeployMojo extends AbstractMojo {
+
+ /**
+ * The maven project.
+ *
+ * @parameter expression="${project}"
+ * @required
+ */
+ private MavenProject project;
+
+ /**
+ * @parameter expression="${localRepository}"
+ * @required
+ */
+ private ArtifactRepository localRepo;
+
+ /**
+ * @component
+ */
+ private ArtifactDeployer artifactDeployer;
+
+ public void execute() throws MojoExecutionException, MojoFailureException {
+
+ // Is snapshot or regular repo depending on project version
+ ArtifactRepository deployRepo = project.getDistributionManagementArtifactRepository();
+
+ Artifact artifact = project.getArtifact();
+ File sourceFile = project.getFile();
+
+ try {
+ artifactDeployer.deploy(sourceFile, artifact, deployRepo, localRepo);
+ } catch (ArtifactDeploymentException e) {
+ throw new MojoExecutionException("NMAVEN-DEPLOY: Deploy Failed", e);
+ }
+ }
+}
Propchange: incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java Fri May 11 21:51:30 2007
@@ -8,7 +8,6 @@
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.installer.ArtifactInstallationException;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
-import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
@@ -21,8 +20,6 @@
import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
import java.util.List;
/**
@@ -58,14 +55,6 @@
*/
private ArtifactHandlerManager artifactHandlerManager;
- private ArtifactHandler createArtifactHandler( String packaging, String extension )
- {
- Handler handler = new Handler();
- handler.setExtension( extension );
- handler.setPackaging( packaging );
- return handler;
- }
-
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -130,83 +119,5 @@
}
}
- }
-
- private class Handler
- implements ArtifactHandler
- {
- private String extension, directory, classifier, packaging, language;
-
- private boolean includesDependencies, addedToClasspath;
-
- public void setExtension( String extension )
- {
- this.extension = extension;
- }
-
- public String getExtension()
- {
- return extension;
- }
-
- public void setDirectory( String directory )
- {
- this.directory = directory;
- }
-
- public String getDirectory()
- {
- return directory;
- }
-
- public void setClassifier( String classifier )
- {
- this.classifier = classifier;
- }
-
- public String getClassifier()
- {
- return classifier;
- }
-
- public void setPackaging( String packaging )
- {
- this.packaging = packaging;
- }
-
- public String getPackaging()
- {
- return packaging;
- }
-
- public void setIncludesDependencies( boolean includesDependencies )
- {
- this.includesDependencies = includesDependencies;
- }
-
- public boolean isIncludesDependencies()
- {
- return includesDependencies;
- }
-
- public void setLanguage( String language )
- {
- this.language = language;
- }
-
- public String getLanguage()
- {
- return language;
- }
-
- public void setAddedToClasspath( boolean addedToClasspath )
- {
- this.addedToClasspath = addedToClasspath;
- }
-
- public boolean isAddedToClasspath()
- {
- return addedToClasspath;
- }
}
}
Modified: incubator/nmaven/branches/SI_XPT/plugins/pom-netplugins.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/pom-netplugins.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/pom-netplugins.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/pom-netplugins.xml Fri May 11 21:51:30 2007
@@ -23,7 +23,7 @@
<groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugins</artifactId>
<packaging>pom</packaging>
- <version>0.14</version>
+ <version>0.14-SNAPSHOT</version>
<name>NMaven.Plugins</name>
<modules>
<module>NMaven.Plugin.Addin</module>
@@ -43,4 +43,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/nmaven/branches/SI_XPT/plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/pom.xml Fri May 11 21:51:30 2007
@@ -41,6 +41,7 @@
<module>maven-xsd-plugin</module>
<module>maven-xsp-plugin</module>
<module>maven-wsdl-plugin</module>
+ <module>maven-deploy-plugin</module>
</modules>
<dependencies>
<dependency>
@@ -114,4 +115,4 @@
-->
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/nmaven/branches/SI_XPT/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/pom.xml?view=diff&rev=537335&r1=537334&r2=537335
==============================================================================
--- incubator/nmaven/branches/SI_XPT/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/pom.xml Fri May 11 21:51:30 2007
@@ -16,28 +16,29 @@
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>org.apache.maven.dotnet</groupId>
- <artifactId>dotnet-project</artifactId>
- <packaging>pom</packaging>
- <version>0.14-SNAPSHOT</version>
- <name>dotnet</name>
- <modules>
- <module>components</module>
- <module>plugins</module>
- </modules>
- <repositories>
- <repository>
- <id>apache.org</id>
- <name>Maven Snapshots</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
+<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>org.apache.maven.dotnet</groupId>
+ <artifactId>dotnet-project</artifactId>
+ <packaging>pom</packaging>
+ <version>0.14-SNAPSHOT</version>
+ <name>dotnet</name>
+ <modules>
+ <module>components</module>
+ <module>plugins</module>
+ </modules>
+ <repositories>
+ <repository>
+ <id>apache.org</id>
+ <name>Maven Snapshots</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
</project>