Merge pull request #86 from gurunrao/sec-jdk-21

4.0.2 service release of XML Binding TCK with JDK11 build. TCK runs on JDK11,17,21.
jakartaee · Jan 14, 2024 · d2e1767 · d2e1767
2 parents d1ce754 + 5a86d19
commit d2e1767
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 49 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -51,16 +51,16 @@ spec:
            defaultValue: 'https://ci.eclipse.org/jaxb-impl/job/jaxb-ri-master-build/lastSuccessfulBuild/artifact/jaxb-ri/bundles/ri/target/jaxb-ri.zip',
            description: 'URL required for downloading JAXB implementation jar' )
     string(name: 'JAF_BUNDLE_URL',
-           defaultValue: 'https://jakarta.oss.sonatype.org/content/repositories/staging/jakarta/activation/jakarta.activation-api/2.1.0/jakarta.activation-api-2.1.0.jar',
+           defaultValue: 'https://jakarta.oss.sonatype.org/content/repositories/staging/jakarta/activation/jakarta.activation-api/2.1.2/jakarta.activation-api-2.1.2.jar',
            description: 'URL required for downloading JAF implementation jar' )
     string(name: 'TCK_BUNDLE_BASE_URL',
            defaultValue: '',
            description: 'Base URL required for downloading prebuilt binary TCK Bundle from a hosted location' )
     string(name: 'TCK_BUNDLE_FILE_NAME', 
-           defaultValue: 'jakarta-xml-binding-tck-4.0.1.zip',
+           defaultValue: 'jakarta-xml-binding-tck-4.0.2.zip', 
 	   description: 'Name of bundle file to be appended to the base url' )
     string(name: 'GF_BUNDLE_URL', 
-           defaultValue: 'https://download.eclipse.org/ee4j/glassfish/glassfish-7.0.0-SNAPSHOT-nightly.zip', 
+           defaultValue: 'https://download.eclipse.org/ee4j/glassfish/glassfish-7.0.0.zip', 
            description: 'URL required for downloading GlassFish Full/Web profile bundle' )
     string(name: 'GF_VERSION_URL', 
            defaultValue: '', 
@@ -69,14 +69,14 @@ spec:
            description: 'License file to be used to build the TCK bundle(s) either EPL(default) or Eclipse Foundation TCK License' )
   choice(name: 'RUNTIME', choices: 'Glassfish\nStandalone',
            description: 'Run JAXB Tests with Standalone/Glassfish' )
-  choice(name: 'JDK', choices: 'JDK11\nJDK17',
-           description: 'Java SE Version to be used for running TCK either JDK11/JDK17' )
+  choice(name: 'JDK', choices: 'JDK11\nJDK17\nJDK21',
+           description: 'Java SE Version to be used for running TCK either JDK11 or JDK17 or JDK21' )
 
   }
   environment {
     ANT_OPTS = "-Djavax.xml.accessExternalStylesheet=all -Djavax.xml.accessExternalSchema=all -Djavax.xml.accessExternalDTD=file,http"
     LANG="en_US.UTF-8"
-    DEFAULT_GF_BUNDLE_URL="https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0.zip" 
+    DEFAULT_GF_BUNDLE_URL="https://download.eclipse.org/ee4j/glassfish/glassfish-7.0.0.zip" 
   }
   stages {
     stage('jaxb-tck-build') {

diff --git a/build.xml b/build.xml
@@ -27,7 +27,7 @@
   <property name="BASEDIR" value="${basedir}"/>
   <property name="deliverable.name" value="xml-binding-tck"/>
   <property name="eclipse.deliverable.name" value="jakarta-xml-binding-tck"/>
-  <property name="deliverable.version" value="4.0.1"/>
+  <property name="deliverable.version" value="4.0.2"/>
   <property name="bundle.name"
             value="${deliverable.name}-${deliverable.version}.zip"/>
   <property name="bundle.folder"

diff --git a/docker/build_jaxbtck.sh b/docker/build_jaxbtck.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 #
-# Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2023 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0, which is available at
@@ -18,20 +18,24 @@ if [ -z "$ANT_HOME" ]; then
   export ANT_HOME=/usr/share/ant/
 fi
 
+WGET_PROPS="--progress=bar:force --no-cache"
+
+
+cd $WORKSPACE
+
 export JAVA_HOME_8=${JAVA_HOME}
 export JAVA_HOME=${JDK11_HOME}
 
-
 export PATH=$JAVA_HOME/bin:$ANT_HOME/bin:$PATH
 
 if [ -z "${JAXB_RI_BUNDLE_URL}" ]; then
   export JAXB_RI_BUNDLE_URL='https://ci.eclipse.org/jaxb-impl/job/jaxb-ri-master-build/lastSuccessfulBuild/artifact/jaxb-ri/bundles/ri/target/jaxb-ri.zip'
 fi
 if [ -z "${JAF_BUNDLE_URL}" ];then
-  export JAF_BUNDLE_URL='https://jakarta.oss.sonatype.org/content/repositories/staging/jakarta/activation/jakarta.activation-api/2.1.0/jakarta.activation-api-2.1.0.jar'
+  export JAF_BUNDLE_URL='https://jakarta.oss.sonatype.org/content/repositories/staging/jakarta/activation/jakarta.activation-api/2.1.2/jakarta.activation-api-2.1.2.jar'
 fi
 if [ -z "${GF_BUNDLE_URL}" ]; then
-  export GF_BUNDLE_URL='https://download.eclipse.org/ee4j/glassfish/glassfish-7.0.0-SNAPSHOT-nightly.zip'
+  export GF_BUNDLE_URL='https://download.eclipse.org/ee4j/glassfish/glassfish-7.0.0.zip'
 fi
 
 echo "JAXB_RI_BUNDLE_URL=${JAXB_RI_BUNDLE_URL}"
@@ -53,7 +57,6 @@ echo "export PATH=$PATH"
 mkdir -p ${HOME}/.m2
 
 cd $WORKSPACE
-WGET_PROPS="--progress=bar:force --no-cache"
 
 if [ ! -z "$TCK_BUNDLE_BASE_URL" ]; then
   #use pre-built tck bundle from this location to run test
@@ -86,7 +89,7 @@ unzip -o latest-glassfish.zip
 ls -l $GF_HOME/glassfish7/glassfish/
 
 if [ ! -z "$GF_VERSION_URL" ]; then
-  wget --progress=bar:force --no-cache $GF_VERSION_URL -O glassfish.version
+  wget ${WGET_PROPS} --no-cache $GF_VERSION_URL -O glassfish.version
   cat glassfish.version
 fi
 which make

diff --git a/docker/run_jaxbtck.sh b/docker/run_jaxbtck.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -x
 
 #
-# Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2023 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0, which is available at
@@ -15,9 +15,12 @@
 #
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 
+WGET_PROPS="--progress=bar:force --no-cache"
+
 TOP_GLASSFISH_DIR="glassfish7"
 TCK_NAME=xml-binding-tck
 
+cd $WORKSPACE
 
 
 if ls ${WORKSPACE}/bundles/*xml-binding-tck*.zip 1> /dev/null 2>&1; then
@@ -39,20 +42,14 @@ fi
 
 export JAVA_HOME=${JDK11_HOME}
 
-if [[ "$JDK" == "JDK12" || "$JDK" == "jdk12" ]];then
-  export JAVA_HOME=${JDK12_HOME}
-elif [[ "$JDK" == "JDK13" || "$JDK" == "jdk13" ]];then
-  export JAVA_HOME=${JDK13_HOME}
-elif [[ "$JDK" == "JDK14" || "$JDK" == "jdk14" ]];then
-  export JAVA_HOME=${JDK14_HOME}
-elif [[ "$JDK" == "JDK15" || "$JDK" == "jdk15" ]];then
-  export JAVA_HOME=${JDK15_HOME}
-elif [[ "$JDK" == "JDK16" || "$JDK" == "jdk16" ]];then
-  export JAVA_HOME=${JDK16_HOME}
-elif [[ "$JDK" == "JDK17" || "$JDK" == "jdk17" ]];then
+if [[ "$JDK" == "JDK17" || "$JDK" == "jdk17" ]];then
   export JAVA_HOME=${JDK17_HOME}
+elif [[ "$JDK" == "JDK21" || "$JDK" == "jdk21" ]];then
+  wget ${WGET_PROPS} https://download.java.net/java/GA/jdk21.0.1/415e3f918a1f4062a0074a2794853d0d/12/GPL/openjdk-21.0.1_linux-x64_bin.tar.gz -O jdk-21.tar.gz
+  tar -xvf jdk-21.tar.gz
+  export JAVA_HOME=$WORKSPACE/jdk-21.0.1
 fi  
-
+    
 sed -i "s#^jck.env.jaxb.testExecute.cmdAsFile=.*#jck.env.jaxb.testExecute.cmdAsFile=${JAVA_HOME}/bin/java#g" ${WORKSPACE}/${TCK_NAME}/lib/javasoft-multiJVM.jti
 sed -i "s#^WORKDIR=.*#WORKDIR=${WORKSPACE}/${TCK_NAME}/batch-multiJVM/work/#g" ${WORKSPACE}/${TCK_NAME}/lib/javasoft-multiJVM.jti
 sed -i "s#^TESTSUITE=.*#TESTSUITE=${WORKSPACE}/${TCK_NAME}/#g" ${WORKSPACE}/${TCK_NAME}/lib/javasoft-multiJVM.jti
@@ -72,8 +69,6 @@ cat ${WORKSPACE}/${TCK_NAME}/lib/javasoft-multiJVM.jti
 cd ${WORKSPACE}
 export BASEDIR=`pwd`
 
-WGET_PROPS="--progress=bar:force --no-cache"
-
 if [ -z "${JAXB_RI_BUNDLE_URL}" ]; then
   export JAXB_RI_BUNDLE_URL='https://ci.eclipse.org/jaxb-impl/job/jaxb-ri-master-build/lastSuccessfulBuild/artifact/jaxb-ri/bundles/ri/target/jaxb-ri.zip'
 fi
@@ -102,9 +97,9 @@ if [ -z "$GF_BUNDLE_URL" ]; then
   export GF_BUNDLE_URL=$DEFAULT_GF_BUNDLE_URL
 fi
 export TCK_ROOT=${WORKSPACE}
-export  JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
+export  JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8 -DnoSecurityManager=true"
 
-wget $WGET_PROPS $GF_BUNDLE_URL -O latest-glassfish.zip
+#wget $WGET_PROPS $GF_BUNDLE_URL -O latest-glassfish.zip
 
 wget ${WGET_PROPS} https://repo1.maven.org/maven2/org/checkerframework/checker/3.5.0/checker-3.5.0.jar -O ${WORKSPACE}/checker.jar
 
@@ -117,15 +112,15 @@ cd ${TCK_NAME}/tests/api/signaturetest
 
 ####RUN tests with GLassfish JAXB
 if [[ "$RUNTIME" == "Glassfish" ]]; then
-	$JAVA_HOME/bin/java -jar ${WORKSPACE}/${TCK_NAME}/lib/javatest.jar -batch -testsuite ${WORKSPACE}/${TCK_NAME} -open ${WORKSPACE}/${TCK_NAME}/lib/javasoft-multiJVM.jti -workdir -create ${WORKSPACE}/batch-multiJVM/work -set jck.env.jaxb.xsd_compiler.skipValidationOptional Yes -set jck.env.jaxb.xsd_compiler.testCompile.xjcCmd "/bin/sh ${WORKSPACE}/${TCK_NAME}/linux/bin/xjc.sh" -set jck.env.jaxb.schemagen.run.jxcCmd "/bin/sh ${WORKSPACE}/${TCK_NAME}/linux/bin/schemagen.sh" -set jck.env.jaxb.testExecute.otherEnvVars "JAVA_HOME=${JAVA_HOME} JAXB_HOME=${WORKSPACE}/${TOP_GLASSFISH_DIR}/glassfish" -set jck.env.jaxb.classes.jaxbClasses "${WORKSPACE}/${TOP_GLASSFISH_DIR}/glassfish/modules/jakarta.xml.bind-api.jar ${WORKSPACE}/${TOP_GLASSFISH_DIR}/glassfish/modules/jaxb-osgi.jar ${WORKSPACE}/${TOP_GLASSFISH_DIR}/glassfish/modules/jersey-media-jaxb.jar ${WORKSPACE}/${TOP_GLASSFISH_DIR}/glassfish/modules/jakarta.activation-api.jar ${WORKSPACE}/checker.jar" -set jck.env.jaxb.classes.needJaxbClasses Yes -runtests
-	$JAVA_HOME/bin/java -jar ${WORKSPACE}/${TCK_NAME}/lib/javatest.jar -batch -testsuite ${WORKSPACE}/${TCK_NAME} -open ${WORKSPACE}/${TCK_NAME}/lib/javasoft-multiJVM.jti -workdir ${WORKSPACE}/batch-multiJVM/work -set jck.env.jaxb.xsd_compiler.skipValidationOptional Yes -set jck.env.jaxb.xsd_compiler.testCompile.xjcCmd "/bin/sh ${WORKSPACE}/${TCK_NAME}/linux/bin/xjc.sh" -set jck.env.jaxb.schemagen.run.jxcCmd "/bin/sh ${WORKSPACE}/${TCK_NAME}/linux/bin/schemagen.sh" -set jck.env.jaxb.testExecute.otherEnvVars "JAVA_HOME=${JAVA_HOME} JAXB_HOME=${WORKSPACE}/${TOP_GLASSFISH_DIR}/glassfish" -set jck.env.jaxb.classes.jaxbClasses "${WORKSPACE}/${TOP_GLASSFISH_DIR}/glassfish/modules/jakarta.xml.bind-api.jar ${WORKSPACE}/${TOP_GLASSFISH_DIR}/glassfish/modules/jaxb-osgi.jar ${WORKSPACE}/${TOP_GLASSFISH_DIR}/glassfish/modules/jersey-media-jaxb.jar ${WORKSPACE}/${TOP_GLASSFISH_DIR}/glassfish/modules/jakarta.activation-api.jar ${WORKSPACE}/checker.jar" -set jck.env.jaxb.classes.needJaxbClasses Yes -set jck.priorStatus.needStatus Yes -set jck.priorStatus.status not_run -runtests
+	$JAVA_HOME/bin/java -DnoSecurityManager=true -jar ${WORKSPACE}/${TCK_NAME}/lib/javatest.jar -batch -testsuite ${WORKSPACE}/${TCK_NAME} -open ${WORKSPACE}/${TCK_NAME}/lib/javasoft-multiJVM.jti -workdir -create ${WORKSPACE}/batch-multiJVM/work -set jck.env.jaxb.xsd_compiler.skipValidationOptional Yes -set jck.env.jaxb.xsd_compiler.testCompile.xjcCmd "/bin/sh ${WORKSPACE}/${TCK_NAME}/linux/bin/xjc.sh" -set jck.env.jaxb.schemagen.run.jxcCmd "/bin/sh ${WORKSPACE}/${TCK_NAME}/linux/bin/schemagen.sh" -set jck.env.jaxb.testExecute.otherEnvVars "JAVA_HOME=${JAVA_HOME} JAXB_HOME=${WORKSPACE}/${TOP_GLASSFISH_DIR}/glassfish" -set jck.env.jaxb.classes.jaxbClasses "${WORKSPACE}/${TOP_GLASSFISH_DIR}/glassfish/modules/jakarta.xml.bind-api.jar ${WORKSPACE}/${TOP_GLASSFISH_DIR}/glassfish/modules/jaxb-osgi.jar ${WORKSPACE}/${TOP_GLASSFISH_DIR}/glassfish/modules/jersey-media-jaxb.jar ${WORKSPACE}/${TOP_GLASSFISH_DIR}/glassfish/modules/jakarta.activation-api.jar ${WORKSPACE}/checker.jar" -set jck.env.jaxb.classes.needJaxbClasses Yes -runtests
+	$JAVA_HOME/bin/java -DnoSecurityManager=true -jar ${WORKSPACE}/${TCK_NAME}/lib/javatest.jar -batch -testsuite ${WORKSPACE}/${TCK_NAME} -open ${WORKSPACE}/${TCK_NAME}/lib/javasoft-multiJVM.jti -workdir ${WORKSPACE}/batch-multiJVM/work -set jck.env.jaxb.xsd_compiler.skipValidationOptional Yes -set jck.env.jaxb.xsd_compiler.testCompile.xjcCmd "/bin/sh ${WORKSPACE}/${TCK_NAME}/linux/bin/xjc.sh" -set jck.env.jaxb.schemagen.run.jxcCmd "/bin/sh ${WORKSPACE}/${TCK_NAME}/linux/bin/schemagen.sh" -set jck.env.jaxb.testExecute.otherEnvVars "JAVA_HOME=${JAVA_HOME} JAXB_HOME=${WORKSPACE}/${TOP_GLASSFISH_DIR}/glassfish" -set jck.env.jaxb.classes.jaxbClasses "${WORKSPACE}/${TOP_GLASSFISH_DIR}/glassfish/modules/jakarta.xml.bind-api.jar ${WORKSPACE}/${TOP_GLASSFISH_DIR}/glassfish/modules/jaxb-osgi.jar ${WORKSPACE}/${TOP_GLASSFISH_DIR}/glassfish/modules/jersey-media-jaxb.jar ${WORKSPACE}/${TOP_GLASSFISH_DIR}/glassfish/modules/jakarta.activation-api.jar ${WORKSPACE}/checker.jar" -set jck.env.jaxb.classes.needJaxbClasses Yes -set jck.priorStatus.needStatus Yes -set jck.priorStatus.status not_run -runtests
 else 
 ####RUN tests with standalone JAXB RI
-	$JAVA_HOME/bin/java -jar ${WORKSPACE}/${TCK_NAME}/lib/javatest.jar -batch -testsuite ${WORKSPACE}/${TCK_NAME} -open ${WORKSPACE}/${TCK_NAME}/lib/javasoft-multiJVM.jti -workdir -create ${WORKSPACE}/batch-multiJVM/work -set jck.env.jaxb.xsd_compiler.skipValidationOptional Yes -set jck.env.jaxb.xsd_compiler.testCompile.xjcCmd "/bin/sh ${WORKSPACE}/${TCK_NAME}/linux/bin/xjc.sh" -set jck.env.jaxb.schemagen.run.jxcCmd "/bin/sh ${WORKSPACE}/${TCK_NAME}/linux/bin/schemagen.sh" -set jck.env.jaxb.testExecute.otherEnvVars "JAVA_HOME=${JAVA_HOME} JAXB_HOME=${WORKSPACE}/jaxb-ri" -set jck.env.jaxb.classes.jaxbClasses "${WORKSPACE}/checker.jar ${WORKSPACE}/jaxb-ri/mod/jakarta.xml.bind-api.jar ${WORKSPACE}/jaxb-ri/mod/jaxb-impl.jar ${WORKSPACE}/jaxb-ri/mod/jaxb-jxc.jar ${WORKSPACE}/jaxb-ri/mod/jakarta.activation-api.jar" -set jck.env.jaxb.classes.needJaxbClasses Yes -runtests
-	$JAVA_HOME/bin/java -jar ${WORKSPACE}/${TCK_NAME}/lib/javatest.jar -batch -testsuite ${WORKSPACE}/${TCK_NAME} -open ${WORKSPACE}/${TCK_NAME}/lib/javasoft-multiJVM.jti -workdir ${WORKSPACE}/batch-multiJVM/work -set jck.env.jaxb.xsd_compiler.skipValidationOptional Yes -set jck.env.jaxb.xsd_compiler.testCompile.xjcCmd "/bin/sh ${WORKSPACE}/${TCK_NAME}/linux/bin/xjc.sh" -set jck.env.jaxb.schemagen.run.jxcCmd "/bin/sh ${WORKSPACE}/${TCK_NAME}/linux/bin/schemagen.sh" -set jck.env.jaxb.testExecute.otherEnvVars "JAVA_HOME=${JAVA_HOME} JAXB_HOME=${WORKSPACE}/jaxb-ri" -set jck.env.jaxb.classes.jaxbClasses "${WORKSPACE}/checker.jar ${WORKSPACE}/jaxb-ri/mod/jakarta.xml.bind-api.jar ${WORKSPACE}/jaxb-ri/mod/jaxb-impl.jar ${WORKSPACE}/jaxb-ri/mod/jaxb-jxc.jar ${WORKSPACE}/jaxb-ri/mod/jakarta.activation-api.jar" -set jck.env.jaxb.classes.needJaxbClasses Yes -set jck.priorStatus.needStatus Yes -set jck.priorStatus.status not_run -runtests
+	$JAVA_HOME/bin/java -DnoSecurityManager=true -jar ${WORKSPACE}/${TCK_NAME}/lib/javatest.jar -batch -testsuite ${WORKSPACE}/${TCK_NAME} -open ${WORKSPACE}/${TCK_NAME}/lib/javasoft-multiJVM.jti -workdir -create ${WORKSPACE}/batch-multiJVM/work -set jck.env.jaxb.xsd_compiler.skipValidationOptional Yes -set jck.env.jaxb.xsd_compiler.testCompile.xjcCmd "/bin/sh ${WORKSPACE}/${TCK_NAME}/linux/bin/xjc.sh" -set jck.env.jaxb.schemagen.run.jxcCmd "/bin/sh ${WORKSPACE}/${TCK_NAME}/linux/bin/schemagen.sh" -set jck.env.jaxb.testExecute.otherEnvVars "JAVA_HOME=${JAVA_HOME} JAXB_HOME=${WORKSPACE}/jaxb-ri" -set jck.env.jaxb.classes.jaxbClasses "${WORKSPACE}/checker.jar ${WORKSPACE}/jaxb-ri/mod/jakarta.xml.bind-api.jar ${WORKSPACE}/jaxb-ri/mod/jaxb-impl.jar ${WORKSPACE}/jaxb-ri/mod/jaxb-jxc.jar ${WORKSPACE}/jaxb-ri/mod/jakarta.activation-api.jar" -set jck.env.jaxb.classes.needJaxbClasses Yes -runtests
+	$JAVA_HOME/bin/java -DnoSecurityManager=true -jar ${WORKSPACE}/${TCK_NAME}/lib/javatest.jar -batch -testsuite ${WORKSPACE}/${TCK_NAME} -open ${WORKSPACE}/${TCK_NAME}/lib/javasoft-multiJVM.jti -workdir ${WORKSPACE}/batch-multiJVM/work -set jck.env.jaxb.xsd_compiler.skipValidationOptional Yes -set jck.env.jaxb.xsd_compiler.testCompile.xjcCmd "/bin/sh ${WORKSPACE}/${TCK_NAME}/linux/bin/xjc.sh" -set jck.env.jaxb.schemagen.run.jxcCmd "/bin/sh ${WORKSPACE}/${TCK_NAME}/linux/bin/schemagen.sh" -set jck.env.jaxb.testExecute.otherEnvVars "JAVA_HOME=${JAVA_HOME} JAXB_HOME=${WORKSPACE}/jaxb-ri" -set jck.env.jaxb.classes.jaxbClasses "${WORKSPACE}/checker.jar ${WORKSPACE}/jaxb-ri/mod/jakarta.xml.bind-api.jar ${WORKSPACE}/jaxb-ri/mod/jaxb-impl.jar ${WORKSPACE}/jaxb-ri/mod/jaxb-jxc.jar ${WORKSPACE}/jaxb-ri/mod/jakarta.activation-api.jar" -set jck.env.jaxb.classes.needJaxbClasses Yes -set jck.priorStatus.needStatus Yes -set jck.priorStatus.status not_run -runtests
 fi
 
-  $JAVA_HOME/bin/java -jar ${WORKSPACE}/${TCK_NAME}/lib/javatest.jar -workdir ${WORKSPACE}/batch-multiJVM/work -writereport ${WORKSPACE}/JAXB_REPORT/JAXB-TCK
+  $JAVA_HOME/bin/java -DnoSecurityManager=true -jar ${WORKSPACE}/${TCK_NAME}/lib/javatest.jar -workdir ${WORKSPACE}/batch-multiJVM/work -writereport ${WORKSPACE}/JAXB_REPORT/JAXB-TCK
 
 
 export HOST=`hostname -f`

diff --git a/jaxb-tck/build/build.ant.xml b/jaxb-tck/build/build.ant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2023 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -602,8 +602,6 @@
   		<arg line="-Xms256m" />
   		<arg line="-Xmx2048m" />
 		<arg line="-Xss128k" />
-  		<arg line="-XX:PermSize=512M"/>
-  		<arg line="-XX:MaxPermSize=512M"/>
   		<arg line="-XX:+UseParallelGC"/>
   		<arg line="-server"/>
   		<arg line="-cp ${java.class.path}:${sun.boot.class.path}"/>

diff --git a/jaxb-tck/build/log2html b/jaxb-tck/build/log2html
@@ -1,6 +1,6 @@
 #! /bin/ksh 
 #
-# Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0, which is available at
@@ -101,7 +101,7 @@ test -d $outDir || mkdir $outDir
 
 #${jctTools}/solaris/bin/mlprint -J-mx128m 
 CLASSPATH=${javaTest}/javatest.jar \
-    ${genJava} -Xmx512m -XX:MaxPermSize=512M com.sun.jck.utils.mlprint.Main \
+    ${genJava} -Xmx512m com.sun.jck.utils.mlprint.Main \
     -b `cd ${buildDir}; pwd` \
     -c ${buildDir}/tck.mlc \
     -m ${buildDir}/tck.mlm \

diff --git a/jaxb-tck/build/log2html.ksh b/jaxb-tck/build/log2html.ksh
@@ -1,6 +1,6 @@
 #! /bin/ksh 
 #
-# Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0, which is available at
@@ -101,7 +101,7 @@ test -d $outDir || mkdir $outDir
 
 #${jctTools}/solaris/bin/mlprint -J-mx128m 
 CLASSPATH=${javaTest}/javatest.jar \
-    ${genJava} -Xmx512m -XX:MaxPermSize=512M com.sun.jck.utils.mlprint.Main \
+    ${genJava} -Xmx512m com.sun.jck.utils.mlprint.Main \
     -b `cd ${buildDir}; pwd` \
     -c ${buildDir}/tck.mlc \
     -m ${buildDir}/tck.mlm \

diff --git a/jaxb-tck/build/run-ant-script b/jaxb-tck/build/run-ant-script
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2023 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,7 +17,7 @@
 
 DIRNAME=`dirname "$0"`
 domain=SFBay
-ANT_OPTS="-Xms1024m -Xmx2048m -XX:PermSize=512M -XX:MaxPermSize=512M -XX:+UseParallelGC -XX:+AggressiveHeap -server"
+ANT_OPTS="-Xms1024m -Xmx2048m -XX:+UseParallelGC -XX:+AggressiveHeap -server"
 ANT_HOME=`grep -h ANT_HOME $DIRNAME/Defs.$domain.mk | sed -e 's/.*=[ ]*//'`
 JAXB_20_RI_HOME=`grep -h JAXB_HOME $DIRNAME/Defs.$domain.mk | sed -e 's/.*=[ ]*//'`
 export DIRNAME

diff --git a/jaxb-tck/lib/javatest.jar b/jaxb-tck/lib/javatest.jar
diff --git a/jaxb-tck/src/share/classes/javasoft/sqe/javatest/lib/EchoCommand.java b/jaxb-tck/src/share/classes/javasoft/sqe/javatest/lib/EchoCommand.java
@@ -24,7 +24,6 @@
 import java.util.Hashtable;
 import com.sun.javatest.Command;
 import com.sun.javatest.Status;
-import com.sun.javatest.util.Properties;
 
 /**
  * EchoCommand simply echoes its arguments to the log stream, and reports success.

diff --git a/...share/classes/org/apache/river/concurrent/ReadResolveFixCollectionCircularReferences.java b/...share/classes/org/apache/river/concurrent/ReadResolveFixCollectionCircularReferences.java
@@ -45,7 +45,7 @@
  */
 /*
  extension of Set<T>, SortedSet<T>, NavigableSet<T> by ReadResolveFixCollectionCircularReferences  
- has been removed to avoid compile time failures with JDK 11.
+ has been removed due to compile time failures with JDK 11.
 */
 abstract class ReadResolveFixCollectionCircularReferences<T> extends SerializationOfReferenceCollection<T>
 implements List<T>, Queue<T>, Deque<T>, BlockingQueue<T>, BlockingDeque<T>{

diff --git a/jaxb-tck/src/share/jttck/classes/com/sun/jaxb_tck/lib/JaxbTckTestSuite.java b/jaxb-tck/src/share/jttck/classes/com/sun/jaxb_tck/lib/JaxbTckTestSuite.java
@@ -30,7 +30,7 @@
  */
 public class JaxbTckTestSuite extends TestSuite {
 
-    public JaxbTckTestSuite(File root, Map<?, ?> tsInfo, ClassLoader cl) throws Fault {
+    public JaxbTckTestSuite(File root, Map tsInfo, ClassLoader cl) throws Fault {
         super(root, tsInfo, cl);
     }