This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 27e2350 Update TCK deployment scripts to copy some cxf-xxx artifacts
to 'modules' folder (service discovery)
27e2350 is described below
commit 27e235093fd3c8c435be63c39dff46fb3aa23f42
Author: Andriy Redko <[email protected]>
AuthorDate: Thu Jan 27 21:19:35 2022 -0500
Update TCK deployment scripts to copy some cxf-xxx artifacts to 'modules'
folder (service discovery)
---
tck/Jenkinsfile | 14 ++++++++------
tck/ts.jte.template | 2 +-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/tck/Jenkinsfile b/tck/Jenkinsfile
index 853a36c..84ade1e 100644
--- a/tck/Jenkinsfile
+++ b/tck/Jenkinsfile
@@ -61,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/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"
+ 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"
+
+ sh "cp glassfish5/glassfish/lib/cxf-rt-frontend-jaxrs-*
glassfish5/glassfish/modules"
+ sh "cp glassfish5/glassfish/lib/cxf-rt-rs-sse--*
glassfish5/glassfish/modules"
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"
diff --git a/tck/ts.jte.template b/tck/ts.jte.template
index 8ed046c..7412163 100644
--- a/tck/ts.jte.template
+++ b/tck/ts.jte.template
@@ -397,7 +397,7 @@ s1as.admin.port=${glassfish.admin.port}
# Default to jersey
##########################################################################
web.home=${GF_HOME}
-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_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.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}/modules/cxf-rt-frontend-jaxrs-${version}.jar:${web.home}/modules/cxf-rt-rs-sse-${version}.jar
