Author: ammulder
Date: Mon Oct 25 11:09:15 2004
New Revision: 55519
Modified:
geronimo/trunk/dependencies.xml
geronimo/trunk/etc/version-info.ent
geronimo/trunk/modules/assembly/project.xml
Log:
1) Remove JAXB from dependency list
2) Add Oro to dependency list
3) Add Axis to default assembly repository
Modified: geronimo/trunk/dependencies.xml
==============================================================================
--- geronimo/trunk/dependencies.xml (original)
+++ geronimo/trunk/dependencies.xml Mon Oct 25 11:09:15 2004
@@ -276,6 +276,7 @@
<version>&javacc-version;</version>
<jar>JavaCC.zip</jar>
</dependency>
+<!-- AMM: Axis module does not seem to use JAXB any more
<dependency>
<groupId>jaxb-ri</groupId>
<artifactId>jaxb-api</artifactId>
@@ -306,6 +307,7 @@
<artifactId>xsdlib</artifactId>
<version>&jaxb-ri-version;</version>
</dependency>
+-->
<dependency>
<groupId>jdbm</groupId>
<artifactId>jdbm</artifactId>
@@ -407,6 +409,11 @@
<groupId>openorb</groupId>
<artifactId>openorb-tools</artifactId>
<version>&openorb-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>&oro-version;</version>
</dependency>
<dependency>
<groupId>p2psockets</groupId>
Modified: geronimo/trunk/etc/version-info.ent
==============================================================================
--- geronimo/trunk/etc/version-info.ent (original)
+++ geronimo/trunk/etc/version-info.ent Mon Oct 25 11:09:15 2004
@@ -74,6 +74,7 @@
<!ENTITY mockobjects-version "0.09">
<!ENTITY mx4j-version "2.0.1">
<!ENTITY openorb-version "1.4.0-BETA2">
+<!ENTITY oro-version "2.0.8">
<!ENTITY p2psockets-version "1.1.2">
<!ENTITY regexp-version "1.3">
<!ENTITY spring-version "1.0.1">
Modified: geronimo/trunk/modules/assembly/project.xml
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Mon Oct 25 11:09:15 2004
@@ -675,6 +675,23 @@
</properties>
</dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis</artifactId>
+ <version>&axis-version;</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>&axis-commons-discovery-version;</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
</dependencies>
</project>
