[hibernate-commits] Hibernate SVN: r14696 - in annotations/trunk: doc/reference/en and 3 other directories.

hibernate-commits at lists.jboss.org hibernate-commits at lists.jboss.org
Tue May 27 15:18:16 EDT 2008


Author: epbernard
Date: 2008-05-27 15:18:16 -0400 (Tue, 27 May 2008)
New Revision: 14696

Modified:
   annotations/trunk/build.properties.dist
   annotations/trunk/build.xml
   annotations/trunk/changelog.txt
   annotations/trunk/doc/reference/en/master.xml
   annotations/trunk/doc/reference/en/modules/setup.xml
   annotations/trunk/ivy.xml
   annotations/trunk/ivy/ivyconf.xml
   annotations/trunk/pom.xml
   annotations/trunk/readme.txt
   annotations/trunk/src/java/org/hibernate/cfg/annotations/Version.java
Log:
release annotations

Modified: annotations/trunk/build.properties.dist
===================================================================
--- annotations/trunk/build.properties.dist	2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/build.properties.dist	2008-05-27 19:18:16 UTC (rev 14696)
@@ -1,8 +1,3 @@
 common.dir=.
 src.dir=src
 test.dir=test
-hibernate-core.home=../hibernate-3.2
-
-#locally present jars
-jpa-api.jar=./lib/ejb3-persistence.jar
-commons-annotations.jar=./lib/hibernate-commons-annotations.jar
\ No newline at end of file

Modified: annotations/trunk/build.xml
===================================================================
--- annotations/trunk/build.xml	2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/build.xml	2008-05-27 19:18:16 UTC (rev 14696)
@@ -273,6 +273,9 @@
 			<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"/>
+
         <copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false">
 		</copy>
 		<antcall target="common-build.dist"/>

Modified: annotations/trunk/changelog.txt
===================================================================
--- annotations/trunk/changelog.txt	2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/changelog.txt	2008-05-27 19:18:16 UTC (rev 14696)
@@ -1,6 +1,19 @@
 Hibernate Annotations Changelog
 ===============================
 
+3.4.0.CR1 (27-05-2008)
+----------------------
+
+** Improvement
+    * [ANN-741] - Move to slf4j
+
+** New Feature
+    * [ANN-713] - Use an ant task to deploy the maven artifacts
+    * [ANN-736] - Add pom
+    * [ANN-737] - Make build independent of Hibernate Core structure
+    * [ANN-738] - Move to Hibernate Core 3.3
+
+
 3.3.1.GA (14-03-2008)
 ---------------------
 

Modified: annotations/trunk/doc/reference/en/master.xml
===================================================================
--- annotations/trunk/doc/reference/en/master.xml	2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/doc/reference/en/master.xml	2008-05-27 19:18:16 UTC (rev 14696)
@@ -12,7 +12,7 @@
 
     <subtitle>Reference Guide</subtitle>
 
-    <releaseinfo>3.3.1.GA</releaseinfo>
+    <releaseinfo>3.4.0.CR1</releaseinfo>
 
     <mediaobject>
       <imageobject>

Modified: annotations/trunk/doc/reference/en/modules/setup.xml
===================================================================
--- annotations/trunk/doc/reference/en/modules/setup.xml	2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/doc/reference/en/modules/setup.xml	2008-05-27 19:18:16 UTC (rev 14696)
@@ -12,12 +12,11 @@
       </listitem>
 
       <listitem>
-        <para><emphasis>This release requires Hibernate Core 3.2.0.GA and above.</emphasis></para>
+        <para><emphasis>This release requires Hibernate Core 3.3 and above.</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>This release is known to work on Hibernate Core 3.2.0 up to
-        3.2.2.GA</para>
+        <para>This release is known to work on Hibernate Core 3.3.CR1</para>
       </listitem>
 
       <listitem>

Modified: annotations/trunk/ivy/ivyconf.xml
===================================================================
--- annotations/trunk/ivy/ivyconf.xml	2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/ivy/ivyconf.xml	2008-05-27 19:18:16 UTC (rev 14696)
@@ -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: annotations/trunk/ivy.xml
===================================================================
--- annotations/trunk/ivy.xml	2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/ivy.xml	2008-05-27 19:18:16 UTC (rev 14696)
@@ -14,7 +14,7 @@
     <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="commons-annotations" rev="3.1.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="org.slf4j" name="slf4j-api" rev="1.4.2" conf="default->default"/>

Modified: annotations/trunk/pom.xml
===================================================================
--- annotations/trunk/pom.xml	2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/pom.xml	2008-05-27 19:18:16 UTC (rev 14696)
@@ -34,7 +34,7 @@
 		</dependency>
         <dependency>
 			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate</artifactId>
+			<artifactId>hibernate-core</artifactId>
 			<version>3.3.0.CR1</version>
 		</dependency>
 		<dependency>

Modified: annotations/trunk/readme.txt
===================================================================
--- annotations/trunk/readme.txt	2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/readme.txt	2008-05-27 19:18:16 UTC (rev 14696)
@@ -1,8 +1,8 @@
 Hibernate Annotations
 ==================================================
-Version: 3.3.1.GA, 14.03.2008
+Version: 3.4.0.CR1, 27.05.2008
 
-THIS RELEASE OF HIBERNATE ANNOTATIONS REQUIRES HIBERNATE CORE 3.2.0.GA (and above)
+THIS RELEASE OF HIBERNATE ANNOTATIONS REQUIRES HIBERNATE CORE 3.3 (and above)
 
 Description
 -----------

Modified: annotations/trunk/src/java/org/hibernate/cfg/annotations/Version.java
===================================================================
--- annotations/trunk/src/java/org/hibernate/cfg/annotations/Version.java	2008-05-27 19:09:55 UTC (rev 14695)
+++ annotations/trunk/src/java/org/hibernate/cfg/annotations/Version.java	2008-05-27 19:18:16 UTC (rev 14696)
@@ -8,7 +8,7 @@
  * @author Emmanuel Bernard
  */
 public class Version {
-	public static final String VERSION = "3.3.1.GA";
+	public static final String VERSION = "3.4.0.CR1";
 	private static Logger log = LoggerFactory.getLogger( Version.class );
 
 	static {




More information about the hibernate-commits mailing list