geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1038488 - in /geronimo/server/trunk/framework: configs/karaf-framework/pom.xml pom.xml
Date Wed, 24 Nov 2010 05:55:08 GMT
Author: genspring
Date: Wed Nov 24 05:55:07 2010
New Revision: 1038488

URL: http://svn.apache.org/viewvc?rev=1038488&view=rev
Log:
GERONIMO-5615 Upgrade Equinox to 3.6, Keep version in one place of pom.xml avoiding inconsistence.
Patch from Viola Lu.

Modified:
    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
    geronimo/server/trunk/framework/pom.xml

Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=1038488&r1=1038487&r2=1038488&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Wed Nov 24 05:55:07 2010
@@ -39,13 +39,10 @@
         <cglib.version>2.1_3_4</cglib.version>
         <commons.logging.version>1.1.1</commons.logging.version>
         <depends.maven.plugin.version>1.0</depends.maven.plugin.version>
-        <easymock.version>2.4</easymock.version>
-        <equinox.version>3.5.1.v20090827</equinox.version>
+        <easymock.version>2.4</easymock.version>        
         <felix.bundlerepository.version>1.6.4</felix.bundlerepository.version>
-        <felix.compendium.version>1.2.0</felix.compendium.version>
-        <felix.configadmin.version>1.2.4</felix.configadmin.version>
-        <felix.fileinstall.version>3.0.0</felix.fileinstall.version>
-        <felix.framework.version>3.0.2</felix.framework.version>
+        <felix.compendium.version>1.2.0</felix.compendium.version>        
+        <felix.fileinstall.version>3.0.0</felix.fileinstall.version>        
         <felix.gogo.version>0.4.0</felix.gogo.version>
         <felix.osgi.version>1.4.0</felix.osgi.version>
         <felix.plugin.version>2.1.0</felix.plugin.version>
@@ -59,8 +56,7 @@
         <maven.version>2.0.9</maven.version>
         <mina.version>2.0.0-RC1</mina.version>
         <pax.exam.version>1.2.0</pax.exam.version>
-        <pax.runner.version>1.4.0</pax.runner.version>
-        <pax.url.version>1.1.2</pax.url.version>
+        <pax.runner.version>1.4.0</pax.runner.version>        
         <sshd.version>0.4.0</sshd.version>
     </properties>
 

Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=1038488&r1=1038487&r2=1038488&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Wed Nov 24 05:55:07 2010
@@ -33,19 +33,26 @@
     <artifactId>framework</artifactId>
     <name>Geronimo Framework</name>
     <packaging>pom</packaging>
+    
+    <properties>        
+        <equinox.version>3.6.0.v20100517</equinox.version>        
+        <felix.configadmin.version>1.2.4</felix.configadmin.version>        
+        <felix.framework.version>3.0.2</felix.framework.version>       
+        <pax.url.version>1.1.2</pax.url.version>        
+    </properties>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.eclipse</groupId>
                 <artifactId>osgi</artifactId>
-                <version>3.5.1.v20090827</version>
+                <version>${equinox.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.framework</artifactId>
-                <version>3.0.2</version>
+                <version>${felix.framework.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.osgi</groupId>
@@ -61,7 +68,7 @@
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.configadmin</artifactId>
-                <version>1.2.4</version>
+                <version>${felix.configadmin.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.felix</groupId>
@@ -107,7 +114,7 @@
             <dependency>
                 <groupId>org.ops4j.pax.url</groupId>
                 <artifactId>pax-url-mvn</artifactId>
-                <version>1.1.2</version>
+                <version>${pax.url.version}</version>
             </dependency>
 
             <dependency>



Mime
View raw message