geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r922320 - in /geronimo/server/trunk: ./ framework/ framework/configs/karaf-framework/ framework/modules/geronimo-blueprint/ plugins/activemq/activemq-broker-blueprint/src/main/history/ plugins/activemq/geronimo-activemq-blueprint/ plugins/c...
Date Fri, 12 Mar 2010 16:33:50 GMT
Author: gawor
Date: Fri Mar 12 16:33:49 2010
New Revision: 922320

URL: http://svn.apache.org/viewvc?rev=922320&view=rev
Log:
use right version of aries artifacts

Modified:
    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml
    geronimo/server/trunk/framework/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
    geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/client/pom.xml
    geronimo/server/trunk/plugins/wab/pom.xml
    geronimo/server/trunk/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=922320&r1=922319&r2=922320&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Fri Mar 12 16:33:49 2010
@@ -51,8 +51,8 @@
         <felix.prefs.version>1.0.4</felix.prefs.version>
         <felix.webconsole.version>2.0.0</felix.webconsole.version>
         <felix.metatype.version>1.0.2</felix.metatype.version>
-        <aries.blueprint.version>1.0.0-incubating-SNAPSHOT</aries.blueprint.version>
-        <aries.jmx.version>1.0.0-incubating-SNAPSHOT</aries.jmx.version>
+        <aries.blueprint.version>0.1-incubating-SNAPSHOT</aries.blueprint.version>
+        <aries.jmx.version>0.1-incubating-SNAPSHOT</aries.jmx.version>
         <geronimo.servlet.version>1.1.2</geronimo.servlet.version>
         <jansi.version>1.1</jansi.version>
         <jetty.bundle.version>6.1.14_1</jetty.bundle.version>
@@ -234,39 +234,6 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.aries.blueprint</groupId>
-                <artifactId>org.apache.aries.blueprint.api</artifactId>
-                <version>${aries.blueprint.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.blueprint</groupId>
-                <artifactId>org.apache.aries.blueprint.core</artifactId>
-                <version>${aries.blueprint.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.blueprint</groupId>
-                <artifactId>org.apache.aries.blueprint.cm</artifactId>
-                <version>${aries.blueprint.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
                 <groupId>org.apache.aries</groupId>
                 <artifactId>org.apache.aries.util</artifactId>
                 <version>${aries.blueprint.version}</version>

Modified: geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml?rev=922320&r1=922319&r2=922320&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml Fri Mar 12 16:33:49
2010
@@ -35,7 +35,6 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.api</artifactId>
-            <version>1.0.0-incubating-SNAPSHOT</version>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=922320&r1=922319&r2=922320&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Fri Mar 12 16:33:49 2010
@@ -147,16 +147,6 @@
                 <version>1.1.2</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.aries.jndi</groupId>
-                <artifactId>org.apache.aries.jndi.core</artifactId>
-                <version>1.0.0-incubating-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.jndi</groupId>
-                <artifactId>org.apache.aries.jndi.url</artifactId>
-                <version>1.0.0-incubating-SNAPSHOT</version>
-            </dependency>
             <!-- overridden dependencies -->
             <!--<dependency>-->
             <!--<groupId>org.apache.geronimo.components</groupId>-->

Modified: geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml?rev=922320&r1=922319&r2=922320&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
Fri Mar 12 16:33:49 2010
@@ -32,11 +32,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.aries</groupId>
-        <artifactId>org.apache.aries.util</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.aries.blueprint</groupId>
         <artifactId>org.apache.aries.blueprint.api</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml?rev=922320&r1=922319&r2=922320&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml Fri Mar 12
16:33:49 2010
@@ -105,17 +105,14 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.api</artifactId>
-            <version>1.0.0-incubating-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
-            <version>1.0.0-incubating-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.cm</artifactId>
-            <version>1.0.0-incubating-SNAPSHOT</version>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=922320&r1=922319&r2=922320&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Fri Mar
12 16:33:49 2010
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>org.apache.aries.util</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.aries.jndi</groupId>
         <artifactId>org.apache.aries.jndi.core</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/pom.xml?rev=922320&r1=922319&r2=922320&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/pom.xml Fri Mar 12 16:33:49 2010
@@ -43,18 +43,7 @@
         <module>geronimo-client</module>
         <module>geronimo-client-builder</module>
     </modules>
-    <dependencyManagement>
-        <dependencies>
-            <!-- aries jndi -->
-            <dependency>
-                <groupId>org.apache.geronimo.framework</groupId>
-                <artifactId>framework</artifactId>
-                <version>${version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>

Modified: geronimo/server/trunk/plugins/wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/pom.xml?rev=922320&r1=922319&r2=922320&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/pom.xml (original)
+++ geronimo/server/trunk/plugins/wab/pom.xml Fri Mar 12 16:33:49 2010
@@ -48,7 +48,7 @@
             <dependency>
                 <groupId>org.apache.aries.web</groupId>
                 <artifactId>org.apache.aries.web.urlhandler</artifactId>
-                <version>1.0.0-incubating-SNAPSHOT</version>
+                <version>0.1-incubating-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=922320&r1=922319&r2=922320&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Mar 12 16:33:49 2010
@@ -1930,6 +1930,54 @@ only found in cxf
                </exclusions>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.aries.jndi</groupId>
+                <artifactId>org.apache.aries.jndi.core</artifactId>
+                <version>0.1-incubating-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.aries.jndi</groupId>
+                <artifactId>org.apache.aries.jndi.url</artifactId>
+                <version>0.1-incubating-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.aries.blueprint</groupId>
+                <artifactId>org.apache.aries.blueprint.api</artifactId>
+                <version>0.1-incubating-SNAPSHOT</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.aries.blueprint</groupId>
+                <artifactId>org.apache.aries.blueprint.core</artifactId>
+                <version>0.1-incubating-SNAPSHOT</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.aries.blueprint</groupId>
+                <artifactId>org.apache.aries.blueprint.cm</artifactId>
+                <version>0.1-incubating-SNAPSHOT</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 



Mime
View raw message