Fixes more issues with the TCK auto deployment to maven.

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@392 c6a108a4-781c-0410-a6c6-c2d559e19af0

build.properties

@@ -10,9 +10,9 @@
 # See also 'test.properties', which contains settings for the regression
 # suite.
 
-project.revision=0.9.9-SNAPSHOT
+project.revision=0.9.9.392
 project.revision.major=0
-project.revision.minor=9090390
+project.revision.minor=9090392
 ivy.artifact.id=olap4j
 ivy.artifact.group=org.olap4j
 impl.title=olap4j

build.xml

@@ -45,6 +45,9 @@ ${src.dir}/org/olap4j/mdx/parser/impl/DefaultMdxParserSym.java" />
  <target name="hudson" depends="clean-all,clean-tests,version-properties,jar,source.jar,tck-jar,test,jar-jdk14"
  description="Sugar goal to build olap4j from hudson." />
 
+ <target name="hudson-notest" depends="clean-all,clean-tests,version-properties,jar,source.jar,tck-jar,jar-jdk14"
+ description="Sugar goal to build olap4j from hudson." />
+
  <!-- Override to create a proper release. -->
  <target name="dist"
  depends="clean,version-properties,jar,tck-jar,javadoc,javadoc-pdf,javadoc-with-ydoc,jar-jdk14,source.zip"
@@ -275,12 +278,48 @@ META-INF/**" />
  <!-- override from subfloor to publish tck as well -->
  <target name="publish-nojar">
  <antcall target="subfloor.publish-nojar"/>
- <antcall target="maven-publish-sources">
- <param name="publish.groupId" value="${ivy.artifact.group}" />
- <param name="publish.artifactId" value="${ivy.artifact.id}-tck" />
- <param name="publish.version" value="${project.revision}" />
- <param name="publish.file" value="${dist.dir}/${ivy.artifact.id}-tck-${project.revision}.jar" />
- </antcall>
+ <property
+ name="publish.file"
+ value="${dist.dir}/${ivy.artifact.id}-tck-${project.revision}.jar"/>
+ <sequential>
+ <fail message="No file found at: ${publish.file}">
+ <condition>
+ <not>
+ <available file="${publish.file}" />
+ </not>
+ </condition>
+ </fail>
+ <echo message="Publishing ${publish.file} to ${ivy.repository.publish}..." />
+ <if>
+ <isset property="isWindows" />
+ <then>
+ <exec executable="cmd" failonerror="true">
+ <arg value="/c" />
+ <arg value="mvn.bat" />
+ <arg value="deploy:deploy-file" />
+ <arg value="-DrepositoryId=${ivy.repository.id}" />
+ <arg value="-Durl=${ivy.repository.publish}" />
+ <arg value="-DgroupId=${ivy.artifact.group}" />
+ <arg value="-DartifactId=${ivy.artifact.id}-tck" />
+ <arg value="-Dpackaging=java" />
+ <arg value="-Dversion=${project.revision}" />
+ <arg value="-Dfile=${publish.file}" />
+ </exec>
+ </then>
+ <else>
+ <exec executable="mvn" failonerror="true">
+ <arg value="deploy:deploy-file" />
+ <arg value="-DrepositoryId=${ivy.repository.id}" />
+ <arg value="-Durl=${ivy.repository.publish}" />
+ <arg value="-DgroupId=${ivy.artifact.group}" />
+ <arg value="-DartifactId=${ivy.artifact.id}-tck" />
+ <arg value="-Dpackaging=java" />
+ <arg value="-Dversion=${project.revision}" />
+ <arg value="-Dfile=${publish.file}" />
+ </exec>
+ </else>
+ </if>
+ </sequential>
  </target>
 
  <target name="javadoc" depends="clean-stray-package-html">