You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2011/11/15 10:24:37 UTC

svn commit: r1202106 - in /karaf/cellar/branches/cellar-2.2.x: ./ pom.xml

Author: iocanel
Date: Tue Nov 15 09:24:36 2011
New Revision: 1202106

URL: http://svn.apache.org/viewvc?rev=1202106&view=rev
Log:
Merged from trunk
[KARAF-1011] Removed springdm from dependency management. [from revision 1202105]

Modified:
    karaf/cellar/branches/cellar-2.2.x/   (props changed)
    karaf/cellar/branches/cellar-2.2.x/pom.xml

Propchange: karaf/cellar/branches/cellar-2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 15 09:24:36 2011
@@ -1 +1 @@
-/karaf/cellar/trunk:1101991,1102000,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494,1161515,1161766,1162249,1162252,1162321,1162327,1162356-1162357,1162390,1162397,1162399,1164077,1164523,1164989,1164994,1166403,1166434,1181287,1186085,1202090
+/karaf/cellar/trunk:1101991,1102000,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494,1161515,1161766,1162249,1162252,1162321,1162327,1162356-1162357,1162390,1162397,1162399,1164077,1164523,1164989,1164994,1166403,1166434,1181287,1186085,1202090,1202105

Modified: karaf/cellar/branches/cellar-2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/pom.xml?rev=1202106&r1=1202105&r2=1202106&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/pom.xml Tue Nov 15 09:24:36 2011
@@ -44,12 +44,10 @@
         <junit.version>4.7</junit.version>
         <junit.bundle.version>4.7_3</junit.bundle.version>
         <karaf.version>2.2.2</karaf.version>
-        <hazelcast.version>1.9.3</hazelcast.version>
         <osgi.version>4.2.0</osgi.version>
         <pax.url.version>1.3.4</pax.url.version>
         <servlet.api.version>2.5</servlet.api.version>
         <slf4j.version>1.6.1</slf4j.version>
-        <spring.osgi.version>1.2.1</spring.osgi.version>
     </properties>
 
     <modules>
@@ -60,7 +58,7 @@
         <module>obr</module>
         <module>dosgi</module>
         <module>shell</module>
-        <module>hazelcast</module>        
+        <module>hazelcast</module>
         <module>utils</module>
         <module>cloud</module>
         <module>management</module>
@@ -162,6 +160,30 @@
                 <artifactId>org.apache.karaf.cellar.utils</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.karaf.cellar</groupId>
+                <artifactId>apache-karaf-cellar</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+
+            <!-- Felix -->
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.bundlerepository</artifactId>
+                <version>${felix.bundlerepository.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.configadmin</artifactId>
+                <version>${felix.configadmin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.webconsole</artifactId>
+                <version>${felix.webconsole.version}</version>
+            </dependency>
 
             <!-- Hazelcast -->
             <dependency>
@@ -187,36 +209,36 @@
                 <version>${karaf.version}</version>
             </dependency>
 
-            <!-- Testing -->
             <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>${junit.version}</version>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>org.apache.karaf.tooling.testing</artifactId>
+                <version>${karaf.version}</version>
             </dependency>
 
-            <!-- Easymock -->
+            <!-- OSGi -->
             <dependency>
-                <groupId>org.easymock</groupId>
-                <artifactId>easymock</artifactId>
-                <version>${easymock.version}</version>
-                <scope>test</scope>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.compendium</artifactId>
+                <version>${osgi.version}</version>
             </dependency>
-
-            <!-- Felix -->
             <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundlerepository</artifactId>
-                <version>${felix.bundlerepository.version}</version>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.core</artifactId>
+                <version>${osgi.version}</version>
             </dependency>
+
+            <!-- Servlet API -->
             <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.configadmin</artifactId>
-                <version>${felix.configadmin.version}</version>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                <version>${servlet.api.version}</version>
             </dependency>
+
+            <!-- ServiceMix Bundles -->
             <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.webconsole</artifactId>
-                <version>${felix.webconsole.version}</version>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.junit</artifactId>
+                <version>${junit.bundle.version}</version>
             </dependency>
 
             <!-- SLF4J -->
@@ -231,28 +253,6 @@
                 <version>${slf4j.version}</version>
             </dependency>
 
-            <!-- ServiceMix bundles -->
-            <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.junit</artifactId>
-                <version>${junit.bundle.version}</version>
-            </dependency>
-
-            <!-- Servlet API -->
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>${servlet.api.version}</version>
-            </dependency>
-
-            <!-- Spring OSGi -->
-            <dependency>
-                <groupId>org.springframework.osgi</groupId>
-                <artifactId>spring-osgi-core</artifactId>
-                <version>${spring.osgi.version}</version>
-            </dependency>
-
-
             <!-- JClouds -->
             <dependency>
                 <groupId>org.jclouds</groupId>
@@ -273,18 +273,25 @@
                 <version>${joda-time.version}</version>
             </dependency>
 
-            <!-- OSGi -->
             <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.core</artifactId>
-                <version>${osgi.version}</version>
+                <groupId>org.ops4j.pax.url</groupId>
+                <artifactId>pax-url-mvn</artifactId>
+                <version>${pax.url.version}</version>
             </dependency>
+
+            <!-- Testing -->
             <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.compendium</artifactId>
-                <version>${osgi.version}</version>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
             </dependency>
 
+            <!-- Easymock -->
+            <dependency>
+                <groupId>org.easymock</groupId>
+                <artifactId>easymock</artifactId>
+                <version>${easymock.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -305,8 +312,8 @@
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-gpg-plugin</artifactId>
-                    <version>1.4</version>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>2.3.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -315,8 +322,8 @@
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-install-plugin</artifactId>
-                    <version>2.3.1</version>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>1.4</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -457,7 +464,8 @@
                         <phase>generate-resources</phase>
                         <configuration>
                             <tasks>
-                                <copy file="NOTICE" todir="target/maven-shared-archive-resources/META-INF" failonerror="false" overwrite="true" />
+                                <copy file="NOTICE" todir="target/maven-shared-archive-resources/META-INF"
+                                      failonerror="false" overwrite="true"/>
                             </tasks>
                         </configuration>
                         <goals>
@@ -547,7 +555,7 @@
                                             <version>[3,4)</version>
                                         </requireMavenVersion>
                                         <requireJavaVersion>
-                                            <version>1.6</version>
+                                            <version>1.5</version>
                                         </requireJavaVersion>
                                     </rules>
                                 </configuration>