jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1498754 - in /incubator/jspwiki/trunk: ChangeLog jspwiki-war/pom.xml pom.xml
Date Tue, 02 Jul 2013 01:37:45 GMT
Author: gmazza
Date: Tue Jul  2 01:37:45 2013
New Revision: 1498754

URL: http://svn.apache.org/r1498754
Log:
Brought back jaxen dependency, removed tomcat:jasper one

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

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1498754&r1=1498753&r2=1498754&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Tue Jul  2 01:37:45 2013
@@ -2,8 +2,8 @@
 
        * 2.10.0-svn-13
 
-       * Got rid of explicit jaxen dependency, switched from jdom:jdom:1.0
-         to org.jdom:jdom:1.2
+       * Switched from jdom:jdom:1.0 to org.jdom:jdom:1.2, removed 
+         tomcat:jasper-runtime dependency
 
 2013-06-26  Glen Mazza (gmazza AT apache DOT org)
 

Modified: incubator/jspwiki/trunk/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/pom.xml?rev=1498754&r1=1498753&r2=1498754&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/pom.xml (original)
+++ incubator/jspwiki/trunk/jspwiki-war/pom.xml Tue Jul  2 01:37:45 2013
@@ -162,11 +162,6 @@
     </dependency>
 
     <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>jasper-runtime</artifactId>
-    </dependency>
-    
-    <dependency>
       <groupId>org.eclipse.jetty.aggregate</groupId>
       <artifactId>jetty-all</artifactId>
     </dependency>

Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1498754&r1=1498753&r2=1498754&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Tue Jul  2 01:37:45 2013
@@ -110,6 +110,18 @@
         <artifactId>jdom</artifactId>
         <version>1.1.2</version>
       </dependency>
+      
+      <!-- Jaxen has to be specified, else jdom above brings in 
+           jaxen:1.1.3, which uses older Maven 1.x cobertura 
+           and findbugs deps no longer available in Central 
+           TODO: Upgrade to org.jdom:jdom2:2.0.5 which uses
+           Jaxen 1.1.4 by default.
+      -->
+      <dependency>
+	<groupId>jaxen</groupId>
+	<artifactId>jaxen</artifactId>
+	<version>1.1.4</version>
+      </dependency>
 
       <dependency>
         <groupId>log4j</groupId>
@@ -219,13 +231,6 @@
         <scope>test</scope>
       </dependency>
 
-      <dependency>
-        <groupId>tomcat</groupId>
-        <artifactId>jasper-runtime</artifactId>
-        <version>5.5.23</version>
-        <scope>test</scope>
-      </dependency>
-
       <!-- provided dependencies -->
       <dependency>
         <groupId>javax.servlet.jsp</groupId>



Mime
View raw message