MONDRIAN: Up version to 4.0.0 (pre alpha, of course).

    Include MondrianInprocProxy in mondrian.jar so that it can be removed from
    olap4j source.

[git-p4: depot-paths = "//open/mondrian/": change = 13109]

build.xml

@@ -23,12 +23,12 @@
   <property name="project.build.debug" value="on"/>
   <property name="Name" value="Mondrian"/>
   <property name="name" value="mondrian"/>
-  <property name="version" value="3.1-SNAPSHOT"/>
+  <property name="version" value="4.0.0.13109"/>
   <property name="vendor" value="Pentaho"/>
   <property name="driver.name" value="Mondrian olap4j driver"/>
-  <property name="driver.version" value="3.1.2"/>
-  <property name="driver.version.major" value="3"/>
-  <property name="driver.version.minor" value="102"/>
+  <property name="driver.version" value="4.0.0"/>
+  <property name="driver.version.major" value="4"/>
+  <property name="driver.version.minor" value="000"/>
   <!--
     ===================================================================
     Set the properties related to paths
@@ -1236,7 +1236,8 @@ META-INF/**"
       <zipfileset
           dir="${testclasses.dir}"
           includes="
-mondrian/test/loader/**/*.class"/>
+mondrian/test/loader/**/*.class,
+mondrian/olap4j/MondrianInprocProxy*.class"/>
       <zipfileset
           dir="${javatest.dir}"
           includes="

ivy.xml

@@ -15,7 +15,7 @@
     xmlns:m="http://ant.apache.org/ivy/maven"
     xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 
-    <info organisation="pentaho" module="mondrian" revision="3.1.1.xxxxx">
+    <info organisation="pentaho" module="mondrian" revision="4.0.0.xxxxx">
         <license name="EPL" url="http://www.eclipse.org/legal/epl-v10.html"/>
         <ivyauthor name="Julian Hyde" />
         <repository name="pentaho-rep" url="http://repo.pentaho.org"/>