You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2022/06/08 22:40:54 UTC
[cxf] branch 3.4.x-fixes updated (5b479390b2 -> e2206fc0d3)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 5b479390b2 Recording .gitmergeinfo Changes
new 4f7dc9880d CXF-8711: Jakarta EE TCKs and compatibility (added support for branch-specific woodstox and stax-api artifact extraction)
new e2206fc0d3 Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 2 ++
tck/Jenkinsfile | 17 +++++++++++++++--
tck/ts.jte.template | 2 +-
3 files changed, 18 insertions(+), 3 deletions(-)
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e2206fc0d31783812e4d4b27667cc21d34bb4821
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Jun 8 18:40:41 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 2e2fe7be5c..bb33a0e934 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -91,6 +91,7 @@ B 9c5658b9b39403cc95d38a61de900af0591222d5
B 9ed98f36a381b8f881c2d63a5846572ba83a4ed9
B a05c7db2a8c09f38e98ad08c921da55f0d5f511f
B a06d00066c88077a1cf25766b841bd8f6cabb027
+B a1fccf8b7628539b201780acf4e079084054b809
B a2405b2a535f76589ce1ad6e72b4ecaf5ec5b6a9
B a7000a6dc4d61290fe96f579a43e231393ed7670
B a7c37c22b7c80eea75d8b992626694b4cdd189d2
@@ -174,6 +175,7 @@ M 2622106afd6e1b24f6140ef89a57fcb5865ec487
M 27f8e28b8415b370d34e46df0d83587d634560c2
M 2871e80043c2452cf9aca3925a07360b8775c508
M 287f3a8a5a4cacbdf6be86e72251ef0f20bcb251
+M 28a4a8269d3b97be7e5c1d793ce43e91bae3cdb5
M 299d6a844b99a69555355b2f9baca3e6ec13a918
M 29e9ae1bd69a373e7a33d84405510a5e825a6508
M 2a1614e5be080b6749fc72d1be2c253215c1bae7
[cxf] 01/02: CXF-8711: Jakarta EE TCKs and compatibility (added support for branch-specific woodstox and stax-api artifact extraction)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 4f7dc9880d98756476306512636ab629dfefaca7
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jun 7 19:57:28 2022 -0400
CXF-8711: Jakarta EE TCKs and compatibility (added support for branch-specific woodstox and stax-api artifact extraction)
(cherry picked from commit 97dc25412eac3342f643ea5faa38c9718d2139bf)
(cherry picked from commit 28a4a8269d3b97be7e5c1d793ce43e91bae3cdb5)
---
tck/Jenkinsfile | 17 +++++++++++++++--
tck/ts.jte.template | 2 +-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/tck/Jenkinsfile b/tck/Jenkinsfile
index 7b26a1bd14..fdf18f3264 100644
--- a/tck/Jenkinsfile
+++ b/tck/Jenkinsfile
@@ -68,8 +68,19 @@ pipeline {
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, 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"
+ 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=."
+
+ script {
+ echo "Detect additional dependencies (woodstox, stax2, ...) versions"
+
+ 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=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:${staxapi_version}:jar -Dtransitive=false -Ddest=glassfish5/glassfish/lib"
+ }
+
+ sh "rm cxf-parent-${params.Version}.pom"
}
}
@@ -78,6 +89,8 @@ pipeline {
withEnv(["WORKSPACE = ${PWD}"]) {
sh "wget https://raw.githubusercontent.com/apache/cxf/3.4.x-fixes/tck/ts.jte.template"
sh "sed -i '" + 's/${version}/' + params.Version + "/g' ts.jte.template"
+ sh "sed -i '" + 's/${woodstox_version}/' + woodstox_version + "/g' ts.jte.template"
+ sh "sed -i '" + 's/${staxapi_version}/' + staxapi_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"
}
diff --git a/tck/ts.jte.template b/tck/ts.jte.template
index 7412163541..7bfbc3d7a7 100644
--- a/tck/ts.jte.template
+++ b/tck/ts.jte.template
@@ -398,7 +398,7 @@ s1as.admin.port=${glassfish.admin.port}
##########################################################################
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.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.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-${woodstox_version}.jar:${web.home}/lib/stax2-api-${staxapi_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