incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r883763 - in /incubator/aries/trunk/jmx: jmx-bundle/pom.xml jmx-core/pom.xml pom.xml
Date Tue, 24 Nov 2009 16:20:51 GMT
Author: linsun
Date: Tue Nov 24 16:20:51 2009
New Revision: 883763

URL: http://svn.apache.org/viewvc?rev=883763&view=rev
Log:
move JMX to use v4.2 osgi.core and compendium

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

Modified: incubator/aries/trunk/jmx/jmx-bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-bundle/pom.xml?rev=883763&r1=883762&r2=883763&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-bundle/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-bundle/pom.xml Tue Nov 24 16:20:51 2009
@@ -40,12 +40,12 @@
           <artifactId>aries-jmx-core</artifactId>
         </dependency>
         <dependency>
-          <groupId>org.apache.felix</groupId>
+          <groupId>org.osgi</groupId>
           <artifactId>org.osgi.core</artifactId>
           <scope>provided</scope>
       </dependency>
       <dependency>
-          <groupId>org.apache.felix</groupId>
+          <groupId>org.osgi</groupId>
           <artifactId>org.osgi.compendium</artifactId>
           <scope>provided</scope>
       </dependency>

Modified: incubator/aries/trunk/jmx/jmx-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-core/pom.xml?rev=883763&r1=883762&r2=883763&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-core/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-core/pom.xml Tue Nov 24 16:20:51 2009
@@ -38,12 +38,12 @@
           <artifactId>aries-jmx-api</artifactId>
       </dependency>
       <dependency>
-          <groupId>org.apache.felix</groupId>
+          <groupId>org.osgi</groupId>
           <artifactId>org.osgi.core</artifactId>
           <scope>provided</scope>
       </dependency>
       <dependency>
-          <groupId>org.apache.felix</groupId>
+          <groupId>org.osgi</groupId>
           <artifactId>org.osgi.compendium</artifactId>
           <scope>provided</scope>
       </dependency>

Modified: incubator/aries/trunk/jmx/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/pom.xml?rev=883763&r1=883762&r2=883763&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/pom.xml (original)
+++ incubator/aries/trunk/jmx/pom.xml Tue Nov 24 16:20:51 2009
@@ -51,40 +51,20 @@
                 <artifactId>aries-jmx-core</artifactId>
                 <version>${version}</version>
             </dependency>
-			<dependency>
+            <dependency>
                 <groupId>org.apache.aries.jmx</groupId>
                 <artifactId>aries-jmx</artifactId>
                 <version>${version}</version>
             </dependency>
-			 <dependency>
-                <groupId>org.apache.felix</groupId>
+            <dependency>
+                <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.core</artifactId>
-                <version>1.4.0</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.felix</groupId>
-                        <artifactId>org.osgi.foundation</artifactId>
-                    </exclusion>
-                </exclusions>
+                <version>4.2.0</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.felix</groupId>
+                <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.compendium</artifactId>
-                <version>1.2.0</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.felix</groupId>
-                        <artifactId>org.osgi.core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.felix</groupId>
-                        <artifactId>org.osgi.foundation</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.felix</groupId>
-                        <artifactId>javax.servlet</artifactId>
-                    </exclusion>
-                </exclusions>
+                <version>4.2.0</version>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>
@@ -126,7 +106,7 @@
     <modules>
         <module>jmx-api</module>
         <module>jmx-core</module>
-		<module>jmx-bundle</module>
+        <module>jmx-bundle</module>
     </modules>
 
 </project>



Mime
View raw message