Author: stliu Date: 2010-02-25 09:12:03 -0500 (Thu, 25 Feb 2010) New Revision: 18888 Modified: entitymanager/branches/v3_3_2_GA_CP/build.xml entitymanager/branches/v3_3_2_GA_CP/common-build.xml entitymanager/branches/v3_3_2_GA_CP/ivy.xml Log: 1. clean build script, remove the out-of-date comment 2. change the ivy publish version from 'lastest' to the actually version Modified: entitymanager/branches/v3_3_2_GA_CP/build.xml =================================================================== --- entitymanager/branches/v3_3_2_GA_CP/build.xml 2010-02-25 13:53:15 UTC (rev 18887) +++ entitymanager/branches/v3_3_2_GA_CP/build.xml 2010-02-25 14:12:03 UTC (rev 18888) @@ -311,7 +311,7 @@ <ivy:resolve conf="core"/> <ivy:publish artifactspattern="${dist.dir}/[artifact].[ext]" resolver="local" - pubrevision="latest" + pubrevision="${version}" pubdate="${now}" status="integration" /> Modified: entitymanager/branches/v3_3_2_GA_CP/common-build.xml =================================================================== --- entitymanager/branches/v3_3_2_GA_CP/common-build.xml 2010-02-25 13:53:15 UTC (rev 18887) +++ entitymanager/branches/v3_3_2_GA_CP/common-build.xml 2010-02-25 14:12:03 UTC (rev 18888) @@ -47,27 +47,6 @@ <property name="hibernate-core.jdbc.dir" location="${hibernate-core.home}/lib"/> <!-- for some reason jdbc.dir is renamed to lib instead of jdbc when doing a dist of hibernate3 --> <property name="hibernate-core.doc.api" location="${hibernate-core.home}/doc/api"/> <property name="hibernate-cvs.doc.reference" location="${common-build.basedir}/../core/doc/reference"/> - - <!-- - Explicitly define tasks from ant.. - Unfortunately, checkstyle-a<path id="lib.class.path"> - <path location="${hibernate-core.jar}"></path> - <fileset dir="${hibernate-core.lib.dir}"> - <include name="*.jar"/> - </fileset> - <fileset dir="${lib.dir}"> - <include name="*.jar"/> - </fileset> - <pathelement path="${clover.jar}"/> - </path>ll.jar contains it's own version of ANTLR, so ANTLR cannot be in the classpath. - --> - <!-- Emmanuel: Removed antlr, shouldn't be useful in Ext package... - taskdef name="antlr" classname="org.apache.tools.ant.taskdefs.optional.ANTLR"> - <classpath> - <pathelement location="${hibernate-core.lib.dir}/antlr-2.7.2.jar"/> - <pathelement location="${hibernate-core.lib.dir}/ant-antlr-1.6.1.jar"/> - </classpath> - </taskdef --> <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"> <classpath> @@ -96,7 +75,6 @@ <include name="*.jar"/> </fileset> <path refid="lib.moduleclass.path"/> - <pathelement path="${clover.jar}"/> </path> <!-- overridable in modules --> @@ -134,11 +112,6 @@ <path id="testsrc.path"> <pathelement location="${test.dir}"/> </path> - - <!-- Clover --> - <property name="clover.out.dir" value="cloverout"/> - <property name="clover.jar" value="${ant.home}/lib/clover.jar"/> - <taskdef resource="clovertasks"/> <path id="junit.classpath"> <fileset dir="${lib.dir}"> @@ -148,33 +121,13 @@ <pathelement path="${testclasses.dir}"/> <path refid="lib.class.path"/> <path refid="junit.moduleclasspath"/> - <path location="${clover.jar}"/> </path> - - <!-- Clover tasks --> - <target name="with.clover"> - <clover-setup initString="clover_coverage.db"/> - </target> - - <target name="cloverreport.html" depends="with.clover" - description="Generate a clover report from the current clover database."> - <clover-report> - <current outfile="${clover.out.dir}"> - <format type="html"/> - </current> - </clover-report> - </target> - - <target name="cloverreport" depends="with.clover,junitreport,cloverreport.html" - description="Run the tests and generate a clover report"> - </target> <!-- Tasks --> <target name="clean" description="Cleans up build and dist directories"> <delete dir="${build.dir}"/> <delete dir="${dist.target.dir}"/> - <delete dir="${clover.out.dir}"/> </target> <target name="init" description="Initialize the build"> Modified: entitymanager/branches/v3_3_2_GA_CP/ivy.xml =================================================================== --- entitymanager/branches/v3_3_2_GA_CP/ivy.xml 2010-02-25 13:53:15 UTC (rev 18887) +++ entitymanager/branches/v3_3_2_GA_CP/ivy.xml 2010-02-25 14:12:03 UTC (rev 18888) @@ -12,9 +12,8 @@ <artifact name="hibernate-entitymanager" conf="core"/> </publications> <dependencies> + <dependency name="hibernate-annotations" rev="3.3.1.GA" conf="core->core"/> <dependency name="ejb3-persistence" rev="1.0.1.GA" conf="core->default"/> - <!-- TODO rename hibernate-commons-annotations --> <dependency name="commons-annotations" rev="3.0.0.GA" conf="core->core"/> - <dependency name="hibernate-annotations" rev="3.3.1.GA" conf="core->core"/> </dependencies> </ivy-module> \ No newline at end of file