From 5ac9bc855faaf1943534ab077a7701d38af01c5a Mon Sep 17 00:00:00 2001
From: Luc Boudreau <lucboudreau@gmail.com>
Date: Fri, 8 Apr 2011 18:47:13 +0000
Subject: [PATCH] Triggers a fixed build number to be deployed to the maven
 repository.

Fixes a javadoc error.

Removes the YDoc doclet and associated Ant targets.

Fixes the Mondrian dependency to a numbered build.

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@437 c6a108a4-781c-0410-a6c6-c2d559e19af0
---
 build.properties                              |  8 +---
 build.xml                                     | 42 +------------------
 ivy-tck.xml                                   |  2 +-
 .../olap4j/driver/xmla/XmlaOlap4jDriver.java  |  2 +-
 4 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/build.properties b/build.properties
index 515b654..3907a65 100644
--- a/build.properties
+++ b/build.properties
@@ -10,9 +10,9 @@
 # See also 'test.properties', which contains settings for the regression
 # suite.
 
-project.revision=1.0.0-SNAPSHOT
+project.revision=1.0.0.437
 project.revision.major=1
-project.revision.minor=0000405
+project.revision.minor=0000437
 ivy.artifact.id=olap4j
 ivy.artifact.group=org.olap4j
 impl.title=olap4j
@@ -23,8 +23,4 @@ build.dir=build
 
 ivy.repository.publish=http://repo.pentaho.org/artifactory
 
-# Uncomment to use yDoc doclet for enhanced javadoc (requires commercial
-# license).
-#ydoc.home=C:/apps/ydoc/ydoc-3.0_01-jdk1.5
-
 # End build.properties
diff --git a/build.xml b/build.xml
index f94a966..5f34c79 100644
--- a/build.xml
+++ b/build.xml
@@ -50,7 +50,7 @@ ${src.dir}/org/olap4j/mdx/parser/impl/DefaultMdxParserSym.java" />
 
     <!-- Override to create a proper release. -->
     <target name="dist"
-        depends="clean,version-properties,jar,tck-jar,xmla-jar,javadoc,javadoc-pdf,javadoc-with-ydoc,jar-jdk14,source.zip"
+        depends="clean,version-properties,jar,tck-jar,xmla-jar,javadoc,javadoc-pdf,jar-jdk14,source.zip"
         description="Creates a distribution">
         <zip zipfile="${dist.dir}/${zip.filename}">
             <zipfileset dir="${basedir}/doc" prefix="${ivy.artifact.id}-${project.revision}/doc"
@@ -68,7 +68,7 @@ VERSION.txt" />
         </zip>
     </target>
 
-    <target name="doczip" depends="clean-all,clean-tests,compile,compile-tests,version-properties,javadoc,javadoc-pdf,javadoc-with-ydoc"
+    <target name="doczip" depends="clean-all,clean-tests,compile,compile-tests,version-properties,javadoc,javadoc-pdf"
         description="Creates an archive of all docs to deploy on www.olap4j.org.
                      See also doc/deployDoc.sh.">
         <mkdir dir="${dist.dir}" />
@@ -421,44 +421,6 @@ class XmlaOlap4jDriverVersion {
         </javadoc>
     </target>
 
-    <!--
-        Generate javadoc with embedded UML diagrams using the yDoc doclet from
-        yWorks.com. Set ydoc.home in build.properties, then replace
-        ${ydoc.home}/resources/ydoc.license with a full license (free for open
-        source use).
-    -->
-    <target name="javadoc-with-ydoc" depends="clean-stray-package-html">
-        <mkdir dir="${javadoc.dir}" />
-        <delete quiet="true" file="${javadoc.dir}/index.html" />
-        <property name="ps" value="${path.separator}" />
-        <javadoc sourcepath="${src.dir}" classpathref="javadoc.classpath"
-            destdir="${javadoc.dir}" packagenames="org.olap4j.*"
-            excludepackagenames="org.olap4j.impl.*,org.olap4j.mdx.parser.impl.*,org.olap4j.sample.*"
-            overview="${src.dir}/overview.html"
-            footer="&lt;a href=&quot;http://sourceforge.net/projects/olap4j&quot;&gt;&lt;img src=&quot;http://sourceforge.net/sflogo.php?group_id=168953&#38;type=1&quot; width=&quot;88&quot; height=&quot;31&quot; border=&quot;0&quot; alt=&quot;SourceForge.net_Logo&quot;&gt;&lt;/a&gt;"
-            author="true" source="1.5" access="public"
-            Windowtitle="olap4j, version ${project.revision}" additionalparam="-linksource">
-            <tag name="pre" description="Pre-condition:" scope="constructors,methods" />
-            <tag name="post" description="Post-condition:" scope="constructors,methods" />
-            <tag name="testcase" description="Test-case:" scope="constructors,methods,types" />
-            <link href="http://download.oracle.com/javase/6/docs/api/" />
-            <link href="http://www.junit.org/junit/javadoc/3.8/" />
-            <doclet name="ydoc.doclets.YStandard"
-                path="${ydoc.home}/lib/ydoc.jar${ps}${ydoc.home}/lib/class2svg.jar${ps}${ydoc.home}/resources${ps}${ydoc.home}/doc">
-                <param name="-author" />
-                <param name="-generic" />
-                <param name="-umlautogen" />
-                <param name="-tag" value="y.precondition" />
-                <param name="-tag" value="y.postcondition" />
-                <param name="-tag" value="y.complexity" />
-                <param name="-tag" value="param" />
-                <param name="-tag" value="return" />
-                <param name="-tag" value="see" />
-                <param name="-tag" value="y.uml" />
-            </doclet>
-        </javadoc>
-    </target>
-
     <target name="javadoc-pdf" depends="clean-stray-package-html">
         <javadoc sourcepath="${src.dir}" classpathref="javadoc.classpath"
             packagenames="org.olap4j.*"
diff --git a/ivy-tck.xml b/ivy-tck.xml
index e90cedd..08314a4 100644
--- a/ivy-tck.xml
+++ b/ivy-tck.xml
@@ -59,7 +59,7 @@
     <dependency org="junit" name="junit" rev="3.8.1"/>
 
     <!-- OLAP tests dependencies - uses Mondrian -->
-    <dependency org="pentaho" name="mondrian" rev="3.3-SNAPSHOT" changing="true">
+    <dependency org="pentaho" name="mondrian" rev="3.3.0.14192" changing="true">
       <exclude org="${ivy.artifact.group}" module="${ivy.artifact.id}"/>
     </dependency>
   </dependencies>
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jDriver.java b/src/org/olap4j/driver/xmla/XmlaOlap4jDriver.java
index 6e92ae2..0b09255 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jDriver.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jDriver.java
@@ -41,7 +41,7 @@
  * &nbsp;&nbsp;&nbsp;connection.unwrap(OlapConnection.class);</code>
  * </blockquote>
  *
- * <p>Note how we use the {@link java.sql.Connection#unwrap(Class)} method to down-cast
+ * <p>Note how we use the java.sql.Connection#unwrap(Class) method to down-cast
  * the JDBC connection object to the extension {@link org.olap4j.OlapConnection}
  * object. This method is only available in JDBC 4.0 (JDK 1.6 onwards).
  *