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 2019/05/11 12:24:49 UTC
[jspwiki] branch master updated (702aa3e -> 0a1ec7e)
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git.
from 702aa3e finally, fix test - patch provided by Murray Altheim on ML
new 7fb36ab remove unused import + reorganize imports
new 0a1ec7e prepare release for 2.11.0.M4
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ChangeLog | 4 +++
.../src/main/java/org/apache/wiki/Release.java | 4 +--
.../wiki/search/tika/TikaSearchProvider.java | 29 ++++++++++------------
3 files changed, 19 insertions(+), 18 deletions(-)
[jspwiki] 02/02: prepare release for 2.11.0.M4
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 0a1ec7e139783515220c285be3b1cadfc077745d
Author: juanpablo <ju...@apache.org>
AuthorDate: Sat May 11 14:24:29 2019 +0200
prepare release for 2.11.0.M4
---
ChangeLog | 4 ++++
jspwiki-main/src/main/java/org/apache/wiki/Release.java | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0cbcd3b..fa9c6b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-05-11 Juan Pablo Santos (juanpablo AT apache DOT org)
+
+ * prepare release for 2.11.0.M4
+
2019-05-02 Juan Pablo Santos (juanpablo AT apache DOT org)
* 2.11.0-M4-git-13
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/Release.java b/jspwiki-main/src/main/java/org/apache/wiki/Release.java
index ee0ef7f..f40c625 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/Release.java
@@ -52,7 +52,7 @@ public final class Release {
* <p>
* If the POSTFIX is empty, it is not added to the version string.
*/
- private static final String POSTFIX = "M4-git";
+ private static final String POSTFIX = "M4";
/** The JSPWiki major version. */
public static final int VERSION = 2;
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "13";
+ public static final String BUILD = "";
/**
* This is the generic version string you should use when printing out the version. It is of
[jspwiki] 01/02: remove unused import + reorganize imports
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 7fb36ab3d3b701cf7272878201dfa6e176269e84
Author: juanpablo <ju...@apache.org>
AuthorDate: Sat May 11 14:17:17 2019 +0200
remove unused import + reorganize imports
---
.../wiki/search/tika/TikaSearchProvider.java | 29 ++++++++++------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/jspwiki-tika-searchprovider/src/main/java/org/apache/wiki/search/tika/TikaSearchProvider.java b/jspwiki-tika-searchprovider/src/main/java/org/apache/wiki/search/tika/TikaSearchProvider.java
index 7427ce6..2d9a95e 100644
--- a/jspwiki-tika-searchprovider/src/main/java/org/apache/wiki/search/tika/TikaSearchProvider.java
+++ b/jspwiki-tika-searchprovider/src/main/java/org/apache/wiki/search/tika/TikaSearchProvider.java
@@ -18,35 +18,32 @@
*/
package org.apache.wiki.search.tika;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashSet;
-import java.util.Set;
-
+import org.apache.log4j.Logger;
+import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.ClimateForcast;
import org.apache.tika.metadata.CreativeCommons;
import org.apache.tika.metadata.Database;
-import org.apache.tika.metadata.HTML;
import org.apache.tika.metadata.HttpHeaders;
import org.apache.tika.metadata.IPTC;
+import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.Office;
import org.apache.tika.metadata.OfficeOpenXMLCore;
import org.apache.tika.metadata.PDF;
+import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.metadata.TikaMetadataKeys;
-import org.apache.wiki.search.LuceneSearchProvider;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-
-import org.apache.log4j.Logger;
+import org.apache.tika.parser.AutoDetectParser;
+import org.apache.tika.sax.BodyContentHandler;
import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.attachment.Attachment;
import org.apache.wiki.attachment.AttachmentManager;
+import org.apache.wiki.search.LuceneSearchProvider;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
-import org.apache.tika.exception.TikaException;
-import org.apache.tika.metadata.Metadata;
-import org.apache.tika.metadata.TikaCoreProperties;
-import org.apache.tika.parser.AutoDetectParser;
-import org.apache.tika.sax.BodyContentHandler;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Set;
/**
* Search provider that extends {link LuceneSearchProvider} using Apache Tika for indexing attachment content.