geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1101300 - in /geronimo/server/trunk: plugins/corba/geronimo-corba/pom.xml plugins/corba/openejb-corba-deployer/pom.xml pom.xml
Date Tue, 10 May 2011 03:40:46 GMT
Author: xiaming
Date: Tue May 10 03:40:45 2011
New Revision: 1101300

URL: http://svn.apache.org/viewvc?rev=1101300&view=rev
Log:
Fix build error of corba deployer

Modified:
    geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml
    geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml?rev=1101300&r1=1101299&r2=1101300&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml Tue May 10 03:40:45 2011
@@ -65,6 +65,30 @@
             <artifactId>yoko-spec-corba</artifactId>
             <scope>provided</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.yoko</groupId>
+            <artifactId>yoko-rmi-impl</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.yoko</groupId>
+                    <artifactId>yoko-spec-corba</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.yoko</groupId>
+                    <artifactId>yoko-rmi-spec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.yoko</groupId>
+                    <artifactId>yoko-osgi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.servicemix.bundles</groupId>
+                    <artifactId>org.apache.servicemix.bundles.bcel</artifactId>
+                </exclusion>                    
+            </exclusions>
+        </dependency>
+        
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.cglib</artifactId>

Modified: geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml?rev=1101300&r1=1101299&r2=1101300&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml Tue May 10 03:40:45
2011
@@ -65,6 +65,30 @@
             <artifactId>geronimo-corba-builder</artifactId>
             <version>${project.version}</version>
         </dependency>
+        
+        <!-- We need this dependency to pass the car-maven-plugin build after adding dependency
in geronimo-corba module -->
+        <dependency>
+            <groupId>org.apache.yoko</groupId>
+            <artifactId>yoko-rmi-impl</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.yoko</groupId>
+                    <artifactId>yoko-spec-corba</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.yoko</groupId>
+                    <artifactId>yoko-rmi-spec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.yoko</groupId>
+                    <artifactId>yoko-osgi</artifactId>
+                </exclusion>
+                <!--<exclusion>
+                    <groupId>org.apache.servicemix.bundles</groupId>
+                    <artifactId>org.apache.servicemix.bundles.bcel</artifactId>
+                </exclusion>-->                    
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1101300&r1=1101299&r2=1101300&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue May 10 03:40:45 2011
@@ -1389,6 +1389,12 @@
                 <artifactId>yoko-rmi-spec</artifactId>
                 <version>${yokoVersion}</version>
             </dependency>
+            
+            <dependency>
+                <groupId>org.apache.yoko</groupId>
+                <artifactId>yoko-rmi-impl</artifactId>
+                <version>${yokoVersion}</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>



Mime
View raw message