This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.5.x-fixes by this push:
new f0e67e2 Update TCK deployment scripts to relocate cxf-xxx artifacts
from 'lib' to 'modules' folder
f0e67e2 is described below
commit f0e67e2874bc23336b5b445ddfc9e11e7357adc7
Author: Andriy Redko <[email protected]>
AuthorDate: Wed Jan 26 22:15:05 2022 -0500
Update TCK deployment scripts to relocate cxf-xxx artifacts from 'lib' to
'modules' folder
---
tck/Jenkinsfile | 26 +++++++++++++++-----------
tck/ts.jte.template | 4 ++--
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/tck/Jenkinsfile b/tck/Jenkinsfile
index b66ed0e..19d8e6a 100644
--- a/tck/Jenkinsfile
+++ b/tck/Jenkinsfile
@@ -6,7 +6,7 @@ pipeline {
tools {
ant 'ant_1.10.10'
maven 'maven_3.6.3'
- jdk 'jdk_1.8.0_241'
+ jdk 'jdk_1.8_latest'
}
environment {
@@ -16,7 +16,9 @@ pipeline {
stages {
stage("Initialization") {
steps {
- buildName "#${BUILD_NUMBER} CXF ${params.Version} JAX-RS 2.1
TCK"
+ script {
+ currentBuild.displayName = "#${BUILD_NUMBER} CXF
${params.Version} JAX-RS 2.1 TCK"
+ }
}
}
@@ -41,7 +43,7 @@ pipeline {
stage('Download JakartaEE TCK') {
steps {
checkout([$class: 'GitSCM',
- branches: [[name: 'refs/tags/8.0.2']],
+ branches: [[name: 'refs/tags/8.0.2']],
userRemoteConfigs: [[url:
'https://github.com/eclipse-ee4j/jakartaee-tck']],
extensions: [[$class: 'RelativeTargetDirectory',
relativeTargetDir: 'jakartaee-tck']]
])
@@ -59,12 +61,14 @@ 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=glassfish5/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=glassfish5/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=glassfish5/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=glassfish5/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=glassfish5/glassfish/lib"
- echo "Including additional dependencies (woodstox, ...)"
+ 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=glassfish5/glassfish/modules"
+ 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=glassfish5/glassfish/modules"
+ 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=glassfish5/glassfish/modules"
+ 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=glassfish5/glassfish/modules"
+ 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=glassfish5/glassfish/modules"
+ sh "cp glassfish5/glassfish/modules/cxf-*
glassfish5/glassfish/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=com.fasterxml.woodstox:woodstox-core:5.2.1:jar -Dtransitive=false
-Ddest=glassfish5/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:4.2:jar -Dtransitive=false
-Ddest=glassfish5/glassfish/lib"
}
@@ -73,7 +77,7 @@ pipeline {
stage('Prepare JAX-RS TCK build configuration') {
steps {
withEnv(["WORKSPACE = ${PWD}"]) {
- sh "wget
https://raw.githubusercontent.com/apache/cxf/master/tck/ts.jte.template";
+ sh "wget
https://raw.githubusercontent.com/apache/cxf/3.5.x-fixes/tck/ts.jte.template";
sh "sed -i '" + 's/${version}/' + params.Version + "/g'
ts.jte.template"
sh "sed -i '" + 's#${GF_HOME}#' +
"${WORKSPACE}/glassfish5/glassfish" + "#g' ts.jte.template"
sh "cp jakartaee-tck/bin/xml/impl/glassfish/jersey.xml
jakartaee-tck/bin/xml/impl/glassfish/cxf.xml"
@@ -159,4 +163,4 @@ pipeline {
cleanWs()
}
}
-}
+}
\ No newline at end of file
diff --git a/tck/ts.jte.template b/tck/ts.jte.template
index 1159944..8ed046c 100644
--- a/tck/ts.jte.template
+++ b/tck/ts.jte.template
@@ -397,10 +397,10 @@ s1as.admin.port=${glassfish.admin.port}
# Default to jersey
##########################################################################
web.home=${GF_HOME}
-jaxrs_impl.classes=${web.home}/lib/cxf-rt-rs-client-${version}.jar:${web.home}/lib/cxf-core-${version}.jar:${web.home}/lib/cxf-rt-transports-http-${version}.jar:${web.home}/lib/cxf-rt-frontend-jaxrs-${version}.jar:${web.home}/lib/cxf-rt-rs-sse-${version}.jar
+jaxrs_impl.classes=${web.home}/modules/cxf-rt-rs-client-${version}.jar:${web.home}/modules/cxf-core-${version}.jar:${web.home}/modules/cxf-rt-transports-http-${version}.jar:${web.home}/modules/cxf-rt-frontend-jaxrs-${version}.jar:${web.home}/modules/cxf-rt-rs-sse-${version}.jar
jaxrs.classes=${web.home}/modules/jakarta.ws.rs-api.jar:${web.home}/modules/endorsed/jakarta.annotation-api.jar:${web.home}/modules/bean-validator.jar:${web.home}/modules/jakarta.json.jar:${web.home}/modules/jakarta.interceptor-api.jar:${web.home}/modules/jakarta.ejb-api.jar:${web.home}/modules/jakarta.inject.jar:${web.home}/modules/cdi-api.jar:${web.home}/modules/jakarta.json.bind-api.jar:${web.home}/lib/woodstox-core-5.2.1.jar:${web.home}/lib/stax2-api-4.2.jar
-jaxrs_impl_lib=${web.home}/lib/cxf-rt-frontend-jaxrs-${version}.jar:${web.home}/lib/cxf-rt-rs-sse-${version}.jar
+jaxrs_impl_lib=${web.home}/modules/cxf-rt-frontend-jaxrs-${version}.jar:${web.home}/modules/cxf-rt-rs-sse-${version}.jar
servlet_adaptor=org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.class
jaxrs_impl_name=cxf
