Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply another Jersey fix in the (patched) Glassfish TCK profile #66

Merged
merged 3 commits into from
Apr 18, 2019
Merged

Apply another Jersey fix in the (patched) Glassfish TCK profile #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4622ef1
Refactored script for running TCK against Glassfish
chkal Apr 18, 2019
35a5a2d
Added another Jersey fix to patched Glassfish profile
chkal Apr 18, 2019
a1336b3
Patched Glassfish profile now passes the TCK
chkal Apr 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
before_script: .travis/docker-payara.sh
script: mvn -P${TYPE} --projects testsuite clean verify
- stage: test
env: TYPE=tck-glassfish-vanilla
env: TYPE=tck-glassfish51-vanilla
script: .travis/tests.sh ${TYPE}
- stage: test
env: TYPE=tck-glassfish-patched
env: TYPE=tck-glassfish51-patched
script: .travis/tests.sh ${TYPE}
- stage: test
env: TYPE=tck-wildfly16-vanilla
Expand All @@ -42,8 +42,7 @@ jobs:
env: TYPE=tck-liberty
script: .travis/tests.sh ${TYPE}
allow_failures:
- env: TYPE=tck-glassfish-vanilla
- env: TYPE=tck-glassfish-patched
- env: TYPE=tck-glassfish51-vanilla
- env: TYPE=tck-wildfly16-vanilla
- env: TYPE=tck-wildfly16-patched
- env: TYPE=tck-tomee
Expand Down
28 changes: 16 additions & 12 deletions .travis/tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,33 @@ elif [ "${1}" == "glassfish-module" ]; then
mvn -Pintegration -Dintegration.serverPort=8080 verify
glassfish5/bin/asadmin stop-domain

elif [ "${1}" == "tck-glassfish-vanilla" ]; then
elif [[ ${1} == tck-glassfish51-* ]]; then

echo "Downloading Glassfish..."
curl -L -s -o glassfish5.zip "${GLASSFISH_URL}"
unzip -q glassfish5.zip
mvn -B -V -DskipTests clean install
glassfish5/bin/asadmin start-domain
sleep 30
pushd tck
mvn -B -V -Dtck-env=glassfish verify
popd
glassfish5/bin/asadmin stop-domain

elif [ "${1}" == "tck-glassfish-patched" ]; then
if [[ ${1} == *-patched ]]; then
echo "Patching Glassfish..."
curl -L -s -o glassfish5/glassfish/modules/jersey-cdi1x.jar \
"https://www.dropbox.com/s/wc2ukjns388lwir/jersey-cdi1x-2.28-fix1.jar"
curl -L -s -o glassfish5/glassfish/modules/jersey-common.jar \
"https://www.dropbox.com/s/qgms27wxlpxw74x/jersey-common-2.28-fix1.jar"
fi

curl -L -s -o glassfish5.zip "${GLASSFISH_URL}"
unzip -q glassfish5.zip
curl -L -s -o glassfish5/glassfish/modules/jersey-cdi1x.jar "https://www.dropbox.com/s/wc2ukjns388lwir/jersey-cdi1x-2.28-fix1.jar"
echo "Building Krazo..."
mvn -B -V -DskipTests clean install

echo "Starting Glassfish..."
glassfish5/bin/asadmin start-domain
sleep 30

echo "Running TCK..."
pushd tck
mvn -B -V -Dtck-env=glassfish verify
popd

echo "Stopping Glassfish..."
glassfish5/bin/asadmin stop-domain

elif [[ ${1} == tck-wildfly16-* ]]; then
Expand Down