- revert arquillian#10 as it is probably the cause for arquillian#21

- keeping junit4 as this extension is still not ready for junit5, see arquillian/arquillian-extension-persistence#195 - update versions arquillian core and junit4
abregar · Feb 19, 2023 · 3f4c23e · 3f4c23e
1 parent 43e4945
commit 3f4c23e
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.jboss.arquillian.extension</groupId>
     <artifactId>arquillian-transaction-parent</artifactId>
-    <version>1.0.6.a1</version>
+    <version>1.0.6.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.jboss.arquillian.extension</groupId>
   <artifactId>arquillian-transaction-bom</artifactId>
-  <version>1.0.6.a1</version>
+  <version>1.0.6.a2</version>
   <packaging>pom</packaging>
   <name>Arquillian Transaction Extension: BOM</name>
   <url>http://arquillian.org</url>

diff --git a/impl-base/pom.xml b/impl-base/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.jboss.arquillian.extension</groupId>
     <artifactId>arquillian-transaction-parent</artifactId>
-    <version>1.0.6.a1</version>
+    <version>1.0.6.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/...ase/src/main/java/org/jboss/arquillian/transaction/impl/lifecycle/TransactionHandler.java b/...ase/src/main/java/org/jboss/arquillian/transaction/impl/lifecycle/TransactionHandler.java
@@ -102,9 +102,9 @@ public void startTransactionBeforeTest(@Observes(precedence = 10) Before beforeT
 
     public void endTransactionAfterTest(@Observes(precedence = -1) EventContext<After> afterTestContext) {
         try {
-            afterTestContext.proceed();
-        } finally {
             endTransaction(afterTestContext.getEvent());
+        } finally {
+            afterTestContext.proceed();
         }
     }
 

diff --git a/impl-jta/pom.xml b/impl-jta/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.arquillian.extension</groupId>
     <artifactId>arquillian-transaction-parent</artifactId>
-    <version>1.0.6.a1</version>
+    <version>1.0.6.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.jboss.arquillian.extension</groupId>
   <artifactId>arquillian-transaction-parent</artifactId>
-  <version>1.0.6.a1</version>
+  <version>1.0.6.a2</version>
   <packaging>pom</packaging>
 
   <name>Arquillian Transaction Extension: Parent</name>
@@ -26,9 +26,9 @@
   </licenses>
 
   <properties>
-    <version.arquillian_core>1.7.0.Alpha13</version.arquillian_core>
+    <version.arquillian_core>1.7.0.Alpha14</version.arquillian_core>
 
-    <version.junit>4.12</version.junit>
+    <version.junit>4.13.2</version.junit>
     <version.fest.assert>1.4</version.fest.assert>
     <version.mockito>4.11.0</version.mockito>
     <version.jboss_spec>3.0.2.Final</version.jboss_spec>

diff --git a/spi/pom.xml b/spi/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.jboss.arquillian.extension</groupId>
     <artifactId>arquillian-transaction-parent</artifactId>
-    <version>1.0.6.a1</version>
+    <version>1.0.6.a2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>