You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by bs...@apache.org on 2008/01/17 01:50:35 UTC
svn commit: r612662 - in
/servicemix/smx3/branches/servicemix-3.2/platforms/geronimo:
deployer/pom.xml pom.xml servicemix/pom.xml
Author: bsnyder
Date: Wed Jan 16 16:50:33 2008
New Revision: 612662
URL: http://svn.apache.org/viewvc?rev=612662&view=rev
Log:
SM-1170 - Geronimo deployer and plugin build failures
Modified:
servicemix/smx3/branches/servicemix-3.2/platforms/geronimo/deployer/pom.xml
servicemix/smx3/branches/servicemix-3.2/platforms/geronimo/pom.xml
servicemix/smx3/branches/servicemix-3.2/platforms/geronimo/servicemix/pom.xml
Modified: servicemix/smx3/branches/servicemix-3.2/platforms/geronimo/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/platforms/geronimo/deployer/pom.xml?rev=612662&r1=612661&r2=612662&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/platforms/geronimo/deployer/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/platforms/geronimo/deployer/pom.xml Wed Jan 16 16:50:33 2008
@@ -31,12 +31,23 @@
<packaging>car</packaging>
<dependencies>
- <!-- Needed to download dependencies -->
<dependency>
- <groupId>org.apache.servicemix.geronimo</groupId>
- <artifactId>dependencies</artifactId>
- <version>3.2.2-SNAPSHOT</version>
- <scope>provided</scope>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>geronimo-gbean-deployer</artifactId>
+ <version>${geronimo-version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-server</artifactId>
+ <version>${geronimo-version}</version>
+ <type>car</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-webservices</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -44,21 +55,26 @@
<artifactId>deployer-service</artifactId>
<version>${servicemix-version}</version>
<type>jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <version>${geronimo-version}</version>
- <type>car</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-deployer</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.servicemix.geronimo</groupId>
- <artifactId>servicemix</artifactId>
+ <artifactId>servicemix</artifactId>
<version>${version}</version>
<type>car</type>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>geronimo-gbean-deployer</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: servicemix/smx3/branches/servicemix-3.2/platforms/geronimo/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/platforms/geronimo/pom.xml?rev=612662&r1=612661&r2=612662&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/platforms/geronimo/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/platforms/geronimo/pom.xml Wed Jan 16 16:50:33 2008
@@ -50,7 +50,7 @@
<modules>
<module>servicemix-service</module>
<module>deployer-service</module>
- <module>dependencies</module>
+ <!--<module>dependencies</module>-->
<module>servicemix</module>
<module>deployer</module>
</modules>
Modified: servicemix/smx3/branches/servicemix-3.2/platforms/geronimo/servicemix/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/platforms/geronimo/servicemix/pom.xml?rev=612662&r1=612661&r2=612662&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/platforms/geronimo/servicemix/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/platforms/geronimo/servicemix/pom.xml Wed Jan 16 16:50:33 2008
@@ -32,12 +32,24 @@
<packaging>car</packaging>
<dependencies>
- <!-- Needed to download Geronimo dependencies -->
<dependency>
- <groupId>org.apache.servicemix.geronimo</groupId>
- <artifactId>dependencies</artifactId>
- <version>${version}</version>
- <scope>provided</scope>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>geronimo-gbean-deployer</artifactId>
+ <version>${geronimo-version}</version>
+ <type>car</type>
+ <!--<scope>provided</scope>-->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-server</artifactId>
+ <version>${geronimo-version}</version>
+ <type>car</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-webservices</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- For build ordering -->
<dependency>
@@ -164,14 +176,6 @@
<artifactId>geronimo-webservices</artifactId>
</exclusion>
</exclusions>
- </dependency>
- <!-- Only needed to build the car -->
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <version>${geronimo-version}</version>
- <type>car</type>
- <scope>provided</scope>
</dependency>
</dependencies>