You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2011/10/14 02:04:24 UTC
svn commit: r1183171 - in /geronimo/yoko/trunk: pom.xml yoko-core/pom.xml
yoko-osgi/pom.xml yoko-spec-corba/pom.xml
Author: djencks
Date: Fri Oct 14 00:04:24 2011
New Revision: 1183171
URL: http://svn.apache.org/viewvc?rev=1183171&view=rev
Log:
better pom cleanup
Modified:
geronimo/yoko/trunk/pom.xml
geronimo/yoko/trunk/yoko-core/pom.xml
geronimo/yoko/trunk/yoko-osgi/pom.xml
geronimo/yoko/trunk/yoko-spec-corba/pom.xml
Modified: geronimo/yoko/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/pom.xml?rev=1183171&r1=1183170&r2=1183171&view=diff
==============================================================================
--- geronimo/yoko/trunk/pom.xml (original)
+++ geronimo/yoko/trunk/pom.xml Fri Oct 14 00:04:24 2011
@@ -61,11 +61,11 @@
<inceptionYear>2006</inceptionYear>
<description>Apache Yoko CORBA Server</description>
- <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
+ <url>http://geronimo.apache.org/maven/${siteId}/${project.version}</url>
<distributionManagement>
<site>
<id>geronimo-website</id>
- <url>${staging.siteURL}/${siteId}/${version}</url>
+ <url>${staging.siteURL}/${siteId}/${project.version}</url>
</site>
</distributionManagement>
@@ -85,27 +85,27 @@
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-spec-corba</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-osgi</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-rmi-spec</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-rmi-impl</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- External dependencies -->
<dependency>
@@ -241,7 +241,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.3.4</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -260,9 +260,11 @@
<plugins>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.6</version>
</plugin>
<plugin>
<artifactId>maven-clover-plugin</artifactId>
+ <version>2.4</version>
</plugin>
<!--plugin>
<artifactId>maven-pmd-plugin</artifactId>
Modified: geronimo/yoko/trunk/yoko-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-core/pom.xml?rev=1183171&r1=1183170&r2=1183171&view=diff
==============================================================================
--- geronimo/yoko/trunk/yoko-core/pom.xml (original)
+++ geronimo/yoko/trunk/yoko-core/pom.xml Fri Oct 14 00:04:24 2011
@@ -31,6 +31,12 @@
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-spec-corba</artifactId>
<scope>provided</scope>
Modified: geronimo/yoko/trunk/yoko-osgi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-osgi/pom.xml?rev=1183171&r1=1183170&r2=1183171&view=diff
==============================================================================
--- geronimo/yoko/trunk/yoko-osgi/pom.xml (original)
+++ geronimo/yoko/trunk/yoko-osgi/pom.xml Fri Oct 14 00:04:24 2011
@@ -33,5 +33,11 @@
<artifactId>yoko-spec-corba</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: geronimo/yoko/trunk/yoko-spec-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-spec-corba/pom.xml?rev=1183171&r1=1183170&r2=1183171&view=diff
==============================================================================
--- geronimo/yoko/trunk/yoko-spec-corba/pom.xml (original)
+++ geronimo/yoko/trunk/yoko-spec-corba/pom.xml Fri Oct 14 00:04:24 2011
@@ -30,18 +30,6 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>