You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/17 18:34:56 UTC
[09/49] git commit: Updated pom.xml to properly include JSP servlet
defs in web.xml on build
Updated pom.xml to properly include JSP servlet defs in web.xml on build
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c56c12c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c56c12c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c56c12c2
Branch: refs/heads/two-dot-o
Commit: c56c12c212dad5779bdff949c5c95a8221968982
Parents: 275f10a
Author: amuramoto <am...@apigee.com>
Authored: Thu Oct 9 10:17:45 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Thu Oct 9 10:17:45 2014 -0700
----------------------------------------------------------------------
stack/rest/pom.xml | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c56c12c2/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index 4a99443..ef6cd26 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -140,17 +140,13 @@
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.3</version>
- </plugin>
-
- <plugin>
<groupId>org.jasig.mojo.jspc</groupId>
<artifactId>jspc-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
- <includeInProject>false</includeInProject>
+ <includeInProject>true</includeInProject>
+ <inputWebXml>${basedir}/src/main/webapp/WEB-INF/web.xml</inputWebXml>
+ <injectString><!--FRAGMENT--></injectString>
<webFragmentFile>${project.build.directory}/web-fragment.xml.txt</webFragmentFile>
</configuration>
<executions>
@@ -164,7 +160,7 @@
<dependencies>
<dependency>
<groupId>org.jasig.mojo.jspc</groupId>
- <artifactId>jspc-compiler-tomcat6</artifactId>
+ <artifactId>jspc-compiler-tomcat7</artifactId>
<version>2.0.0</version>
</dependency>
</dependencies>
@@ -172,6 +168,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webXml>${project.build.directory}/jspweb.xml</webXml>
+ </configuration>
+ <version>2.3</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.2</version>
<configuration>