Author: sisbell
Date: Mon May 28 20:26:03 2007
New Revision: 542396
URL: http://svn.apache.org/viewvc?view=rev&rev=542396
Log:
Added init parameter in registry-config to set default artifact versions for
NMaven net dependencies.xml entries. This gives one place to change all the
values, making it easier to do releases.
Modified:
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/NetDependenciesRepositoryImpl.java
incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml
incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/registry-config.xml
Modified:
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/NetDependenciesRepositoryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/NetDependenciesRepositoryImpl.java?view=diff&rev=542396&r1=542395&r2=542396
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/NetDependenciesRepositoryImpl.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/NetDependenciesRepositoryImpl.java
Mon May 28 20:26:03 2007
@@ -83,9 +83,17 @@
catch ( XmlPullParserException e )
{
e.printStackTrace();
- throw new IOException( "NMAVEN-062-000: Could not read
plugins-compiler.xml" );
+ throw new IOException( "NMAVEN-062-000: Could not read
net-dependencies.xml" );
}
netDependencies = model.getNetDependencies();
+ String nmavenVersion = (String) properties.get( "nmaven.version" );
+ for ( NetDependency dependency : netDependencies )
+ {
+ if ( dependency.getVersion() == null &&
dependency.getGroupId().startsWith( "NMaven" ) )
+ {
+ dependency.setVersion( nmavenVersion );
+ }
+ }
}
Modified:
incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml?view=diff&rev=542396&r1=542395&r2=542396
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml
(original)
+++
incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml
Mon May 28 20:26:03 2007
@@ -3,31 +3,26 @@
<netDependency>
<groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugin.Resx</artifactId>
- <version>0.14-SNAPSHOT</version>
<type>exe</type>
</netDependency>
<netDependency>
<groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugin.Settings</artifactId>
- <version>0.14-SNAPSHOT</version>
<type>netplugin</type>
</netDependency>
<netDependency>
<groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugin.Solution</artifactId>
- <version>0.14-SNAPSHOT</version>
<type>netplugin</type>
</netDependency>
<netDependency>
<groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugin.Devenv</artifactId>
- <version>0.14-SNAPSHOT</version>
<type>netplugin</type>
</netDependency>
<netDependency>
<groupId>NMaven.Plugins</groupId>
<artifactId>NMaven.Plugin.Addin</artifactId>
- <version>0.14-SNAPSHOT</version>
<type>netplugin</type>
</netDependency>
@@ -35,14 +30,12 @@
<netDependency>
<groupId>NMaven.VisualStudio</groupId>
<artifactId>NMaven.VisualStudio.Addin</artifactId>
- <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-SNAPSHOT</version>
<type>library</type>
<profile>VisualStudio2005</profile>
</netDependency>
@@ -51,33 +44,28 @@
<netDependency>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin</artifactId>
- <version>0.14-SNAPSHOT</version>
<type>library</type>
<isGacInstall>true</isGacInstall>
</netDependency>
<netDependency>
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.Pom</artifactId>
- <version>0.14-SNAPSHOT</version>
<type>library</type>
<isGacInstall>true</isGacInstall>
</netDependency>
<netDependency>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin.Runner</artifactId>
- <version>0.14-SNAPSHOT</version>
<type>exe</type>
</netDependency>
<netDependency>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin.Loader</artifactId>
- <version>0.14-SNAPSHOT</version>
<type>exe</type>
</netDependency>
<netDependency>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin.MojoGenerator</artifactId>
- <version>0.14-SNAPSHOT</version>
<type>exe</type>
</netDependency>
</netDependencies>
Modified:
incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/registry-config.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/registry-config.xml?view=diff&rev=542396&r1=542395&r2=542396
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/registry-config.xml
(original)
+++
incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/registry-config.xml
Mon May 28 20:26:03 2007
@@ -38,6 +38,10 @@
<repository-name>net-dependencies</repository-name>
<repository-class>org.apache.maven.dotnet.artifact.impl.NetDependenciesRepositoryImpl</repository-class>
<repository-config>/META-INF/nmaven/net-dependencies.xml</repository-config>
+ <init-param>
+ <param-name>nmaven.version</param-name>
+ <param-value>0.14-SNAPSHOT</param-value>
+ </init-param>
</repository>
<repository>
<repository-name>configuration-appenders</repository-name>
