Java Mailing List Archive

http://www.gg3721.com/

Home » Hibernate Commits List »

[hibernate-commits] Hibernate SVN: r15094 - in
 commons-annotations/trunk:
 src/java/org/hibernate/annotations/common and 1 other directory.

hibernate-commits

2008-08-18


Author LoginPost Reply
Author: hardy.ferentschik
Date: 2008-08-18 11:22:12 -0400 (Mon, 18 Aug 2008)
New Revision: 15094

Modified:
 commons-annotations/trunk/build.xml
 commons-annotations/trunk/changelog.txt
 commons-annotations/trunk/common-build.xml
 commons-annotations/trunk/pom.xml
 commons-annotations/trunk/readme.txt
 commons-annotations/trunk/src/java/org/hibernate/annotations/common/Version.java
Log:
* Updated all files for 3.1.0.GA release

Modified: commons-annotations/trunk/build.xml
===================================================================
--- commons-annotations/trunk/build.xml  2008-08-18 15:16:52 UTC (rev 15093)
+++ commons-annotations/trunk/build.xml  2008-08-18 15:22:12 UTC (rev 15094)
@@(protected) @@
 <!-- Name of project and version, used to create filenames -->
 <property name="Name" value="Hibernate Commons Annotations"/>
 <property name="name" value="hibernate-commons-annotations"/>
-  <property name="version" value="3.1.0.CR2"/>
+  <property name="version" value="3.1.0.GA"/>
 <property name="javadoc.packagenames" value="org.hibernate.commons.annotations.*"/>
 <property name="copy.test" value="true"/>
 <property name="javac.source" value="1.5"/>
@@(protected) @@
 </path>

 <target name="init" description="Initialize the build">
-    <!-- CCed from common-build to avoid failure when hibernate core is not compiled -->
-    <tstamp>
-      <format property="subversion" pattern="yyyy-MM-dd hh:mm:ss"/>
-    </tstamp>
+     <antcall target="common-build.init"/>
     <tstamp>
     <format property="now" pattern="yyyyMMddhhmmss"/>
   </tstamp>

Modified: commons-annotations/trunk/changelog.txt
===================================================================
--- commons-annotations/trunk/changelog.txt  2008-08-18 15:16:52 UTC (rev 15093)
+++ commons-annotations/trunk/changelog.txt  2008-08-18 15:22:12 UTC (rev 15094)
@@(protected) @@
Hibernate Annotations Changelog
===============================

+3.1.0.GA (18-08-2008)
+----------------------
+
3.1.0.CR2 (23-07-2008)
----------------------


Modified: commons-annotations/trunk/common-build.xml
===================================================================
--- commons-annotations/trunk/common-build.xml  2008-08-18 15:16:52 UTC (rev 15093)
+++ commons-annotations/trunk/common-build.xml  2008-08-18 15:22:12 UTC (rev 15094)
@@(protected) @@
-<?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
@@(protected) @@
 <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"/>
@@(protected) @@
 <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"
@@(protected) @@
   <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}"/>
@@(protected) @@
       <patternset refid="support.files"/>
     </fileset>
   </copy>
-    
-    <copy todir="${build.dir}">
+    <filter token="version" value="${version}"/>
+     <filter token="releasedate" value="${releasedate}"/>
+     <echo>filtering</echo>
+    <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}"/>
@@(protected) @@
       <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}"/>
@@(protected) @@
   <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="@(protected)}"/>
-        </antcall>
-        <mkdir dir="${instrumenttest.out.dir}/@(protected)}"/>
-        <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}/@(protected)">
-            <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="@(protected)}"/>
+        </antcall>
+        <mkdir dir="${instrumenttest.out.dir}/@(protected)}"/>
+        <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}/@(protected)">
+            <fileset refid="junit.batchtestset"/>
+          </batchtest>
+        </junit>
+      </sequential>
   </for>
 </target>
 

Modified: commons-annotations/trunk/pom.xml
===================================================================
--- commons-annotations/trunk/pom.xml  2008-08-18 15:16:52 UTC (rev 15093)
+++ commons-annotations/trunk/pom.xml  2008-08-18 15:22:12 UTC (rev 15094)
@@(protected) @@
 <artifactId>hibernate-commons-annotations</artifactId>
 <packaging>jar</packaging>
 <name>Hibernate Commons Annotations</name>
-  <version>3.1.0.CR2</version>
+  <version>@version@(protected)>
 <licenses>
   <license>
     <name>GNU LESSER GENERAL PUBLIC LICENSE</name>

Modified: commons-annotations/trunk/readme.txt
===================================================================
--- commons-annotations/trunk/readme.txt  2008-08-18 15:16:52 UTC (rev 15093)
+++ commons-annotations/trunk/readme.txt  2008-08-18 15:22:12 UTC (rev 15094)
@@(protected) @@
Hibernate Commons Annotations
==================================================
-Version: 3.1.0.CR2, 23.07.2008
+Version: @version@(protected)@

Description
-----------

Modified: commons-annotations/trunk/src/java/org/hibernate/annotations/common/Version.java
===================================================================
--- commons-annotations/trunk/src/java/org/hibernate/annotations/common/Version.java  2008-08-18 15:16:52 UTC (rev 15093)
+++ commons-annotations/trunk/src/java/org/hibernate/annotations/common/Version.java  2008-08-18 15:22:12 UTC (rev 15094)
@@(protected) @@
* @author Emmanuel Bernard
*/
public class Version {
-  public static final String VERSION = "3.1.0.CR2";
+  public static final String VERSION = "3.1.0.GA";
 private static Logger log = LoggerFactory.getLogger( Version.class );

 static {

_______________________________________________
hibernate-commits mailing list
hibernate-commits@(protected)
https://lists.jboss.org/mailman/listinfo/hibernate-commits
©2008 gg3721.com - Jax Systems, LLC, U.S.A.