diff --git a/boms/modeshape-bom-embedded/pom.xml b/boms/modeshape-bom-embedded/pom.xml
index 18ace5e4e6..dd1044a81c 100644
--- a/boms/modeshape-bom-embedded/pom.xml
+++ b/boms/modeshape-bom-embedded/pom.xml
@@ -63,7 +63,7 @@
2.14.02.0.0-rc21.11.24
- 1.12
+ 1.143.3.0-v200704263.3.0-v_7713.3.0-v20070604
@@ -81,7 +81,7 @@
2.4.13.18.1-GA2.0.3
- 3.13
+ 3.151.51.6.36.0.0
diff --git a/deploy/jbossas/kit/jboss-wf/org/apache/tika/1.12/module.xml b/deploy/jbossas/kit/jboss-wf/org/apache/tika/1.14/module.xml
similarity index 67%
rename from deploy/jbossas/kit/jboss-wf/org/apache/tika/1.12/module.xml
rename to deploy/jbossas/kit/jboss-wf/org/apache/tika/1.14/module.xml
index 0411e3867a..870890dd58 100644
--- a/deploy/jbossas/kit/jboss-wf/org/apache/tika/1.12/module.xml
+++ b/deploy/jbossas/kit/jboss-wf/org/apache/tika/1.14/module.xml
@@ -16,32 +16,34 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
+
-
-
+
+
-
-
+
+
+
+
-
-
-
-
+
+
+
-
+
-
-
+
+
+
diff --git a/deploy/jbossas/kit/jboss-wf/org/modeshape/sequencer/pdf/main/module.xml b/deploy/jbossas/kit/jboss-wf/org/modeshape/sequencer/pdf/main/module.xml
index dee389e69c..70dec6f43f 100644
--- a/deploy/jbossas/kit/jboss-wf/org/modeshape/sequencer/pdf/main/module.xml
+++ b/deploy/jbossas/kit/jboss-wf/org/modeshape/sequencer/pdf/main/module.xml
@@ -19,13 +19,12 @@
-
-
-
+
+
diff --git a/extractors/modeshape-extractor-tika/src/main/java/org/modeshape/extractor/tika/TikaTextExtractor.java b/extractors/modeshape-extractor-tika/src/main/java/org/modeshape/extractor/tika/TikaTextExtractor.java
index 0f0a2879a1..ef55d1f922 100644
--- a/extractors/modeshape-extractor-tika/src/main/java/org/modeshape/extractor/tika/TikaTextExtractor.java
+++ b/extractors/modeshape-extractor-tika/src/main/java/org/modeshape/extractor/tika/TikaTextExtractor.java
@@ -16,15 +16,15 @@
package org.modeshape.extractor.tika;
import java.io.IOException;
-import java.io.InputStream;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.atomic.AtomicReference;
import javax.jcr.RepositoryException;
+import org.apache.tika.config.ServiceLoader;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.mime.MediaTypeRegistry;
import org.apache.tika.parser.DefaultParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
@@ -83,9 +83,9 @@ public class TikaTextExtractor extends TextExtractor {
MediaType.application("x-tar"), MediaType.application("zip"), MediaType.application("vnd.teiid.vdb"),
MediaType.image("*"), MediaType.audio("*"), MediaType.video("*"));
- private final Set excludedMediaTypes = new HashSet();
- private final Set includedMediaTypes = new HashSet();
- private final Set parserSupportedMediaTypes = new HashSet();
+ private final Set excludedMediaTypes = new HashSet<>();
+ private final Set includedMediaTypes = new HashSet<>();
+ private final Set parserSupportedMediaTypes = new HashSet<>();
/**
* The write limit for the Tika parser, representing the maximum number of characters that should be extracted by the
@@ -93,8 +93,7 @@ public class TikaTextExtractor extends TextExtractor {
*/
private Integer writeLimit;
- private final Lock initLock = new ReentrantLock();
- private DefaultParser parser;
+ private final AtomicReference parser = new AtomicReference<>();
/**
* No-arg constructor is required because this is instantiated by reflection.
@@ -130,33 +129,30 @@ public void extractFrom( final Binary binary,
final DefaultParser parser = initialize();
final Integer writeLimit = this.writeLimit;
- processStream(binary, new BinaryOperation