Author: metskem
Date: Sat Aug 3 15:01:59 2013
New Revision: 1510004
URL: http://svn.apache.org/r1510004
Log:
2013-08-03 Harry Metske ([email protected])
* 2.10.0-svn-31
* refixed JSPWIKI-791 NoClassDefFoundError for
org.apache.lucene.analysis.standard.ClassicAnalyzer
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
jspwiki/trunk/jspwiki-war/pom.xml
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
Modified: jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1510004&r1=1510003&r2=1510004&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Sat Aug 3 15:01:59 2013
@@ -1,5 +1,11 @@
2013-08-03 Harry Metske ([email protected])
+ * 2.10.0-svn-31
+
+ * refixed JSPWIKI-791 NoClassDefFoundError for
org.apache.lucene.analysis.standard.ClassicAnalyzer
+
+2013-08-03 Harry Metske ([email protected])
+
* 2.10.0-svn-30
* fixed JSPWIKI-789 upgrade commons-io from 1.4 to 2.4
Modified:
jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext?rev=1510004&r1=1510003&r2=1510004&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
(original)
+++
jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
Sat Aug 3 15:01:59 2013
@@ -1,5 +1,26 @@
Title: Changelog
+#### 2013-08-03 Harry Metske ([email protected])
+
+* 2.10.0-svn-30
+
+* fixed [JSPWIKI 789][JIRA-789] upgrade commons-io from 1.4 to 2.4
+
+#### 2013-08-03 Harry Metske ([email protected])
+
+* 2.10.0-svn-29
+
+* fixed [JSPWIKI 790][JIRA-790] upgrade HSQLDB from 2.2.9 to 2.3.0
+
+#### 2013-08-03 Glen Mazza (gmazza AT apache DOT org)
+
+* 2.10.0-svn-28
+
+* Removed unused variables as reported by Sonar, as information is obtainable
+ by other means when needed.
+
+* Removed "incubating" references in pom.xml
+
#### 2013-08-01 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.0-svn-27
@@ -1061,6 +1082,8 @@ and propagated the change to all plugins
* 2.9.0-svn-1
* release bump because of package rename
+ [JIRA-789]: https://issues.apache.org/jira/browse/JSPWIKI-789
+ [JIRA-790]: https://issues.apache.org/jira/browse/JSPWIKI-790
[JIRA-761]: https://issues.apache.org/jira/browse/JSPWIKI-761
[JIRA-791]: https://issues.apache.org/jira/browse/JSPWIKI-791
[JIRA-784]: https://issues.apache.org/jira/browse/JSPWIKI-784
Modified: jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext?rev=1510004&r1=1510003&r2=1510004&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
(original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext Sat Aug
3 15:01:59 2013
@@ -1 +1 @@
-JSPWiki v2.10.0-svn-27
\ No newline at end of file
+JSPWiki v2.10.0-svn-30
\ No newline at end of file
Modified: jspwiki/trunk/jspwiki-war/pom.xml
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/pom.xml?rev=1510004&r1=1510003&r2=1510004&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/pom.xml (original)
+++ jspwiki/trunk/jspwiki-war/pom.xml Sat Aug 3 15:01:59 2013
@@ -51,7 +51,6 @@
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-common</artifactId>
- <scope>test</scope>
</dependency>
<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=1510004&r1=1510003&r2=1510004&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
Aug 3 15:01:59 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 = "30";
+ public static final String BUILD = "31";
/**
* This is the generic version string you should use
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java?rev=1510004&r1=1510003&r2=1510004&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
Sat Aug 3 15:01:59 2013
@@ -396,8 +396,8 @@ public class LuceneSearchProvider implem
try
{
Class clazz = ClassUtil.findClass( "", m_analyzerClass );
- Constructor constructor = clazz.getConstructor(
Version.LUCENE_36.getClass() );
- Analyzer analyzer = (Analyzer) constructor.newInstance(
Version.LUCENE_36 );
+ Constructor constructor = clazz.getConstructor(
Version.LUCENE_44.getClass() );
+ Analyzer analyzer = (Analyzer) constructor.newInstance(
Version.LUCENE_44 );
return analyzer;
}
catch( Exception e )
