--- project.xml	2006-05-25 18:26:37.877500000 -0700
+++ project-fixed.xml	2006-05-25 18:32:01.752500000 -0700
@@ -3,7 +3,7 @@
 <project>
   <pomVersion>3</pomVersion>
   <name>groovy</name>
-  <groupId>groovy</groupId>
+  <groupId>org.codehaus.groovy</groupId>
   <id>groovy</id>
   <currentVersion>1.0-RC-01-SNAPSHOT</currentVersion>
 
@@ -538,6 +538,9 @@
       <artifactId>xerces</artifactId>    
       <version>2.4.0</version>
       <url>http://xml.apache.org/</url>
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
 
     <dependency>
@@ -545,6 +548,9 @@
       <artifactId>xml-apis</artifactId>    
       <version>1.0.b2</version>
       <url>http://xml.apache.org/</url>
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
 
     <!-- only used for command line tools -->
@@ -552,6 +558,9 @@
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>    
       <version>1.0</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
 
     <!-- only used for Ant tasks & scripting tools -->
@@ -560,18 +569,25 @@
       <groupId>ant</groupId>
       <artifactId>ant</artifactId>    
       <version>1.6.5</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
     <dependency>
       <groupId>ant</groupId>
-
       <artifactId>ant-junit</artifactId>    
       <version>1.6.5</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
     <dependency>
       <groupId>ant</groupId>
       <artifactId>ant-launcher</artifactId>    
       <version>1.6.5</version>
-
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
 
     <!-- only used for testing helper classes -->
@@ -579,30 +595,33 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>    
       <version>3.8.1</version>
+      <properties>
+        <scope>test</scope>
+      </properties>
     </dependency>    
     <dependency>
-
       <groupId>jmock</groupId>
       <artifactId>jmock</artifactId>
       <version>1.0.1</version>
-      <!--
-      <version>SNAPSHOT</version>
-      -->
+      <properties>
+        <scope>test</scope>
+      </properties>
     </dependency>
     <dependency>
       <groupId>jmock</groupId>
-
       <artifactId>jmock-cglib</artifactId>
       <version>1.0.1</version>
-      <!--
-      <version>SNAPSHOT</version>
-      -->
+      <properties>
+        <scope>test</scope>
+      </properties>
     </dependency>
     <dependency>
-        <groupId>cglib</groupId>
-        <artifactId>cglib</artifactId>
-
-        <version>nodep-2.1</version>
+      <groupId>cglib</groupId>
+      <artifactId>cglib</artifactId>
+      <version>nodep-2.1</version>
+      <properties>
+        <scope>test</scope>
+      </properties>
     </dependency>
 
     <!-- only used for testing/debugging-->
@@ -610,21 +629,28 @@
       <groupId>asm</groupId>
       <artifactId>asm-util</artifactId>    
       <version>2.2</version>
-
       <url>http://asm.objectweb.org/</url>
+      <properties>
+        <scope>test</scope>
+      </properties>
     </dependency>
     <dependency>
       <groupId>asm</groupId>
       <artifactId>asm-attrs</artifactId>    
       <version>2.2</version>
       <url>http://asm.objectweb.org/</url>
-
+      <properties>
+        <scope>test</scope>
+      </properties>
     </dependency>
     <dependency>
       <groupId>asm</groupId>
       <artifactId>asm-analysis</artifactId>    
       <version>2.2</version>
       <url>http://asm.objectweb.org/</url>
+      <properties>
+        <scope>test</scope>
+      </properties>
     </dependency>
 
     <dependency>
@@ -632,6 +658,9 @@
       <artifactId>asm-tree</artifactId>    
       <version>2.2</version>
       <url>http://asm.objectweb.org/</url>
+      <properties>
+        <scope>test</scope>
+      </properties>
     </dependency>
 
     <!-- only used for BSF adapter-->
@@ -641,6 +670,9 @@
       <artifactId>bsf</artifactId>    
       <version>2.3.0-rc1</version>
       <url>http://jakarta.apache.org/bsf/</url>
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
 
     <!-- only used for JMX utilities -->
@@ -650,7 +682,8 @@
       <artifactId>mx4j</artifactId>    
       <version>2.0-beta-1</version>
       <properties>
-          <bootstrap>true</bootstrap>
+        <bootstrap>true</bootstrap>
+        <optional>true</optional>
       </properties>
 
     </dependency>
@@ -660,6 +693,9 @@
       <groupId>mockobjects</groupId>
       <artifactId>mockobjects-core</artifactId>
       <version>0.09</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
 
     <!-- only used for EJB browser -->
@@ -667,6 +703,9 @@
       <groupId>openejb</groupId>
       <artifactId>openejb-loader</artifactId>
       <version>0.9.2</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
 
     <!-- only used for SQL library -->
@@ -674,33 +713,46 @@
       <groupId>axion</groupId>
       <artifactId>axion</artifactId>    
       <version>1.0-M3-dev</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
-
       <artifactId>commons-logging</artifactId>    
       <version>1.0.3</version>
       <url>http://jakarta.apache.org/commons/logging.html</url>
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>    
       <version>3.0-dev2</version>
-
       <url>http://jakarta.apache.org/commons/collections</url>
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
     <dependency>
       <groupId>regexp</groupId>
       <artifactId>regexp</artifactId>    
       <version>1.2</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
 
   
     <!-- only used for servlet / gsp -->
     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>    
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>    
       <version>2.3</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
   
     <!-- only used for the Wiki Ant tasks -->
@@ -709,12 +761,17 @@
       <groupId>radeox</groupId>
       <artifactId>radeox</artifactId>    
       <version>0.9</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
     <dependency>
       <groupId>radeox</groupId>
       <artifactId>radeox-oro</artifactId>    
       <version>0.9</version>
-
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
 
     <!-- only used for the HTML to Wiki script -->
@@ -722,6 +779,9 @@
       <groupId>nekohtml</groupId>
       <artifactId>nekohtml</artifactId>    
       <version>0.7.7</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
 
     <!-- only used for the JavaDoc generator script -->
@@ -729,6 +789,9 @@
       <groupId>qdox</groupId>
       <artifactId>qdox</artifactId>    
       <version>1.3</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
 
     <!-- only used in the samples (BlogLines client) -->
@@ -737,6 +800,9 @@
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
       <version>3.0-rc3</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
 
     <!-- used to dump out the AST -->
@@ -745,6 +811,9 @@
       <groupId>xstream</groupId>
       <artifactId>xstream</artifactId>
       <version>1.1.1</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
 
     <!-- used by xstream -->
@@ -753,6 +822,9 @@
 
       <artifactId>xpp3</artifactId>
       <version>1.1.3.4-RC8_min</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
 
     <!-- used to build embeddable jar -->
@@ -761,6 +833,9 @@
       <artifactId>jarjar</artifactId>
 
       <version>0.6</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
     </dependency>
 
     <!-- prepare for EMMA
@@ -768,12 +843,18 @@
             <id>emma</id>
             <version>2.0.latest</version>
             <url>http://emma.sourceforge.net</url>
+            <properties>
+              <optional>true</optional>
+            </properties>
         </dependency>
         <dependency>
             <id>emma_ant</id>
             <groupId>emma</groupId>
             <version>2.0.latest</version>
             <url>http://emma.sourceforge.net</url>
+            <properties>
+              <optional>true</optional>
+            </properties>
         </dependency>
     -->