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/01/28 02:24:10 UTC
[cxf] branch 3.5.x-fixes updated (a2405b2 -> 1cc69bd)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from a2405b2 Recording .gitmergeinfo Changes
new 95d35762 Update TCK deployment scripts to copy some cxf-xxx artifacts to 'modules' folder (service discovery)
new a77494b Update TCK deployment scripts, fixing typo
new 1cc69bd Recording .gitmergeinfo Changes
The 3 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 | 1 +
tck/Jenkinsfile | 14 ++++++++------
tck/ts.jte.template | 2 +-
3 files changed, 10 insertions(+), 7 deletions(-)
[cxf] 01/03: Update TCK deployment scripts to copy some cxf-xxx artifacts to 'modules' folder (service discovery)
Posted by re...@apache.org.
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
commit 95d35762140fbb4472efa10f4e4fe46dd200fe36
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Jan 27 21:19:35 2022 -0500
Update TCK deployment scripts to copy some cxf-xxx artifacts to 'modules' folder (service discovery)
(cherry picked from commit 27e235093fd3c8c435be63c39dff46fb3aa23f42)
---
tck/Jenkinsfile | 14 ++++++++------
tck/ts.jte.template | 2 +-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/tck/Jenkinsfile b/tck/Jenkinsfile
index 19d8e6a..f923aab 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
[cxf] 03/03: 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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1cc69bd3ae56bcb514d706d876f9b97135253d34
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Jan 27 21:23:39 2022 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 061bb14..7edc93b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -2,6 +2,7 @@ origin/master
B 8f7c9dae610cd708b5e17828b58b642a5485b9cc
B b740e0a7f606d9e5acb8c27dfb3a671708bb19db
+M 18f1791fa72dba0a7f2ed784d0dfbbb5e9923306
M 309cfbf5710dab302eb4a611ac34dc288d1d8203
M a903a5392b3cd2b5925c6afa46f289b3b94a694a
M c5b7db5a4cceb3df6094ee38215725fd4ecc2b8c
[cxf] 02/03: Update TCK deployment scripts, fixing typo
Posted by re...@apache.org.
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
commit a77494bae7157ec3fd9ed39f32a3aad31f51f2e7
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Jan 27 21:22:37 2022 -0500
Update TCK deployment scripts, fixing typo
(cherry picked from commit 02403c59b767a985454856e31166d960bd78f0fa)
---
tck/Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tck/Jenkinsfile b/tck/Jenkinsfile
index f923aab..755e524 100644
--- a/tck/Jenkinsfile
+++ b/tck/Jenkinsfile
@@ -68,7 +68,7 @@ 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"
sh "cp glassfish5/glassfish/lib/cxf-rt-frontend-jaxrs-* glassfish5/glassfish/modules"
- sh "cp glassfish5/glassfish/lib/cxf-rt-rs-sse--* 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"