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/05/24 08:33:51 UTC
svn commit: r1597256 - in /stanbol/branches/release-0.12/entityhub:
indexing/core/ indexing/dblp/ indexing/dbpedia/
indexing/destination/solryard/ indexing/freebase/ indexing/genericrdf/
indexing/geonames/ indexing/source/jenatdb/ indexing/source/vcard...
Author: rwesten
Date: Sat May 24 06:33:49 2014
New Revision: 1597256
URL: http://svn.apache.org/r1597256
Log:
fix for STANBOL-1344 in the 0.12 branch
Modified:
stanbol/branches/release-0.12/entityhub/indexing/core/pom.xml
stanbol/branches/release-0.12/entityhub/indexing/dblp/pom.xml
stanbol/branches/release-0.12/entityhub/indexing/dbpedia/pom.xml
stanbol/branches/release-0.12/entityhub/indexing/destination/solryard/pom.xml
stanbol/branches/release-0.12/entityhub/indexing/freebase/pom.xml
stanbol/branches/release-0.12/entityhub/indexing/genericrdf/pom.xml
stanbol/branches/release-0.12/entityhub/indexing/geonames/pom.xml
stanbol/branches/release-0.12/entityhub/indexing/source/jenatdb/pom.xml
stanbol/branches/release-0.12/entityhub/indexing/source/vcard/pom.xml
stanbol/branches/release-0.12/entityhub/ldpath/pom.xml
Modified: stanbol/branches/release-0.12/entityhub/indexing/core/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/indexing/core/pom.xml?rev=1597256&r1=1597255&r2=1597256&view=diff
==============================================================================
--- stanbol/branches/release-0.12/entityhub/indexing/core/pom.xml (original)
+++ stanbol/branches/release-0.12/entityhub/indexing/core/pom.xml Sat May 24 06:33:49 2014
@@ -93,13 +93,13 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.namespaceprefix.service</artifactId>
- <version>0.11.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.core</artifactId>
- <version>0.11.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -153,7 +153,7 @@
<dependency> <!-- provides the default Stanbol mappings -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.namespaceprefix.provider.stanbol</artifactId>
- <version>0.11.0</version>
+ <version>0.12.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: stanbol/branches/release-0.12/entityhub/indexing/dblp/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/indexing/dblp/pom.xml?rev=1597256&r1=1597255&r2=1597256&view=diff
==============================================================================
--- stanbol/branches/release-0.12/entityhub/indexing/dblp/pom.xml (original)
+++ stanbol/branches/release-0.12/entityhub/indexing/dblp/pom.xml Sat May 24 06:33:49 2014
@@ -96,26 +96,26 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.core</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider</artifactId>
- <version>0.11.0</version>
+ <version>0.12.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.source.jenatdb</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<!-- dependencies of the solr yard destination -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.destination.solryard</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -123,12 +123,12 @@
<dependency> <!-- provides the default Stanbol mappings -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.namespaceprefix.provider.stanbol</artifactId>
- <version>0.11.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency> <!-- provides the prefix.cc mappings -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.namespaceprefix.provider.prefixcc</artifactId>
- <version>0.11.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
Modified: stanbol/branches/release-0.12/entityhub/indexing/dbpedia/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/indexing/dbpedia/pom.xml?rev=1597256&r1=1597255&r2=1597256&view=diff
==============================================================================
--- stanbol/branches/release-0.12/entityhub/indexing/dbpedia/pom.xml (original)
+++ stanbol/branches/release-0.12/entityhub/indexing/dbpedia/pom.xml Sat May 24 06:33:49 2014
@@ -116,20 +116,20 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.core</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.source.jenatdb</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<!-- dependencies of the solr yard destination -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.destination.solryard</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -159,12 +159,12 @@
<dependency> <!-- provides the default Stanbol mappings -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.namespaceprefix.provider.stanbol</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency> <!-- provides the prefix.cc mappings -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.namespaceprefix.provider.prefixcc</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency> <!-- for the Main (command line utility) -->
Modified: stanbol/branches/release-0.12/entityhub/indexing/destination/solryard/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/indexing/destination/solryard/pom.xml?rev=1597256&r1=1597255&r2=1597256&view=diff
==============================================================================
--- stanbol/branches/release-0.12/entityhub/indexing/destination/solryard/pom.xml (original)
+++ stanbol/branches/release-0.12/entityhub/indexing/destination/solryard/pom.xml Sat May 24 06:33:49 2014
@@ -102,17 +102,17 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.core</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.core</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.yard.solr</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<!-- FST model generation -->
<dependency>
@@ -136,11 +136,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -149,7 +144,7 @@
<dependency> <!-- provides the default Stanbol mappings -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.namespaceprefix.provider.stanbol</artifactId>
- <version>0.11.0</version>
+ <version>0.12.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: stanbol/branches/release-0.12/entityhub/indexing/freebase/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/indexing/freebase/pom.xml?rev=1597256&r1=1597255&r2=1597256&view=diff
==============================================================================
--- stanbol/branches/release-0.12/entityhub/indexing/freebase/pom.xml (original)
+++ stanbol/branches/release-0.12/entityhub/indexing/freebase/pom.xml Sat May 24 06:33:49 2014
@@ -120,20 +120,20 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.core</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.source.jenatdb</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<!-- dependencies of the solr yard destination -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.destination.solryard</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -141,34 +141,34 @@
<dependency> <!-- provides the default Stanbol mappings -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.namespaceprefix.provider.stanbol</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0</version>
</dependency>
<dependency> <!-- provides the prefix.cc mappings -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.namespaceprefix.provider.prefixcc</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0</version>
</dependency>
<!-- additional Solr modules -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.extras.icu</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.extras.smartcn</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.extras.kuromoji</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.extras.stempel</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency> <!-- for the Main (command line utility) -->
@@ -200,11 +200,6 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency> <!-- see also the log4j.properties in src/main/resources -->
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>runtime</scope>
- </dependency>
<!-- for testing -->
<dependency>
Modified: stanbol/branches/release-0.12/entityhub/indexing/genericrdf/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/indexing/genericrdf/pom.xml?rev=1597256&r1=1597255&r2=1597256&view=diff
==============================================================================
--- stanbol/branches/release-0.12/entityhub/indexing/genericrdf/pom.xml (original)
+++ stanbol/branches/release-0.12/entityhub/indexing/genericrdf/pom.xml Sat May 24 06:33:49 2014
@@ -97,7 +97,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.core</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -105,12 +105,12 @@
<dependency> <!-- provides the default Stanbol mappings -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.namespaceprefix.provider.stanbol</artifactId>
- <version>0.11.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency> <!-- provides the prefix.cc mappings -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.namespaceprefix.provider.prefixcc</artifactId>
- <version>0.11.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency> <!-- for the Main (command line utility) -->
@@ -140,17 +140,12 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency> <!-- see also the log4j.properties in src/main/resources -->
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>runtime</scope>
- </dependency>
<!-- dependencies of the jena tdb source -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.source.jenatdb</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -158,7 +153,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.source.vcard</artifactId>
- <version>0.11.0</version>
+ <version>0.12.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -166,7 +161,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.destination.solryard</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Modified: stanbol/branches/release-0.12/entityhub/indexing/geonames/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/indexing/geonames/pom.xml?rev=1597256&r1=1597255&r2=1597256&view=diff
==============================================================================
--- stanbol/branches/release-0.12/entityhub/indexing/geonames/pom.xml (original)
+++ stanbol/branches/release-0.12/entityhub/indexing/geonames/pom.xml Sat May 24 06:33:49 2014
@@ -111,20 +111,20 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.core</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<!-- runtime dependencies for the standalone tool -->
<dependency> <!-- provides the default Stanbol mappings -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.namespaceprefix.provider.stanbol</artifactId>
- <version>0.11.0</version>
+ <version>0.12.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency> <!-- provides the prefix.cc mappings -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.namespaceprefix.provider.prefixcc</artifactId>
- <version>0.11.0</version>
+ <version>0.12.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency> <!-- we use log4j 1.2 -->
@@ -132,16 +132,11 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency> <!-- see also the log4j.properties in src/main/resources -->
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>runtime</scope>
- </dependency>
<dependency> <!-- we want to use the SolrYard as target -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.destination.solryard</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: stanbol/branches/release-0.12/entityhub/indexing/source/jenatdb/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/indexing/source/jenatdb/pom.xml?rev=1597256&r1=1597255&r2=1597256&view=diff
==============================================================================
--- stanbol/branches/release-0.12/entityhub/indexing/source/jenatdb/pom.xml (original)
+++ stanbol/branches/release-0.12/entityhub/indexing/source/jenatdb/pom.xml Sat May 24 06:33:49 2014
@@ -93,13 +93,13 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.namespaceprefix.service</artifactId>
- <version>0.11.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.core</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -147,11 +147,6 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>junit</groupId>
Modified: stanbol/branches/release-0.12/entityhub/indexing/source/vcard/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/indexing/source/vcard/pom.xml?rev=1597256&r1=1597255&r2=1597256&view=diff
==============================================================================
--- stanbol/branches/release-0.12/entityhub/indexing/source/vcard/pom.xml (original)
+++ stanbol/branches/release-0.12/entityhub/indexing/source/vcard/pom.xml Sat May 24 06:33:49 2014
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.core</artifactId>
- <version>0.12.0</version>
+ <version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency>
Modified: stanbol/branches/release-0.12/entityhub/ldpath/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/ldpath/pom.xml?rev=1597256&r1=1597255&r2=1597256&view=diff
==============================================================================
--- stanbol/branches/release-0.12/entityhub/ldpath/pom.xml (original)
+++ stanbol/branches/release-0.12/entityhub/ldpath/pom.xml Sat May 24 06:33:49 2014
@@ -106,6 +106,16 @@
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>ldpath-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- generic tax -->