geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: rev 54506 - in geronimo/trunk: . etc modules/axis
Date Mon, 11 Oct 2004 02:02:14 GMT
Author: ammulder
Date: Sun Oct 10 19:02:13 2004
New Revision: 54506

Modified:
   geronimo/trunk/dependencies.xml
   geronimo/trunk/etc/version-info.ent
   geronimo/trunk/modules/axis/project.xml
   geronimo/trunk/project.properties
Log:
Now the "download dependencies" build followed by a "m:rebuild-all -o"
  should work -- except for the maven/plugin dependencies


Modified: geronimo/trunk/dependencies.xml
==============================================================================
--- geronimo/trunk/dependencies.xml	(original)
+++ geronimo/trunk/dependencies.xml	Sun Oct 10 19:02:13 2004
@@ -56,13 +56,13 @@
         </dependency>
         <dependency>
             <groupId>axis</groupId>
-            <artifactId>axis-commons-discovery</artifactId>
-            <version>&axis-version;</version>
+            <artifactId>commons-discovery</artifactId>
+            <version>&axis-commons-discovery-version;</version>
         </dependency>
         <dependency>
             <groupId>axis</groupId>
-            <artifactId>axis-commons-logging</artifactId>
-            <version>&axis-version;</version>
+            <artifactId>commons-logging</artifactId>
+            <version>&axis-commons-logging-version;</version>
         </dependency>
         <dependency>
             <groupId>axis</groupId>
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>axis</groupId>
             <artifactId>axis-wsdl4j</artifactId>
-            <version>&axis-version;</version>
+            <version>&axis-wsdl4j-version;</version>
         </dependency>
         <dependency>
             <groupId>castor</groupId>
@@ -502,6 +502,51 @@
             <artifactId>xstream</artifactId>
             <version>&xstream-version;</version>
         </dependency>
+
+<!-- Aaron put these in to get ActiveMQ to work -->
+    <dependency>
+      <id>servletapi</id>
+      <version>2.3</version>
+    </dependency>
+    <dependency>
+      <id>springframework</id>
+      <artifactId>spring</artifactId>
+      <version>1.1</version>
+      <url>http://www.springframework.org</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>berkeleydb</id>
+      <version>1.5.1</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>berkeleydb+native</id>
+      <version>4.2</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>jmdns</id>
+      <version>0.2</version>
+    </dependency>
+    <dependency>
+      <id>jetty</id>
+      <jar>org.mortbay.jetty-&activemq-jetty-version;.jar</jar>
+    </dependency>
+    <dependency>
+      <id>jetty+jasper-compiler</id>
+      <jar>jasper-compiler-&activemq-jetty-version;.jar</jar>
+    </dependency>
+    <dependency>
+      <id>jetty+jasper-runtime</id>
+      <jar>jasper-runtime-&activemq-jetty-version;.jar</jar>
+    </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/trunk/etc/version-info.ent
==============================================================================
--- geronimo/trunk/etc/version-info.ent	(original)
+++ geronimo/trunk/etc/version-info.ent	Sun Oct 10 19:02:13 2004
@@ -19,12 +19,16 @@
 <!ENTITY geronimo-spec-servlet-version "2.4-SNAPSHOT">
 
 <!ENTITY activecluster-version "1.0-SNAPSHOT">
+<!ENTITY activemq-jetty-version "4.2.20RC0">
 <!ENTITY ant-version "1.5">
 <!ENTITY antlr-version "2.7.2">
 <!ENTITY axion-version "1.0-M3-dev">
 <!ENTITY axis-version "1.2-RC1">
 <!ENTITY axis-jaxrpc-version "1.2-RC1">
 <!ENTITY axis-saaj-version "1.2-RC1">
+<!ENTITY axis-wsdl4j-version "1.2-RC1">
+<!ENTITY axis-commons-logging-version "SNAPSHOT">
+<!ENTITY axis-commons-discovery-version "SNAPSHOT">
 <!ENTITY cglib-version "2.0">
 <!ENTITY castor-version "0.9.3.9">
 <!ENTITY commons-beanutils-version "1.6.1">
@@ -48,7 +52,7 @@
 <!ENTITY emberio-version "0.3-alpha">
 <!ENTITY ews-version "SNAPSHOT">
 <!ENTITY howl-version "0.1.7">
-<!ENTITY hsqldb-version "1.7.1">
+<!ENTITY hsqldb-version "1.7.2.2">
 <!ENTITY javacc-version "2.1">
 <!ENTITY jaxb-ri-version "SNAPSHOT">
 <!ENTITY jdbm-version "0.20-dev">
@@ -73,5 +77,5 @@
 <!ENTITY xml-parser-apis-version "2.2.1">
 <!ENTITY xmlbeans-version "1.0-DEV">
 <!ENTITY xmlpull-version "1.1.3.4d_b4_min">
-<!ENTITY xstream-version "1.0.1">
+<!ENTITY xstream-version "1.0.2">
 <!ENTITY xpp3-version "1.1.3.3">

Modified: geronimo/trunk/modules/axis/project.xml
==============================================================================
--- geronimo/trunk/modules/axis/project.xml	(original)
+++ geronimo/trunk/modules/axis/project.xml	Sun Oct 10 19:02:13 2004
@@ -354,7 +354,7 @@
         <dependency>
             <groupId>axis</groupId>
             <artifactId>commons-discovery</artifactId>
-            <version>&axis-version;</version>
+            <version>&axis-commons-discovery-version;</version>
             <properties>
                 <module>true</module>
             </properties>
@@ -362,7 +362,7 @@
         <dependency>
             <groupId>axis</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>&axis-version;</version>
+            <version>&axis-commons-logging-version;</version>
             <properties>
                 <module>true</module>
             </properties>
@@ -370,7 +370,7 @@
         <dependency>
             <groupId>axis</groupId>
             <artifactId>axis-jaxrpc</artifactId>
-            <version>&axis-version;</version>
+            <version>&axis-jaxrpc-version;</version>
             <properties>
                 <module>true</module>
             </properties>
@@ -378,7 +378,7 @@
         <dependency>
             <groupId>axis</groupId>
             <artifactId>axis-saaj</artifactId>
-            <version>&axis-version;</version>
+            <version>&axis-saaj-version;</version>
             <properties>
                 <module>true</module>
             </properties>
@@ -386,7 +386,7 @@
         <dependency>
             <groupId>axis</groupId>
             <artifactId>axis-wsdl4j</artifactId>
-            <version>&axis-version;</version>
+            <version>&axis-wsdl4j-version;</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: geronimo/trunk/project.properties
==============================================================================
--- geronimo/trunk/project.properties	(original)
+++ geronimo/trunk/project.properties	Sun Oct 10 19:02:13 2004
@@ -29,8 +29,8 @@
 http://www.apache.org/dist/java-repository/,\
 http://www.mortbay.org/maven,\
 http://www.openejb.org/maven,\
-http://www.ibiblio.org/maven
-
+http://www.ibiblio.org/maven,\
+http://www.apache.org/~dims/maven/
 
 module.excludes=axis
 #maven.test.failure.ignore=true

Mime
View raw message