You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gm...@apache.org on 2013/07/01 23:17:29 UTC
svn commit: r1498692 - in /incubator/jspwiki/trunk: ChangeLog
jspwiki-war/pom.xml jspwiki-war/src/main/java/org/apache/wiki/Release.java
pom.xml
Author: gmazza
Date: Mon Jul 1 21:17:29 2013
New Revision: 1498692
URL: http://svn.apache.org/r1498692
Log:
Got rid of explicit jaxen dependency, now relying on the dep from the jdom dependency instead.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/jspwiki-war/pom.xml
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/pom.xml
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1498692&r1=1498691&r2=1498692&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Mon Jul 1 21:17:29 2013
@@ -1,4 +1,11 @@
-2013-06-11 Glen Mazza (gmazza AT apache DOT org)
+2013-07-01 Glen Mazza (gmazza AT apache DOT org)
+
+ * 2.10.0-svn-13
+
+ * Got rid of explicit jaxen dependency, switched from jdom:jdom:1.0
+ to org.jdom:jdom:1.2
+
+2013-06-26 Glen Mazza (gmazza AT apache DOT org)
* 2.10.0-svn-12
Modified: incubator/jspwiki/trunk/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/pom.xml?rev=1498692&r1=1498691&r2=1498692&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/pom.xml (original)
+++ incubator/jspwiki/trunk/jspwiki-war/pom.xml Mon Jul 1 21:17:29 2013
@@ -50,6 +50,7 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
+
<dependency>
<groupId>net.sourceforge</groupId>
<artifactId>sandler</artifactId>
@@ -91,7 +92,7 @@
</dependency>
<dependency>
- <groupId>jdom</groupId>
+ <groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
</dependency>
@@ -146,11 +147,6 @@
</dependency>
<dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- </dependency>
-
- <dependency>
<groupId>net.sourceforge.stripes</groupId>
<artifactId>stripes</artifactId>
</dependency>
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1498692&r1=1498691&r2=1498692&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Mon Jul 1 21:17:29 2013
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "12";
+ public static final String BUILD = "13";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1498692&r1=1498691&r2=1498692&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Mon Jul 1 21:17:29 2013
@@ -106,15 +106,9 @@
</dependency>
<dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.4</version>
- </dependency>
-
- <dependency>
- <groupId>jdom</groupId>
+ <groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
- <version>1.0</version>
+ <version>1.1.2</version>
</dependency>
<dependency>
@@ -606,4 +600,4 @@
<system>Jenkins</system>
<url>https://builds.apache.org/job/JSPWiki</url>
</ciManagement>
-</project>
\ No newline at end of file
+</project>