[hibernate] Upstream release 4.3.1.Final

Marek Goldmann goldmann at fedoraproject.org
Fri Feb 14 09:11:36 UTC 2014


commit 3d4c8039222da366cf14e7defae53bcf94188eb3
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Fri Feb 14 10:12:00 2014 +0100

    Upstream release 4.3.1.Final

 .gitignore                                         |    1 +
 ...3.0.Beta4.pom => hibernate-c3p0-4.3.1.Final.pom |    4 ++--
 ...3.0.Beta4.pom => hibernate-core-4.3.1.Final.pom |    6 +++---
 ....Beta4.pom => hibernate-ehcache-4.3.1.Final.pom |    4 ++--
 ....pom => hibernate-entitymanager-4.3.1.Final.pom |    6 +++---
 ...0.Beta4.pom => hibernate-envers-4.3.1.Final.pom |    6 +++---
 ...ta4.pom => hibernate-infinispan-4.3.1.Final.pom |    6 +++---
 ...4.pom => hibernate-maven-plugin-4.3.1.Final.pom |    4 ++--
 ...3.0.Beta4.pom => hibernate-osgi-4.3.1.Final.pom |   12 +++++++++---
 ...0.Beta4.pom => hibernate-parent-4.3.1.Final.pom |    4 ++--
 ....Beta4.pom => hibernate-proxool-4.3.1.Final.pom |    4 ++--
 ....Beta4.pom => hibernate-testing-4.3.1.Final.pom |   10 +++++-----
 hibernate.spec                                     |   20 ++++++++++----------
 sources                                            |    2 +-
 14 files changed, 48 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a459ec7..d1c9ad0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /hibernate-release-4.1.7.Final.tgz
 /4.3.0.Beta4.tar.gz
+/4.3.1.Final.tar.gz
diff --git a/hibernate-c3p0-4.3.0.Beta4.pom b/hibernate-c3p0-4.3.1.Final.pom
similarity index 97%
rename from hibernate-c3p0-4.3.0.Beta4.pom
rename to hibernate-c3p0-4.3.1.Final.pom
index 1c6d130..963b13d 100644
--- a/hibernate-c3p0-4.3.0.Beta4.pom
+++ b/hibernate-c3p0-4.3.1.Final.pom
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.hibernate</groupId>
   <artifactId>hibernate-c3p0</artifactId>
-  <version>4.3.0.Beta4</version>
+  <version>4.3.1.Final</version>
   <dependencies>
     <dependency>
       <groupId>org.jboss.logging</groupId>
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>4.3.0.Beta4</version>
+      <version>4.3.1.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/hibernate-core-4.3.0.Beta4.pom b/hibernate-core-4.3.1.Final.pom
similarity index 96%
rename from hibernate-core-4.3.0.Beta4.pom
rename to hibernate-core-4.3.1.Final.pom
index dbe99bc..2202cf0 100644
--- a/hibernate-core-4.3.0.Beta4.pom
+++ b/hibernate-core-4.3.1.Final.pom
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.hibernate</groupId>
   <artifactId>hibernate-core</artifactId>
-  <version>4.3.0.Beta4</version>
+  <version>4.3.1.Final</version>
   <dependencies>
     <dependency>
       <groupId>org.jboss.logging</groupId>
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>org.jboss.spec.javax.transaction</groupId>
       <artifactId>jboss-transaction-api_1.2_spec</artifactId>
-      <version>1.0.0.Alpha1</version>
+      <version>1.0.0.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>org.jboss</groupId>
       <artifactId>jandex</artifactId>
-      <version>1.1.0.Alpha1</version>
+      <version>1.1.0.Final</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/hibernate-ehcache-4.3.0.Beta4.pom b/hibernate-ehcache-4.3.1.Final.pom
similarity index 97%
rename from hibernate-ehcache-4.3.0.Beta4.pom
rename to hibernate-ehcache-4.3.1.Final.pom
index dc19fd7..a34467f 100644
--- a/hibernate-ehcache-4.3.0.Beta4.pom
+++ b/hibernate-ehcache-4.3.1.Final.pom
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.hibernate</groupId>
   <artifactId>hibernate-ehcache</artifactId>
-  <version>4.3.0.Beta4</version>
+  <version>4.3.1.Final</version>
   <dependencies>
     <dependency>
       <groupId>org.jboss.logging</groupId>
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>4.3.0.Beta4</version>
+      <version>4.3.1.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/hibernate-entitymanager-4.3.0.Beta4.pom b/hibernate-entitymanager-4.3.1.Final.pom
similarity index 96%
rename from hibernate-entitymanager-4.3.0.Beta4.pom
rename to hibernate-entitymanager-4.3.1.Final.pom
index a26d10c..fb9734b 100644
--- a/hibernate-entitymanager-4.3.0.Beta4.pom
+++ b/hibernate-entitymanager-4.3.1.Final.pom
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.hibernate</groupId>
   <artifactId>hibernate-entitymanager</artifactId>
-  <version>4.3.0.Beta4</version>
+  <version>4.3.1.Final</version>
   <dependencies>
     <dependency>
       <groupId>org.jboss.logging</groupId>
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>4.3.0.Beta4</version>
+      <version>4.3.1.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.jboss.spec.javax.transaction</groupId>
       <artifactId>jboss-transaction-api_1.2_spec</artifactId>
-      <version>1.0.0.Alpha1</version>
+      <version>1.0.0.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/hibernate-envers-4.3.0.Beta4.pom b/hibernate-envers-4.3.1.Final.pom
similarity index 95%
rename from hibernate-envers-4.3.0.Beta4.pom
rename to hibernate-envers-4.3.1.Final.pom
index 5964f72..dfb6d8d 100644
--- a/hibernate-envers-4.3.0.Beta4.pom
+++ b/hibernate-envers-4.3.1.Final.pom
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.hibernate</groupId>
   <artifactId>hibernate-envers</artifactId>
-  <version>4.3.0.Beta4</version>
+  <version>4.3.1.Final</version>
   <dependencies>
     <dependency>
       <groupId>org.jboss.logging</groupId>
@@ -20,13 +20,13 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>4.3.0.Beta4</version>
+      <version>4.3.1.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-entitymanager</artifactId>
-      <version>4.3.0.Beta4</version>
+      <version>4.3.1.Final</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/hibernate-infinispan-4.3.0.Beta4.pom b/hibernate-infinispan-4.3.1.Final.pom
similarity index 95%
rename from hibernate-infinispan-4.3.0.Beta4.pom
rename to hibernate-infinispan-4.3.1.Final.pom
index 34ca3f4..2c8dfe3 100644
--- a/hibernate-infinispan-4.3.0.Beta4.pom
+++ b/hibernate-infinispan-4.3.1.Final.pom
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.hibernate</groupId>
   <artifactId>hibernate-infinispan</artifactId>
-  <version>4.3.0.Beta4</version>
+  <version>4.3.1.Final</version>
   <dependencies>
     <dependency>
       <groupId>org.jboss.logging</groupId>
@@ -20,13 +20,13 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>4.3.0.Beta4</version>
+      <version>4.3.1.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-core</artifactId>
-      <version>5.3.0.Final</version>
+      <version>6.0.0.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/hibernate-maven-plugin-4.3.0.Beta4.pom b/hibernate-maven-plugin-4.3.1.Final.pom
similarity index 97%
rename from hibernate-maven-plugin-4.3.0.Beta4.pom
rename to hibernate-maven-plugin-4.3.1.Final.pom
index a4868f9..1b066a9 100644
--- a/hibernate-maven-plugin-4.3.0.Beta4.pom
+++ b/hibernate-maven-plugin-4.3.1.Final.pom
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.hibernate</groupId>
   <artifactId>hibernate-maven-plugin</artifactId>
-  <version>4.3.0.Beta4</version>
+  <version>4.3.1.Final</version>
   <dependencies>
     <dependency>
       <groupId>org.jboss.logging</groupId>
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>4.3.0.Beta4</version>
+      <version>4.3.1.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/hibernate-osgi-4.3.0.Beta4.pom b/hibernate-osgi-4.3.1.Final.pom
similarity index 89%
rename from hibernate-osgi-4.3.0.Beta4.pom
rename to hibernate-osgi-4.3.1.Final.pom
index bd0cfc2..695ba92 100644
--- a/hibernate-osgi-4.3.0.Beta4.pom
+++ b/hibernate-osgi-4.3.1.Final.pom
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.hibernate</groupId>
   <artifactId>hibernate-osgi</artifactId>
-  <version>4.3.0.Beta4</version>
+  <version>4.3.1.Final</version>
   <dependencies>
     <dependency>
       <groupId>org.jboss.logging</groupId>
@@ -20,13 +20,13 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>4.3.0.Beta4</version>
+      <version>4.3.1.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-entitymanager</artifactId>
-      <version>4.3.0.Beta4</version>
+      <version>4.3.1.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -35,6 +35,12 @@
       <version>4.3.1</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <version>4.3.1</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
   <name>Hibernate OSGi Support</name>
   <description>Support for running Hibernate O/RM in OSGi environments</description>
diff --git a/hibernate-parent-4.3.0.Beta4.pom b/hibernate-parent-4.3.1.Final.pom
similarity index 98%
rename from hibernate-parent-4.3.0.Beta4.pom
rename to hibernate-parent-4.3.1.Final.pom
index 65d8942..54478af 100644
--- a/hibernate-parent-4.3.0.Beta4.pom
+++ b/hibernate-parent-4.3.1.Final.pom
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.hibernate</groupId>
   <artifactId>hibernate-parent</artifactId>
-  <version>4.3.0.Beta4</version>
+  <version>4.3.1.Final</version>
   <packaging>pom</packaging>
   <name>Hibernate Parent</name>
 
@@ -15,9 +15,9 @@
     <module>hibernate-entitymanager</module>
     <module>hibernate-infinispan</module>
     <module>hibernate-osgi</module>
-    <module>hibernate-maven-plugin</module>
     <module>hibernate-proxool</module>
     <module>hibernate-testing</module>
+    <module>tooling/hibernate-maven-plugin</module>
   </modules>
   <build>
     <pluginManagement>
diff --git a/hibernate-proxool-4.3.0.Beta4.pom b/hibernate-proxool-4.3.1.Final.pom
similarity index 97%
rename from hibernate-proxool-4.3.0.Beta4.pom
rename to hibernate-proxool-4.3.1.Final.pom
index 73616c5..3803f27 100644
--- a/hibernate-proxool-4.3.0.Beta4.pom
+++ b/hibernate-proxool-4.3.1.Final.pom
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.hibernate</groupId>
   <artifactId>hibernate-proxool</artifactId>
-  <version>4.3.0.Beta4</version>
+  <version>4.3.1.Final</version>
   <dependencies>
     <dependency>
       <groupId>org.jboss.logging</groupId>
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>4.3.0.Beta4</version>
+      <version>4.3.1.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/hibernate-testing-4.3.0.Beta4.pom b/hibernate-testing-4.3.1.Final.pom
similarity index 93%
rename from hibernate-testing-4.3.0.Beta4.pom
rename to hibernate-testing-4.3.1.Final.pom
index 1c95ef1..db1cba7 100644
--- a/hibernate-testing-4.3.0.Beta4.pom
+++ b/hibernate-testing-4.3.1.Final.pom
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.hibernate</groupId>
   <artifactId>hibernate-testing</artifactId>
-  <version>4.3.0.Beta4</version>
+  <version>4.3.1.Final</version>
   <dependencies>
     <dependency>
       <groupId>org.jboss.logging</groupId>
@@ -20,13 +20,13 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>4.3.0.Beta4</version>
+      <version>4.3.1.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.10</version>
+      <version>4.11</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -60,8 +60,8 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-  <name>A Hibernate O/RM module</name>
-  <description>A module of the Hibernate O/RM project</description>
+  <name>Hibernate ORM Testing</name>
+  <description>Support for testing Hibernate ORM functionality</description>
   <url>http://hibernate.org</url>
   <organization>
     <name>Hibernate.org</name>
diff --git a/hibernate.spec b/hibernate.spec
index 0a8c544..fc2b2d7 100644
--- a/hibernate.spec
+++ b/hibernate.spec
@@ -1,9 +1,9 @@
-%global namedreltag .Beta4
+%global namedreltag .Final
 %global namedversion %{version}%{?namedreltag}
 
 Name:          hibernate
-Version:       4.3.0
-Release:       0.6%{namedreltag}%{?dist}
+Version:       4.3.1
+Release:       1%{?dist}
 Summary:       Relational persistence and query service
 Group:         Development/Libraries
 License:       LGPLv2+ and ASL 2.0
@@ -183,7 +183,7 @@ cp %{SOURCE6} hibernate-infinispan/pom.xml
 cp %{SOURCE7} hibernate-proxool/pom.xml
 cp %{SOURCE8} hibernate-testing/pom.xml
 cp %{SOURCE9} hibernate-osgi/pom.xml
-cp %{SOURCE10} hibernate-maven-plugin/pom.xml
+cp %{SOURCE10} tooling/hibernate-maven-plugin/pom.xml
 
 cp -p %{SOURCE60} .
 sed -i 's/\r//' LICENSE-2.0.txt
@@ -380,7 +380,7 @@ for m in c3p0 ehcache entitymanager envers infinispan osgi proxool testing; do
 
 done
 
-%pom_add_plugin org.apache.felix:maven-bundle-plugin hibernate-maven-plugin "
+%pom_add_plugin org.apache.felix:maven-bundle-plugin tooling/hibernate-maven-plugin "
 <extensions>true</extensions>
 <configuration>
   <instructions>
@@ -400,7 +400,7 @@ done
   </execution>
 </executions>"
 
-%pom_add_plugin org.apache.maven.plugins:maven-jar-plugin hibernate-maven-plugin "
+%pom_add_plugin org.apache.maven.plugins:maven-jar-plugin tooling/hibernate-maven-plugin "
 <configuration>
   <archive>
     <manifestFile>\${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -427,11 +427,8 @@ done
 %pom_remove_dep "org.jboss.jbossts:jbossjta" hibernate-testing/pom.xml
 %pom_add_dep "org.jboss.narayana.jta:jta" hibernate-testing/pom.xml
 
-# Infinispan 6.0.0 support
-sed -i "s|org.infinispan.util.FileLookupFactory|org.infinispan.commons.util.FileLookupFactory|" hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java
-
 # fix non ASCII chars
-for f in $(grep -e 'Lichtmaier\|Chanfreau\|Benke\|Carlos\|CREATE\ SCHEMA' --include *.java -r -l | sort | uniq); do
+for f in $(grep -e 'Pedersen\|Lichtmaier\|Chanfreau\|Benke\|Carlos\|CREATE\ SCHEMA' --include *.java -r -l | sort | uniq); do
   native2ascii -encoding UTF8 ${f} ${f}
 done
 
@@ -479,6 +476,9 @@ done
 %doc lgpl.txt LICENSE-2.0.txt
 
 %changelog
+* Fri Feb 14 2014 Marek Goldmann <mgoldman at redhat.com> - 4.3.1-1
+- Upstream release 4.3.1.Final
+
 * Mon Nov 18 2013 Marek Goldmann <mgoldman at redhat.com> - 4.3.0-0.6.Beta4
 - Use processor to generate the _logger classes
 - Fixed ASCII chars in some files
diff --git a/sources b/sources
index bc8fd93..35187e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-62c992994b532b0c1c2cbb9c33cfa7ae  4.3.0.Beta4.tar.gz
+91ab76dfd66562a82c622cd9f8caa488  4.3.1.Final.tar.gz


More information about the scm-commits mailing list