Author: ogrisel
Date: Thu Dec 1 18:29:32 2011
New Revision: 1209172
URL: http://svn.apache.org/viewvc?rev=1209172&view=rev
Log:
fix OSGi deployment step 3: be tolerant on the version of the JAX-RS API as
jersey does not provide it
Modified:
incubator/stanbol/trunk/commons/web/webvie/pom.xml
incubator/stanbol/trunk/contenthub/web/pom.xml
incubator/stanbol/trunk/enhancer/jersey/pom.xml
incubator/stanbol/trunk/entityhub/jersey/pom.xml
incubator/stanbol/trunk/factstore/factstore/pom.xml
Modified: incubator/stanbol/trunk/commons/web/webvie/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/webvie/pom.xml?rev=1209172&r1=1209171&r2=1209172&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/webvie/pom.xml (original)
+++ incubator/stanbol/trunk/commons/web/webvie/pom.xml Thu Dec 1 18:29:32 2011
@@ -33,7 +33,12 @@
<Export-Package>
org.apache.stanbol.commons.web.vie.*
</Export-Package>
- <Import-Package>*</Import-Package>
+ <!-- Accept any version of the JAX RS API as Jersey is exposing the
+ 0.0.0 version -->
+ <Import-Package>
+ javax.ws.rs.*; version="[0,2)",
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
Modified: incubator/stanbol/trunk/contenthub/web/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/web/pom.xml?rev=1209172&r1=1209171&r2=1209172&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/web/pom.xml (original)
+++ incubator/stanbol/trunk/contenthub/web/pom.xml Thu Dec 1 18:29:32 2011
@@ -55,6 +55,14 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Import-Package>
+ javax.ws.rs.*; version="[0,2)",
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
Modified: incubator/stanbol/trunk/enhancer/jersey/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/jersey/pom.xml?rev=1209172&r1=1209171&r2=1209172&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/jersey/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/jersey/pom.xml Thu Dec 1 18:29:32 2011
@@ -62,6 +62,10 @@
<Embed-Dependency>*;scope=compile|runtime;inline=false;artifactId=jersey-json|jettison|jackson-core-asl
</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
+ <Import-Package>
+ javax.ws.rs.*; version="[0,2)",
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
@@ -74,7 +78,7 @@
<exclude>src/main/resources/org/apache/stanbol/enhancer/jersey/static/openlayers-2.9/**</exclude>
</excludes>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
Modified: incubator/stanbol/trunk/entityhub/jersey/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/jersey/pom.xml?rev=1209172&r1=1209171&r2=1209172&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/jersey/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/jersey/pom.xml Thu Dec 1 18:29:32 2011
@@ -51,6 +51,10 @@
<Embed-Dependency>
mail
</Embed-Dependency>
+ <Import-Package>
+ javax.ws.rs.*; version="[0,2)",
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
Modified: incubator/stanbol/trunk/factstore/factstore/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/factstore/factstore/pom.xml?rev=1209172&r1=1209171&r2=1209172&view=diff
==============================================================================
--- incubator/stanbol/trunk/factstore/factstore/pom.xml (original)
+++ incubator/stanbol/trunk/factstore/factstore/pom.xml Thu Dec 1 18:29:32 2011
@@ -58,8 +58,7 @@
org.apache.stanbol.factstore.api.*
</Export-Package>
<Import-Package>
- <!-- apache derby -->
- org.apache.derby.jdbc,
+ javax.ws.rs.*; version="[0,2)",
*
</Import-Package>
</instructions>
@@ -140,7 +139,6 @@
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.7.1.1</version>
- <scope>provided</scope>
</dependency>
<dependency>
