You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/03/07 14:05:33 UTC
[camel] branch main updated: CAMEL-17756: camel-tika - Upgrade to tika 2.3.0
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 6427307 CAMEL-17756: camel-tika - Upgrade to tika 2.3.0
6427307 is described below
commit 642730785b459a93c0ceec6809e900a6b3fcfa9f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Mar 7 14:57:48 2022 +0100
CAMEL-17756: camel-tika - Upgrade to tika 2.3.0
---
camel-dependencies/pom.xml | 2 +-
components/camel-tika/pom.xml | 2 +-
.../generated/resources/org/apache/camel/component/tika/tika.json | 6 +++---
.../java/org/apache/camel/component/tika/TikaConfiguration.java | 4 ++--
.../src/main/java/org/apache/camel/component/tika/TikaProducer.java | 2 +-
parent/pom.xml | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 7dfdf10..ac69327 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -538,7 +538,7 @@
<tagsoup-version>1.2.1</tagsoup-version>
<templating-maven-plugin-version>1.0.0</templating-maven-plugin-version>
<testcontainers-version>1.16.3</testcontainers-version>
- <tika-version>1.28.1</tika-version>
+ <tika-version>2.3.0</tika-version>
<trimStackTrace>false</trimStackTrace>
<twilio-version>7.55.3</twilio-version>
<twitter4j-version>4.0.7</twitter4j-version>
diff --git a/components/camel-tika/pom.xml b/components/camel-tika/pom.xml
index 34df6a6..02653a5 100644
--- a/components/camel-tika/pom.xml
+++ b/components/camel-tika/pom.xml
@@ -48,7 +48,7 @@
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
+ <artifactId>tika-parsers-standard-package</artifactId>
<version>${tika-version}</version>
</dependency>
diff --git a/components/camel-tika/src/generated/resources/org/apache/camel/component/tika/tika.json b/components/camel-tika/src/generated/resources/org/apache/camel/component/tika/tika.json
index 135d860..8aa84d5 100644
--- a/components/camel-tika/src/generated/resources/org/apache/camel/component/tika/tika.json
+++ b/components/camel-tika/src/generated/resources/org/apache/camel/component/tika/tika.json
@@ -28,9 +28,9 @@
"properties": {
"operation": { "kind": "path", "displayName": "Operation", "group": "producer", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.tika.TikaOperation", "enum": [ "parse", "detect" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.tika.TikaConfiguration", "configurationField": "tikaConfiguration", "description": "Operation type" },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
- "tikaConfig": { "kind": "parameter", "displayName": "Tika Config", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.tika.config.TikaConfig", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.tika.TikaConfiguration", "configurationField": "tikaConfiguration", "description": "Tika Config" },
- "tikaConfigUri": { "kind": "parameter", "displayName": "Tika Config Uri", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.tika.TikaConfiguration", "configurationField": "tikaConfiguration", "description": "Tika Config Url" },
"tikaParseOutputEncoding": { "kind": "parameter", "displayName": "Tika Parse Output Encoding", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.tika.TikaConfiguration", "configurationField": "tikaConfiguration", "description": "Tika Parse Output Encoding" },
- "tikaParseOutputFormat": { "kind": "parameter", "displayName": "Tika Parse Output Format", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.tika.TikaParseOutputFormat", "enum": [ "xml", "html", "text", "textMain" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "xml", "configurationClass": "org.apache.camel.component.tika.TikaConfiguration", "configurationField": "tikaConfiguration", "descriptio [...]
+ "tikaParseOutputFormat": { "kind": "parameter", "displayName": "Tika Parse Output Format", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.tika.TikaParseOutputFormat", "enum": [ "xml", "html", "text", "textMain" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "xml", "configurationClass": "org.apache.camel.component.tika.TikaConfiguration", "configurationField": "tikaConfiguration", "descriptio [...]
+ "tikaConfig": { "kind": "parameter", "displayName": "Tika Config", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.tika.config.TikaConfig", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.tika.TikaConfiguration", "configurationField": "tikaConfiguration", "description": "Tika Config" },
+ "tikaConfigUri": { "kind": "parameter", "displayName": "Tika Config Uri", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.tika.TikaConfiguration", "configurationField": "tikaConfiguration", "description": "Tika Config Url" }
}
}
diff --git a/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaConfiguration.java b/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaConfiguration.java
index d3ee61d..93de5fc 100644
--- a/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaConfiguration.java
+++ b/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaConfiguration.java
@@ -35,9 +35,9 @@ public class TikaConfiguration {
private TikaParseOutputFormat tikaParseOutputFormat = TikaParseOutputFormat.xml;
@UriParam(description = "Tika Parse Output Encoding")
private String tikaParseOutputEncoding = Charset.defaultCharset().name();
- @UriParam(description = "Tika Config")
+ @UriParam(label = "advanced", description = "Tika Config")
private TikaConfig tikaConfig = TikaConfig.getDefaultConfig();
- @UriParam(description = "Tika Config Url")
+ @UriParam(label = "advanced", description = "Tika Config Url")
private String tikaConfigUri;
public TikaOperation getOperation() {
diff --git a/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaProducer.java b/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaProducer.java
index 9169709..f434156 100644
--- a/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaProducer.java
+++ b/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaProducer.java
@@ -44,9 +44,9 @@ import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
-import org.apache.tika.parser.html.BoilerpipeContentHandler;
import org.apache.tika.sax.BodyContentHandler;
import org.apache.tika.sax.ExpandedTitleContentHandler;
+import org.apache.tika.sax.boilerpipe.BoilerpipeContentHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/parent/pom.xml b/parent/pom.xml
index a5e3736..be314c8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -526,7 +526,7 @@
<tagsoup-version>1.2.1</tagsoup-version>
<templating-maven-plugin-version>1.0.0</templating-maven-plugin-version>
<testcontainers-version>1.16.3</testcontainers-version>
- <tika-version>1.28.1</tika-version>
+ <tika-version>2.3.0</tika-version>
<twilio-version>7.55.3</twilio-version>
<twitter4j-version>4.0.7</twitter4j-version>
<undertow-version>2.2.16.Final</undertow-version>