openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject [openwebbeans] branch master updated: OWB-1301 ensure OSGi ranges are tolerating some upgrades
Date Mon, 18 Nov 2019 13:47:00 GMT
This is an automated email from the ASF dual-hosted git repository.

rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new fb14046  OWB-1301 ensure OSGi ranges are tolerating some upgrades
fb14046 is described below

commit fb140464e065e148e34fcac8d5612f68d5f9f3eb
Author: Romain Manni-Bucau <rmannibucau@gmail.com>
AuthorDate: Mon Nov 18 14:46:55 2019 +0100

    OWB-1301 ensure OSGi ranges are tolerating some upgrades
---
 webbeans-impl/pom.xml | 12 ++++++------
 webbeans-jsf/pom.xml  |  6 +++---
 webbeans-osgi/pom.xml |  2 +-
 webbeans-spi/pom.xml  |  2 +-
 webbeans-web/pom.xml  |  6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/webbeans-impl/pom.xml b/webbeans-impl/pom.xml
index 446a6a7..5cc259f 100644
--- a/webbeans-impl/pom.xml
+++ b/webbeans-impl/pom.xml
@@ -107,12 +107,12 @@
                 <configuration>
                     <instructions>
                         <Import-Package>
-                            javax.annotation.*;version="1.2",
-                            javax.inject.*;version="1.0",
-                            javax.decorator.*;version="[1.1,1.2]",
-                            javax.enterprise.*;version="[1.1,1.2]",
-                            javax.interceptor.*;version="1.2",
-                            javax.el.*;version="${osgi.el.range}",
+                            javax.annotation.*;version="[1.2,2)",
+                            javax.inject.*;version="[1.0,2)",
+                            javax.decorator.*;version="[1.1,3)",
+                            javax.enterprise.*;version="[1.1,3)",
+                            javax.interceptor.*;version="[1.2,2)",
+                            javax.el.*;version="[${osgi.el.range},3)";resolution:="optional",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/webbeans-jsf/pom.xml b/webbeans-jsf/pom.xml
index 3fee259..c119703 100644
--- a/webbeans-jsf/pom.xml
+++ b/webbeans-jsf/pom.xml
@@ -88,9 +88,9 @@
                 <configuration>
                     <instructions>
                         <Import-Package>
-                            javax.servlet.*;version="${osgi.servlet.range}",
-                            javax.el.*;version="${osgi.el.range}",
-                            javax.faces.*;version="${osgi.faces.range}",
+                            javax.servlet.*;version="[${osgi.servlet.range},5)",
+                            javax.el.*;version="[${osgi.el.range},3)",
+                            javax.faces.*;version="[${osgi.faces.range},3)",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/webbeans-osgi/pom.xml b/webbeans-osgi/pom.xml
index f8de8ee..a1e3393 100644
--- a/webbeans-osgi/pom.xml
+++ b/webbeans-osgi/pom.xml
@@ -81,7 +81,7 @@
                 <configuration>
                     <instructions>
                         <Import-Package>
-                            javax.servlet.*;version="${osgi.servlet.range}",
+                            javax.servlet.*;version="[${osgi.servlet.range},5)",
                             *
                         </Import-Package>
                     </instructions>
diff --git a/webbeans-spi/pom.xml b/webbeans-spi/pom.xml
index 3f482bd..3f9c045 100644
--- a/webbeans-spi/pom.xml
+++ b/webbeans-spi/pom.xml
@@ -61,7 +61,7 @@
                 <configuration>
                     <instructions>
                         <Import-Package>
-                            javax.el.*;version="${osgi.el.range}";resolution:=optional,
+                            javax.el.*;version="[${osgi.el.range},3)";resolution:=optional,
                             *
                         </Import-Package>
                     </instructions>
diff --git a/webbeans-web/pom.xml b/webbeans-web/pom.xml
index 6507be9..06f1f92 100644
--- a/webbeans-web/pom.xml
+++ b/webbeans-web/pom.xml
@@ -120,9 +120,9 @@
                 <configuration>
                     <instructions>
                         <Import-Package>
-                            javax.servlet.jsp*;version="2.1",
-                            javax.servlet.*;version="${osgi.servlet.range}",
-                            javax.el.*;version="${osgi.el.range}",
+                            javax.servlet.jsp*;version="[2.1,3)",
+                            javax.servlet.*;version="[${osgi.servlet.range},5)",
+                            javax.el.*;version="[${osgi.el.range},3)";resolution:="optional",
                             *
                         </Import-Package>
                     </instructions>


Mime
View raw message