Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-include the temporary jakarta testing modules

This commit is contained in:
Christian Beikov 2021-05-05 15:47:50 +02:00
parent 72f4a2f610
commit 129484557b
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ci/jpa-2.2-tck.Jenkinsfile
View File

@ -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
""",

6
ci/jpa-3.0-tck.Jenkinsfile
View File

@ -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
""",

9
settings.gradle
View File

@ -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'