Author: hardy.ferentschik Date: 2008-08-18 13:54:58 -0400 (Mon, 18 Aug 2008) New Revision: 15098 Modified: annotations/trunk/build.xml annotations/trunk/changelog.txt annotations/trunk/common-build.xml annotations/trunk/doc/reference/en/master.xml annotations/trunk/ivy.xml annotations/trunk/pom.xml annotations/trunk/readme.txt annotations/trunk/src/java/org/hibernate/cfg/annotations/Version.java Log: Updated all files for 3.4.0.GA release Modified: annotations/trunk/build.xml =================================================================== --- annotations/trunk/build.xml 2008-08-18 17:51:31 UTC (rev 15097) +++ annotations/trunk/build.xml 2008-08-18 17:54:58 UTC (rev 15098) @@ -17,7 +17,7 @@ <!-- Name of project and version, used to create filenames --> <property name="Name" value="Hibernate Annotations"/> <property name="name" value="hibernate-annotations"/> - <property name="version" value="3.4.0.CR2"/> + <property name="version" value="3.4.0.GA"/> <property name="javadoc.packagenames" value="org.hibernate.*"/> <property name="jdbc.dir" value="jdbc"/> <property name="copy.test" value="true"/> Modified: annotations/trunk/changelog.txt =================================================================== --- annotations/trunk/changelog.txt 2008-08-18 17:51:31 UTC (rev 15097) +++ annotations/trunk/changelog.txt 2008-08-18 17:54:58 UTC (rev 15098) @@ -1,6 +1,23 @@ Hibernate Annotations Changelog =============================== +3.4.0.GA (18-08-2008) +---------------------- + +** Bug + * [ANN-761] - Typo in documentation + + +** Improvement + * [ANN-765] - Update of "Preface" section in documentation + * [ANN-766] - Test updates due to the usage of (oracle) reserved keywords as properties + + + +** Task + * [ANN-767] - Refactor build to allow filtering of resources + + 3.4.0.CR2 (01-08-2008) ---------------------- Modified: annotations/trunk/common-build.xml =================================================================== --- annotations/trunk/common-build.xml 2008-08-18 17:51:31 UTC (rev 15097) +++ annotations/trunk/common-build.xml 2008-08-18 17:54:58 UTC (rev 15098) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <project name="common-build" default="dist" xmlns:artifact="urn:maven-artifact-ant" xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> <description>Common properties and targets for the HibernateExt @@ -13,9 +13,9 @@ <property file="${common-build.basedir}/build.properties"/> <property file="${user.home}/.ant.properties"/> - <property name="src.dir" location="src/java"/> - <property name="test.dir" location="src/test"/> - <property name="test.resources.dir" location="src/test-resources"/> + <property name="src.dir" location="src/java"/> + <property name="test.dir" location="src/test"/> + <property name="test.resources.dir" location="src/test-resources"/> <property name="filter.dir" location="src/filters"/> <property name="lib.dir" location="lib"/> <property name="build.dir" location="build"/> @@ -45,7 +45,7 @@ <property name="javac.source" value="1.4"/> <property name="javac.target" value="1.4"/> - <property name="pom.file" value="pom.xml"/> + <property name="pom.file" value="${build.dir}/pom.xml"/> <property name="src.jar" value="${build.dir}/src.jar"/> <taskdef name="junit" @@ -184,6 +184,9 @@ <tstamp> <format property="subversion" pattern="yyyy-MM-dd hh:mm:ss"/> </tstamp> + <tstamp> + <format property="releasedate" pattern="dd-MM-yyyy"/> + </tstamp> <echo message="Build ${Name}-${version} (${subversion})"/> <mkdir dir="${classes.dir}"/> <mkdir dir="${testclasses.dir}"/> @@ -192,27 +195,29 @@ <patternset refid="support.files"/> </fileset> </copy> - - <copy todir="${build.dir}"> + <filter token="version" value="${version}"/> + <filter token="releasedate" value="${releasedate}"/> + <copy todir="${build.dir}" filtering="true"> <fileset dir="."> <include name="readme.txt"/> <include name="lgpl.txt"/> + <include name="pom.xml"/> </fileset> </copy> - </target> - - <target name="get.deps.core" depends="init" - description="retrieve the core dependencies"> - <ivy:resolve conf="default"/> - <ivy:retrieve pattern="${ivy.dep.dir}/core/[artifact].[ext]" - conf="default"/> - </target> - - <target name="get.deps.test" depends="init" - description="retrieve the test dependencies"> - <ivy:resolve conf="test"/> - <ivy:retrieve pattern="${ivy.dep.dir}/test/[artifact].[ext]" conf="test"/> + </target> + + <target name="get.deps.core" depends="init" + description="retrieve the core dependencies"> + <ivy:resolve conf="default"/> + <ivy:retrieve pattern="${ivy.dep.dir}/core/[artifact].[ext]" + conf="default"/> </target> + + <target name="get.deps.test" depends="init" + description="retrieve the test dependencies"> + <ivy:resolve conf="test"/> + <ivy:retrieve pattern="${ivy.dep.dir}/test/[artifact].[ext]" conf="test"/> + </target> <target name="copytest" description="Copy tests to dist dir" if="copy.test"> <mkdir dir="${dist.test.dir}"/> @@ -302,7 +307,7 @@ <include name="*.bat"/> </fileset> </copy> - <copy file="readme.txt" todir="${dist.dir}"/> + <copy file="${build.dir}/readme.txt" todir="${dist.dir}"/> <copy file="lgpl.txt" todir="${dist.dir}"/> <copy file="changelog.txt" todir="${dist.dir}"/> <copy file="build.xml" todir="${dist.dir}"/> @@ -345,49 +350,49 @@ <mkdir dir="${testclasses.dir}"/> <copy todir="${testclasses.dir}" filtering="true" overwrite="true"> <fileset dir="${test.resources.dir}"> - <include name="*.properties"/> + <include name="*.properties"/> <include name="*.xml"/> </fileset> </copy> </target> - - <target name="instrument" depends="compiletest" - description="Instrument the persistent classes"> <!-- depends="jar" --> - - <taskdef name="instrument" - classname="org.hibernate.tool.instrument.javassist.InstrumentTask"> - <classpath refid="junit.classpath"/> - </taskdef> - - <instrument verbose="true"> - <fileset dir="${testclasses.dir}/org/hibernate/test"> - <include name="**/*.class"/> - <exclude name="**/*Test$*.class"/> - <exclude name="**/*Test.class"/> - <exclude name="**/*Tests.class"/> - </fileset> - </instrument> + + <target name="instrument" depends="compiletest" + description="Instrument the persistent classes"> <!-- depends="jar" --> + + <taskdef name="instrument" + classname="org.hibernate.tool.instrument.javassist.InstrumentTask"> + <classpath refid="junit.classpath"/> + </taskdef> + + <instrument verbose="true"> + <fileset dir="${testclasses.dir}/org/hibernate/test"> + <include name="**/*.class"/> + <exclude name="**/*Test$*.class"/> + <exclude name="**/*Test.class"/> + <exclude name="**/*Tests.class"/> + </fileset> + </instrument> </target> <target name="junitinstrument" depends="compiletest,instrument" - description="Run the instrument test suite"> - <for list="${targetdb}" param="db"> - <sequential> - <antcall target="test-resources"> - <param name="db" value="@{db}"/> - </antcall> - <mkdir dir="${instrumenttest.out.dir}/@{db}"/> - <echo>Running against db: @{db}</echo> - <junit printsummary="yes" haltonfailure="yes" dir="${basedir}" - maxmemory="256M" fork="yes" forkmode="perBatch"> - <classpath refid="junit.classpath"/> - <formatter type="plain"/> - <formatter type="xml"/> - <batchtest todir="${instrumenttest.out.dir}/@{db}" haltonfailure="no"> - <fileset refid="junit.batchtestset"/> - </batchtest> - </junit> - </sequential> + description="Run the instrument test suite"> + <for list="${targetdb}" param="db"> + <sequential> + <antcall target="test-resources"> + <param name="db" value="@{db}"/> + </antcall> + <mkdir dir="${instrumenttest.out.dir}/@{db}"/> + <echo>Running against db: @{db}</echo> + <junit printsummary="yes" haltonfailure="yes" dir="${basedir}" + maxmemory="256M" fork="yes" forkmode="perBatch"> + <classpath refid="junit.classpath"/> + <formatter type="plain"/> + <formatter type="xml"/> + <batchtest todir="${instrumenttest.out.dir}/@{db}" haltonfailure="no"> + <fileset refid="junit.batchtestset"/> + </batchtest> + </junit> + </sequential> </for> </target> Modified: annotations/trunk/doc/reference/en/master.xml =================================================================== --- annotations/trunk/doc/reference/en/master.xml 2008-08-18 17:51:31 UTC (rev 15097) +++ annotations/trunk/doc/reference/en/master.xml 2008-08-18 17:54:58 UTC (rev 15098) @@ -12,7 +12,7 @@ <subtitle>Reference Guide</subtitle> - <releaseinfo>3.4.0.CR2</releaseinfo> + <releaseinfo>3.4.0.GA</releaseinfo> <mediaobject> <imageobject> Modified: annotations/trunk/ivy.xml =================================================================== --- annotations/trunk/ivy.xml 2008-08-18 17:51:31 UTC (rev 15097) +++ annotations/trunk/ivy.xml 2008-08-18 17:54:58 UTC (rev 15098) @@ -14,8 +14,8 @@ <dependencies> <!-- compile time dependencies --> <dependency name="ejb3-persistence" rev="1.0.2.GA" conf="default->default"/> - <dependency name="commons-annotations" rev="3.1.0.CR2" conf="default->default"/> - <dependency org="org.hibernate" name="hibernate-core" rev="3.3.0.CR2" conf="default->default"/> + <dependency name="commons-annotations" rev="3.1.0.GA" conf="default->default"/> + <dependency org="org.hibernate" name="hibernate-core" rev="3.3.0.GA" conf="default->default"/> <dependency org="dom4j" name="dom4j" rev="1.6.1" conf="default->default"/> <dependency org="org.slf4j" name="slf4j-api" rev="1.4.2" conf="default->default"/> Modified: annotations/trunk/pom.xml =================================================================== --- annotations/trunk/pom.xml 2008-08-18 17:51:31 UTC (rev 15097) +++ annotations/trunk/pom.xml 2008-08-18 17:54:58 UTC (rev 15098) @@ -8,7 +8,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-annotations</artifactId> <packaging>jar</packaging> - <version>3.4.0.CR2</version> + <version>@version@</version> <name>Hibernate Annotations</name> <description>Annotations metadata for Hibernate</description> @@ -30,12 +30,12 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-commons-annotations</artifactId> - <version>3.1.0.CR2</version> + <version>3.1.0.GA</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>3.3.0.CR2</version> + <version>3.3.0.GA</version> </dependency> <dependency> <groupId>org.slf4j</groupId> Modified: annotations/trunk/readme.txt =================================================================== --- annotations/trunk/readme.txt 2008-08-18 17:51:31 UTC (rev 15097) +++ annotations/trunk/readme.txt 2008-08-18 17:54:58 UTC (rev 15098) @@ -1,6 +1,6 @@ Hibernate Annotations ================================================== -Version: 3.4.0.CR2, 01.08.2008 +Version: @version@, @releasedate@ THIS RELEASE OF HIBERNATE ANNOTATIONS REQUIRES HIBERNATE CORE 3.3 (and above) Modified: annotations/trunk/src/java/org/hibernate/cfg/annotations/Version.java =================================================================== --- annotations/trunk/src/java/org/hibernate/cfg/annotations/Version.java 2008-08-18 17:51:31 UTC (rev 15097) +++ annotations/trunk/src/java/org/hibernate/cfg/annotations/Version.java 2008-08-18 17:54:58 UTC (rev 15098) @@ -8,7 +8,7 @@ * @author Emmanuel Bernard */ public class Version { - public static final String VERSION = "3.4.0.CR2"; + public static final String VERSION = "3.4.0.GA"; private static Logger log = LoggerFactory.getLogger( Version.class ); static {