You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/10/25 15:00:41 UTC

svn commit: r588221 - in /incubator/servicemix/branches/servicemix-4.0: core/pom.xml gshell/gshell-core/pom.xml management/core/pom.xml pom.xml spring/pom.xml transaction/pom.xml

Author: gnodet
Date: Thu Oct 25 06:00:41 2007
New Revision: 588221

URL: http://svn.apache.org/viewvc?rev=588221&view=rev
Log:
Fix dependencies a bit

Modified:
    incubator/servicemix/branches/servicemix-4.0/core/pom.xml
    incubator/servicemix/branches/servicemix-4.0/gshell/gshell-core/pom.xml
    incubator/servicemix/branches/servicemix-4.0/management/core/pom.xml
    incubator/servicemix/branches/servicemix-4.0/pom.xml
    incubator/servicemix/branches/servicemix-4.0/spring/pom.xml
    incubator/servicemix/branches/servicemix-4.0/transaction/pom.xml

Modified: incubator/servicemix/branches/servicemix-4.0/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/core/pom.xml?rev=588221&r1=588220&r2=588221&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/core/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/core/pom.xml Thu Oct 25 06:00:41 2007
@@ -37,12 +37,10 @@
 	<dependency>
 	  <groupId>org.apache.servicemix</groupId>
 	  <artifactId>org.apache.servicemix.api</artifactId>
-      <version>${project.version}</version>
 	</dependency>
 	<dependency>
 	  <groupId>junit</groupId>
 	  <artifactId>junit</artifactId>
-	  <version>${junit.version}</version>
 	  <scope>test</scope>
 	</dependency>
   </dependencies>

Modified: incubator/servicemix/branches/servicemix-4.0/gshell/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/gshell/gshell-core/pom.xml?rev=588221&r1=588220&r2=588221&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/gshell/gshell-core/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/gshell/gshell-core/pom.xml Thu Oct 25 06:00:41 2007
@@ -136,12 +136,10 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
-            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>cglib</groupId>

Modified: incubator/servicemix/branches/servicemix-4.0/management/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/management/core/pom.xml?rev=588221&r1=588220&r2=588221&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/management/core/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/management/core/pom.xml Thu Oct 25 06:00:41 2007
@@ -37,17 +37,14 @@
     <dependency>
       <groupId>org.springframework.osgi</groupId>
       <artifactId>spring-osgi-core</artifactId>
-      <version>${spring.osgi.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>${spring.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -59,13 +56,11 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>${commons.logging.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: incubator/servicemix/branches/servicemix-4.0/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/pom.xml?rev=588221&r1=588220&r2=588221&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/pom.xml Thu Oct 25 06:00:41 2007
@@ -112,6 +112,101 @@
     </repository>
   </repositories>
 
+  <dependencyManagement>
+	<dependencies>
+		<dependency>
+		  <groupId>org.apache.servicemix</groupId>
+		  <artifactId>org.apache.servicemix.api</artifactId>
+	      <version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.acegisecurity</groupId>
+			<artifactId>acegi-security</artifactId>
+			<version>${acegi.version}</version>
+			<exclusions>
+				<exclusion>
+	              <groupId>org.springframework</groupId>
+	              <artifactId>spring-remoting</artifactId>
+	            </exclusion>
+				<exclusion>
+	              <groupId>org.springframework</groupId>
+	              <artifactId>spring-jdbc</artifactId>
+	            </exclusion>
+	        </exclusions>
+	    </dependency>
+	    <dependency>
+	      <groupId>org.apache.geronimo.specs</groupId>
+	      <artifactId>geronimo-jta_1.1_spec</artifactId>
+	      <version>1.1.1-SNAPSHOT</version>
+	    </dependency>
+	    <dependency>
+	      <groupId>org.apache.geronimo.components</groupId>
+	      <artifactId>geronimo-transaction</artifactId>
+	      <version>2.0.1</version>
+	    </dependency>
+	    <dependency>
+	      <groupId>org.apache.geronimo.components</groupId>
+	      <artifactId>geronimo-connector</artifactId>
+	      <version>2.0.1</version>
+	    </dependency>
+	    <dependency>
+	      <groupId>org.jencks</groupId>
+	      <artifactId>jencks</artifactId>
+	      <version>2.1</version>
+	    </dependency>
+	    <dependency>
+	      <groupId>org.objectweb.howl</groupId>
+	      <artifactId>howl</artifactId>
+	      <version>1.0.1-1</version>
+	    </dependency>
+	    <dependency>
+	      <groupId>org.springframework.osgi</groupId>
+	      <artifactId>spring-osgi-core</artifactId>
+	      <version>${spring.osgi.version}</version>
+	    </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+	    <dependency>
+	      <groupId>org.springframework</groupId>
+	      <artifactId>spring-tx</artifactId>
+	      <version>${spring.version}</version>
+	    </dependency>
+	    <dependency>
+	      <groupId>org.apache.felix</groupId>
+	      <artifactId>org.osgi.core</artifactId>
+	      <version>${felix.version}</version>
+	    </dependency>
+	    <dependency>
+	      <groupId>junit</groupId>
+	      <artifactId>junit</artifactId>
+	      <version>${junit.version}</version>
+	    </dependency>
+	    <dependency>
+	      <groupId>commons-logging</groupId>
+	      <artifactId>commons-logging</artifactId>
+	      <version>${commons.logging.version}</version>
+	    </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <build>
     <defaultGoal>install</defaultGoal>
 

Modified: incubator/servicemix/branches/servicemix-4.0/spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/spring/pom.xml?rev=588221&r1=588220&r2=588221&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/spring/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/spring/pom.xml Thu Oct 25 06:00:41 2007
@@ -37,29 +37,24 @@
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>org.apache.servicemix.api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.osgi</groupId>
       <artifactId>spring-osgi-core</artifactId>
-      <version>${spring.osgi.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>${commons.logging.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: incubator/servicemix/branches/servicemix-4.0/transaction/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/transaction/pom.xml?rev=588221&r1=588220&r2=588221&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/transaction/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/transaction/pom.xml Thu Oct 25 06:00:41 2007
@@ -37,54 +37,44 @@
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jta_1.1_spec</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.components</groupId>
       <artifactId>geronimo-transaction</artifactId>
-      <version>2.0.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.components</groupId>
       <artifactId>geronimo-connector</artifactId>
-      <version>2.0.1</version>
     </dependency>
     <dependency>
       <groupId>org.jencks</groupId>
       <artifactId>jencks</artifactId>
-      <version>2.1</version>
     </dependency>
     <dependency>
       <groupId>org.objectweb.howl</groupId>
       <artifactId>howl</artifactId>
-      <version>1.0.1-1</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.osgi</groupId>
       <artifactId>spring-osgi-core</artifactId>
-      <version>${spring.osgi.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>${spring.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>${felix.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>${commons.logging.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>