You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2015/04/20 13:24:44 UTC
svn commit: r1674800 - in /tika/trunk: CHANGES.txt
tika-app/src/main/appended-resources/META-INF/LICENSE tika-parsers/pom.xml
tika-parsers/src/main/appended-resources/META-INF/LICENSE
Author: tallison
Date: Mon Apr 20 11:24:43 2015
New Revision: 1674800
URL: http://svn.apache.org/r1674800
Log:
TIKA-1511, move xerial dependency to 'provided'
Modified:
tika/trunk/CHANGES.txt
tika/trunk/tika-app/src/main/appended-resources/META-INF/LICENSE
tika/trunk/tika-parsers/pom.xml
tika/trunk/tika-parsers/src/main/appended-resources/META-INF/LICENSE
Modified: tika/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/tika/trunk/CHANGES.txt?rev=1674800&r1=1674799&r2=1674800&view=diff
==============================================================================
--- tika/trunk/CHANGES.txt (original)
+++ tika/trunk/CHANGES.txt Mon Apr 20 11:24:43 2015
@@ -78,10 +78,11 @@ Release 1.8 - 4/13/2015
* Increased the speed of language identification by
a factor of two -- contributed by Toke Eskildsen (TIKA-1549).
- * Added parser for Sqlite3 db files. BEWARE: the org.xerial
- dependency includes native libs. Some users may need to
- exclude this dependency or configure it specially for
- their environment (TIKA-1511).
+ * Added parser for Sqlite3 db files. Because the org.xerial
+ dependency includes native libs, we have not included it
+ in tika-app or tika-server. Users who want to parse Sqlite3 db
+ files must "provide" the jar -- see tika-parsers/pom.xml
+ for the correct version. (TIKA-1511).
* Use POST instead of PUT for tika-server form methods
(TIKA-1547).
Modified: tika/trunk/tika-app/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/tika/trunk/tika-app/src/main/appended-resources/META-INF/LICENSE?rev=1674800&r1=1674799&r2=1674800&view=diff
==============================================================================
--- tika/trunk/tika-app/src/main/appended-resources/META-INF/LICENSE (original)
+++ tika/trunk/tika-app/src/main/appended-resources/META-INF/LICENSE Mon Apr 20 11:24:43 2015
@@ -1122,3 +1122,8 @@ AspectJ runtime library (aspectjrt)
this Agreement will bring a legal action under this Agreement more than
one year after the cause of action arose. Each party waives its rights to
a jury trial in any resulting litigation.
+
+Sqlite (included in the "provided" org.xerial's sqlite-jdbc)
+ Sqlite is in the Public Domain. For details
+ see: https://www.sqlite.org/copyright.html
+
Modified: tika/trunk/tika-parsers/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/pom.xml?rev=1674800&r1=1674799&r2=1674800&view=diff
==============================================================================
--- tika/trunk/tika-parsers/pom.xml (original)
+++ tika/trunk/tika-parsers/pom.xml Mon Apr 20 11:24:43 2015
@@ -196,11 +196,6 @@
<version>${vorbis.version}</version>
</dependency>
<dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
- <version>3.8.6</version> <!-- 3.8.7 failed on Ubuntu -->
- </dependency>
- <dependency>
<groupId>com.googlecode.juniversalchardet</groupId>
<artifactId>juniversalchardet</artifactId>
<version>1.0.3</version>
@@ -221,6 +216,14 @@
<version>0.7</version>
</dependency>
+ <!-- Provided dependencies -->
+ <dependency>
+ <groupId>org.xerial</groupId>
+ <artifactId>sqlite-jdbc</artifactId>
+ <version>3.8.6</version> <!-- 3.8.7 failed on Ubuntu -->
+ <scope>provided</scope>
+ </dependency>
+
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
Modified: tika/trunk/tika-parsers/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/appended-resources/META-INF/LICENSE?rev=1674800&r1=1674799&r2=1674800&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/appended-resources/META-INF/LICENSE (original)
+++ tika/trunk/tika-parsers/src/main/appended-resources/META-INF/LICENSE Mon Apr 20 11:24:43 2015
@@ -80,8 +80,8 @@ JUnRAR (https://github.com/edmund-wagner
Thank you for your interest in RAR and UnRAR. Alexander L. Roshal
-Sqlite (bundled in org.xerial's sqlite-jdbc)
- This product bundles Sqlite, which is in the Public Domain. For details
+Sqlite (included in the "provided" org.xerial's sqlite-jdbc)
+ Sqlite is in the Public Domain. For details
see: https://www.sqlite.org/copyright.html
Two photos in test-documents (testWebp_Alpha_Lossy.webp and testWebp_Alpha_Lossless.webp)