You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/04/27 20:14:56 UTC
svn commit: r938591 - in /geronimo/server/trunk:
framework/buildsupport/car-maven-plugin/pom.xml
framework/configs/karaf-framework/pom.xml plugins/corba/pom.xml
plugins/openejb/pom.xml pom.xml
Author: gawor
Date: Tue Apr 27 18:14:56 2010
New Revision: 938591
URL: http://svn.apache.org/viewvc?rev=938591&view=rev
Log:
use released yoko 1.1 - more cleanup
Modified:
geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
geronimo/server/trunk/plugins/corba/pom.xml
geronimo/server/trunk/plugins/openejb/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml?rev=938591&r1=938590&r2=938591&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml Tue Apr 27 18:14:56 2010
@@ -134,12 +134,11 @@
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-spec-corba</artifactId>
- <version>1.1-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-rmi-spec</artifactId>
- <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
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=938591&r1=938590&r2=938591&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Tue Apr 27 18:14:56 2010
@@ -82,13 +82,6 @@
<version>${felix.karaf.version}</version>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko</artifactId>
- <type>pom</type>
- <version>1.1</version>
- <scope>import</scope>
- </dependency>
<!--<dependency>-->
<!--<groupId>org.apache.felix</groupId>-->
Modified: geronimo/server/trunk/plugins/corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/pom.xml?rev=938591&r1=938590&r2=938591&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/pom.xml Tue Apr 27 18:14:56 2010
@@ -41,7 +41,7 @@
<module>geronimo-yoko</module>
<module>j2ee-corba-yoko</module>
<module>openejb-corba-deployer</module>
- </modules>
+ </modules>
<profiles>
<profile>
@@ -51,6 +51,7 @@
</modules>
</profile>
</profiles>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -69,4 +70,4 @@
</dependencies>
</dependencyManagement>
-</project>
\ No newline at end of file
+</project>
Modified: geronimo/server/trunk/plugins/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/pom.xml?rev=938591&r1=938590&r2=938591&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/pom.xml Tue Apr 27 18:14:56 2010
@@ -64,14 +64,7 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <!-- duplicated in corba -->
- <dependency>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-spec-corba</artifactId>
- <version>1.1-SNAPSHOT</version>
- </dependency>
-
</dependencies>
</dependencyManagement>
-</project>
\ No newline at end of file
+</project>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=938591&r1=938590&r2=938591&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Apr 27 18:14:56 2010
@@ -137,13 +137,12 @@
<dependencyManagement>
<dependencies>
-
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-osgi-registry</artifactId>
<version>1.0</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
@@ -173,11 +172,13 @@
<artifactId>geronimo-concurrent_1.0_spec</artifactId>
<version>1.1-EA-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.1_spec</artifactId>
<version>1.0</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_2.2_spec</artifactId>
@@ -236,6 +237,7 @@
<artifactId>geronimo-jaxb_2.2_spec</artifactId>
<version>1.0</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxr_1.0_spec</artifactId>
@@ -1337,6 +1339,18 @@
</dependency>
<dependency>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-spec-corba</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-rmi-spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>woodstox</artifactId>
<version>3.2.9_1-SNAPSHOT</version>