This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/4.0.x-fixes by this push:
new 0e3ef75a23 CXF-9038: Run Jakarta RESTful Web Services 3.0 TCK
0e3ef75a23 is described below
commit 0e3ef75a23d6cc950db9c36f6877d706ca91ba22
Author: Andriy Redko <drr...@gmail.com>
AuthorDate: Sat Jul 13 18:53:03 2024 -0400
CXF-9038: Run Jakarta RESTful Web Services 3.0 TCK
---
tck/Jenkinsfile | 40 +++++++++++++++++-----------------------
1 file changed, 17 insertions(+), 23 deletions(-)
diff --git a/tck/Jenkinsfile b/tck/Jenkinsfile
index 92a827d0eb..f5e1c4f107 100644
--- a/tck/Jenkinsfile
+++ b/tck/Jenkinsfile
@@ -10,7 +10,7 @@ pipeline {
}
environment {
- ANT_OPTS = "-Xmx2G -Djava.endorsed.dirs=${JAKARTA_JARS}/endorsed
-Djavax.xml.accessExternalStylesheet=all -Djavax.xml.accessExternalSchema=all
-DenableExternalEntityProcessing=true -Djavax.xml.accessExternalDTD=file,http"
+ ANT_OPTS = "-Djavax.xml.accessExternalStylesheet=all
-Djavax.xml.accessExternalSchema=all -DenableExternalEntityProcessing=true
-Djavax.xml.accessExternalDTD=file,http"
}
stages {
@@ -43,7 +43,7 @@ pipeline {
stage('Download JakartaEE TCK') {
steps {
checkout([$class: 'GitSCM',
- branches: [[name: 'refs/tags/9.1.x']],
+ branches: [[name: 'refs/tags/9.1.0']],
userRemoteConfigs: [[url:
'https://github.com/eclipse-ee4j/jakartaee-tck']],
extensions: [[$class: 'RelativeTargetDirectory',
relativeTargetDir: 'jakartaee-tck']]
])
@@ -61,11 +61,11 @@ pipeline {
stage('Download Apache CXF bits') {
steps {
echo "Using Apache CXF version: " + params.Version
- sh "mvn
org.apache.maven.plugins:maven-dependency-plugin:2.8:get
-DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org
-Dartifact=org.apache.cxf:cxf-core:${params.Version}:jar -Dtransitive=false
-Ddest=glassfish6/glassfish/lib"
- sh "mvn
org.apache.maven.plugins:maven-dependency-plugin:2.8:get
-DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org
-Dartifact=org.apache.cxf:cxf-rt-frontend-jaxrs:${params.Version}:jar
-Dtransitive=false -Ddest=glassfish6/glassfish/lib"
- sh "mvn
org.apache.maven.plugins:maven-dependency-plugin:2.8:get
-DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org
-Dartifact=org.apache.cxf:cxf-rt-rs-client:${params.Version}:jar
-Dtransitive=false -Ddest=glassfish6/glassfish/lib"
- sh "mvn
org.apache.maven.plugins:maven-dependency-plugin:2.8:get
-DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org
-Dartifact=org.apache.cxf:cxf-rt-rs-sse:${params.Version}:jar
-Dtransitive=false -Ddest=glassfish6/glassfish/lib"
- sh "mvn
org.apache.maven.plugins:maven-dependency-plugin:2.8:get
-DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org
-Dartifact=org.apache.cxf:cxf-rt-transports-http:${params.Version}:jar
-Dtransitive=false -Ddest=glassfish6/glassfish/lib"
+ sh "mvn
org.apache.maven.plugins:maven-dependency-plugin:2.8:get
-DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org
-Dartifact=org.apache.cxf:cxf-core:${params.Version}:jar -Dtransitive=false
-Ddest=glassfish6/glassfish/domains/domain1/lib"
+ sh "mvn
org.apache.maven.plugins:maven-dependency-plugin:2.8:get
-DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org
-Dartifact=org.apache.cxf:cxf-rt-frontend-jaxrs:${params.Version}:jar
-Dtransitive=false -Ddest=glassfish6/glassfish/domains/domain1/lib"
+ sh "mvn
org.apache.maven.plugins:maven-dependency-plugin:2.8:get
-DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org
-Dartifact=org.apache.cxf:cxf-rt-rs-client:${params.Version}:jar
-Dtransitive=false -Ddest=glassfish6/glassfish/domains/domain1/lib"
+ sh "mvn
org.apache.maven.plugins:maven-dependency-plugin:2.8:get
-DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org
-Dartifact=org.apache.cxf:cxf-rt-rs-sse:${params.Version}:jar
-Dtransitive=false -Ddest=glassfish6/glassfish/domains/domain1/lib"
+ sh "mvn
org.apache.maven.plugins:maven-dependency-plugin:2.8:get
-DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org
-Dartifact=org.apache.cxf:cxf-rt-transports-http:${params.Version}:jar
-Dtransitive=false -Ddest=glassfish6/glassfish/domains/domain1/lib"
echo "Including additional dependencies (woodstox, stax2, ...)"
sh "mvn
org.apache.maven.plugins:maven-dependency-plugin:2.8:get
-DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org
-Dartifact=org.apache.cxf:cxf-parent:${params.Version}:pom -Dtransitive=false
-Ddest=."
@@ -76,8 +76,8 @@ pipeline {
woodstox_version = sh(returnStdout: true, script: "grep
'<cxf.woodstox.core.version>'
cxf-parent-${params.Version}.pom").replaceAll("[\n\r]",
"").replaceAll(".+[>](.+)[<].+", '$1')
staxapi_version = sh(returnStdout: true, script: "grep
'<cxf.woodstox.stax2-api.version>'
cxf-parent-${params.Version}.pom").replaceAll("[\n\r]",
"").replaceAll(".+[>](.+)[<].+", '$1')
- sh "mvn
org.apache.maven.plugins:maven-dependency-plugin:2.8:get
-DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org
-Dartifact=com.fasterxml.woodstox:woodstox-core:${woodstox_version}:jar
-Dtransitive=false -Ddest=glassfish6/glassfish/lib"
- sh "mvn
org.apache.maven.plugins:maven-dependency-plugin:2.8:get
-DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org
-Dartifact=org.codehaus.woodstox:stax2-api:${staxapi_version}:jar
-Dtransitive=false -Ddest=glassfish6/glassfish/lib"
+ sh "mvn
org.apache.maven.plugins:maven-dependency-plugin:2.8:get
-DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org
-Dartifact=com.fasterxml.woodstox:woodstox-core:${woodstox_version}:jar
-Dtransitive=false -Ddest=glassfish6/glassfish/domains/domain1/lib"
+ sh "mvn
org.apache.maven.plugins:maven-dependency-plugin:2.8:get
-DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org
-Dartifact=org.codehaus.woodstox:stax2-api:${staxapi_version}:jar
-Dtransitive=false -Ddest=glassfish6/glassfish/domains/domain1/lib"
}
sh "rm cxf-parent-${params.Version}.pom"
@@ -102,7 +102,7 @@ pipeline {
withEnv([
"WORKSPACE=${pwd()}",
"TS_HOME=${WORKSPACE}/jakartaee-tck",
- "JAKARTA_JARS=${TS_HOME}/jakartaeetck-bundles",
+
"JAKARTA_JARS=${WORKSPACE}/jakartaee-tck/jakartaeetck-bundles",
"javaee_home=${WORKSPACE}/glassfish6",
"GF_HOME=${WORKSPACE}/glassfish6/glassfish",
"AS_JAVA=$JAVA_HOME",
@@ -110,10 +110,10 @@ pipeline {
]) {
sh 'yes | cp -vr ts.jte.template
jakartaee-tck/install/jaxrs/bin/ts.jte'
- mkdir -p ${JAKARTA_JARS}
- mkdir -p ${JAKARTA_JARS}/modules
- mkdir -p ${JAKARTA_JARS}/endorsed
- mvn -f ${TS_HOME}/docker/pom.xml
dependency:copy-dependencies -DoutputDirectory="${JAKARTA_JARS}/modules"
-Dmdep.stripVersion=true
+ sh "mkdir -p ${JAKARTA_JARS}"
+ sh "mkdir -p ${JAKARTA_JARS}/modules"
+ sh "mkdir -p ${JAKARTA_JARS}/endorsed"
+ sh "mvn -f ${TS_HOME}/docker/pom.xml
dependency:copy-dependencies -DoutputDirectory=\"${JAKARTA_JARS}/modules\"
-Dmdep.stripVersion=true"
dir("${TS_HOME}/install/${deliverabledir}/bin") {
sh "ant build.all"
@@ -131,24 +131,18 @@ pipeline {
tools {
jdk 'jdk_11_latest'
}
+
steps {
withEnv([
"WORKSPACE=${pwd()}",
"TS_HOME=${WORKSPACE}/restful-ws-tck",
"javaee_home=${WORKSPACE}/glassfish6",
"GF_HOME=${WORKSPACE}/glassfish6/glassfish",
- "AS_JAVA=$JAVA_HOME",
"deliverabledir=jaxrs"
]) {
sh "cp -r
jakartaee-tck/release/JAXRS_BUILD/latest/restful-ws-tck ${WORKSPACE}"
sh "yes | cp -vr ts.jte.template ${TS_HOME}/bin/ts.jte"
- // It seems to be impossible to exclude Jersey from the
Glassfish deployment but it
- // interferes with Apache CXF, as such some tests cases
are failing. Modifying the Jersey
- // manifest to exclude 'javax.ws.rs.ext.RuntimeDelegate'
from Jersey so the Apache CXF
- // implementation will be used reliably all the time.
- sh 'zip -d
${WORKSPACE}/glassfish6/glassfish/modules/jersey-server.jar
META-INF/services/javax.ws.rs.ext.RuntimeDelegate'
-
dir("${TS_HOME}/bin") {
sh "ant config.vi"
sh "ant deploy.all"
@@ -159,7 +153,7 @@ pipeline {
} catch (exc) {
echo 'Some TCK tests have failed, marking
build as unstable'
currentBuild.result = 'UNSTABLE'
- }
+ }
}
}
}
@@ -169,7 +163,7 @@ pipeline {
always {
withEnv([
"WORKSPACE=${pwd()}",
- "TS_HOME=${WORKSPACE}/restful-ws-tck",
+ "TS_HOME=${WORKSPACE}/restful-ws-tck"
]) {
dir("${TS_HOME}/bin") {
sh "ant stop-server -f
xml/impl/glassfish/config.vi.xml"
