From 129484557b3e92f2a59db6b41db107e2c78e6f41 Mon Sep 17 00:00:00 2001
From: Christian Beikov <christian.beikov@gmail.com>
Date: Wed, 5 May 2021 15:47:50 +0200
Subject: [PATCH] Re-include the temporary jakarta testing modules

---
 ci/jpa-2.2-tck.Jenkinsfile | 6 +++---
 ci/jpa-3.0-tck.Jenkinsfile | 6 +++---
 settings.gradle            | 9 ++++-----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ci/jpa-2.2-tck.Jenkinsfile b/ci/jpa-2.2-tck.Jenkinsfile
index fbc97668e0..87e9aa7bab 100644
--- a/ci/jpa-2.2-tck.Jenkinsfile
+++ b/ci/jpa-2.2-tck.Jenkinsfile
@@ -38,7 +38,7 @@ pipeline {
 		stage('Run TCK') {
 			steps {
 				sh """ \
-					docker rm -f tck
+					docker rm -f tck || true
 					docker run -v ~/.m2/repository/org/hibernate:/root/.m2/repository/org/hibernate:z -e NO_SLEEP=true -e HIBERNATE_VERSION=$HIBERNATE_VERSION --name tck jakarta-tck-runner
 					docker cp tck:/tck/persistence-tck/tmp/JTreport/ ./JTreport
 				"""
@@ -47,8 +47,8 @@ pipeline {
 					failures = sh (
 						script: """ \
 							while read line; do
-							  if [[ "$line" != "*Passed." ]]; then
-								echo "$line"
+							  if [[ "\$line" != *"Passed." ]]; then
+								echo "\$line"
 							  fi
 							done <JTreport/text/summary.txt
 						""",
diff --git a/ci/jpa-3.0-tck.Jenkinsfile b/ci/jpa-3.0-tck.Jenkinsfile
index cc945ca81c..15dfacd1ab 100644
--- a/ci/jpa-3.0-tck.Jenkinsfile
+++ b/ci/jpa-3.0-tck.Jenkinsfile
@@ -38,7 +38,7 @@ pipeline {
 		stage('Run TCK') {
 			steps {
 				sh """ \
-					docker rm -f tck
+					docker rm -f tck || true
 					docker run -v ~/.m2/repository/org/hibernate:/root/.m2/repository/org/hibernate:z -e NO_SLEEP=true -e HIBERNATE_VERSION=$HIBERNATE_VERSION --name tck jakarta-tck-runner
 					docker cp tck:/tck/persistence-tck/tmp/JTreport/ ./JTreport
 				"""
@@ -47,8 +47,8 @@ pipeline {
 					failures = sh (
 						script: """ \
 							while read line; do
-							  if [[ "$line" != "*Passed." ]]; then
-								echo "$line"
+							  if [[ "\$line" != *"Passed." ]]; then
+								echo "\$line"
 							  fi
 							done <JTreport/text/summary.txt
 						""",
diff --git a/settings.gradle b/settings.gradle
index af1d875e26..fc6fac4161 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -90,11 +90,10 @@ include 'hibernate-core'
 include 'hibernate-core-jakarta'
 include 'hibernate-entitymanager'
 include 'hibernate-testing'
-// todo: enable again when we can finally use the Jakarta JARs from narayana
-//include 'hibernate-testing-jakarta'
-// todo (jakarta): remove these three when the jakarta artifacts are released
-//include 'hibernate-jboss-jta'
-//include 'hibernate-transaction-client'
+include 'hibernate-testing-jakarta'
+// todo (jakarta): remove these two when the jakarta artifacts are released
+include 'hibernate-jboss-jta'
+include 'hibernate-transaction-client'
 
 include 'hibernate-envers'
 include 'hibernate-envers-jakarta'