You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by lc...@apache.org on 2011/11/04 15:46:07 UTC
svn commit: r1197606 - in /incubator/npanday/trunk:
dist/dotnet-repository-builder/pom.xml dist/npanday-installer/pom.xml
dist/pom.xml dotnet/assemblies/NPanday.Model.Pom/pom.xml
dotnet/assemblies/NPanday.Plugin/pom.xml dotnet/pom.xml pom.xml
Author: lcorneliussen
Date: Fri Nov 4 15:46:06 2011
New Revision: 1197606
URL: http://svn.apache.org/viewvc?rev=1197606&view=rev
Log:
Renable ${npanday.bootstrap.version} + explicit plugin versions
Modified:
incubator/npanday/trunk/dist/dotnet-repository-builder/pom.xml
incubator/npanday/trunk/dist/npanday-installer/pom.xml
incubator/npanday/trunk/dist/pom.xml
incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.Pom/pom.xml
incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin/pom.xml
incubator/npanday/trunk/dotnet/pom.xml
incubator/npanday/trunk/pom.xml
Modified: incubator/npanday/trunk/dist/dotnet-repository-builder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dist/dotnet-repository-builder/pom.xml?rev=1197606&r1=1197605&r2=1197606&view=diff
==============================================================================
--- incubator/npanday/trunk/dist/dotnet-repository-builder/pom.xml (original)
+++ incubator/npanday/trunk/dist/dotnet-repository-builder/pom.xml Fri Nov 4 15:46:06 2011
@@ -226,13 +226,13 @@ under the License.
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
- <version>${project.version}</version>
+ <version>${bootstrap.npanday.version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-repository-plugin</artifactId>
- <version>${project.version}</version>
+ <version>${bootstrap.npanday.version}</version>
<configuration>
<outputDirectory>npanday-repository</outputDirectory>
</configuration>
Modified: incubator/npanday/trunk/dist/npanday-installer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dist/npanday-installer/pom.xml?rev=1197606&r1=1197605&r2=1197606&view=diff
==============================================================================
--- incubator/npanday/trunk/dist/npanday-installer/pom.xml (original)
+++ incubator/npanday/trunk/dist/npanday-installer/pom.xml Fri Nov 4 15:46:06 2011
@@ -21,7 +21,7 @@ under the License.
<parent>
<groupId>org.apache.npanday</groupId>
<artifactId>npanday-dist-parent</artifactId>
- <version>1.4.1-incubating-SNAPSHOT</version>
+ <version>1.4.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>npanday-installer</artifactId>
@@ -129,13 +129,13 @@ under the License.
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
- <version>${project.version}</version>
+ <version>${bootstrap.npanday.version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>wix-maven-plugin</artifactId>
- <version>${project.version}</version>
+ <version>${bootstrap.npanday.version}</version>
<configuration>
<extensions>
<extension>WixNetFxExtension</extension>
Modified: incubator/npanday/trunk/dist/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dist/pom.xml?rev=1197606&r1=1197605&r2=1197606&view=diff
==============================================================================
--- incubator/npanday/trunk/dist/pom.xml (original)
+++ incubator/npanday/trunk/dist/pom.xml Fri Nov 4 15:46:06 2011
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.npanday</groupId>
<version>1.4.1-incubating-SNAPSHOT</version>
- <artifactId>npanday-project</artifactId>
+ <artifactId>npanday-project</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>npanday-dist-parent</artifactId>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.Pom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.Pom/pom.xml?rev=1197606&r1=1197605&r2=1197606&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.Pom/pom.xml (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.Pom/pom.xml Fri Nov 4 15:46:06 2011
@@ -74,14 +74,16 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
- <artifactId>maven-compile-plugin</artifactId>
+ <artifactId>maven-compile-plugin</artifactId>
+ <version>${bootstrap.npanday.version}</version>
<configuration>
<keyfile>sample.snk</keyfile>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>${bootstrap.npanday.version}</version>
<configuration>
<isGacInstall>true</isGacInstall>
</configuration>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin/pom.xml?rev=1197606&r1=1197605&r2=1197606&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin/pom.xml (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin/pom.xml Fri Nov 4 15:46:06 2011
@@ -68,15 +68,17 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
- <artifactId>maven-compile-plugin</artifactId>
- <configuration>
+ <artifactId>maven-compile-plugin</artifactId>
+ <version>${bootstrap.npanday.version}</version>
+ <configuration>
<keyfile>sample.snk</keyfile>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <configuration>
+ <version>${bootstrap.npanday.version}</version>
+ <configuration>
<isGacInstall>true</isGacInstall>
</configuration>
</plugin>
Modified: incubator/npanday/trunk/dotnet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/pom.xml?rev=1197606&r1=1197605&r2=1197606&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/pom.xml (original)
+++ incubator/npanday/trunk/dotnet/pom.xml Fri Nov 4 15:46:06 2011
@@ -39,7 +39,8 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
- <artifactId>maven-compile-plugin</artifactId>
+ <artifactId>maven-compile-plugin</artifactId>
+ <version>${bootstrap.npanday.version}</version>
<extensions>true</extensions>
<configuration>
<frameworkVersion>2.0.50727</frameworkVersion>
@@ -51,53 +52,58 @@ under the License.
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
- <version>${project.version}</version>
+ <version>${bootstrap.npanday.version}</version>
</plugin>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-resgen-plugin</artifactId>
- <version>${project.version}</version>
+ <version>${bootstrap.npanday.version}</version>
</plugin>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-repository-plugin</artifactId>
- <version>${project.version}</version>
+ <version>${bootstrap.npanday.version}</version>
</plugin>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>${project.version}</version>
+ <version>${bootstrap.npanday.version}</version>
</plugin>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-resolver-plugin</artifactId>
- <version>${project.version}</version>
+ <version>${bootstrap.npanday.version}</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.npanday.plugins</groupId>
- <artifactId>maven-xsd-plugin</artifactId>
- <version>${project.version}</version>
+ <artifactId>maven-xsd-plugin</artifactId>
+ <version>${bootstrap.npanday.version}</version>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.npanday.plugins</groupId>
- <artifactId>maven-test-plugin</artifactId>
- <version>${project.version}</version>
+ <artifactId>maven-test-plugin</artifactId>
+ <version>${bootstrap.npanday.version}</version>
<configuration>
- <forceX86>true</forceX86>
+ <forceX86>true</forceX86>
</configuration>
</plugin>
- <plugin>
+ <plugin>
+ <groupId>org.apache.npanday.plugins</groupId>
+ <artifactId>partcover-maven-plugin</artifactId>
+ <version>${bootstrap.npanday.version}</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.npanday.plugins</groupId>
- <artifactId>maven-mojo-generator-plugin</artifactId>
- <version>${project.version}</version>
+ <artifactId>maven-mojo-generator-plugin</artifactId>
+ <version>${bootstrap.npanday.version}</version>
</plugin>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>NPanday.Plugin.Settings.JavaBinding</artifactId>
- <version>${project.version}</version>
+ <version>${bootstrap.npanday.version}</version>
<configuration>
<skip>true</skip>
</configuration>
@@ -154,55 +160,55 @@ under the License.
<dependency>
<groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Model.Pom</artifactId>
- <version>1.4.1-incubating-SNAPSHOT</version>
+ <version>1.4.0-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Model.AutomationExtensibility</artifactId>
- <version>1.4.1-incubating-SNAPSHOT</version>
+ <version>1.4.0-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Model.Settings</artifactId>
- <version>1.4.1-incubating-SNAPSHOT</version>
+ <version>1.4.0-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Logging</artifactId>
- <version>1.4.1-incubating-SNAPSHOT</version>
+ <version>1.4.0-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Artifact</artifactId>
- <version>1.4.1-incubating-SNAPSHOT</version>
+ <version>1.4.0-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Utils</artifactId>
- <version>1.4.1-incubating-SNAPSHOT</version>
+ <version>1.4.0-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>NPanday.Plugin</artifactId>
- <version>1.4.1-incubating-SNAPSHOT</version>
+ <version>1.4.0-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>org.apache.npanday.visualstudio</groupId>
<artifactId>NPanday.ProjectImporterEngine</artifactId>
- <version>1.4.1-incubating-SNAPSHOT</version>
+ <version>1.4.0-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
<groupId>org.apache.npanday.visualstudio</groupId>
<artifactId>NPanday.VisualStudio</artifactId>
- <version>1.4.1-incubating-SNAPSHOT</version>
+ <version>1.4.0-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
</dependencies>
Modified: incubator/npanday/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/pom.xml?rev=1197606&r1=1197605&r2=1197606&view=diff
==============================================================================
--- incubator/npanday/trunk/pom.xml (original)
+++ incubator/npanday/trunk/pom.xml Fri Nov 4 15:46:06 2011
@@ -31,7 +31,43 @@ under the License.
<version>1.4.1-incubating-SNAPSHOT</version>
<name>Apache NPanday</name>
<url>http://incubator.apache.org/npanday/</url>
- <description>NPanday provides Maven plugins to support building of .NET applications</description>
+ <description>NPanday provides Maven plugins to support building of .NET applications</description>
+
+ <!-- this is what get edited most, so lets put it on the top -->
+ <properties>
+ <mavenVersion>2.0.9</mavenVersion>
+ <plexus.utils.version>1.5.1</plexus.utils.version>
+ <npanday.snapshots.url>http://repo.npanday.org/archiva/repository/npanday-snapshots</npanday.snapshots.url>
+ <npanday.releases.url>http://repo.npanday.org/archiva/repository/npanday-releases</npanday.releases.url>
+ <bootstrap.npanday.version>${project.version}</bootstrap.npanday.version>
+ <!-- if you want to build NPanday with a specific version, use this, instead of the line above -->
+ <!--bootstrap.npanday.version>1.2.1</bootstrap.npanday.version-->
+ </properties>
+
+ <!--
+ Theese repos are slow. Enable them once, when needed.
+ <pluginRepositories>
+ <pluginRepository>
+ <id>npanday.group</id>
+ <name>NPanday Group Repository</name>
+ <url>http://repo.npanday.org/archiva/repository/npanday-group</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ <repositories>
+ <repository>
+ <id>npanday.group</id>
+ <name>NPanday Group Repository</name>
+ <url>http://repo.npanday.org/archiva/repository/npanday-group</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ -->
+
<mailingLists>
<mailingList>
<name>NPanday Developers List</name>
@@ -588,14 +624,6 @@ under the License.
</build>
</profile>
</profiles>
- <properties>
- <mavenVersion>2.0.9</mavenVersion>
- <plexus.utils.version>1.5.1</plexus.utils.version>
- <npanday.snapshots.url>http://repo.npanday.org/archiva/repository/npanday-snapshots</npanday.snapshots.url>
- <npanday.releases.url>http://repo.npanday.org/archiva/repository/npanday-releases</npanday.releases.url>
- <bootstrap.npanday.version>${project.version}</bootstrap.npanday.version>
- <!--bootstrap.npanday.version>1.2.1</bootstrap.npanday.version-->
- </properties>
<distributionManagement>
<repository>
<id>vmbuild.staging</id>
@@ -606,27 +634,4 @@ under the License.
<url>http://repo.npanday.org/archiva/repository/npanday-snapshots/</url>
</snapshotRepository>
</distributionManagement>
- <!--
- Theese repos are slow. Enable them once, when needed.
- <pluginRepositories>
- <pluginRepository>
- <id>npanday.group</id>
- <name>NPanday Group Repository</name>
- <url>http://repo.npanday.org/archiva/repository/npanday-group</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- <repositories>
- <repository>
- <id>npanday.group</id>
- <name>NPanday Group Repository</name>
- <url>http://repo.npanday.org/archiva/repository/npanday-group</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- -->
</project>