diff --git a/build.xml b/build.xml
index 1e37d7988..232903a19 100644
--- a/build.xml
+++ b/build.xml
@@ -1,46 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!--build.xml generated by maven from project.xml version 1.2-SNAPSHOT
-  on date December 22 2005, time 1344-->
+<!--build.xml generated by maven from project.xml version 1.2-RC2
+  on date April 24 2008, time 1634-->
 
 <project default="jar" name="commons-math" basedir=".">
-  <!--Load local and user build preferences-->
-
-  <property file="build.properties">
+  <property name="defaulttargetdir" value="target">
   </property>
-  <property file="${user.home}/build.properties">
+  <property name="libdir" value="target/lib">
   </property>
-  <!--Build properties-->
-
-  <property name="defaulttargetdir" value="${basedir}/target">
+  <property name="classesdir" value="target/classes">
   </property>
-  <property name="libdir" value="${user.home}/.maven/repository">
+  <property name="testclassesdir" value="target/test-classes">
   </property>
-  <property name="classesdir" value="${basedir}/target/classes">
+  <property name="testclassesdir" value="target/test-classes">
   </property>
-  <property name="testclassesdir" value="${basedir}/target/test-classes">
+  <property name="testreportdir" value="target/test-reports">
   </property>
-  <property name="testreportdir" value="${basedir}/target/test-reports">
+  <property name="distdir" value="dist">
   </property>
-  <property name="distdir" value="${basedir}/dist">
+  <property name="javadocdir" value="dist/docs/api">
   </property>
-  <property name="javadocdir" value="${basedir}/dist/docs/api">
-  </property>
-  <property name="final.name" value="commons-math-1.2">
-  </property>
-  <property name="proxy.host" value="">
-  </property>
-  <property name="proxy.port" value="">
-  </property>
-  <property name="proxy.username" value="">
-  </property>
-  <property name="proxy.password" value="">
+  <property name="final.name" value="commons-math-1.2-RC2">
   </property>
   <path id="build.classpath">
-    <pathelement location="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar">
-    </pathelement>
-    <pathelement location="${libdir}/commons-discovery/jars/commons-discovery-0.2.jar">
-    </pathelement>
+    <fileset dir="${libdir}">
+      <include name="**/*.jar">
+      </include>
+    </fileset>
   </path>
   <target name="init" description="o Initializes some properties">
     <mkdir dir="${libdir}">
@@ -53,25 +39,13 @@
 
     <available property="Junit.present" classname="junit.framework.Test">
     </available>
-    <!--Test if user defined a proxy-->
-
-    <condition property="useProxy">
-      <and>
-        <isset property="proxy.host">
-        </isset>
-        <not>
-          <equals trim="true" arg2="" arg1="${proxy.host}">
-          </equals>
-        </not>
-      </and>
-    </condition>
   </target>
   <target name="compile" description="o Compile the code" depends="get-deps">
     <mkdir dir="${classesdir}">
     </mkdir>
     <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
       <src>
-        <pathelement location="${basedir}/src/java">
+        <pathelement location="src/java">
         </pathelement>
       </src>
       <classpath refid="build.classpath">
@@ -80,11 +54,9 @@
     <mkdir dir="${classesdir}/META-INF">
     </mkdir>
     <copy todir="${classesdir}/META-INF">
-      <fileset dir="${basedir}/.">
+      <fileset dir=".">
         <include name="NOTICE.txt">
         </include>
-      	<include name="LICENSE.txt">
-      	</include>
       </fileset>
     </copy>
   </target>
@@ -115,7 +87,7 @@
   <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
     <mkdir dir="${testreportdir}">
     </mkdir>
-    <junit dir="${basedir}" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
+    <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
       <sysproperty key="basedir" value=".">
       </sysproperty>
       <formatter type="xml">
@@ -131,7 +103,7 @@
         </pathelement>
       </classpath>
       <batchtest todir="${testreportdir}">
-        <fileset dir="${basedir}/src/test">
+        <fileset dir="src/test">
           <include name="**/*Test.java">
           </include>
           <exclude name="**/*AbstractTest.java">
@@ -150,7 +122,7 @@
     </mkdir>
     <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
       <src>
-        <pathelement location="${basedir}/src/test">
+        <pathelement location="src/test">
         </pathelement>
       </src>
       <classpath>
@@ -161,7 +133,7 @@
       </classpath>
     </javac>
     <copy todir="${testclassesdir}">
-      <fileset dir="${basedir}/src/test">
+      <fileset dir="src/test">
         <include name="**/*.xml">
         </include>
         <include name="**/*.txt">
@@ -178,42 +150,16 @@
     </tstamp>
     <property name="copyright" value="Copyright &amp;copy;  The Apache Software Foundation. All Rights Reserved.">
     </property>
-    <property name="title" value="Math 1.2-SNAPSHOT API">
+    <property name="title" value="Math 1.2-RC2 API">
     </property>
-    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.commons.math.*">
+    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.math.*">
       <classpath>
         <path refid="build.classpath">
         </path>
       </classpath>
     </javadoc>
   </target>
-  <target name="get-dep-commons-logging.jar" description="o Download the dependency : commons-logging.jar" unless="commons-logging.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-logging.jar">
-    <mkdir dir="${libdir}/commons-logging/jars/">
-    </mkdir>
-    <get dest="${libdir}/commons-logging/jars/commons-logging-1.0.4.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.4.jar">
-    </get>
-  </target>
-  <target name="get-custom-dep-commons-logging.jar" if="commons-logging.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/commons-logging/jars/">
-    </mkdir>
-    <get dest="${libdir}/commons-logging/jars/commons-logging-1.0.4.jar" usetimestamp="true" ignoreerrors="true" src="${commons-logging.jar}">
-    </get>
-  </target>
-  <target name="get-dep-commons-discovery.jar" description="o Download the dependency : commons-discovery.jar" unless="commons-discovery.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-discovery.jar">
-    <mkdir dir="${libdir}/commons-discovery/jars/">
-    </mkdir>
-    <get dest="${libdir}/commons-discovery/jars/commons-discovery-0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-discovery/jars/commons-discovery-0.2.jar">
-    </get>
-  </target>
-  <target name="get-custom-dep-commons-discovery.jar" if="commons-discovery.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/commons-discovery/jars/">
-    </mkdir>
-    <get dest="${libdir}/commons-discovery/jars/commons-discovery-0.2.jar" usetimestamp="true" ignoreerrors="true" src="${commons-discovery.jar}">
-    </get>
-  </target>
-  <target name="get-deps" unless="noget" depends="get-dep-commons-logging.jar,get-dep-commons-discovery.jar">
-  </target>
-  <target name="setProxy" if="useProxy" depends="init">
+  <target name="get-deps" unless="noget" depends="init">
     <!--Proxy settings works only with a JDK 1.2 and higher.-->
 
     <echo>Proxy used :</echo>
@@ -222,6 +168,10 @@
     <echo>Proxy user [${proxy.username}]</echo>
     <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}">
     </setproxy>
+    <get dest="${libdir}/maven-cobertura-plugin-1.1.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/maven-plugins/plugins/maven-cobertura-plugin-1.1.1.jar">
+    </get>
+    <get dest="${libdir}/maven-xdoc-plugin-1.9.2.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/maven/plugins/maven-xdoc-plugin-1.9.2.jar">
+    </get>
   </target>
   <target name="noProxy" unless="useProxy" depends="init">
     <echo>Proxy not used.</echo>
diff --git a/maven.xml b/maven.xml
index 691cc46d3..750576b6a 100644
--- a/maven.xml
+++ b/maven.xml
@@ -51,12 +51,6 @@
   </preGoal>
 -->
 
-<!-- Uncomment to include compile time dependent jars (discovery, logging)
-  <preGoal name="dist:build-bin">
-    <deploy:copy-deps todir="${maven.build.dir}/${maven.final.name}/bin/${maven.final.name}" />
-  </preGoal>
- -->
- 
  <!-- Limit maven resources included in site generation -->
   <postGoal name="xdoc:copy-resources">
     <copy todir="${maven.docs.dest}/images">
diff --git a/project.properties b/project.properties
index cc4f520f4..6c00c155b 100644
--- a/project.properties
+++ b/project.properties
@@ -44,8 +44,7 @@ maven.docs.dest=${maven.build.dir}/site
 maven.docs.src=${basedir}/src/site/xdoc
 
 maven.javadoc.links = http://java.sun.com/j2se/1.4.2/docs/api/,\
-                      http://commons.apache.org/collections/api/,\
-                      http://commons.apache.org/discovery/apidocs/
+                      http://commons.apache.org/collections/api/
 
 maven.changes.issue.template=http://issues.apache.org/jira/browse/%ISSUE%
 
diff --git a/project.xml b/project.xml
index 462b7f7a5..fdeefa47f 100644
--- a/project.xml
+++ b/project.xml
@@ -202,30 +202,6 @@
     </contributor>
   </contributors>
   <dependencies>
-     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-       <version>1.0.4</version>
-       <url>http://commons.apache.org/logging</url>
-       <properties>
-       <comment>
-        Only required when commons-discovery is used for class factory
-        configuration. No hard compile or runtime dependency.
-       </comment>
-      </properties>
-     </dependency>
-     <dependency>
-      <groupId>commons-discovery</groupId>
-      <artifactId>commons-discovery</artifactId>
-      <version>0.2</version>
-      <url>http://commons.apache.org/discovery</url>
-      <properties>
-       <comment>
-        Only required when commons-discovery is used for class
-        factory configuration. No hard compile or runtime dependency.
-       </comment>
-      </properties>
-     </dependency>
      <dependency>
       <groupId>maven-plugins</groupId>
       <artifactId>maven-cobertura-plugin</artifactId>
diff --git a/src/java/org/apache/commons/math/analysis/UnivariateRealSolverFactory.java b/src/java/org/apache/commons/math/analysis/UnivariateRealSolverFactory.java
index 33a879d56..74f36d888 100644
--- a/src/java/org/apache/commons/math/analysis/UnivariateRealSolverFactory.java
+++ b/src/java/org/apache/commons/math/analysis/UnivariateRealSolverFactory.java
@@ -35,11 +35,6 @@ package org.apache.commons.math.analysis;
  * BrentSolver solver = factory.newBrentSolver(f);
  * </pre>
  *
- * <a href="http://commons.apache.org/discovery/">Apache Commons Discovery</a>
- * is used to determine the concrete factory returned by 
- * <code>UnivariateRealSolverFactory.newInstance().</code>  The default is
- * {@link UnivariateRealSolverFactoryImpl}.
- *
  * @version $Revision$ $Date$
  */
 public abstract class UnivariateRealSolverFactory {
diff --git a/src/site/xdoc/userguide/overview.xml b/src/site/xdoc/userguide/overview.xml
index 893165095..644d2a1e0 100644
--- a/src/site/xdoc/userguide/overview.xml
+++ b/src/site/xdoc/userguide/overview.xml
@@ -115,17 +115,7 @@
 
 <subsection name="0.5 Dependencies" href="dependencies">
     <p>
-    Commons Math requires JDK 1.3+ and has no runtime dependencies.  Commons
-    Discovery is used to enable pluggable implementations in the 
-    <code>distributions, analysis</code> and <code>stat</code> packages; but
-    default implementations are used if the commons-discovery and 
-    commons-logging (a dependency of commons-discovery) jars are not present in
-    the classpath.  To compile the sources, the following versions of these
-    components are required:
-    <ul>
-    <li>commons-discovery 0.2 </li>
-    <li>commons-logging 1.0.3 </li>
-    </ul>
+    Commons Math requires JDK 1.3+ and has no runtime dependencies.
     </p>
 </subsection>
 
diff --git a/test-jar.xml b/test-jar.xml
index 8de175726..c397ababb 100644
--- a/test-jar.xml
+++ b/test-jar.xml
@@ -95,7 +95,7 @@
     ==========================================================================
   </echo>
   </target>
-  <target name="compile-tests" if="Junit.present" depends="junit-present,get-deps">
+  <target name="compile-tests" if="Junit.present" depends="junit-present">
     <mkdir dir="${testclassesdir}"/>
     <javac destdir="${testclassesdir}" deprecation="true" debug="true"
             optimize="false" excludes="**/package.html">
@@ -113,15 +113,4 @@
       </fileset>
     </copy>
   </target>
-  <target name="get-deps" unless="noget" depends="init">
-    <get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true" 
-              src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.3.jar"/>
-    <get dest="${libdir}/commons-discovery-0.2.jar" usetimestamp="true" ignoreerrors="true" 
-              src="http://www.ibiblio.org/maven/commons-discovery/jars/commons-discovery-0.2.jar"/>
-    <copy todir="${libdir}">
-      <fileset dir="${jardir}">
-        <include name="*.jar"/>
-      </fileset>
-    </copy>
-  </target>
 </project>
\ No newline at end of file