You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by dk...@apache.org on 2013/02/01 18:00:49 UTC

svn commit: r1441531 - in /aries/trunk/jmx: jmx-blueprint-bundle/pom.xml jmx-bundle/pom.xml jmx-core-whiteboard/pom.xml jmx-core/pom.xml

Author: dkulp
Date: Fri Feb  1 17:00:48 2013
New Revision: 1441531

URL: http://svn.apache.org/viewvc?rev=1441531&view=rev
Log:
[ARIES-1013] Fix import version ranges in JMX
Patch from Jean-Baptiste Onofré applied

Modified:
    aries/trunk/jmx/jmx-blueprint-bundle/pom.xml
    aries/trunk/jmx/jmx-bundle/pom.xml
    aries/trunk/jmx/jmx-core-whiteboard/pom.xml
    aries/trunk/jmx/jmx-core/pom.xml

Modified: aries/trunk/jmx/jmx-blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-bundle/pom.xml?rev=1441531&r1=1441530&r2=1441531&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-blueprint-bundle/pom.xml (original)
+++ aries/trunk/jmx/jmx-blueprint-bundle/pom.xml Fri Feb  1 17:00:48 2013
@@ -51,10 +51,10 @@
             !org.apache.aries.jmx*,
             javax.management,
             javax.management.openmbean,
-            org.osgi.framework;version="1.5.0",
-            org.osgi.service.blueprint.container;version="1.0",
-            org.osgi.service.blueprint.reflect;version="1.0",
-            org.osgi.util.tracker;version="1.4",
+            org.osgi.framework;version="[1.5,2)",
+            org.osgi.service.blueprint.container;version="[1.0,2)",
+            org.osgi.service.blueprint.reflect;version="[1.0,2)",
+            org.osgi.util.tracker;version="[1.4,2)",
             *
         </aries.osgi.import>
         <aries.osgi.private.pkg>

Modified: aries/trunk/jmx/jmx-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-bundle/pom.xml?rev=1441531&r1=1441530&r2=1441531&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-bundle/pom.xml (original)
+++ aries/trunk/jmx/jmx-bundle/pom.xml Fri Feb  1 17:00:48 2013
@@ -56,18 +56,18 @@
             !org.apache.aries.jmx*,
             !org.osgi.service.framework,
             !org.eclipse*,
-            org.osgi.framework;version="[1.7.0,2.0)",
-            org.osgi.service.cm;version="[1.3.0,2.0)";resolution:="optional",
-            org.osgi.service.permissionadmin;version="[1.2.0,2.0)";resolution:="optional",
-            org.osgi.service.provisioning;version="[1.2.0,2.0)";resolution:="optional",
-            org.osgi.service.useradmin;version="[1.1.0,2.0)";resolution:="optional",
-            org.osgi.util.tracker,
-            org.osgi.jmx;version="[1.1.0,2.0)",
-            org.osgi.jmx.framework;version="[1.7.0,2.0)",
-            org.osgi.jmx.service.cm;version="[1.3.0,2.0)",
-            org.osgi.jmx.service.permissionadmin;version="[1.2.0,2.0)",
-            org.osgi.jmx.service.provisioning;version="[1.2.0,2.0)",
-            org.osgi.jmx.service.useradmin;version="[1.1.0,2.0)",
+            org.osgi.framework;version="[1.6,2)",
+            org.osgi.service.cm;version="[1.4,2)";resolution:="optional",
+            org.osgi.service.permissionadmin;version="[1.2,2)";resolution:="optional",
+            org.osgi.service.provisioning;version="[1.2,2)";resolution:="optional",
+            org.osgi.service.useradmin;version="[1.1,2)";resolution:="optional",
+            org.osgi.util.tracker;version="[1.5,2)",
+            org.osgi.jmx;version="[1.1,2)",
+            org.osgi.jmx.framework;version="[1.7,2)",
+            org.osgi.jmx.service.cm;version="[1.3,2)",
+            org.osgi.jmx.service.permissionadmin;version="[1.2,2)",
+            org.osgi.jmx.service.provisioning;version="[1.2,2)",
+            org.osgi.jmx.service.useradmin;version="[1.1,2)",
             *
         </aries.osgi.import>
         <aries.osgi.private.pkg>

Modified: aries/trunk/jmx/jmx-core-whiteboard/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core-whiteboard/pom.xml?rev=1441531&r1=1441530&r2=1441531&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-core-whiteboard/pom.xml (original)
+++ aries/trunk/jmx/jmx-core-whiteboard/pom.xml Fri Feb  1 17:00:48 2013
@@ -52,14 +52,14 @@
           org.apache.aries.jmx*
         </aries.osgi.private.pkg>
         <aries.osgi.dynamic>
-            org.osgi.jmx.service.cm;version="[1.3.0,2)",
-            org.osgi.jmx.service.permissionadmin;version="[1.2.0,2)",
-            org.osgi.jmx.service.provisioning;version="[1.2.0,2)",
-            org.osgi.jmx.service.useradmin;version="[1.1.0,2)",
-            org.osgi.service.cm;version="[1.3.0,2)",
-            org.osgi.service.permissionadmin;version="[1.2.0,2)",
-            org.osgi.service.provisioning;version="[1.2.0,2)",
-            org.osgi.service.useradmin;version="[1.1.0,2)"
+            org.osgi.jmx.service.cm;version="[1.3,2)",
+            org.osgi.jmx.service.permissionadmin;version="[1.2,2)",
+            org.osgi.jmx.service.provisioning;version="[1.2,2)",
+            org.osgi.jmx.service.useradmin;version="[1.1,2)",
+            org.osgi.service.cm;version="[1.4,2)",
+            org.osgi.service.permissionadmin;version="[1.2,2)",
+            org.osgi.service.provisioning;version="[1.2,2)",
+            org.osgi.service.useradmin;version="[1.1,2)"
         </aries.osgi.dynamic>
     </properties>
 

Modified: aries/trunk/jmx/jmx-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core/pom.xml?rev=1441531&r1=1441530&r2=1441531&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-core/pom.xml (original)
+++ aries/trunk/jmx/jmx-core/pom.xml Fri Feb  1 17:00:48 2013
@@ -45,18 +45,18 @@
         </aries.osgi.activator>
         <aries.osgi.import>
             !org.apache.aries.jmx*,
-            org.osgi.framework;version="[1.7.0,2.0)",
-            org.osgi.service.cm;version="[1.3.0,2.0)";resolution:="optional",
-            org.osgi.service.permissionadmin;version="[1.2.0,2.0)";resolution:="optional",
-            org.osgi.service.provisioning;version="[1.2.0,2.0)";resolution:="optional",
-            org.osgi.service.useradmin;version="[1.1.0,2.0)";resolution:="optional",
-            org.osgi.util.tracker,
-            org.osgi.jmx;version="[1.1.0,2.0)",
-            org.osgi.jmx.framework;version="[1.7.0,1.8.0)",
-            org.osgi.jmx.service.cm;version="[1.3.0,1.4.0)",
-            org.osgi.jmx.service.permissionadmin;version="[1.2.0,1.3.0)",
-            org.osgi.jmx.service.provisioning;version="[1.2.0,1.3.0)",
-            org.osgi.jmx.service.useradmin;version="[1.1.0,1.2.0)",
+            org.osgi.framework;version="[1.6,2)",
+            org.osgi.service.cm;version="[1.4,2)";resolution:="optional",
+            org.osgi.service.permissionadmin;version="[1.2,2)";resolution:="optional",
+            org.osgi.service.provisioning;version="[1.2,2)";resolution:="optional",
+            org.osgi.service.useradmin;version="[1.1,2)";resolution:="optional",
+            org.osgi.util.tracker;version="[1.5,2)",
+            org.osgi.jmx;version="[1.1,2)",
+            org.osgi.jmx.framework;version="[1.7,1.8)",
+            org.osgi.jmx.service.cm;version="[1.3,1.4)",
+            org.osgi.jmx.service.permissionadmin;version="[1.2,1.3)",
+            org.osgi.jmx.service.provisioning;version="[1.2,1.3)",
+            org.osgi.jmx.service.useradmin;version="[1.1,1.2)",
             *
         </aries.osgi.import>
         <!-- Export package versions are maintained in packageinfo files -->