Author: brett
Date: Sat Jul 12 15:51:07 2014
New Revision: 1609952
URL: http://svn.apache.org/r1609952
Log:
run ITs on x64 systems as well
Modified:
incubator/npanday/trunk/plugins/application-maven-plugin/pom.xml
incubator/npanday/trunk/plugins/aspnet-maven-plugin/pom.xml
Modified: incubator/npanday/trunk/plugins/application-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/application-maven-plugin/pom.xml?rev=1609952&r1=1609951&r2=1609952&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/application-maven-plugin/pom.xml (original)
+++ incubator/npanday/trunk/plugins/application-maven-plugin/pom.xml Sat Jul 12
15:51:07 2014
@@ -64,17 +64,53 @@
</excludes>
</configuration>
</plugin>
+ <!-- TODO: remove when XDT doesn't rely on Visual Studio being
installed -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <configuration>
+ <pomExcludes>
+ <!-- This test requires Visual Studio 2010 be installed -->
+ <pomExclude>IT001_TransformAppConfig/pom.xml</pomExclude>
+ <pomExclude>IT002_TransformFurtherConfigs/pom.xml</pomExclude>
+ <pomExclude>IT004_CopyTransformOtherXmlFiles/pom.xml</pomExclude>
+ </pomExcludes>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
<profiles>
- <!-- TODO: remove when XDT doesn't rely on Visual Studio being installed
-->
<profile>
- <id>no-visual-studio</id>
+ <id>visualstudio</id>
+ <activation>
+ <file>
+ <exists>
+
${env.PROGRAMFILES(X86)}\MSBuild\Microsoft\VisualStudio\v10.0\Web\Microsoft.Web.Publishing.Tasks.dll
+ </exists>
+ </file>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <configuration>
+ <pomExcludes combine.self="override"/>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ <profile>
+ <id>visualstudiox86</id>
<activation>
<file>
-
<missing>${env.ProgramFiles}/MSBuild/Microsoft/VisualStudio/v10.0/Web/Microsoft.Web.Publishing.Tasks.dll</missing>
+
<exists>${env.PROGRAMFILES}\MSBuild\Microsoft\VisualStudio\v10.0\Web\Microsoft.Web.Publishing.Tasks.dll
+ </exists>
</file>
</activation>
<build>
@@ -84,12 +120,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
- <pomExcludes>
- <!-- This test requires Visual Studio 2010 be installed -->
- <pomExclude>IT001_TransformAppConfig/pom.xml</pomExclude>
-
<pomExclude>IT002_TransformFurtherConfigs/pom.xml</pomExclude>
-
<pomExclude>IT004_CopyTransformOtherXmlFiles/pom.xml</pomExclude>
- </pomExcludes>
+ <pomExcludes combine.self="override"/>
</configuration>
</plugin>
</plugins>
Modified: incubator/npanday/trunk/plugins/aspnet-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/aspnet-maven-plugin/pom.xml?rev=1609952&r1=1609951&r2=1609952&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/aspnet-maven-plugin/pom.xml (original)
+++ incubator/npanday/trunk/plugins/aspnet-maven-plugin/pom.xml Sat Jul 12
15:51:07 2014
@@ -64,17 +64,50 @@
</excludes>
</configuration>
</plugin>
+ <!-- TODO: remove when XDT doesn't rely on Visual Studio being
installed -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <configuration>
+ <pomExcludes>
+ <!-- This test requires Visual Studio 2010 be installed -->
+ <pomExclude>IT004_ConfigurationHandling/pom.xml</pomExclude>
+ </pomExcludes>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
-
<profiles>
- <!-- TODO: remove when XDT doesn't rely on Visual Studio being installed
-->
<profile>
- <id>no-visual-studio</id>
+ <id>visualstudio</id>
+ <activation>
+ <file>
+ <exists>
+
${env.PROGRAMFILES(X86)}\MSBuild\Microsoft\VisualStudio\v10.0\Web\Microsoft.Web.Publishing.Tasks.dll
+ </exists>
+ </file>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <configuration>
+ <pomExcludes combine.self="override"/>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ <profile>
+ <id>visualstudiox86</id>
<activation>
<file>
-
<missing>${env.ProgramFiles}/MSBuild/Microsoft/VisualStudio/v10.0/Web/Microsoft.Web.Publishing.Tasks.dll</missing>
+
<exists>${env.PROGRAMFILES}\MSBuild\Microsoft\VisualStudio\v10.0\Web\Microsoft.Web.Publishing.Tasks.dll
+ </exists>
</file>
</activation>
<build>
@@ -84,10 +117,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
- <pomExcludes>
- <!-- This test requires Visual Studio 2010 be installed -->
- <pomExclude>IT004_ConfigurationHandling/pom.xml</pomExclude>
- </pomExcludes>
+ <pomExcludes combine.self="override"/>
</configuration>
</plugin>
</plugins>
