Merge remote-tracking branch 'origin/develop' into develop

seam · Dec 21, 2011 · ff438d4 · ff438d4
2 parents 8d4400d + af0cec6
commit ff438d4
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jboss.seam.transaction</groupId>
         <artifactId>seam-transaction-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>org.jboss.seam.transaction</groupId>
         <artifactId>seam-transaction-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.jboss.seam.transaction</groupId>
     <artifactId>seam-transaction-reference-guide</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>jdocbook</packaging>
     <name>Seam Transaction Reference Guide</name>
 

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jboss.seam.transaction</groupId>
         <artifactId>seam-transaction-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/impl/src/main/java/org/jboss/seam/transaction/SimpleTransactionExceptionHandler.java b/impl/src/main/java/org/jboss/seam/transaction/SimpleTransactionExceptionHandler.java
@@ -62,5 +62,6 @@ public void markTransactionRollback(@Handles(precedence = Precedence.BUILT_IN, d
         } catch (SystemException e) {
             log.warn("Could not set transaction to rollback", e);
         }
+        t.rethrow();
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <groupId>org.jboss.seam</groupId>
         <artifactId>seam-parent</artifactId>
-        <version>18</version>
+        <version>19</version>
     </parent>
 
     <artifactId>seam-transaction-parent</artifactId>
     <groupId>org.jboss.seam.transaction</groupId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
 
     <packaging>pom</packaging>
     <name>Seam Transaction Module</name>
@@ -27,7 +27,7 @@
     </modules>
 
     <properties>
-        <seam.version>3.1.0.CR1</seam.version>
+        <seam.version>3.1.0.Final</seam.version>
         <emma.version>2.0.5312</emma.version>
     </properties>
 

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>seam-transaction-parent</artifactId>
         <groupId>org.jboss.seam.transaction</groupId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>