You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by ah...@apache.org on 2006/07/11 13:44:57 UTC
svn commit: r420846 - in /incubator/yoko/trunk: api/pom.xml bindings/pom.xml
core/.classpath core/pom.xml distribution/pom.xml maven-plugins/pom.xml
pom.xml rmi/pom.xml tools/pom.xml
Author: ahj
Date: Tue Jul 11 06:44:56 2006
New Revision: 420846
URL: http://svn.apache.org/viewvc?rev=420846&view=rev
Log:
YOKO-77: Versions of dependencies should be managed in the parent POM
Removed:
incubator/yoko/trunk/core/.classpath
Modified:
incubator/yoko/trunk/api/pom.xml
incubator/yoko/trunk/bindings/pom.xml
incubator/yoko/trunk/core/pom.xml
incubator/yoko/trunk/distribution/pom.xml
incubator/yoko/trunk/maven-plugins/pom.xml
incubator/yoko/trunk/pom.xml
incubator/yoko/trunk/rmi/pom.xml
incubator/yoko/trunk/tools/pom.xml
Modified: incubator/yoko/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/api/pom.xml?rev=420846&r1=420845&r2=420846&view=diff
==============================================================================
--- incubator/yoko/trunk/api/pom.xml (original)
+++ incubator/yoko/trunk/api/pom.xml Tue Jul 11 06:44:56 2006
@@ -4,7 +4,6 @@
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-api</artifactId>
<packaging>jar</packaging>
- <version>1.0-incubating-M1-SNAPSHOT</version>
<name>Yoko Public API</name>
<parent>
@@ -21,7 +20,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
@@ -35,19 +33,16 @@
<dependency>
<groupId>org.objectweb.celtix</groupId>
<artifactId>celtix-common</artifactId>
- <version>${celtix.version}</version>
</dependency>
<dependency>
<groupId>org.objectweb.celtix</groupId>
<artifactId>celtix-tools</artifactId>
- <version>${celtix.version}</version>
</dependency>
<dependency>
<groupId>org.objectweb.celtix</groupId>
<artifactId>celtix-api</artifactId>
- <version>${celtix.version}</version>
</dependency>
</dependencies>
Modified: incubator/yoko/trunk/bindings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/pom.xml?rev=420846&r1=420845&r2=420846&view=diff
==============================================================================
--- incubator/yoko/trunk/bindings/pom.xml (original)
+++ incubator/yoko/trunk/bindings/pom.xml Tue Jul 11 06:44:56 2006
@@ -4,7 +4,6 @@
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-bindings</artifactId>
<packaging>jar</packaging>
- <version>1.0-incubating-M1-SNAPSHOT</version>
<name>Yoko Bindings</name>
<parent>
@@ -21,38 +20,32 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.objectweb.celtix</groupId>
<artifactId>celtix-common</artifactId>
- <version>${celtix.version}</version>
</dependency>
<dependency>
<groupId>org.objectweb.celtix</groupId>
<artifactId>celtix-rt</artifactId>
- <version>${celtix.version}</version>
</dependency>
<dependency>
<groupId>org.objectweb.celtix</groupId>
<artifactId>celtix-api</artifactId>
- <version>${celtix.version}</version>
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-api</artifactId>
- <version>${project.version}</version>
</dependency>
-
- <dependency>
+
+ <dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-core</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
Modified: incubator/yoko/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/pom.xml?rev=420846&r1=420845&r2=420846&view=diff
==============================================================================
--- incubator/yoko/trunk/core/pom.xml (original)
+++ incubator/yoko/trunk/core/pom.xml Tue Jul 11 06:44:56 2006
@@ -4,7 +4,6 @@
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-core</artifactId>
<name>Yoko Core</name>
- <version>1.0-incubating-M1-SNAPSHOT</version>
<packaging>jar</packaging>
<parent>
@@ -17,18 +16,15 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
- <version>1.3.4</version>
<scope>test</scope>
</dependency>
Modified: incubator/yoko/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/pom.xml?rev=420846&r1=420845&r2=420846&view=diff
==============================================================================
--- incubator/yoko/trunk/distribution/pom.xml (original)
+++ incubator/yoko/trunk/distribution/pom.xml Tue Jul 11 06:44:56 2006
@@ -3,7 +3,6 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-distribution</artifactId>
- <version>1.0-incubating-M1-SNAPSHOT</version>
<name>Yoko Distribution</name>
<url>http://www.apache.org/incubator/yoko</url>
<packaging>jar</packaging>
@@ -23,17 +22,14 @@
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-tools</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-bindings</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
Modified: incubator/yoko/trunk/maven-plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/maven-plugins/pom.xml?rev=420846&r1=420845&r2=420846&view=diff
==============================================================================
--- incubator/yoko/trunk/maven-plugins/pom.xml (original)
+++ incubator/yoko/trunk/maven-plugins/pom.xml Tue Jul 11 06:44:56 2006
@@ -4,7 +4,6 @@
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-maven-plugins</artifactId>
<name>Yoko Maven plugins</name>
- <version>1.0-incubating-M1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<parent>
@@ -17,14 +16,12 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0.1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -36,7 +33,6 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0.1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -48,17 +44,14 @@
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-tools</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-nodeps</artifactId>
- <version>1.6.5</version>
</dependency>
</dependencies>
Modified: incubator/yoko/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/pom.xml?rev=420846&r1=420845&r2=420846&view=diff
==============================================================================
--- incubator/yoko/trunk/pom.xml (original)
+++ incubator/yoko/trunk/pom.xml Tue Jul 11 06:44:56 2006
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko</artifactId>
- <version>1.0-incubating-M1-SNAPSHOT</version>
+ <version>${yoko.version}</version>
<name>Yoko CORBA Server</name>
<url>http://incubator.apache.org/yoko/</url>
@@ -12,7 +12,8 @@
<modules>
<module>sunjars</module>
- <module>core</module>
+ <module>core</module>
+ <module>rmi</module>
<module>api</module>
<module>tools</module>
<module>maven-plugins</module>
@@ -26,7 +27,23 @@
<!-- These properties should be defined in top level pom.xml -->
<properties>
+ <!-- The current version -->
+ <yoko.version>1.0-incubating-M1-SNAPSHOT</yoko.version>
+
+ <!-- CORBA spec version -->
+ <yoko.spec.version>${yoko.version}</yoko.spec.version>
+
+ <!-- versions of external dependencies -->
+ <ant.version>1.6.5</ant.version>
+ <antlr.version>2.7.5</antlr.version>
+ <bcel.version>5.2</bcel.version>
<celtix.version>1.1-SNAPSHOT</celtix.version>
+ <commons.logging.version>1.0.4</commons.logging.version>
+ <concurrent.version>1.3.4</concurrent.version>
+ <junit.version>3.8.2</junit.version>
+ <maven.version>2.0.1</maven.version>
+ <xmlschema.version>1.0.2</xmlschema.version>
+
<compiler.version>2.0.1</compiler.version>
<javadoc.version>2.0-beta-3</javadoc.version>
<jar.version>2.0</jar.version>
@@ -38,11 +55,119 @@
<java.source.version>1.5</java.source.version>
<compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</compile.flags>
<topDirectoryLocation>.</topDirectoryLocation>
- <no.checkstyle>false</no.checkstyle>
- <no.pmd>false</no.pmd>
- </properties>
+ <no.checkstyle>false</no.checkstyle>
+ <no.pmd>false</no.pmd>
+ </properties>
- <build>
+ <dependencyManagement>
+ <dependencies>
+ <!-- Yoko modules -->
+ <dependency>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-core</artifactId>
+ <version>${yoko.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-spec-corba</artifactId>
+ <version>${yoko.spec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-api</artifactId>
+ <version>${yoko.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-tools</artifactId>
+ <version>${yoko.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-bindings</artifactId>
+ <version>${yoko.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-rmi</artifactId>
+ <version>${yoko.version}</version>
+ </dependency>
+ <!-- External dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bcel</groupId>
+ <artifactId>bcel</artifactId>
+ <version>${bcel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>${antlr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>${xmlschema.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.objectweb.celtix</groupId>
+ <artifactId>celtix-common</artifactId>
+ <version>${celtix.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.objectweb.celtix</groupId>
+ <artifactId>celtix-tools</artifactId>
+ <version>${celtix.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.objectweb.celtix</groupId>
+ <artifactId>celtix-api</artifactId>
+ <version>${celtix.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.objectweb.celtix</groupId>
+ <artifactId>celtix-rt</artifactId>
+ <version>${celtix.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>${concurrent.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
<resources>
<resource>
<directory>src/main/java</directory>
Modified: incubator/yoko/trunk/rmi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/rmi/pom.xml?rev=420846&r1=420845&r2=420846&view=diff
==============================================================================
--- incubator/yoko/trunk/rmi/pom.xml (original)
+++ incubator/yoko/trunk/rmi/pom.xml Tue Jul 11 06:44:56 2006
@@ -26,7 +26,6 @@
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-rmi</artifactId>
<packaging>jar</packaging>
- <version>1.0-incubating-M1-SNAPSHOT</version>
<name>Yoko RMI</name>
<url>http://maven.apache.org</url>
<dependencies>
@@ -35,17 +34,14 @@
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-spec-corba</artifactId>
- <version>1.0-incubating-M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.bcel</groupId>
<artifactId>bcel</artifactId>
- <version>5.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/yoko/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/pom.xml?rev=420846&r1=420845&r2=420846&view=diff
==============================================================================
--- incubator/yoko/trunk/tools/pom.xml (original)
+++ incubator/yoko/trunk/tools/pom.xml Tue Jul 11 06:44:56 2006
@@ -3,7 +3,6 @@
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-tools</artifactId>
<packaging>jar</packaging>
- <version>1.0-incubating-M1-SNAPSHOT</version>
<name>Yoko Command Line Tools</name>
<parent>
@@ -21,28 +20,23 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.objectweb.celtix</groupId>
<artifactId>celtix-api</artifactId>
- <version>${celtix.version}</version>
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
- <version>2.7.5</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
- <version>1.0.2</version>
</dependency>
</dependencies>