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 2017/07/13 08:14:43 UTC
[1/2] camel git commit: Upgrade Tika
Repository: camel
Updated Branches:
refs/heads/camel-2.19.x 81ddec977 -> ab8381859
refs/heads/master 668ad2431 -> c57d31075
Upgrade Tika
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c57d3107
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c57d3107
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c57d3107
Branch: refs/heads/master
Commit: c57d31075675fd55b2a809bc430cb560bb983f16
Parents: 668ad24
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jul 13 10:12:49 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 13 10:12:49 2017 +0200
----------------------------------------------------------------------
parent/pom.xml | 3 +--
.../components-starter/camel-tika-starter/pom.xml | 8 --------
2 files changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c57d3107/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b5eeca8..597a8bc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -666,8 +666,7 @@
<tagsoup-version>1.2.1</tagsoup-version>
<testng-version>6.8.21</testng-version>
<tinybundles-version>2.1.1</tinybundles-version>
- <!-- tika 1.15 does not work in OSGi: https://issues.apache.org/jira/browse/TIKA-2379 -->
- <tika-version>1.14</tika-version>
+ <tika-version>1.16</tika-version>
<twilio-version>7.9.1</twilio-version>
<twitter4j-bundle-version>4.0.6_1</twitter4j-bundle-version>
<twitter4j-version>4.0.6</twitter4j-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/c57d3107/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml b/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml
index edf84df..20d7e71 100644
--- a/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml
@@ -38,14 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-tika</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
[2/2] camel git commit: Upgrade Tika
Posted by da...@apache.org.
Upgrade Tika
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ab838185
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ab838185
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ab838185
Branch: refs/heads/camel-2.19.x
Commit: ab8381859411ded7e7a7529a368cf7ebd347e5b9
Parents: 81ddec9
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jul 13 10:12:49 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 13 10:14:10 2017 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
.../components-starter/camel-tika-starter/pom.xml | 8 --------
2 files changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ab838185/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4b7a0d4..4dcf594 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -644,7 +644,7 @@
<tagsoup-version>1.2.1</tagsoup-version>
<testng-version>6.8.21</testng-version>
<tinybundles-version>2.1.1</tinybundles-version>
- <tika-version>1.14</tika-version>
+ <tika-version>1.16</tika-version>
<twitter4j-bundle-version>4.0.6_1</twitter4j-bundle-version>
<twitter4j-version>4.0.6</twitter4j-version>
<undertow-version>1.4.13.Final</undertow-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/ab838185/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml b/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml
index f334ecb..95fdf7a 100644
--- a/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml
@@ -36,14 +36,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-tika</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>