You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2014/04/23 08:50:12 UTC
svn commit: r1589349 - in /stanbol/trunk: ./ commons/ commons/tikabundle/
enhancement-engines/
enhancement-engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/
launchers/ launchers/bundlelists/enhancer/
launchers/bundlelists/enhancer/sr...
Author: rwesten
Date: Wed Apr 23 06:50:12 2014
New Revision: 1589349
URL: http://svn.apache.org/r1589349
Log:
merged changes related to STANBOL-1171 to trunk - Stanbol 1.0.0-SNAPSHOT now also uses Tika 1.5
Added:
stanbol/trunk/commons/tikabundle/
- copied from r1589341, stanbol/branches/release-0.12/commons/tikabundle/
Modified:
stanbol/trunk/ (props changed)
stanbol/trunk/commons/ (props changed)
stanbol/trunk/commons/pom.xml
stanbol/trunk/commons/tikabundle/pom.xml
stanbol/trunk/enhancement-engines/ (props changed)
stanbol/trunk/enhancement-engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/TikaEngineTest.java
stanbol/trunk/launchers/ (props changed)
stanbol/trunk/launchers/bundlelists/enhancer/ (props changed)
stanbol/trunk/launchers/bundlelists/enhancer/src/main/bundles/list.xml
stanbol/trunk/parent/ (props changed)
stanbol/trunk/parent/pom.xml
Propchange: stanbol/trunk/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12:r1589341
Propchange: stanbol/trunk/commons/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12/commons:r1589341
Modified: stanbol/trunk/commons/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/pom.xml?rev=1589349&r1=1589348&r2=1589349&view=diff
==============================================================================
--- stanbol/trunk/commons/pom.xml (original)
+++ stanbol/trunk/commons/pom.xml Wed Apr 23 06:50:12 2014
@@ -96,6 +96,9 @@
<module>solr/extras/icu</module> <!-- support for ICU -->
<module>solr/extras/stempel</module> <!-- support for the Polish stemmer -->
+ <!-- Apache Tika Bundle-->
+ <module>tikabundle</module>
+
<module>jobs</module> <!-- Stanbol Background Jobs Framework -->
<module>opennlp</module> <!-- Allows to load OpenNLP modles via DataFile provider -->
Modified: stanbol/trunk/commons/tikabundle/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/tikabundle/pom.xml?rev=1589349&r1=1589341&r2=1589349&view=diff
==============================================================================
--- stanbol/trunk/commons/tikabundle/pom.xml (original)
+++ stanbol/trunk/commons/tikabundle/pom.xml Wed Apr 23 06:50:12 2014
@@ -22,12 +22,12 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>4.1-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
+ <version>5-SNAPSHOT</version>
</parent>
<artifactId>org.apache.stanbol.commons.tikabundle</artifactId>
- <version>0.12.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Commons Tika Bundle</name>
Propchange: stanbol/trunk/enhancement-engines/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12/enhancement-engines:r1589341
Modified: stanbol/trunk/enhancement-engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/TikaEngineTest.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/TikaEngineTest.java?rev=1589349&r1=1589348&r2=1589349&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/TikaEngineTest.java (original)
+++ stanbol/trunk/enhancement-engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/TikaEngineTest.java Wed Apr 23 06:50:12 2014
@@ -366,7 +366,7 @@ public class TikaEngineTest {
new UriRef(NamespaceEnum.media+"Track"),
new UriRef(NamespaceEnum.media+"AudioTrack"));
//properties
- verifyValue(ci, audioTrack, new UriRef(NamespaceEnum.media+"hasFormat"), XSD.string, "Stereo");
+ verifyValue(ci, audioTrack, new UriRef(NamespaceEnum.media+"hasFormat"), XSD.string, "Mono");
verifyValue(ci, audioTrack, new UriRef(NamespaceEnum.media+"samplingRate"), XSD.int_, "44100");
verifyValue(ci, audioTrack, new UriRef(NamespaceEnum.media+"hasCompression"), XSD.string, "MP3");
}
Propchange: stanbol/trunk/launchers/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12/launchers:r1589341
Propchange: stanbol/trunk/launchers/bundlelists/enhancer/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12/launchers/bundlelists/enhancer:r1589341
Modified: stanbol/trunk/launchers/bundlelists/enhancer/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/enhancer/src/main/bundles/list.xml?rev=1589349&r1=1589348&r2=1589349&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/enhancer/src/main/bundles/list.xml (original)
+++ stanbol/trunk/launchers/bundlelists/enhancer/src/main/bundles/list.xml Wed Apr 23 06:50:12 2014
@@ -38,14 +38,14 @@
<bundle> <!-- Apache Tika core (required by the LangId and TikaEngine) -->
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>1.2</version>
+ <version>1.5</version>
</bundle>
</startLevel>
<startLevel level="27">
- <bundle> <!-- Apache Tika bundle (required by the TikaEngine) -->
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-bundle</artifactId>
- <version>1.2</version>
+ <bundle> <!-- Stanbol version of the Apache Tika bundle -->
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.tikabundle</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</bundle>
</startLevel>
<!-- Stanbol Enhancer infrastructure and required libraries -->
Propchange: stanbol/trunk/parent/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12/parent:r1589341
Modified: stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/parent/pom.xml?rev=1589349&r1=1589348&r2=1589349&view=diff
==============================================================================
--- stanbol/trunk/parent/pom.xml (original)
+++ stanbol/trunk/parent/pom.xml Wed Apr 23 06:50:12 2014
@@ -63,6 +63,7 @@
<sesame-version>2.7.7</sesame-version>
<marmotta-version>3.2.0-SNAPSHOT</marmotta-version>
<ldpath-version>${marmotta-version}</ldpath-version>
+ <tika-version>1.5</tika-version>
<sourceReleaseAssemblyDescriptor>stanbol-source-release-zip-tar</sourceReleaseAssemblyDescriptor>
</properties>
@@ -1351,17 +1352,17 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>1.2</version>
+ <version>${tika-version}</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
- <version>1.2</version>
+ <version>${tika-version}</version>
</dependency>
<!-- dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-xmp</artifactId>
- <version>1.4</version>
+ <version>${tika-version}</version>
</dependency -->
<!-- Aperture -->
<dependency>