Skip to content

Commit

Permalink
remove jsonp tck.
Browse files Browse the repository at this point in the history
Signed-off-by: gurunrao <gurunandan.rao@oracle.com>
  • Loading branch information
gurunrao committed Mar 15, 2022
1 parent 1bf3cb4 commit 56db6f7
Show file tree
Hide file tree
Showing 148 changed files with 13 additions and 49,913 deletions.
5 changes: 3 additions & 2 deletions Jenkinsfile
Expand Up @@ -17,7 +17,8 @@
env.label = "jakartaee-tck-pod-${UUID.randomUUID().toString()}"

default_suites=[ "samples", "signaturetest/javaee" ]
default_tcks=["caj", "concurrency", "connector", "el", "jacc", "jaspic", "jaxws", "jms", "jpa", "jsf", "jsp", "jsonb", "jsonp", "jstl", "jta", "saaj", "securityapi", "servlet", "websocket"]
default_tcks=["caj", "concurrency", "connector", "el", "jacc", "jaspic", "jaxws", "jms", "jpa", "jsf", "jsp", "jsonb", "jstl", "jta", "saaj", "securityapi", "servlet", "websocket"]


def cts_suites = params.test_suites != null ? params.test_suites.split() : default_suites
def tcks = params.standalone_tcks != null ? params.standalone_tcks.split() : default_tcks
Expand Down Expand Up @@ -192,7 +193,7 @@ spec:
description: 'Run the full EE compliance testsuite or a standalone tck' )
string(name: 'test_suites', defaultValue: 'concurrency connector ejb ejb30/bb ejb30/lite/appexception ejb30/lite/async ejb30/lite/basic ejb30/lite/ejbcontext ejb30/lite/enventry ejb30/lite/interceptor ejb30/lite/lookup ejb30/lite/naming ejb30/lite/nointerface ejb30/lite/packaging ejb30/lite/singleton ejb30/lite/stateful ejb30/lite/tx ejb30/lite/view ejb30/lite/xmloverride ejb30/assembly ejb30/timer ejb30/webservice ejb30/zombie ejb30/misc ejb30/sec ejb32 el integration jacc jaspic javaee javamail jaxrs jbatch jdbc_appclient jdbc_ejb jdbc_jsp jdbc_servlet jms_appclient jms_ejb jms_jsp jms_servlet jpa_appmanaged jpa_appmanagedNoTx jpa_pmservlet jpa_puservlet jpa_stateful3 jpa_stateless3 jsf jsonb jsonp jsp jstl jta jws samples securityapi servlet signaturetest/javaee webservices12 webservices13 websocket xa',
description: 'Space separated list of Test suites to run')
string(name: 'standalone_tcks', defaultValue: 'caj concurrency connector el jacc jaspic jaxws jms jpa jsf jsp jsonb jsonp jstl jta saaj securityapi servlet websocket',
string(name: 'standalone_tcks', defaultValue: 'caj concurrency connector el jacc jaspic jaxws jms jpa jsf jsp jsonb jstl jta saaj securityapi servlet websocket',
description: 'Space separated list of standalone TCKs to build and run')
string(name: 'USER_KEYWORDS',
defaultValue: '',
Expand Down
10 changes: 1 addition & 9 deletions bin/coverage-build.xml
Expand Up @@ -313,7 +313,7 @@
<target name="all" depends="start.log,
jta,jdbc,ejb,connector,jaspic,
jsp,el,servlet,jms,jacc,javaee,jstl,jpa,
jaxrs,webservices,jsf,jsonp,
jaxrs,webservices,jsf,
jsonb,concurrency,websocket,securityapi">
<antcall target="generate.exec.summary"/>
<antcall target="generate.index.page"/>
Expand Down Expand Up @@ -416,14 +416,6 @@
</antcall>
</target>

<target name="jsonp">
<antcall target="calculate.coverage">
<param name="api.coverage.dir" value="${coverage.base.dir}/jsonp_1_1/api"/>
<param name="api.assertions" value="${ts.docs.dir}/jsonp/JSONP1.1JavadocAssertions.xml"/>
<param name="test.src.dir" value="/jsonp"/>
</antcall>
</target>

<target name="jsonb">
<antcall target="calculate.coverage">
<param name="api.coverage.dir" value="${coverage.base.dir}/jsonb_1_0/api"/>
Expand Down
7 changes: 1 addition & 6 deletions docker/build_standalone-tcks.sh
Expand Up @@ -68,7 +68,7 @@ fi
echo "The option selected to build is $TCK_NAME TCK"

if [ "All" == "$TCK_NAME" ];then
TCK_LIST=( jsonp jsonb websocket el concurrency connector jacc jaspic caj jms jsp jstl jaxws saaj servlet jsf securityapi jpa jta )
TCK_LIST=( jsonb websocket el concurrency connector jacc jaspic caj jms jsp jstl jaxws saaj servlet jsf securityapi jpa jta )
else
TCK_LIST=( ${TCK_NAME} )
fi
Expand Down Expand Up @@ -126,11 +126,6 @@ for tck in ${TCK_LIST[@]}; do
TCK_SPECIFIC_PROPS="-Djsf.classes=$JAKARTA_JARS/modules/jakarta.enterprise.cdi-api.jar:$JAKARTA_JARS/modules/jakarta.servlet.jsp.jstl-api.jar:$JAKARTA_JARS/modules/jakarta.inject-api.jar:$JAKARTA_JARS/modules/jakarta.faces-api.jar:$JAKARTA_JARS/modules/jakarta.servlet.jsp-api.jar:$JAKARTA_JARS/modules/jakarta.servlet-api.jar:$JAKARTA_JARS/modules/jakarta.el-api.jar:$JAKARTA_JARS/modules/jakarta.annotation-api.jar:$JAKARTA_JARS/modules/glassfish-corba-omgapi.jar"
DOC_SPECIFIC_PROPS=""
JAXWS_SPECIFIC_PROPS=""
elif [ "jsonp" == "$tck" ]
then
TCK_SPECIFIC_PROPS="-Djsonp.classes=$JAKARTA_JARS/modules/jakarta.json-api.jar:$JAKARTA_JARS/modules/jakarta.json.bind-api.jar:$JAKARTA_JARS/modules/glassfish-corba-omgapi.jar"
DOC_SPECIFIC_PROPS=""
JAXWS_SPECIFIC_PROPS=""
elif [ "jsonb" == "$tck" ]
then
TCK_SPECIFIC_PROPS="-Djsonb.classes=$JAKARTA_JARS/modules/jakarta.json-api.jar:$JAKARTA_JARS/modules/jakarta.json.bind-api.jar:$JAKARTA_JARS/modules/jakarta.inject-api.jar:$JAKARTA_JARS/modules/jakarta.servlet-api.jar:$JAKARTA_JARS/modules/glassfish-corba-omgapi.jar"
Expand Down
89 changes: 0 additions & 89 deletions docker/jsonptck.sh

This file was deleted.

5 changes: 0 additions & 5 deletions docker/scripts/tcks/docker-entrypoint.sh
Expand Up @@ -69,11 +69,6 @@ if [ "$TCK_NAME" == "securityapi" ];then
exit 0
fi

if [ "$TCK_NAME" == "jsonp" ];then
source jsonptck.sh
exit 0
fi

if [ "$TCK_NAME" == "websocket" ];then
source websockettck.sh
exit 0
Expand Down
43 changes: 0 additions & 43 deletions docker/scripts/tcks/jsonptck.sh

This file was deleted.

2 changes: 1 addition & 1 deletion install/jakartaee/bin/sig-test.map
Expand Up @@ -151,7 +151,7 @@ jakarta.json=2.1

# JSON-B
# (This is JSR-367)
jakarta.json.bind=2.1
jakarta.json.bind=3.0

# WebSocket 2.1
# (This is JSR-356)
Expand Down

0 comments on commit 56db6f7

Please sign in to comment.