Author: rwesten
Date: Fri Jan 18 22:45:22 2013
New Revision: 1435389
URL: http://svn.apache.org/viewvc?rev=1435389&view=rev
Log:
STANBOL-887, STANBOL-888, STANBOL-889: fixing further issues related to the
version upgrade
Modified:
stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml
stanbol/trunk/commons/stanboltools/datafileprovider/pom.xml
stanbol/trunk/commons/web/home/pom.xml
stanbol/trunk/contenthub/web/pom.xml
stanbol/trunk/enhancer/jersey/pom.xml
stanbol/trunk/entityhub/jersey/pom.xml
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
stanbol/trunk/ontologymanager/web/pom.xml
stanbol/trunk/rules/web/pom.xml
Modified: stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml?rev=1435389&r1=1435388&r2=1435389&view=diff
==============================================================================
--- stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml (original)
+++ stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml Fri Jan
18 22:45:22 2013
@@ -61,8 +61,11 @@
<Bundle-Activator>
org.apache.stanbol.commons.stanboltools.datafileprovider.bundle.impl.Activator
</Bundle-Activator>
+ <Import-Package>
+ org.apache.stanbol.commons.stanboltools.datafileprovider;
provide:=true; version="[0.9,0.13)",
+ *
+ </Import-Package>
<Export-Package>
- org.apache.stanbol.commons.stanboltools.datafileprovider;
provide:=true,
org.apache.stanbol.commons.stanboltools.datafileprovider.bundle;version=${project.version}
</Export-Package>
<Private-Package>
Modified: stanbol/trunk/commons/stanboltools/datafileprovider/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/stanboltools/datafileprovider/pom.xml?rev=1435389&r1=1435388&r2=1435389&view=diff
==============================================================================
--- stanbol/trunk/commons/stanboltools/datafileprovider/pom.xml (original)
+++ stanbol/trunk/commons/stanboltools/datafileprovider/pom.xml Fri Jan 18
22:45:22 2013
@@ -58,6 +58,7 @@
<instructions>
<Import-Package>
javax.servlet.*; version="[2.5.0,4.0.0)",
+ org.apache.stanbol.commons.stanboltools.datafileprovider;
provide:=true; version="[0.9,0.13)",
*
</Import-Package>
<Export-Package>
Modified: stanbol/trunk/commons/web/home/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/home/pom.xml?rev=1435389&r1=1435388&r2=1435389&view=diff
==============================================================================
--- stanbol/trunk/commons/web/home/pom.xml (original)
+++ stanbol/trunk/commons/web/home/pom.xml Fri Jan 18 22:45:22 2013
@@ -56,7 +56,7 @@
<configuration>
<instructions>
<Import-Package>
- org.apache.stanbol.commons.web.base; provide:=true,
+ org.apache.stanbol.commons.web.base; provide:=true;
version="[0.11,0.13)",
*;
</Import-Package>
<Export-Package>
Modified: stanbol/trunk/contenthub/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/contenthub/web/pom.xml?rev=1435389&r1=1435388&r2=1435389&view=diff
==============================================================================
--- stanbol/trunk/contenthub/web/pom.xml (original)
+++ stanbol/trunk/contenthub/web/pom.xml Fri Jan 18 22:45:22 2013
@@ -61,7 +61,7 @@
<instructions>
<Import-Package>
javax.ws.rs.*; version="[0,2)",
- org.apache.stanbol.commons.web.base; provide:=true,
+ org.apache.stanbol.commons.web.base; provide:=true;
version="[0.11,0.13)",
*
</Import-Package>
<Export-Package>
Modified: stanbol/trunk/enhancer/jersey/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/pom.xml?rev=1435389&r1=1435388&r2=1435389&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/pom.xml (original)
+++ stanbol/trunk/enhancer/jersey/pom.xml Fri Jan 18 22:45:22 2013
@@ -67,7 +67,7 @@
<Import-Package>
javax.servlet.*; version="[2.5.0,4.0.0)",
javax.ws.rs.*; version="[0,2)",
- org.apache.stanbol.commons.web.base; provide:=true,
+ org.apache.stanbol.commons.web.base; provide:=true;
version="[0.11,0.13)",
*
</Import-Package>
</instructions>
Modified: stanbol/trunk/entityhub/jersey/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/jersey/pom.xml?rev=1435389&r1=1435388&r2=1435389&view=diff
==============================================================================
--- stanbol/trunk/entityhub/jersey/pom.xml (original)
+++ stanbol/trunk/entityhub/jersey/pom.xml Fri Jan 18 22:45:22 2013
@@ -64,7 +64,7 @@
</Embed-Dependency>
<Import-Package>
javax.ws.rs.*; version="[0,2)",
- org.apache.stanbol.commons.web.base; provide:=true,
+ org.apache.stanbol.commons.web.base; provide:=true;
version="[0.11,0.13)",
*
</Import-Package>
</instructions>
Modified:
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml?rev=1435389&r1=1435388&r2=1435389&view=diff
==============================================================================
---
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
(original)
+++
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
Fri Jan 18 22:45:22 2013
@@ -179,6 +179,11 @@
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.11</version>
</bundle>
+ <bundle> <!-- for JAX-RS integration -->
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-jaxrs</artifactId>
+ <version>1.9.11</version>
+ </bundle>
</startLevel>
<!-- Jersey -->
<startLevel level="24">
@@ -190,21 +195,6 @@
<artifactId>jersey-core</artifactId>
<version>1.15</version>
</bundle>
- <bundle>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>1.9.7</version>
- </bundle>
- <bundle>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.7</version>
- </bundle>
- <bundle>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- <version>1.9.7</version>
- </bundle>
</startLevel>
<startLevel level="25">
<bundle>
@@ -415,7 +405,7 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.core</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/ontologymanager/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/pom.xml?rev=1435389&r1=1435388&r2=1435389&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/pom.xml (original)
+++ stanbol/trunk/ontologymanager/web/pom.xml Fri Jan 18 22:45:22 2013
@@ -58,7 +58,7 @@
<instructions>
<Import-Package>
javax.ws.rs.*; version="[0,2)",
- org.apache.stanbol.commons.web.base; provide:=true,
+ org.apache.stanbol.commons.web.base; provide:=true;
version="[0.11,0.13)",
*
</Import-Package>
<Export-Package>
Modified: stanbol/trunk/rules/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/rules/web/pom.xml?rev=1435389&r1=1435388&r2=1435389&view=diff
==============================================================================
--- stanbol/trunk/rules/web/pom.xml (original)
+++ stanbol/trunk/rules/web/pom.xml Fri Jan 18 22:45:22 2013
@@ -63,7 +63,7 @@
!org.apache.felix.http.jetty,
!org.mortbay.jetty.*,
javax.ws.rs.*; version="[0,2)",
- org.apache.stanbol.commons.web.base; provide:=true,
+ org.apache.stanbol.commons.web.base; provide:=true;
version="[0.11,0.13)",
*
</Import-Package>
</instructions>
