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 br...@apache.org on 2012/01/13 15:27:44 UTC
svn commit: r1231128 - in /incubator/npanday/trunk/plugins/wix-maven-plugin:
./ src/it/IT002/ src/it/IT003/TestApplication/ src/it/IT003/TestLibrary/
src/it/IT004/TestConsoleApplication/ src/it/IT005/TestApplication/
src/it/IT005/TestLibrary/ src/it/IT...
Author: brett
Date: Fri Jan 13 15:27:44 2012
New Revision: 1231128
URL: http://svn.apache.org/viewvc?rev=1231128&view=rev
Log:
wix ITs to use correct NPanday version
Modified:
incubator/npanday/trunk/plugins/wix-maven-plugin/pom.xml
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/pom.xml
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT003/TestApplication/pom.xml
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT003/TestLibrary/pom.xml
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT004/TestConsoleApplication/pom.xml
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT005/TestApplication/pom.xml
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT005/TestLibrary/pom.xml
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/VBWebApplication_Wix/pom.xml
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/pom.xml
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/WIXLocalizationExample/pom.xml
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT008/pom.xml
Modified: incubator/npanday/trunk/plugins/wix-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/pom.xml?rev=1231128&r1=1231127&r2=1231128&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/wix-maven-plugin/pom.xml (original)
+++ incubator/npanday/trunk/plugins/wix-maven-plugin/pom.xml Fri Jan 13 15:27:44 2012
@@ -70,7 +70,7 @@
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <version>1.3</version>
+ <version>1.5</version>
<configuration>
<projectsDirectory>src/it</projectsDirectory>
<cloneProjectsTo>target/it</cloneProjectsTo>
@@ -81,6 +81,9 @@
See http://npanday.codeplex.com/WorkItem/View.aspx?WorkItemId=10557
<localRepositoryPath>target/local-repo</localRepositoryPath> -->
<postBuildHookScript>verify.bsh</postBuildHookScript>
+ <filterProperties>
+ <npandayVersion>${bootstrap.npanday.version}</npandayVersion>
+ </filterProperties>
</configuration>
<executions>
<execution>
Modified: incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/pom.xml?rev=1231128&r1=1231127&r2=1231128&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/pom.xml (original)
+++ incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/pom.xml Fri Jan 13 15:27:44 2012
@@ -37,8 +37,8 @@
<version>@project.version@</version>
<configuration>
<objectFiles>
- <objectFile>Sample.wixobj</objectFile>
- </objectFiles>
+ <objectFile>Sample.wixobj</objectFile>
+ </objectFiles>
</configuration>
</plugin>
</plugins>
Modified: incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT003/TestApplication/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT003/TestApplication/pom.xml?rev=1231128&r1=1231127&r2=1231128&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT003/TestApplication/pom.xml (original)
+++ incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT003/TestApplication/pom.xml Fri Jan 13 15:27:44 2012
@@ -34,6 +34,7 @@
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
+ <version>@npandayVersion@</version>
<extensions>true</extensions>
<configuration>
<includeSources>
@@ -48,6 +49,7 @@
</plugin>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
+ <version>@npandayVersion@</version>
<artifactId>maven-resgen-plugin</artifactId>
<configuration>
<embeddedResources>
Modified: incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT003/TestLibrary/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT003/TestLibrary/pom.xml?rev=1231128&r1=1231127&r2=1231128&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT003/TestLibrary/pom.xml (original)
+++ incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT003/TestLibrary/pom.xml Fri Jan 13 15:27:44 2012
@@ -34,6 +34,7 @@
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
+ <version>@npandayVersion@</version>
<extensions>true</extensions>
<configuration>
<includeSources>
Modified: incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT004/TestConsoleApplication/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT004/TestConsoleApplication/pom.xml?rev=1231128&r1=1231127&r2=1231128&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT004/TestConsoleApplication/pom.xml (original)
+++ incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT004/TestConsoleApplication/pom.xml Fri Jan 13 15:27:44 2012
@@ -34,6 +34,7 @@
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
+ <version>@npandayVersion@</version>
<extensions>true</extensions>
<configuration>
<includeSources>
Modified: incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT005/TestApplication/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT005/TestApplication/pom.xml?rev=1231128&r1=1231127&r2=1231128&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT005/TestApplication/pom.xml (original)
+++ incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT005/TestApplication/pom.xml Fri Jan 13 15:27:44 2012
@@ -34,6 +34,7 @@
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
+ <version>@npandayVersion@</version>
<extensions>true</extensions>
<configuration>
<includeSources>
@@ -49,6 +50,7 @@
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-resgen-plugin</artifactId>
+ <version>@npandayVersion@</version>
<configuration>
<embeddedResources>
<embeddedResource>
Modified: incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT005/TestLibrary/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT005/TestLibrary/pom.xml?rev=1231128&r1=1231127&r2=1231128&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT005/TestLibrary/pom.xml (original)
+++ incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT005/TestLibrary/pom.xml Fri Jan 13 15:27:44 2012
@@ -34,6 +34,7 @@
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
+ <version>@npandayVersion@</version>
<extensions>true</extensions>
<configuration>
<includeSources>
Modified: incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/VBWebApplication_Wix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/VBWebApplication_Wix/pom.xml?rev=1231128&r1=1231127&r2=1231128&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/VBWebApplication_Wix/pom.xml (original)
+++ incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/VBWebApplication_Wix/pom.xml Fri Jan 13 15:27:44 2012
@@ -34,6 +34,7 @@
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
+ <version>@npandayVersion@</version>
<extensions>true</extensions>
<configuration>
<language>VB</language>
@@ -75,6 +76,7 @@
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-resgen-plugin</artifactId>
+ <version>@npandayVersion@</version>
<configuration>
<embeddedResources>
<embeddedResource>
@@ -86,4 +88,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/pom.xml?rev=1231128&r1=1231127&r2=1231128&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/WIXLocalizationExample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/WIXLocalizationExample/pom.xml?rev=1231128&r1=1231127&r2=1231128&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/WIXLocalizationExample/pom.xml (original)
+++ incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/WIXLocalizationExample/pom.xml Fri Jan 13 15:27:44 2012
@@ -34,6 +34,7 @@
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
+ <version>@npandayVersion@</version>
<extensions>true</extensions>
<configuration>
<includeSources>
@@ -49,6 +50,7 @@
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-resgen-plugin</artifactId>
+ <version>@npandayVersion@</version>
<configuration>
<embeddedResources>
<embeddedResource>
Modified: incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT008/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT008/pom.xml?rev=1231128&r1=1231127&r2=1231128&view=diff
==============================================================================
Binary files - no diff available.