[hibernate-commits] Hibernate SVN: r14697 - in entitymanager/trunk: doc/reference/en and 2 other directories.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2008-05-27 16:01:00 -0400 (Tue, 27 May 2008)
New Revision: 14697

Modified:
   entitymanager/trunk/build.properties.dist
   entitymanager/trunk/build.xml
   entitymanager/trunk/changelog.txt
   entitymanager/trunk/doc/reference/en/master.xml
   entitymanager/trunk/ivy.xml
   entitymanager/trunk/ivy/ivyconf.xml
   entitymanager/trunk/readme.txt
   entitymanager/trunk/src/java/org/hibernate/ejb/Version.java
Log:
release entitymanager

Modified: entitymanager/trunk/build.properties.dist
===================================================================
--- entitymanager/trunk/build.properties.dist	2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/build.properties.dist	2008-05-27 20:01:00 UTC (rev 14697)
@@ -2,11 +2,4 @@
 src.dir=src
 test.dir=test
 resources.dir=resources
-testresources.dir=test-resources
-hibernate-core.home=../hibernate-3.2
-
-
-#locally present jars
-jpa-api.jar=./lib/ejb3-persistence.jar
-commons-annotations.jar=./lib/hibernate-commons-annotations.jar
-annotations.jar=./lib/hibernate-annotations.jar
\ No newline at end of file
+testresources.dir=test-resources
\ No newline at end of file

Modified: entitymanager/trunk/build.xml
===================================================================
--- entitymanager/trunk/build.xml	2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/build.xml	2008-05-27 20:01:00 UTC (rev 14697)
@@ -416,6 +416,11 @@
 			<fileset file="${lib.dir}/build/*.jar"/>
         </copy>
 
+        <!-- ivy uses the module name without hibernate- (to mimic the directory names). Revert the situation -->
+        <move file="${dist.lib.dir}/commons-annotations.jar" tofile="${dist.lib.dir}/hibernate-commons-annotations.jar"/>
+        <move file="${dist.lib.dir}/annotations.jar" tofile="${dist.lib.dir}/hibernate-annotations.jar"/>
+
+
         <copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false">
         </copy>
         <antcall target="common-build.dist"/>

Modified: entitymanager/trunk/changelog.txt
===================================================================
--- entitymanager/trunk/changelog.txt	2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/changelog.txt	2008-05-27 20:01:00 UTC (rev 14697)
@@ -1,6 +1,18 @@
 Hibernate EntityManager Changelog
 ==================================
 
+3.4.0.CR1 (27-05-2008)
+----------------------
+
+** Improvement
+    * [EJB-359] - Move to slf4j
+
+** New Feature
+    * [EJB-352] - Add pom
+    * [EJB-353] - Make build independent of Hibernate Core structure
+    * [EJB-354] - Move to Hibernate Core 3.3
+
+
 3.3.2.GA (14-03-2008)
 ---------------------
 

Modified: entitymanager/trunk/doc/reference/en/master.xml
===================================================================
--- entitymanager/trunk/doc/reference/en/master.xml	2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/doc/reference/en/master.xml	2008-05-27 20:01:00 UTC (rev 14697)
@@ -16,7 +16,7 @@
 
     <subtitle>User guide</subtitle>
 
-    <releaseinfo>3.3.2.GA</releaseinfo>
+    <releaseinfo>3.4.0.CR1</releaseinfo>
 
     <mediaobject>
       <imageobject>

Modified: entitymanager/trunk/ivy/ivyconf.xml
===================================================================
--- entitymanager/trunk/ivy/ivyconf.xml	2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/ivy/ivyconf.xml	2008-05-27 20:01:00 UTC (rev 14697)
@@ -12,6 +12,9 @@
                 <ivy pattern="../[module]/target/[revision]/ivy.xml"/>
                 <artifact pattern="../[module]/target/[revision]/[artifact].[ext]"/>
             </filesystem>
+            <filesystem name="maven-local" m2compatible="true">
+                <artifact pattern="${offline.repository.jboss.org}/[organization]/hibernate-[module]/[revision]/hibernate-[artifact]-[revision].[ext]"/>
+            </filesystem>
             <url name="jboss-rep-maven-regular" m2compatible="true">
                 <artifact pattern="http://repository.jboss.org/maven2/[organization]/[module]/[revision]/[artifact]-[revision].[ext]"/>
             </url>

Modified: entitymanager/trunk/ivy.xml
===================================================================
--- entitymanager/trunk/ivy.xml	2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/ivy.xml	2008-05-27 20:01:00 UTC (rev 14697)
@@ -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="latest" conf="default->default"/>
-        <dependency name="annotations" rev="latest" conf="default->default"/>
+        <dependency name="commons-annotations" rev="3.1.0.CR1" conf="default->default"/>
+        <dependency name="annotations" rev="3.4.0.CR1" conf="default->default"/>
         <dependency org="org.hibernate" name="hibernate-core" rev="3.3.0.CR1" conf="default->default"/>
         <dependency org="dom4j" name="dom4j" rev="1.6.1" conf="default->default"/>
         <dependency org="javax.transaction" name="jta" rev="1.1" conf="default->default"/>

Modified: entitymanager/trunk/readme.txt
===================================================================
--- entitymanager/trunk/readme.txt	2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/readme.txt	2008-05-27 20:01:00 UTC (rev 14697)
@@ -1,8 +1,8 @@
 Hibernate EntityManager
 ==================================================
-Version: 3.3.2.GA, 14.03.2008
+Version: 3.4.0.CR1, 27.05.2008
 
-THIS RELEASE OF HIBERNATE ENTITYMANAGER REQUIRES HIBERNATE CORE 3.2.0.GA (and above)
+THIS RELEASE OF HIBERNATE ENTITYMANAGER REQUIRES HIBERNATE CORE 3.3 (and above)
 
 
 Description

Modified: entitymanager/trunk/src/java/org/hibernate/ejb/Version.java
===================================================================
--- entitymanager/trunk/src/java/org/hibernate/ejb/Version.java	2008-05-27 19:18:16 UTC (rev 14696)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/Version.java	2008-05-27 20:01:00 UTC (rev 14697)
@@ -9,7 +9,7 @@
  * @author Emmanuel Bernard
  */
 public class Version {
-	public static final String VERSION = "3.3.2.GA";
+	public static final String VERSION = "3.4.0.CR1";
 	private static final Logger log = LoggerFactory.getLogger( Version.class );
 
 	static {