You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2014/11/08 13:55:13 UTC
svn commit: r1637557 - in /jspwiki/trunk: ChangeLog LICENSE
jspwiki-war/pom.xml jspwiki-war/src/main/java/org/apache/wiki/Release.java
pom.xml
Author: metskem
Date: Sat Nov 8 12:55:13 2014
New Revision: 1637557
URL: http://svn.apache.org/r1637557
Log:
2014-11-04 Harry Metske (metskem@apache.org)
* 2.10.2-svn-9
* Fixed JSPWIKI-871 - upgraded nekohtml (0.9.5 => 1.9.21) and xercesImpl (2.4 => 2.10.0)
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/LICENSE
jspwiki/trunk/jspwiki-war/pom.xml
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/pom.xml
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1637557&r1=1637556&r2=1637557&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Sat Nov 8 12:55:13 2014
@@ -1,5 +1,11 @@
2014-11-04 Harry Metske (metskem@apache.org)
+ * 2.10.2-svn-9
+
+ * Fixed JSPWIKI-871 - upgraded nekohtml (0.9.5 => 1.9.21) and xercesImpl (2.4 => 2.10.0)
+
+2014-11-04 Harry Metske (metskem@apache.org)
+
* 2.10.2-svn-8
* Fixed JSPWIKI-870 - JSPWiki does not start, if tomcat directory path contains a white space.
Modified: jspwiki/trunk/LICENSE
URL: http://svn.apache.org/viewvc/jspwiki/trunk/LICENSE?rev=1637557&r1=1637556&r2=1637557&view=diff
==============================================================================
--- jspwiki/trunk/LICENSE (original)
+++ jspwiki/trunk/LICENSE Sat Nov 8 12:55:13 2014
@@ -228,13 +228,14 @@ lucene-core-4.7.0.jar
lucene-highlighter-4.7.0.jar LICENSE
lucene-memory-4.7.0.jar LICENSE
mail-1.4.7.jar doc/LICENSE.cddl
-nekohtml-0.9.5.jar LICENSE
+nekohtml-1.9.21.jar LICENSE
oro-2.0.8.jar LICENSE
ehcache-2.8.3.jar LICENSE
sandler-0.5.jar doc/LICENSE.sandler
servlet-api-2.5.jar doc/LICENSE.cddl
slf4-api-1.7.7.jar doc/LICENSE.mit
slf4j-log4j-1.7.7.jar doc/LICENSE.mit
+xercesImpl-2.10.0.jar LICENSE
xmlrpc-2.0.1.jar LICENSE
TEST LIBRARY LICENSE FILE
@@ -249,7 +250,6 @@ selenium-chrome-driver-2.42.0.jar
selenium-firefox-driver-2.42.0.jar LICENSE
selenium-ie-driver-2.42.0.jar LICENSE
stripes-1.5.8.jar LICENSE
-xercesImpl-2.6.2.jar LICENSE
xml-apis-1.0.b2.jar LICENSE
yuicompressor-2.4.7.jar doc/LICENSE.yui
Modified: jspwiki/trunk/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/pom.xml?rev=1637557&r1=1637556&r2=1637557&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/pom.xml (original)
+++ jspwiki/trunk/jspwiki-war/pom.xml Sat Nov 8 12:55:13 2014
@@ -149,7 +149,7 @@
</dependency>
<dependency>
- <groupId>nekohtml</groupId>
+ <groupId>net.sourceforge.nekohtml</groupId>
<artifactId>nekohtml</artifactId>
<scope>runtime</scope>
</dependency>
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1637557&r1=1637556&r2=1637557&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Sat Nov 8 12:55:13 2014
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "8";
+ public static final String BUILD = "9";
/**
* This is the generic version string you should use when printing out the version. It is of
Modified: jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/pom.xml?rev=1637557&r1=1637556&r2=1637557&view=diff
==============================================================================
--- jspwiki/trunk/pom.xml (original)
+++ jspwiki/trunk/pom.xml Sat Nov 8 12:55:13 2014
@@ -267,11 +267,11 @@
</dependency>
<!-- runtime dependencies -->
- <dependency>
- <groupId>nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- <version>0.9.5</version>
- </dependency>
+ <dependency>
+ <groupId>net.sourceforge.nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>1.9.21</version>
+ </dependency>
</dependencies>
</dependencyManagement>