felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfre...@apache.org
Subject svn commit: r450902 - in /incubator/felix/trunk: ./ mosgi.console.component/ mosgi.console.gui/ mosgi.console.ifc/ mosgi.jmx.agent/ mosgi.jmx.httpconnector/ mosgi.jmx.registry/ mosgi.jmx.remotelogger/ mosgi.jmx.rmiconnector/ mosgi.managedelements.bundl...
Date Thu, 28 Sep 2006 15:46:54 GMT
Author: sfrenot
Date: Thu Sep 28 08:46:53 2006
New Revision: 450902

URL: http://svn.apache.org/viewvc?view=rev&rev=450902
Log:
FELIX-155

Add a dependencyManagement tag in the main pom.
Use default version number of dependencies in mosgi.*/pom.xml modules.


Modified:
    incubator/felix/trunk/mosgi.console.component/pom.xml
    incubator/felix/trunk/mosgi.console.gui/pom.xml
    incubator/felix/trunk/mosgi.console.ifc/pom.xml
    incubator/felix/trunk/mosgi.jmx.agent/pom.xml
    incubator/felix/trunk/mosgi.jmx.httpconnector/pom.xml
    incubator/felix/trunk/mosgi.jmx.registry/pom.xml
    incubator/felix/trunk/mosgi.jmx.remotelogger/pom.xml
    incubator/felix/trunk/mosgi.jmx.rmiconnector/pom.xml
    incubator/felix/trunk/mosgi.managedelements.bundlesprobes.tab/pom.xml
    incubator/felix/trunk/mosgi.managedelements.bundlesprobes/pom.xml
    incubator/felix/trunk/mosgi.managedelements.memoryprobe/pom.xml
    incubator/felix/trunk/mosgi.managedelements.obrprobe.tab/pom.xml
    incubator/felix/trunk/mosgi.managedelements.obrprobe/pom.xml
    incubator/felix/trunk/mosgi.managedelements.osgiprobes.tab/pom.xml
    incubator/felix/trunk/mosgi.managedelements.osgiprobes/pom.xml
    incubator/felix/trunk/pom.xml

Modified: incubator/felix/trunk/mosgi.console.component/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/mosgi.console.component/pom.xml?view=diff&rev=450902&r1=450901&r2=450902
==============================================================================
--- incubator/felix/trunk/mosgi.console.component/pom.xml (original)
+++ incubator/felix/trunk/mosgi.console.component/pom.xml Thu Sep 28 08:46:53 2006
@@ -6,15 +6,6 @@
     <version>0.8.0-SNAPSHOT</version>
   </parent>
   
-  <properties>
-    <felix.version>0.8.0-SNAPSHOT</felix.version>
-    <!--
-      Use a property to set felix version. 
-      Properties can be set once on the top-level POM
-    -->
-    <mosgi.console.ifc.version>0.9.0-SNAPSHOT</mosgi.console.ifc.version>
-  </properties>
-
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
   <name>Apache Felix MOSGi JMX Console GUI component</name>
@@ -25,24 +16,11 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${felix.version}</version>
-      <!-- A default value of version can be set on the top-level POM in a dependencyManagement
section :
-        <dependencyManagement>
-	  <dependencies>
-	    <dependency>
-	      <groupId>${pom.groupId}</groupId>
-	      <artifactId>org.osgi.core</artifactId>
-	      <version>${pom.version}</version>
-	    </dependency>
-	    [...]
-	  </dependencies>
-	</dependencyManagement-->
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.mosgi.console.ifc</artifactId>
-      <version>${mosgi.console.ifc.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -52,7 +30,7 @@
       <plugin>
         <groupId>org.apache.felix.plugins</groupId>
         <artifactId>maven-osgi-plugin</artifactId>
-        <version>${felix.version}</version>
+        <!--version>${felix.version}</version-->
         <extensions>true</extensions>
         <configuration>
           <osgiManifest>

Modified: incubator/felix/trunk/mosgi.console.gui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/mosgi.console.gui/pom.xml?view=diff&rev=450902&r1=450901&r2=450902
==============================================================================
--- incubator/felix/trunk/mosgi.console.gui/pom.xml (original)
+++ incubator/felix/trunk/mosgi.console.gui/pom.xml Thu Sep 28 08:46:53 2006
@@ -6,40 +6,32 @@
     <version>0.8.0-SNAPSHOT</version>
   </parent>
 
-  <properties>
-    <felix.version>0.8.0-SNAPSHOT</felix.version>
-    <mosgi.console.ifc.version>0.9.0-SNAPSHOT</mosgi.console.ifc.version>
-  </properties>
-  
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
   <name>Apache Felix MOSGi JMX Console Main GUI</name>
   <artifactId>org.apache.felix.mosgi.console.gui</artifactId>
+  <groupId>org.apache.felix</groupId>
   <version>0.9.0-SNAPSHOT</version>
 
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+     <groupId>${pom.groupId}</groupId> 
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.mosgi.console.ifc</artifactId>
-      <version>${mosgi.console.ifc.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -49,7 +41,7 @@
       <plugin>
         <groupId>org.apache.felix.plugins</groupId>
         <artifactId>maven-osgi-plugin</artifactId>
-        <version>${felix.version}</version>
+        <!--version>${felix.version}</version-->
         <extensions>true</extensions>
         <configuration>
           <osgiManifest>

Modified: incubator/felix/trunk/mosgi.console.ifc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/mosgi.console.ifc/pom.xml?view=diff&rev=450902&r1=450901&r2=450902
==============================================================================
--- incubator/felix/trunk/mosgi.console.ifc/pom.xml (original)
+++ incubator/felix/trunk/mosgi.console.ifc/pom.xml Thu Sep 28 08:46:53 2006
@@ -6,10 +6,6 @@
     <version>0.8.0-SNAPSHOT</version>
   </parent>
 
-  <properties>
-    <felix.version>0.8.0-SNAPSHOT</felix.version>
-  </properties>
-
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
   <name>Apache Felix MOSGi JMX Console Interface</name>
@@ -20,13 +16,11 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -36,7 +30,7 @@
       <plugin>
         <groupId>org.apache.felix.plugins</groupId>
         <artifactId>maven-osgi-plugin</artifactId>
-        <version>${felix.version}</version>
+        <!--version>${felix.version}</version-->
         <extensions>true</extensions>
         <configuration>
           <osgiManifest>

Modified: incubator/felix/trunk/mosgi.jmx.agent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/mosgi.jmx.agent/pom.xml?view=diff&rev=450902&r1=450901&r2=450902
==============================================================================
--- incubator/felix/trunk/mosgi.jmx.agent/pom.xml (original)
+++ incubator/felix/trunk/mosgi.jmx.agent/pom.xml Thu Sep 28 08:46:53 2006
@@ -6,10 +6,6 @@
     <version>0.8.0-SNAPSHOT</version>
   </parent>
 
-  <properties>
-    <felix.version>0.8.0-SNAPSHOT</felix.version>
-  </properties>
-
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
   <name>Apache Felix MOSGi JMX agent</name>
@@ -20,19 +16,16 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -42,7 +35,7 @@
       <plugin>
         <groupId>org.apache.felix.plugins</groupId>
         <artifactId>maven-osgi-plugin</artifactId>
-        <version>${felix.version}</version>
+        <!--version>${felix.version}</version-->
         <extensions>true</extensions>
         <configuration>
           <osgiManifest>

Modified: incubator/felix/trunk/mosgi.jmx.httpconnector/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/mosgi.jmx.httpconnector/pom.xml?view=diff&rev=450902&r1=450901&r2=450902
==============================================================================
--- incubator/felix/trunk/mosgi.jmx.httpconnector/pom.xml (original)
+++ incubator/felix/trunk/mosgi.jmx.httpconnector/pom.xml Thu Sep 28 08:46:53 2006
@@ -6,11 +6,6 @@
     <version>0.8.0-SNAPSHOT</version>
   </parent>
 
-  <properties>
-    <felix.version>0.8.0-SNAPSHOT</felix.version>
-    <mosgi.jmx.agent.version>0.9.0-SNAPSHOT</mosgi.jmx.agent.version>
-  </properties>
-
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
   <name>Apache Felix MOSGi JMX httpconnector</name>
@@ -21,25 +16,21 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.mosgi.jmx.agent</artifactId>
-      <version>${mosgi.jmx.agent.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -49,7 +40,7 @@
       <plugin>
         <groupId>org.apache.felix.plugins</groupId>
         <artifactId>maven-osgi-plugin</artifactId>
-        <version>${felix.version}</version>
+        <!--version>${felix.version}</version-->
         <extensions>true</extensions>
         <configuration>
           <osgiManifest>

Modified: incubator/felix/trunk/mosgi.jmx.registry/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/mosgi.jmx.registry/pom.xml?view=diff&rev=450902&r1=450901&r2=450902
==============================================================================
--- incubator/felix/trunk/mosgi.jmx.registry/pom.xml (original)
+++ incubator/felix/trunk/mosgi.jmx.registry/pom.xml Thu Sep 28 08:46:53 2006
@@ -6,10 +6,6 @@
     <version>0.8.0-SNAPSHOT</version>
   </parent>
   
-  <properties>
-    <felix.version>0.8.0-SNAPSHOT</felix.version>
-  </properties>
-  
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
   <name>Apache Felix MOSGi JMX registry</name>
@@ -20,19 +16,16 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -42,7 +35,7 @@
       <plugin>
         <groupId>org.apache.felix.plugins</groupId>
         <artifactId>maven-osgi-plugin</artifactId>
-        <version>${felix.version}</version>
+        <!--version>${felix.version}</version-->
         <extensions>true</extensions>
         <configuration>
           <osgiManifest>

Modified: incubator/felix/trunk/mosgi.jmx.remotelogger/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/mosgi.jmx.remotelogger/pom.xml?view=diff&rev=450902&r1=450901&r2=450902
==============================================================================
--- incubator/felix/trunk/mosgi.jmx.remotelogger/pom.xml (original)
+++ incubator/felix/trunk/mosgi.jmx.remotelogger/pom.xml Thu Sep 28 08:46:53 2006
@@ -5,10 +5,6 @@
     <artifactId>felix</artifactId>
     <version>0.8.0-SNAPSHOT</version>
   </parent>
-  
-  <properties>
-    <felix.version>0.8.0-SNAPSHOT</felix.version>
-  </properties>
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
@@ -20,13 +16,11 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <!--dependency>
@@ -42,7 +36,7 @@
       <plugin>
         <groupId>org.apache.felix.plugins</groupId>
         <artifactId>maven-osgi-plugin</artifactId>
-        <version>${felix.version}</version>
+        <!--version>${felix.version}</version-->
         <extensions>true</extensions>
         <configuration>
           <osgiManifest>

Modified: incubator/felix/trunk/mosgi.jmx.rmiconnector/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/mosgi.jmx.rmiconnector/pom.xml?view=diff&rev=450902&r1=450901&r2=450902
==============================================================================
--- incubator/felix/trunk/mosgi.jmx.rmiconnector/pom.xml (original)
+++ incubator/felix/trunk/mosgi.jmx.rmiconnector/pom.xml Thu Sep 28 08:46:53 2006
@@ -6,12 +6,6 @@
     <version>0.8.0-SNAPSHOT</version>
   </parent>
   
-  <properties>
-    <felix.version>0.8.0-SNAPSHOT</felix.version>
-    <mosgi.jmx.agent.version>0.9.0-SNAPSHOT</mosgi.jmx.agent.version>
-    <mosgi.jmx.registry.version>0.9.0-SNAPSHOT</mosgi.jmx.registry.version>
-  </properties>
-  
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
   <name>Apache Felix MOSGi JMX rmiconnector</name>
@@ -22,31 +16,26 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.mosgi.jmx.agent</artifactId>
-      <version>${mosgi.jmx.agent.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.mosgi.jmx.registry</artifactId>
-      <version>${mosgi.jmx.registry.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -56,7 +45,7 @@
       <plugin>
         <groupId>org.apache.felix.plugins</groupId>
         <artifactId>maven-osgi-plugin</artifactId>
-        <version>${felix.version}</version>
+        <!--version>${felix.version}</version-->
         <extensions>true</extensions>
         <configuration>
           <osgiManifest>

Modified: incubator/felix/trunk/mosgi.managedelements.bundlesprobes.tab/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/mosgi.managedelements.bundlesprobes.tab/pom.xml?view=diff&rev=450902&r1=450901&r2=450902
==============================================================================
--- incubator/felix/trunk/mosgi.managedelements.bundlesprobes.tab/pom.xml (original)
+++ incubator/felix/trunk/mosgi.managedelements.bundlesprobes.tab/pom.xml Thu Sep 28 08:46:53
2006
@@ -6,11 +6,6 @@
     <version>0.8.0-SNAPSHOT</version>
   </parent>
   
-  <properties>
-    <felix.version>0.8.0-SNAPSHOT</felix.version>
-    <mosgi.console.ifc.version>0.9.0-SNAPSHOT</mosgi.console.ifc.version>
-  </properties>
-
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
   <name>Apache Felix MOSGi Bundles management tab for the JMX console</name>
@@ -21,25 +16,21 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.mosgi.console.ifc</artifactId>
-      <version>${mosgi.console.ifc.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -49,7 +40,7 @@
       <plugin>
         <groupId>org.apache.felix.plugins</groupId>
         <artifactId>maven-osgi-plugin</artifactId>
-        <version>${felix.version}</version>
+        <!--version>${felix.version}</version-->
         <extensions>true</extensions>
         <configuration>
           <osgiManifest>

Modified: incubator/felix/trunk/mosgi.managedelements.bundlesprobes/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/mosgi.managedelements.bundlesprobes/pom.xml?view=diff&rev=450902&r1=450901&r2=450902
==============================================================================
--- incubator/felix/trunk/mosgi.managedelements.bundlesprobes/pom.xml (original)
+++ incubator/felix/trunk/mosgi.managedelements.bundlesprobes/pom.xml Thu Sep 28 08:46:53
2006
@@ -6,11 +6,6 @@
     <version>0.8.0-SNAPSHOT</version>
   </parent>
   
-  <properties>
-    <felix.version>0.8.0-SNAPSHOT</felix.version>
-    <mosgi.console.ifc.version>0.9.0-SNAPSHOT</mosgi.console.ifc.version>
-  </properties>
-
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
   <name>Apache Felix MOSGi JMX MBean for OSGi bundles management</name>
@@ -21,25 +16,21 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.mosgi.console.ifc</artifactId>
-      <version>${mosgi.console.ifc.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -49,7 +40,7 @@
       <plugin>
         <groupId>org.apache.felix.plugins</groupId>
         <artifactId>maven-osgi-plugin</artifactId>
-        <version>${felix.version}</version>
+        <!--version>${felix.version}</version-->
         <extensions>true</extensions>
         <configuration>
           <osgiManifest>

Modified: incubator/felix/trunk/mosgi.managedelements.memoryprobe/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/mosgi.managedelements.memoryprobe/pom.xml?view=diff&rev=450902&r1=450901&r2=450902
==============================================================================
--- incubator/felix/trunk/mosgi.managedelements.memoryprobe/pom.xml (original)
+++ incubator/felix/trunk/mosgi.managedelements.memoryprobe/pom.xml Thu Sep 28 08:46:53 2006
@@ -6,12 +6,6 @@
     <version>0.8.0-SNAPSHOT</version>
   </parent>
   
-  <properties>
-    <felix.version>0.8.0-SNAPSHOT</felix.version>
-    <mosgi.console.ifc.version>0.9.0-SNAPSHOT</mosgi.console.ifc.version>
-    <mosgi.jmx.agent.version>0.9.0-SNAPSHOT</mosgi.jmx.agent.version>
-  </properties>
-  
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
   <name>Apache Felix MOSGi JMX MBean for obr interaction</name>
@@ -22,31 +16,26 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.mosgi.console.ifc</artifactId>
-      <version>${mosgi.console.ifc.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.mosgi.jmx.agent</artifactId>
-      <version>${mosgi.jmx.agent.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -56,7 +45,7 @@
       <plugin>
         <groupId>org.apache.felix.plugins</groupId>
         <artifactId>maven-osgi-plugin</artifactId>
-        <version>${felix.version}</version>
+        <!--version>${felix.version}</version-->
         <extensions>true</extensions>
         <configuration>
           <osgiManifest>

Modified: incubator/felix/trunk/mosgi.managedelements.obrprobe.tab/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/mosgi.managedelements.obrprobe.tab/pom.xml?view=diff&rev=450902&r1=450901&r2=450902
==============================================================================
--- incubator/felix/trunk/mosgi.managedelements.obrprobe.tab/pom.xml (original)
+++ incubator/felix/trunk/mosgi.managedelements.obrprobe.tab/pom.xml Thu Sep 28 08:46:53 2006
@@ -6,11 +6,6 @@
     <version>0.8.0-SNAPSHOT</version>
   </parent>
   
-  <properties>
-    <felix.version>0.8.0-SNAPSHOT</felix.version>
-    <mosgi.console.ifc.version>0.9.0-SNAPSHOT</mosgi.console.ifc.version>
-  </properties>
-
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
   <name>Apache Felix MOSGi obr remote manipulation tab for the JMX console</name>
@@ -21,25 +16,21 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.mosgi.console.ifc</artifactId>
-      <version>${mosgi.console.ifc.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.bundlerepository</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -49,7 +40,7 @@
       <plugin>
         <groupId>org.apache.felix.plugins</groupId>
         <artifactId>maven-osgi-plugin</artifactId>
-        <version>${felix.version}</version>
+        <!--version>${felix.version}</version-->
         <extensions>true</extensions>
         <configuration>
           <osgiManifest>

Modified: incubator/felix/trunk/mosgi.managedelements.obrprobe/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/mosgi.managedelements.obrprobe/pom.xml?view=diff&rev=450902&r1=450901&r2=450902
==============================================================================
--- incubator/felix/trunk/mosgi.managedelements.obrprobe/pom.xml (original)
+++ incubator/felix/trunk/mosgi.managedelements.obrprobe/pom.xml Thu Sep 28 08:46:53 2006
@@ -5,11 +5,6 @@
     <artifactId>felix</artifactId>
     <version>0.8.0-SNAPSHOT</version>
   </parent>
-  
-  <properties>
-    <felix.version>0.8.0-SNAPSHOT</felix.version>
-    <mosgi.console.ifc.version>0.9.0-SNAPSHOT</mosgi.console.ifc.version>
-  </properties>
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
@@ -21,31 +16,26 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.mosgi.console.ifc</artifactId>
-      <version>${mosgi.console.ifc.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.bundlerepository</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -55,7 +45,7 @@
       <plugin>
         <groupId>org.apache.felix.plugins</groupId>
         <artifactId>maven-osgi-plugin</artifactId>
-        <version>${felix.version}</version>
+        <!--version>${felix.version}</version-->
         <extensions>true</extensions>
         <configuration>
           <osgiManifest>

Modified: incubator/felix/trunk/mosgi.managedelements.osgiprobes.tab/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/mosgi.managedelements.osgiprobes.tab/pom.xml?view=diff&rev=450902&r1=450901&r2=450902
==============================================================================
--- incubator/felix/trunk/mosgi.managedelements.osgiprobes.tab/pom.xml (original)
+++ incubator/felix/trunk/mosgi.managedelements.osgiprobes.tab/pom.xml Thu Sep 28 08:46:53
2006
@@ -6,11 +6,6 @@
     <version>0.8.0-SNAPSHOT</version>
   </parent>
   
-  <properties>
-    <felix.version>0.8.0-SNAPSHOT</felix.version>
-    <mosgi.console.ifc.version>0.9.0-SNAPSHOT</mosgi.console.ifc.version>
-  </properties>
-  
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
   <name>Apache Felix MOSGi OSGi gateway status tab for the JMX console</name>
@@ -21,19 +16,16 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.mosgi.console.ifc</artifactId>
-      <version>${mosgi.console.ifc.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -43,7 +35,7 @@
       <plugin>
         <groupId>org.apache.felix.plugins</groupId>
         <artifactId>maven-osgi-plugin</artifactId>
-        <version>${felix.version}</version>
+        <!--version>${felix.version}</version-->
         <extensions>true</extensions>
         <configuration>
           <osgiManifest>

Modified: incubator/felix/trunk/mosgi.managedelements.osgiprobes/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/mosgi.managedelements.osgiprobes/pom.xml?view=diff&rev=450902&r1=450901&r2=450902
==============================================================================
--- incubator/felix/trunk/mosgi.managedelements.osgiprobes/pom.xml (original)
+++ incubator/felix/trunk/mosgi.managedelements.osgiprobes/pom.xml Thu Sep 28 08:46:53 2006
@@ -5,11 +5,6 @@
     <artifactId>felix</artifactId>
     <version>0.8.0-SNAPSHOT</version>
   </parent>
- 
-  <properties>
-    <felix.version>0.8.0-SNAPSHOT</felix.version>
-    <mosgi.console.ifc.version>0.9.0-SNAPSHOT</mosgi.console.ifc.version>
-  </properties>
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
@@ -21,25 +16,21 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.mosgi.console.ifc</artifactId>
-      <version>${mosgi.console.ifc.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -49,7 +40,7 @@
       <plugin>
         <groupId>org.apache.felix.plugins</groupId>
         <artifactId>maven-osgi-plugin</artifactId>
-        <version>${felix.version}</version>
+        <!--version>${felix.version}</version-->
         <extensions>true</extensions>
         <configuration>
           <osgiManifest>

Modified: incubator/felix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/pom.xml?view=diff&rev=450902&r1=450901&r2=450902
==============================================================================
--- incubator/felix/trunk/pom.xml (original)
+++ incubator/felix/trunk/pom.xml Thu Sep 28 08:46:53 2006
@@ -106,12 +106,10 @@
         <module>mosgi.managedelements.obrprobe</module>
         <module>mosgi.managedelements.obrprobe.tab</module>
         <module>mosgi.managedelements.memoryprobe</module>
-
         <module>ipojo.plugin</module>
         <module>ipojo.arch</module>
       </modules>
     </profile>
-    
     <profile>    
       <id>jdk1.4</id>
       <activation>
@@ -122,8 +120,48 @@
         <module>ipojo.arch</module>
       </modules>
     </profile>
-
   </profiles>
+
+  <!-- Specify a default version number for dependencies -->
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.osgi.core</artifactId>
+        <version>0.8.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.osgi.compendium</artifactId>
+        <version>0.8.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.framework</artifactId>
+        <version>0.8.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+	<artifactId>org.apache.felix.bundlerepository</artifactId>
+	<version>0.8.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.mosgi.jmx.registry</artifactId>
+        <version>0.9.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.mosgi.jmx.agent</artifactId>
+        <version>0.9.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.mosgi.console.ifc</artifactId>
+        <version>0.9.0-SNAPSHOT</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
   <repositories>
     <!-- For snapshots (no release jars or non-apache jars)           -->



Mime
View raw message