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 2013/04/11 14:54:59 UTC
svn commit: r1466867 - in /stanbol/trunk: commons/solr/core/pom.xml
enhancement-engines/entitytagging/pom.xml parent/pom.xml
Author: rwesten
Date: Thu Apr 11 12:54:59 2013
New Revision: 1466867
URL: http://svn.apache.org/r1466867
Log:
STANBOL-1026: upgrade to Solr 4.2.1
Modified:
stanbol/trunk/commons/solr/core/pom.xml
stanbol/trunk/enhancement-engines/entitytagging/pom.xml
stanbol/trunk/parent/pom.xml
Modified: stanbol/trunk/commons/solr/core/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/core/pom.xml?rev=1466867&r1=1466866&r2=1466867&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/core/pom.xml (original)
+++ stanbol/trunk/commons/solr/core/pom.xml Thu Apr 11 12:54:59 2013
@@ -95,7 +95,8 @@
lucene-spatial, lucene-spellchecker, lucene-misc, lucene-queries,
lucene-memory, lucene-phonetic, lucene-grouping, lucene-codecs,
lucene-queryparser, lucene-sandbox, lucene-suggest,
- zookeeper
+ zookeeper,
+ org.restlet, org.restlet.ext.servlet
</Embed-Dependency>
<Private-Package>
org.apache.stanbol.commons.solr.impl;version=${project.version}
@@ -260,6 +261,22 @@
<artifactId>velocity-tools</artifactId>
</dependency>
+ <!--
+ Restlet is used starting with Solr 4.2. For now commented as this in only
+ a runtime dependency referenced in Bundlelists
+ -->
+ <dependency>
+ <groupId>org.restlet.jee</groupId>
+ <artifactId>org.restlet</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.restlet.jee</groupId>
+ <artifactId>org.restlet.ext.servlet</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+
+ <!-- OSGI dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -300,5 +317,16 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <!--
+ Apache Solr uses restlet (starting with Solr 4.2.0). This modules are
+ distributed by an own Maven server
+ -->
+ <repositories>
+ <repository>
+ <id>maven-restlet</id>
+ <name>Public online Restlet repository</name>
+ <url>http://maven.restlet.org</url>
+ </repository>
+ </repositories>
</project>
Modified: stanbol/trunk/enhancement-engines/entitytagging/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/entitytagging/pom.xml?rev=1466867&r1=1466866&r2=1466867&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/entitytagging/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/entitytagging/pom.xml Thu Apr 11 12:54:59 2013
@@ -123,6 +123,12 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
+ <exclusions>
+ <exclusion> <!-- Do not override a newer version required by Solr 4.2.1 -->
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/parent/pom.xml?rev=1466867&r1=1466866&r2=1466867&view=diff
==============================================================================
--- stanbol/trunk/parent/pom.xml (original)
+++ stanbol/trunk/parent/pom.xml Thu Apr 11 12:54:59 2013
@@ -60,7 +60,7 @@
<jersey-version>1.15</jersey-version>
<freemarker-version>2.3.19</freemarker-version>
<owlapi-version>3.3</owlapi-version>
- <solr-version>4.1.0</solr-version>
+ <solr-version>4.2.1</solr-version>
<pax-exam-version>2.3.0.M1</pax-exam-version>
<sourceReleaseAssemblyDescriptor>stanbol-source-release-zip-tar</sourceReleaseAssemblyDescriptor>
</properties>