svn commit: r1464777 - in /incubator/jspwiki/trunk: ChangeLog pom.xml

[gm...@apache.org]

Author: gmazza
Date: Thu Apr  4 21:52:05 2013
New Revision: 1464777

URL: http://svn.apache.org/r1464777
Log:
Added Jaxen dependency exclusions, added comments on how to deploy to Tomcat using Maven pom file.

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/pom.xml

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1464777&r1=1464776&r2=1464777&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Thu Apr  4 21:52:05 2013
@@ -1,3 +1,8 @@
+2013-04-04 Glen Mazza (glenmazza AT apache DOT org)
+
+      * Updated pom.xml by removing Jaxen transitive dependencies and providing
+        comments on how to deploy via tomcat7:run-war and tomcat7:redeploy
+
 2013-04-02 Glen Mazza (glenmazza AT apache DOT org)
 
       * Removed apparently unused stripes library from WAR created by build.xml

Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1464777&r1=1464776&r2=1464777&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Thu Apr  4 21:52:05 2013
@@ -159,6 +159,12 @@
             <groupId>jaxen</groupId>
             <artifactId>jaxen</artifactId>
             <version>1.1-beta-6</version>
+            <exclusions>
+               <exclusion>
+                 <groupId>*</groupId>
+                 <artifactId>*</artifactId>
+               </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>net.sourceforge.stripes</groupId>
@@ -201,7 +207,7 @@
 
     <build>
         <!-- below name temporary to distinguish from Ant JSPWiki -->
-        <finalName>MavenJSPWiki</finalName>
+        <finalName>JSPWiki</finalName>
         <!--finalName>JSPWiki</finalName-->
         <sourceDirectory>${basedir}/src</sourceDirectory>
         <testSourceDirectory>${basedir}/tests</testSourceDirectory>
@@ -244,6 +250,16 @@
                     <target>${jspwiki.jdk.version}</target>
                 </configuration>
             </plugin>
+            <!-- With below plugin can deploy to an embedded Tomcat instance via:
+                 mvn clean install tomcat7:run-war [-Dmaven.test.skip]
+                 ...or standalone by adding a <server/> entry "myTomcat":
+                 http://www.jroller.com/gmazza/entry/web_service_tutorial#maventomcat
+                 and running tomcat7:redeploy instead of run-war in 
+                 string above.
+
+                 Either way, JSPWiki URL will be
+                 http://localhost:8080/JSPWiki
+            -->
             <plugin>
                 <groupId>org.apache.tomcat.maven</groupId>
                 <artifactId>tomcat7-maven-plugin</artifactId>