Skip to content
Browse files

Merge branch 'AEROGEAR-163'

  • Loading branch information...
2 parents f0eae17 + ec87bc5 commit 43d1ddefd6e45f7191251ec65437125a7ad50d41 Bruno Oliveira committed Apr 10, 2012
Showing with 2 additions and 11 deletions.
  1. +0 −9 helloworld-html5/pom.xml
  2. +2 −2 kitchensink-html5-mobile/pom.xml
View
9 helloworld-html5/pom.xml
@@ -82,15 +82,6 @@
is deployed -->
<finalName>${project.artifactId}</finalName>
<plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
- <configuration>
- <!-- Java EE 6 doesn't require web.xml, Maven needs to catch
- up! -->
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </configuration>
- </plugin>
<!-- JBoss AS plugin to deploy war -->
<plugin>
<groupId>org.jboss.as.plugins</groupId>
View
4 kitchensink-html5-mobile/pom.xml
@@ -175,7 +175,7 @@
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
+ <version>2.2</version>
<configuration>
<!-- Java EE 6 doesn't require web.xml, Maven needs to catch up! -->
<failOnMissingWebXml>false</failOnMissingWebXml>
@@ -244,7 +244,7 @@
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
+ <version>2.2</version>
<configuration>
<outputDirectory>deployments</outputDirectory>
<warName>ROOT</warName>

0 comments on commit 43d1dde

Please sign in to comment.
Something went wrong with that request. Please try again.