You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by fc...@apache.org on 2011/02/10 14:32:44 UTC
svn commit: r1069386 - in /incubator/stanbol/trunk/entityhub:
generic/core/pom.xml yard/embeddedSolrProvider/pom.xml yard/solr/pom.xml
yard/solrProvider/pom.xml
Author: fchrist
Date: Thu Feb 10 13:32:44 2011
New Revision: 1069386
URL: http://svn.apache.org/viewvc?rev=1069386&view=rev
Log:
Fixed entityhub dependencies for correct generation of Eclipse projects using mvn eclipse:eclipse
Modified:
incubator/stanbol/trunk/entityhub/generic/core/pom.xml
incubator/stanbol/trunk/entityhub/yard/embeddedSolrProvider/pom.xml
incubator/stanbol/trunk/entityhub/yard/solr/pom.xml
incubator/stanbol/trunk/entityhub/yard/solrProvider/pom.xml
Modified: incubator/stanbol/trunk/entityhub/generic/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/core/pom.xml?rev=1069386&r1=1069385&r2=1069386&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/core/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/generic/core/pom.xml Thu Feb 10 13:32:44 2011
@@ -60,7 +60,7 @@
org.apache.stanbol.entityhub.core.yard;version=${pom.version},
org.apache.stanbol.entityhub.core.utils;version=${pom.version}
</Export-Package>
- <Private-Package>
+ <Private-Package>
org.apache.stanbol.entityhub.core.impl;version=${pom.version},
</Private-Package>
</instructions>
@@ -82,22 +82,31 @@
<version>0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
+
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.2</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.core</artifactId>
<version>0.12-incubating-SNAPSHOT</version>
<scope>provided</scope>
- </dependency>
+ </dependency -->
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>1.6.2</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -108,22 +117,31 @@
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.1.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
<version>1.3.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
<version>1.2.4</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.foundation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
<version>1.0.4</version>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.apache.felix</groupId>
@@ -135,7 +153,9 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
<version>1.4.0</version>
+ <scope>provided</scope>
</dependency>
+
<!-- for tests -->
<dependency>
<groupId>org.apache.stanbol</groupId>
Modified: incubator/stanbol/trunk/entityhub/yard/embeddedSolrProvider/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/embeddedSolrProvider/pom.xml?rev=1069386&r1=1069385&r2=1069386&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/embeddedSolrProvider/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/yard/embeddedSolrProvider/pom.xml Thu Feb 10 13:32:44 2011
@@ -202,6 +202,12 @@
<artifactId>org.apache.felix.configadmin</artifactId>
<version>1.2.4</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.foundation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: incubator/stanbol/trunk/entityhub/yard/solr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/pom.xml?rev=1069386&r1=1069385&r2=1069386&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/solr/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/yard/solr/pom.xml Thu Feb 10 13:32:44 2011
@@ -130,12 +130,19 @@
<artifactId>org.apache.felix.scr.annotations</artifactId>
<version>1.3.0</version>
</dependency>
-<!-- <dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
<version>1.2.4</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.foundation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
@@ -146,12 +153,12 @@
<artifactId>org.osgi.foundation</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
<version>1.4.0</version>
- </dependency> -->
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Modified: incubator/stanbol/trunk/entityhub/yard/solrProvider/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solrProvider/pom.xml?rev=1069386&r1=1069385&r2=1069386&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/solrProvider/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/yard/solrProvider/pom.xml Thu Feb 10 13:32:44 2011
@@ -123,6 +123,12 @@
<artifactId>org.apache.felix.configadmin</artifactId>
<version>1.2.4</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.foundation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- <dependency>
<groupId>org.apache.felix</groupId>