You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2013/11/28 21:01:15 UTC
svn commit: r1546453 - in /jspwiki/trunk: LICENSE
jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
pom.xml
Author: juanpablo
Date: Thu Nov 28 20:01:15 2013
New Revision: 1546453
URL: http://svn.apache.org/r1546453
Log:
* Lucene upgraded to 4.6, minor upgrades on plugin versions:
maven-idea-plugin : 2.2 -> 2.2.1
maven-install-plugin : 2.4 -> 2.5.1
maven-javadoc-plugin : 2.9 -> 2.9.1
maven-surefire-plugin : 2.15 -> 2.16
maven-surefire-report-plugin : 2.15 -> 2.16
org.apache.tomcat.maven:tomcat7-maven-plugin : 2.1 -> 2.2
org.codehaus.mojo:clirr-maven-plugin : 2.5 -> 2.6.1
org.codehaus.mojo:cobertura-maven-plugin : 2.5.2 -> 2.6
org.codehaus.mojo:sonar-maven-plugin : 2.0 -> 2.2
ro.isdc.wro4j:wro4j-maven-plugin : 1.7.0 -> 1.7.2
wro4j-maven-plugin ignored by m2e
Modified:
jspwiki/trunk/LICENSE
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
jspwiki/trunk/pom.xml
Modified: jspwiki/trunk/LICENSE
URL: http://svn.apache.org/viewvc/jspwiki/trunk/LICENSE?rev=1546453&r1=1546452&r2=1546453&view=diff
==============================================================================
--- jspwiki/trunk/LICENSE (original)
+++ jspwiki/trunk/LICENSE Thu Nov 28 20:01:15 2013
@@ -224,9 +224,9 @@ jrcs-diff-0.4.2.jar
jsonrpc-1.0.jar LICENSE
jsp-api-2.1.jar LICENSE
log4j-1.2.17.jar LICENSE
-lucene-core-4.4.0.jar LICENSE
-lucene-highlighter-4.4.0.jar LICENSE
-lucene-memory-4.4.0.jar LICENSE
+lucene-core-4.6.0.jar LICENSE
+lucene-highlighter-4.6.0.jar LICENSE
+lucene-memory-4.6.0.jar LICENSE
mail-1.4.7.jar doc/LICENSE.cddl
nekohtml-0.9.5.jar LICENSE
oro-2.0.8.jar LICENSE
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=1546453&r1=1546452&r2=1546453&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 Thu Nov 28 20:01:15 2013
@@ -420,8 +420,8 @@ public class LuceneSearchProvider implem
try
{
Class clazz = ClassUtil.findClass( "", m_analyzerClass );
- Constructor constructor = clazz.getConstructor( Version.LUCENE_44.getClass() );
- Analyzer analyzer = (Analyzer) constructor.newInstance( Version.LUCENE_44 );
+ Constructor constructor = clazz.getConstructor( Version.LUCENE_46.getClass() );
+ Analyzer analyzer = (Analyzer) constructor.newInstance( Version.LUCENE_46 );
return analyzer;
}
catch( Exception e )
@@ -529,7 +529,7 @@ public class LuceneSearchProvider implem
LockObtainFailedException, IOException, ProviderException
{
IndexWriter writer = null;
- IndexWriterConfig writerConfig = new IndexWriterConfig( Version.LUCENE_44, getLuceneAnalyzer() );
+ IndexWriterConfig writerConfig = new IndexWriterConfig( Version.LUCENE_46, getLuceneAnalyzer() );
writerConfig.setOpenMode( OpenMode.CREATE_OR_APPEND );
writer = new IndexWriter( luceneDir, writerConfig );
@@ -620,7 +620,7 @@ public class LuceneSearchProvider implem
try
{
String[] queryfields = { LUCENE_PAGE_CONTENTS, LUCENE_PAGE_NAME, LUCENE_AUTHOR, LUCENE_ATTACHMENTS };
- QueryParser qp = new MultiFieldQueryParser(Version.LUCENE_44, queryfields, getLuceneAnalyzer() );
+ QueryParser qp = new MultiFieldQueryParser( Version.LUCENE_46, queryfields, getLuceneAnalyzer() );
//QueryParser qp = new QueryParser( LUCENE_PAGE_CONTENTS, getLuceneAnalyzer() );
Query luceneQuery = qp.parse( query );
Modified: jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/pom.xml?rev=1546453&r1=1546452&r2=1546453&view=diff
==============================================================================
--- jspwiki/trunk/pom.xml (original)
+++ jspwiki/trunk/pom.xml Thu Nov 28 20:01:15 2013
@@ -38,7 +38,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<jdk.version>1.6</jdk.version>
- <lucene.version>4.4.0</lucene.version>
+ <lucene.version>4.6.0</lucene.version>
</properties>
<prerequisites>
@@ -331,7 +331,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-idea-plugin</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
<configuration>
<downloadSources>true</downloadSources>
<downloadJavadocs>true</downloadJavadocs>
@@ -374,7 +374,7 @@
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5.1</version>
<configuration>
<createChecksum>true</createChecksum>
</configuration>
@@ -382,7 +382,7 @@
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
+ <version>2.9.1</version>
<configuration>
<additionalparam>
-charset ${project.build.sourceEncoding}
@@ -434,12 +434,12 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.15</version>
+ <version>2.16</version>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.15</version>
+ <version>2.16</version>
</plugin>
<plugin>
@@ -470,7 +470,7 @@
<plugin>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-maven-plugin</artifactId>
- <version>1.7.0</version>
+ <version>1.7.2</version>
</plugin>
<!-- yuicompressor => replaced by wro4j
@@ -508,7 +508,7 @@
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<configuration>
<contextReloadable>true</contextReloadable>
<port>8080</port>
@@ -518,13 +518,13 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.5.2</version>
+ <version>2.6</version>
<configuration>
<formats>
<format>html</format>
@@ -545,7 +545,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>sonar-maven-plugin</artifactId>
- <version>2.0</version>
+ <version>2.2</version>
</plugin>
<plugin>
@@ -589,6 +589,15 @@
</pluginExecutionFilter>
<action><ignore/></action>
</pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>ro.isdc.wro4j</groupId>
+ <artifactId>wro4j-maven-plugin</artifactId>
+ <versionRange>[1.7.2,)</versionRange>
+ <goals><goal>run</goal></goals>
+ </pluginExecutionFilter>
+ <action><ignore/></action>
+ </pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>