Issue 225 fix OSGi dependencies

chardcyber · Nov 5, 2012 · df9608a · df9608a
1 parent 6c24e07
commit df9608a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/odata4j-core/pom.xml b/odata4j-core/pom.xml
@@ -23,19 +23,19 @@
         <configuration>
           <instructions>
             <Import-Package>
-              javax.persistence;version="[1.0.0,2.0.0)",
+              javax.persistence;version="[2.0.0,3.0.0)",
               javax.persistence.metamodel;version="[2.0.0,3.0.0)",
               javax.ws.rs;version="[1.1.0,2.0.0)",
               javax.ws.rs.core;version="[1.1.0,2.0.0)",
               javax.ws.rs.ext;version="[1.1.0,2.0.0)",
               org.core4j;version="[0.5.0,1.0.0)",
-              org.eclipse.persistence;version="[1.1.0,2.0.0)",
-              org.eclipse.persistence.internal.helper;version="[1.1.0,2.0.0)",
+              org.eclipse.persistence;version="[2.0.0,3.0.0)",
+              org.eclipse.persistence.internal.helper;version="[2.2.0,3.0.0)",
               org.eclipse.persistence.internal.jpa.metamodel;version="[2.0.0,3.0.0)";resolution:=optional,
-              org.eclipse.persistence.mappings;version="[1.1.0,2.0.0)",
-              org.joda.time;version="[1.6.0,2.0.0)",
-              org.joda.time.format;version="[1.6.0,2.0.0)",
-              org.xmlpull.v1;version="[1.1.0,2.0.0)",
+              org.eclipse.persistence.mappings;version="[2.0.0,3.0.0)",
+              org.joda.time;version="[2.0.0,3.0.0)",
+              org.joda.time.format;version="[2.0.0,3.0.0)",
+              org.xmlpull.v1;version="[1.0.0,2.0.0)",
               *
             </Import-Package>
             <Export-Package>

diff --git a/odata4j-cxf/pom.xml b/odata4j-cxf/pom.xml
@@ -23,7 +23,7 @@
         <configuration>
           <instructions>
             <Import-Package>
-              javax.servlet;version="[3.0.0,4.0.0)",
+              javax.servlet;version="[2.0.0,4.0.0)",
               javax.ws.rs.core;version="[1.1.0,2.0.0)",
               org.apache.cxf.jaxrs.servlet;version="[2.5.0,3.0.0)",
               org.apache.http;version="[4.1.0,5.0.0)",
@@ -37,7 +37,7 @@
               org.eclipse.jetty.server.handler;version="[7.5.0,8.0.0)";resolution:=optional,
               org.eclipse.jetty.servlet;version="[7.5.0,8.0.0)";resolution:=optional,
               org.eclipse.jetty.util.component;version="[7.5.0,8.0.0)";resolution:=optional,
-              org.joda.time;version="[1.6.0,8.0.0)",
+              org.joda.time;version="[2.0.0,3.0.0)",
               *
             </Import-Package>
             <Export-Package>

diff --git a/pom.xml b/pom.xml
@@ -97,7 +97,7 @@
     <jersey.version>1.1.5</jersey.version>
     <cxf.version>2.6.0</cxf.version>
     <jetty.version>7.5.3.v20111011</jetty.version>
-    <httpclient.version>4.1.2</httpclient.version>
+    <httpclient.version>4.2.1</httpclient.version>
     <slf4j.version>1.6.4</slf4j.version>
     <xmlunit.version>1.3</xmlunit.version>