From 4622ef1fe9f8f73cb9347b7aa3b0c43540d1e6f1 Mon Sep 17 00:00:00 2001
From: Christian Kaltepoth <christian@kaltepoth.de>
Date: Thu, 18 Apr 2019 06:51:00 +0200
Subject: [PATCH 1/3] Refactored script for running TCK against Glassfish

---
 .travis.yml      |  8 ++++----
 .travis/tests.sh | 26 ++++++++++++++------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ba86daa7..d4582233 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
@@ -42,8 +42,8 @@ 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-glassfish51-patched
     - env: TYPE=tck-wildfly16-vanilla
     - env: TYPE=tck-wildfly16-patched
     - env: TYPE=tck-tomee
diff --git a/.travis/tests.sh b/.travis/tests.sh
index 4795c0d9..576a7af3 100755
--- a/.travis/tests.sh
+++ b/.travis/tests.sh
@@ -31,29 +31,31 @@ 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"
+  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

From 35a5a2d6b1a165c511be56cf5c4f3db5eb64f901 Mon Sep 17 00:00:00 2001
From: Christian Kaltepoth <christian@kaltepoth.de>
Date: Thu, 18 Apr 2019 06:51:23 +0200
Subject: [PATCH 2/3] Added another Jersey fix to patched Glassfish profile

---
 .travis/tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis/tests.sh b/.travis/tests.sh
index 576a7af3..5a3dae37 100755
--- a/.travis/tests.sh
+++ b/.travis/tests.sh
@@ -41,6 +41,8 @@ elif [[ ${1} == tck-glassfish51-* ]]; 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
 
   echo "Building Krazo..."

From a1336b3ab971a6db2ace42f54795fe86b71577ed Mon Sep 17 00:00:00 2001
From: Christian Kaltepoth <christian@kaltepoth.de>
Date: Thu, 18 Apr 2019 06:51:44 +0200
Subject: [PATCH 3/3] Patched Glassfish profile now passes the TCK

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d4582233..24ac6997 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,6 @@ jobs:
       script: .travis/tests.sh ${TYPE}
   allow_failures:
     - env: TYPE=tck-glassfish51-vanilla
-    - env: TYPE=tck-glassfish51-patched
     - env: TYPE=tck-wildfly16-vanilla
     - env: TYPE=tck-wildfly16-patched
     - env: TYPE=tck-tomee