[cxf] branch master updated: Upgrade commons-io to 2.10.0
This is an automated email from the ASF dual-hosted git repository. deki 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 4dc7c95 Upgrade commons-io to 2.10.0 new 50e4ba6 Merge pull request #823 from jimma/commons-io-upgrade 4dc7c95 is described below commit 4dc7c95796c89ec6d33d99b2df202cb71124a741 Author: Jim Ma AuthorDate: Fri Jul 2 12:28:59 2021 +0800 Upgrade commons-io to 2.10.0 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index d167f44..8b2a330 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -94,7 +94,7 @@ 4.8.25 1.5.1 1.15 -2.9.0 +2.10.0 2.1 3.11 1.2
[cxf] branch master updated: Update Swagger UI to 3.38.0
This is an automated email from the ASF dual-hosted git repository. deki 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 e775237 Update Swagger UI to 3.38.0 e775237 is described below commit e775237e6dcb16b647d102bcbb3908d3e9fce1de Author: Dennis Kieselhorst AuthorDate: Wed Dec 23 14:41:58 2020 +0100 Update Swagger UI to 3.38.0 --- distribution/src/main/release/samples/pom.xml | 2 +- parent/pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index 331ae6e..a16d698 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -34,7 +34,7 @@ 3.0.0 9.4.34.v20201102 4.5.13 -3.32.1 +3.38.0 1.25 9.0.41 diff --git a/parent/pom.xml b/parent/pom.xml index 5f80442..8e4d58d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -202,7 +202,7 @@ 5.4.2 5.3.2 1.8.3 -3.37.0 +3.38.0 2.1.6 1.6.2 27.0-jre
[cxf] branch master updated: Jenkins: fix JDK refs
This is an automated email from the ASF dual-hosted git repository.
deki 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 b1ab732 Jenkins: fix JDK refs
b1ab732 is described below
commit b1ab732fb0d10056c125fce80b5e79aad7b26cc3
Author: Dennis Kieselhorst
AuthorDate: Sun Nov 8 11:07:26 2020 +0100
Jenkins: fix JDK refs
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 9aff7c6..781ebe5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,7 +33,7 @@ pipeline {
axes {
axis {
name 'JAVA_VERSION'
-values 'JDK 1.8 (latest)', 'JDK 11 (latest)'
+values 'jdk_1.8_latest', 'jdk_11_latest'
}
}
stages {
[cxf] branch master updated: Jenkins: fix Maven ref
This is an automated email from the ASF dual-hosted git repository.
deki 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 f2214d0 Jenkins: fix Maven ref
f2214d0 is described below
commit f2214d0c391d4ccd7896141b48ff41486f985403
Author: Dennis Kieselhorst
AuthorDate: Sun Nov 8 10:18:51 2020 +0100
Jenkins: fix Maven ref
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 1dd043e..9aff7c6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -43,7 +43,7 @@ pipeline {
}
tools {
jdk "${JAVA_VERSION}"
- maven 'Maven (latest)'
+ maven 'maven_latest'
}
environment {
MAVEN_OPTS = "-Xmx1024m"
[cxf] branch master updated: fixed Maven warning for duplicate junit dependency definition
This is an automated email from the ASF dual-hosted git repository. deki 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 a8fc2af fixed Maven warning for duplicate junit dependency definition a8fc2af is described below commit a8fc2af2afcd562a2b97d99308095c2e94b81216 Author: Dennis Kieselhorst AuthorDate: Wed Aug 19 08:56:27 2020 +0200 fixed Maven warning for duplicate junit dependency definition --- systests/rs-sse/rs-sse-base/pom.xml | 5 - 1 file changed, 5 deletions(-) diff --git a/systests/rs-sse/rs-sse-base/pom.xml b/systests/rs-sse/rs-sse-base/pom.xml index 5013775..6a62a9d 100644 --- a/systests/rs-sse/rs-sse-base/pom.xml +++ b/systests/rs-sse/rs-sse-base/pom.xml @@ -38,11 +38,6 @@ junit junit -provided - - -junit -junit compile
[cxf] branch master updated: add an outdated note until we update it
This is an automated email from the ASF dual-hosted git repository. deki 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 a6d0fff add an outdated note until we update it a6d0fff is described below commit a6d0fffa218865d3972d407d268865d43c52a58a Author: Dennis Kieselhorst AuthorDate: Tue Aug 18 22:19:09 2020 +0200 add an outdated note until we update it --- distribution/src/main/release/lib/WHICH_JARS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distribution/src/main/release/lib/WHICH_JARS b/distribution/src/main/release/lib/WHICH_JARS index e7e87bc..7951988 100755 --- a/distribution/src/main/release/lib/WHICH_JARS +++ b/distribution/src/main/release/lib/WHICH_JARS @@ -6,8 +6,8 @@ specific parts of CXF. The 'manifest jar' is a jar containing only a MANIFEST.MF with a classpath that calls in all the other jar. -Jars marked with a [7] at the end are optional for Java 7 as the -functionality provided by those jars are provided in the JDK. +!!Please note the following list is outdated and needs an update!! +Use the mvn dependency:list command to identify dependencies in the meantime. The following jars are required for all CXF usage: - cxf-core.jar
[cxf] branch master updated: Update Swagger UI to 3.32.1
This is an automated email from the ASF dual-hosted git repository. deki 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 f20d35a Update Swagger UI to 3.32.1 f20d35a is described below commit f20d35a720ea55f21d960ef81e7fb5e39632969d Author: Dennis Kieselhorst AuthorDate: Tue Aug 18 22:07:01 2020 +0200 Update Swagger UI to 3.32.1 --- distribution/src/main/release/samples/pom.xml | 4 ++-- parent/pom.xml| 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index d19341e..36b484f 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -30,11 +30,11 @@ true UTF-8 -2.3.1.RELEASE +2.3.3.RELEASE 2.2.3.RELEASE 9.4.30.v20200611 4.5.9 -3.30.0 +3.32.1 1.24.1 9.0.37 diff --git a/parent/pom.xml b/parent/pom.xml index df32dda..6d694f092 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -200,7 +200,7 @@ 5.3.4.RELEASE 5.2.8.RELEASE 1.8.3 -3.30.0 +3.32.1 2.1.4 1.6.2 27.0-jre
[cxf] branch master updated: Jenkins: JDK 8 -> JDK 1.8
This is an automated email from the ASF dual-hosted git repository.
deki 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 d9a7680 Jenkins: JDK 8 -> JDK 1.8
d9a7680 is described below
commit d9a7680ec5978fe9f4338bede5de4e0d020acdb3
Author: Dennis Kieselhorst
AuthorDate: Wed Aug 5 06:56:28 2020 +0200
Jenkins: JDK 8 -> JDK 1.8
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 63d7627..1dd043e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,7 +33,7 @@ pipeline {
axes {
axis {
name 'JAVA_VERSION'
-values 'JDK 8 (latest)', 'JDK 11 (latest)'
+values 'JDK 1.8 (latest)', 'JDK 11 (latest)'
}
}
stages {
[cxf] branch master updated: Jenkins: try ${JAVA_VERSION} instead of ${JDK}
This is an automated email from the ASF dual-hosted git repository.
deki 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 5e2655a Jenkins: try ${JAVA_VERSION} instead of ${JDK}
5e2655a is described below
commit 5e2655a268e22622aac4f8835b71b942df8e5ff7
Author: Dennis Kieselhorst
AuthorDate: Tue Aug 4 08:25:29 2020 +0200
Jenkins: try ${JAVA_VERSION} instead of ${JDK}
---
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d4f3df3..63d7627 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,7 +32,7 @@ pipeline {
}
axes {
axis {
-name 'JDK'
+name 'JAVA_VERSION'
values 'JDK 8 (latest)', 'JDK 11 (latest)'
}
}
@@ -42,7 +42,7 @@ pipeline {
label 'ubuntu'
}
tools {
- jdk "${JDK}"
+ jdk "${JAVA_VERSION}"
maven 'Maven (latest)'
}
environment {
[cxf] branch master updated: Jenkins: fix ${JDK} label
This is an automated email from the ASF dual-hosted git repository.
deki 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 ff2b7c8 Jenkins: fix ${JDK} label
ff2b7c8 is described below
commit ff2b7c87de12d16cd71a62e7a1f0a0be3901b39e
Author: Dennis Kieselhorst
AuthorDate: Tue Aug 4 08:22:19 2020 +0200
Jenkins: fix ${JDK} label
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 0567dda..d4f3df3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,7 +49,7 @@ pipeline {
MAVEN_OPTS = "-Xmx1024m"
}
stages {
- stage('Build & Test ${JDK}') {
+ stage('Build & Test') {
steps {
sh 'mvn -B clean install'
// step([$class: 'JiraIssueUpdater', issueSelector: [$class:
'DefaultIssueSelector'], scm: scm])
[cxf] branch master updated: Jenkins: fix ${JDK} label
This is an automated email from the ASF dual-hosted git repository.
deki 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 3313427 Jenkins: fix ${JDK} label
3313427 is described below
commit 331342782e654235803406a5d80cd38f7a88a2b9
Author: Dennis Kieselhorst
AuthorDate: Tue Aug 4 08:17:51 2020 +0200
Jenkins: fix ${JDK} label
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b73574b..0567dda 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,7 +37,7 @@ pipeline {
}
}
stages {
- stage("${JDK}") {
+ stage('JDK specific build') {
agent {
label 'ubuntu'
}
[cxf] branch master updated: Jenkins: fix ${JDK} label
This is an automated email from the ASF dual-hosted git repository.
deki 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 77dcdc7 Jenkins: fix ${JDK} label
77dcdc7 is described below
commit 77dcdc79082a380083c6e349b16935d9427bd52f
Author: Dennis Kieselhorst
AuthorDate: Tue Aug 4 08:15:15 2020 +0200
Jenkins: fix ${JDK} label
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index ce21e4d..b73574b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,7 +37,7 @@ pipeline {
}
}
stages {
- stage(${JDK}) {
+ stage("${JDK}") {
agent {
label 'ubuntu'
}
[cxf] branch master updated: Jenkins: fix ${JDK} label
This is an automated email from the ASF dual-hosted git repository.
deki 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 6856458 Jenkins: fix ${JDK} label
6856458 is described below
commit 685645871160d02696d8df3c584633d29e42df3b
Author: Dennis Kieselhorst
AuthorDate: Tue Aug 4 08:13:28 2020 +0200
Jenkins: fix ${JDK} label
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 99194bc..ce21e4d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,7 +37,7 @@ pipeline {
}
}
stages {
- stage('${JDK}') {
+ stage(${JDK}) {
agent {
label 'ubuntu'
}
[cxf] branch master updated: Jenkins: use matrix
This is an automated email from the ASF dual-hosted git repository.
deki 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 dd1ccb0 Jenkins: use matrix
dd1ccb0 is described below
commit dd1ccb028406995ea5143c53e886a5408cd50b92
Author: Dennis Kieselhorst
AuthorDate: Mon Aug 3 14:05:18 2020 +0200
Jenkins: use matrix
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index f22e56b..99194bc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -42,7 +42,7 @@ pipeline {
label 'ubuntu'
}
tools {
- jdk ${JDK}
+ jdk "${JDK}"
maven 'Maven (latest)'
}
environment {
[cxf] branch master updated: Jenkins: use matrix
This is an automated email from the ASF dual-hosted git repository.
deki 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 2960338 Jenkins: use matrix
2960338 is described below
commit 29603389cb1cfc045b1be61fe2c5e01df59549fe
Author: Dennis Kieselhorst
AuthorDate: Mon Aug 3 14:03:30 2020 +0200
Jenkins: use matrix
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 851b75f..f22e56b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -42,7 +42,7 @@ pipeline {
label 'ubuntu'
}
tools {
- jdk '${JDK}'
+ jdk ${JDK}
maven 'Maven (latest)'
}
environment {
[cxf] branch master updated: Jenkins: use matrix
This is an automated email from the ASF dual-hosted git repository.
deki 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 583f29c Jenkins: use matrix
583f29c is described below
commit 583f29cf4c0e69b11df770e7449c0a254595adb6
Author: Dennis Kieselhorst
AuthorDate: Mon Aug 3 14:02:07 2020 +0200
Jenkins: use matrix
---
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 32790ac..851b75f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,7 +33,7 @@ pipeline {
axes {
axis {
name 'JDK'
-values 'JDK 8', 'JDK 11'
+values 'JDK 8 (latest)', 'JDK 11 (latest)'
}
}
stages {
@@ -42,7 +42,7 @@ pipeline {
label 'ubuntu'
}
tools {
- jdk '${JDK} (latest)'
+ jdk '${JDK}'
maven 'Maven (latest)'
}
environment {
[cxf] branch master updated: Jenkins: use matrix
This is an automated email from the ASF dual-hosted git repository.
deki 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 6321ffd Jenkins: use matrix
6321ffd is described below
commit 6321ffd680de76dc882068cf0b74492ce3c0e23e
Author: Dennis Kieselhorst
AuthorDate: Mon Aug 3 13:59:16 2020 +0200
Jenkins: use matrix
---
Jenkinsfile | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 2e8a210..32790ac 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -61,7 +61,7 @@ pipeline {
}
}
}
-/* stage('Build Source & JavaDoc') {
+ /* stage('Build Source & JavaDoc') {
when {
branch 'master'
}
@@ -92,10 +92,11 @@ pipeline {
}
}
} */
- }
- post {
-always {
- cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**',
type: 'INCLUDE']]
+}
+post {
+ always {
+cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**',
type: 'INCLUDE']]
+ }
}
}
}
[cxf] branch master updated: Jenkins: use matrix
This is an automated email from the ASF dual-hosted git repository.
deki 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 ccb5935 Jenkins: use matrix
ccb5935 is described below
commit ccb5935a6884e8691448da2b65f3cce66b94cc34
Author: Dennis Kieselhorst
AuthorDate: Mon Aug 3 13:54:29 2020 +0200
Jenkins: use matrix
---
Jenkinsfile | 81 +++--
1 file changed, 30 insertions(+), 51 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index a59f5c9..2e8a210 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,62 +26,41 @@ pipeline {
}
}
stage('Build') {
- parallel {
-stage('JDK 11') {
- agent {
-label 'ubuntu'
- }
- tools {
-jdk 'JDK 11 (latest)'
-maven 'Maven (latest)'
- }
- environment {
-MAVEN_OPTS = "-Xmx1024m"
+ matrix {
+agent {
+ label 'ubuntu'
+}
+axes {
+ axis {
+name 'JDK'
+values 'JDK 8', 'JDK 11'
}
- stages {
-stage('Build & Test JDK 11') {
- steps {
-sh 'mvn -B clean install'
-// step([$class: 'JiraIssueUpdater', issueSelector: [$class:
'DefaultIssueSelector'], scm: scm])
- }
- post {
-always {
- junit(testResults: '**/surefire-reports/*.xml',
allowEmptyResults: true)
- junit(testResults: '**/failsafe-reports/*.xml',
allowEmptyResults: true)
-}
- }
+}
+stages {
+ stage('${JDK}') {
+agent {
+ label 'ubuntu'
}
- }
- post {
-always {
- cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**',
type: 'INCLUDE']]
+tools {
+ jdk '${JDK} (latest)'
+ maven 'Maven (latest)'
}
- }
-}
-stage('JDK 8') {
- agent {
-label 'ubuntu'
- }
- tools {
-jdk 'JDK 1.8 (latest)'
-maven 'Maven (latest)'
- }
- environment {
-MAVEN_OPTS = "-Xmx1024m"
- }
- stages {
-stage('Build & Test JDK 8') {
- steps {
-sh 'mvn -B clean install'
-// step([$class: 'JiraIssueUpdater', issueSelector: [$class:
'DefaultIssueSelector'], scm: scm])
- }
- post {
-always {
- junit(testResults: '**/surefire-reports/*.xml',
allowEmptyResults: true)
- junit(testResults: '**/failsafe-reports/*.xml',
allowEmptyResults: true)
+environment {
+ MAVEN_OPTS = "-Xmx1024m"
+}
+stages {
+ stage('Build & Test ${JDK}') {
+steps {
+ sh 'mvn -B clean install'
+ // step([$class: 'JiraIssueUpdater', issueSelector: [$class:
'DefaultIssueSelector'], scm: scm])
+}
+post {
+ always {
+junit(testResults: '**/surefire-reports/*.xml',
allowEmptyResults: true)
+junit(testResults: '**/failsafe-reports/*.xml',
allowEmptyResults: true)
+ }
}
}
-}
/* stage('Build Source & JavaDoc') {
when {
branch 'master'
[cxf] branch master updated: Jenkins: increase timeout
This is an automated email from the ASF dual-hosted git repository.
deki 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 964d789 Jenkins: increase timeout
964d789 is described below
commit 964d78985b67512dfbc0600b3d1e4f8ee401bf6f
Author: Dennis Kieselhorst
AuthorDate: Sun Aug 2 11:16:13 2020 +0200
Jenkins: increase timeout
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 083563c..a59f5c9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,7 +4,7 @@ pipeline {
agent none
options {
buildDiscarder logRotator(daysToKeepStr: '14', numToKeepStr: '10')
-timeout(80)
+timeout(140)
disableConcurrentBuilds()
skipStagesAfterUnstable()
quietPeriod(30)
[cxf] branch master updated: Jenkins: commented out stages apart from build to get it running first
This is an automated email from the ASF dual-hosted git repository.
deki 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 c6b762b Jenkins: commented out stages apart from build to get it
running first
c6b762b is described below
commit c6b762b70358423212e1d4b35b2873d31c156672
Author: Dennis Kieselhorst
AuthorDate: Fri Jul 31 09:28:22 2020 +0200
Jenkins: commented out stages apart from build to get it running first
---
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 3197193..083563c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -82,7 +82,7 @@ pipeline {
}
}
}
-stage('Build Source & JavaDoc') {
+/* stage('Build Source & JavaDoc') {
when {
branch 'master'
}
@@ -112,7 +112,7 @@ pipeline {
sh 'mvn sonar:sonar -DskipAssembly -Dsonar.projectKey=cxf
-Dsonar.organization=apache -Dsonar.host.url=https://sonarcloud.io
-Dsonar.login=${SONARCLOUD_TOKEN}'
}
}
-}
+} */
}
post {
always {
[cxf] branch master updated: Jenkins: combine build & test for now
This is an automated email from the ASF dual-hosted git repository.
deki 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 fbc83c5 Jenkins: combine build & test for now
fbc83c5 is described below
commit fbc83c5b702e24fc074c4a98e8aaee371e055996
Author: Dennis Kieselhorst
AuthorDate: Thu Jul 30 21:11:15 2020 +0200
Jenkins: combine build & test for now
---
Jenkinsfile | 20 +---
1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index ea8c312..3197193 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,14 +39,9 @@ pipeline {
MAVEN_OPTS = "-Xmx1024m"
}
stages {
-stage('Build JDK 11') {
+stage('Build & Test JDK 11') {
steps {
-sh 'mvn -B clean install -Dmaven.test.skip.exec=true'
- }
-}
-stage('Test JDK 11') {
- steps {
-sh 'mvn -B test'
+sh 'mvn -B clean install'
// step([$class: 'JiraIssueUpdater', issueSelector: [$class:
'DefaultIssueSelector'], scm: scm])
}
post {
@@ -75,14 +70,9 @@ pipeline {
MAVEN_OPTS = "-Xmx1024m"
}
stages {
-stage('Build JDK 8') {
- steps {
-sh 'mvn -B clean install -Dmaven.test.skip.exec=true '
- }
-}
-stage('Test JDK 8') {
+stage('Build & Test JDK 8') {
steps {
-sh 'mvn -B test'
+sh 'mvn -B clean install'
// step([$class: 'JiraIssueUpdater', issueSelector: [$class:
'DefaultIssueSelector'], scm: scm])
}
post {
@@ -109,7 +99,7 @@ pipeline {
}
steps {
withCredentials([file(credentialsId:
'lukaszlenart-repository-access-token', variable: 'CUSTOM_SETTINGS')]) {
- sh 'mvn -s \${CUSTOM_SETTINGS} deploy -skipAssembly'
+ sh 'mvn -U -B -e clean install -Pdeploy,everything,nochecks
-Dmaven.test.skip.exec=true -V -DobrRepository=NONE'
}
}
}
[cxf] branch master updated: avoid NPE
This is an automated email from the ASF dual-hosted git repository.
deki 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 4dfd510 avoid NPE
4dfd510 is described below
commit 4dfd51045436d16f94c422d20f930244bb819e2c
Author: Dennis Kieselhorst
AuthorDate: Mon Jul 27 07:49:23 2020 +0200
avoid NPE
---
.../http/netty/server/integration/SSLNettySpringServerTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettySpringServerTest.java
b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettySpringServerTest.java
index 53f0ee6..677bb77 100644
---
a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettySpringServerTest.java
+++
b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettySpringServerTest.java
@@ -69,7 +69,9 @@ public class SSLNettySpringServerTest extends
SSLNettyServerTest {
ep.stop();
}
ep = null;
-context.close();
+if (context != null) {
+context.close();
+}
}
}
[cxf] branch master updated: Jenkins: remove JDK 9
This is an automated email from the ASF dual-hosted git repository.
deki 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 9be6635 Jenkins: remove JDK 9
9be6635 is described below
commit 9be663526f0890f0e465c57dd9b8fa27a22c51ce
Author: Dennis Kieselhorst
AuthorDate: Mon Jul 27 07:18:48 2020 +0200
Jenkins: remove JDK 9
---
Jenkinsfile | 48 ++--
1 file changed, 6 insertions(+), 42 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index f32a8b3..ea8c312 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,48 +39,12 @@ pipeline {
MAVEN_OPTS = "-Xmx1024m"
}
stages {
-stage('Build') {
+stage('Build JDK 11') {
steps {
-sh 'mvn -B clean install -DskipTests -DskipAssembly'
+sh 'mvn -B clean install -Dmaven.test.skip.exec=true'
}
}
-stage('Test') {
- steps {
-sh 'mvn -B test'
-// step([$class: 'JiraIssueUpdater', issueSelector: [$class:
'DefaultIssueSelector'], scm: scm])
- }
- post {
-always {
- junit(testResults: '**/surefire-reports/*.xml',
allowEmptyResults: true)
- junit(testResults: '**/failsafe-reports/*.xml',
allowEmptyResults: true)
-}
- }
-}
- }
- post {
-always {
- cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**',
type: 'INCLUDE']]
-}
- }
-}
-stage('JDK 9') {
- agent {
-label 'ubuntu'
- }
- tools {
-jdk 'JDK 1.9 (latest)'
-maven 'Maven (latest)'
- }
- environment {
-MAVEN_OPTS = "-Xmx1024m"
- }
- stages {
-stage('Build') {
- steps {
-sh 'mvn -B clean install -DskipTests -DskipAssembly'
- }
-}
-stage('Test') {
+stage('Test JDK 11') {
steps {
sh 'mvn -B test'
// step([$class: 'JiraIssueUpdater', issueSelector: [$class:
'DefaultIssueSelector'], scm: scm])
@@ -111,12 +75,12 @@ pipeline {
MAVEN_OPTS = "-Xmx1024m"
}
stages {
-stage('Build') {
+stage('Build JDK 8') {
steps {
-sh 'mvn -B clean install -DskipTests -DskipAssembly'
+sh 'mvn -B clean install -Dmaven.test.skip.exec=true '
}
}
-stage('Test') {
+stage('Test JDK 8') {
steps {
sh 'mvn -B test'
// step([$class: 'JiraIssueUpdater', issueSelector: [$class:
'DefaultIssueSelector'], scm: scm])
[cxf] branch master updated: Jenkins: parallel must be part of a stage
This is an automated email from the ASF dual-hosted git repository.
deki 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 d239c1b Jenkins: parallel must be part of a stage
d239c1b is described below
commit d239c1b3472550a60eefbbee2da8dc802d472c59
Author: Dennis Kieselhorst
AuthorDate: Fri Jul 24 07:36:15 2020 +0200
Jenkins: parallel must be part of a stage
---
Jenkinsfile | 228 ++--
1 file changed, 115 insertions(+), 113 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index a41fc4b..f32a8b3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,146 +25,148 @@ pipeline {
}
}
}
-parallel {
- stage('JDK 11') {
-agent {
- label 'ubuntu'
-}
-tools {
- jdk 'JDK 11 (latest)'
- maven 'Maven (latest)'
-}
-environment {
- MAVEN_OPTS = "-Xmx1024m"
-}
-stages {
- stage('Build') {
-steps {
- sh 'mvn -B clean install -DskipTests -DskipAssembly'
-}
+stage('Build') {
+ parallel {
+stage('JDK 11') {
+ agent {
+label 'ubuntu'
+ }
+ tools {
+jdk 'JDK 11 (latest)'
+maven 'Maven (latest)'
+ }
+ environment {
+MAVEN_OPTS = "-Xmx1024m"
}
- stage('Test') {
-steps {
- sh 'mvn -B test'
- // step([$class: 'JiraIssueUpdater', issueSelector: [$class:
'DefaultIssueSelector'], scm: scm])
+ stages {
+stage('Build') {
+ steps {
+sh 'mvn -B clean install -DskipTests -DskipAssembly'
+ }
}
-post {
- always {
-junit(testResults: '**/surefire-reports/*.xml',
allowEmptyResults: true)
-junit(testResults: '**/failsafe-reports/*.xml',
allowEmptyResults: true)
+stage('Test') {
+ steps {
+sh 'mvn -B test'
+// step([$class: 'JiraIssueUpdater', issueSelector: [$class:
'DefaultIssueSelector'], scm: scm])
+ }
+ post {
+always {
+ junit(testResults: '**/surefire-reports/*.xml',
allowEmptyResults: true)
+ junit(testResults: '**/failsafe-reports/*.xml',
allowEmptyResults: true)
+}
}
}
}
-}
-post {
- always {
-cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**',
type: 'INCLUDE']]
+ post {
+always {
+ cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**',
type: 'INCLUDE']]
+}
}
}
- }
- stage('JDK 9') {
-agent {
- label 'ubuntu'
-}
-tools {
- jdk 'JDK 1.9 (latest)'
- maven 'Maven (latest)'
-}
-environment {
- MAVEN_OPTS = "-Xmx1024m"
-}
-stages {
- stage('Build') {
-steps {
- sh 'mvn -B clean install -DskipTests -DskipAssembly'
-}
+stage('JDK 9') {
+ agent {
+label 'ubuntu'
+ }
+ tools {
+jdk 'JDK 1.9 (latest)'
+maven 'Maven (latest)'
+ }
+ environment {
+MAVEN_OPTS = "-Xmx1024m"
}
- stage('Test') {
-steps {
- sh 'mvn -B test'
- // step([$class: 'JiraIssueUpdater', issueSelector: [$class:
'DefaultIssueSelector'], scm: scm])
+ stages {
+stage('Build') {
+ steps {
+sh 'mvn -B clean install -DskipTests -DskipAssembly'
+ }
}
-post {
- always {
-junit(testResults: '**/surefire-reports/*.xml',
allowEmptyResults: true)
-junit(testResults: '**/failsafe-reports/*.xml',
allowEmptyResults: true)
+stage('Test') {
+ steps {
+sh 'mvn -B test'
+// step([$class: 'JiraIssueUpdater', issueSelector: [$class:
'DefaultIssueSelector'], scm: scm])
+ }
+ post {
+always {
+ junit(testResults: '**/surefire-reports/*.xml',
allowEmptyResults: true)
+ junit(testResults: '**/failsafe-reports/*.xml',
allowEmptyResults: true)
+}
}
}
}
-}
-post {
- always {
-cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**',
type: 'INCLUDE']]
+ post {
+always {
+ cleanWs deleteDirs: true, patterns: [[
[cxf] branch master updated: created Jenkinsfile based on https://github.com/apache/struts/blob/master/Jenkinsfile
This is an automated email from the ASF dual-hosted git repository.
deki 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 ef53e68 created Jenkinsfile based on
https://github.com/apache/struts/blob/master/Jenkinsfile
ef53e68 is described below
commit ef53e68a21747a39198db22a3dbf804512fbebab
Author: Dennis Kieselhorst
AuthorDate: Fri Jul 24 07:20:19 2020 +0200
created Jenkinsfile based on
https://github.com/apache/struts/blob/master/Jenkinsfile
---
Jenkinsfile | 240
1 file changed, 240 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..a41fc4b
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,240 @@
+#!groovy
+
+pipeline {
+ agent none
+ options {
+buildDiscarder logRotator(daysToKeepStr: '14', numToKeepStr: '10')
+timeout(80)
+disableConcurrentBuilds()
+skipStagesAfterUnstable()
+quietPeriod(30)
+ }
+ triggers {
+pollSCM 'H/15 * * * *'
+ }
+ stages {
+stage('Prepare') {
+ agent {
+label 'ubuntu'
+ }
+ stages {
+stage('Clean up') {
+ steps {
+cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**',
type: 'INCLUDE']]
+ }
+}
+ }
+}
+parallel {
+ stage('JDK 11') {
+agent {
+ label 'ubuntu'
+}
+tools {
+ jdk 'JDK 11 (latest)'
+ maven 'Maven (latest)'
+}
+environment {
+ MAVEN_OPTS = "-Xmx1024m"
+}
+stages {
+ stage('Build') {
+steps {
+ sh 'mvn -B clean install -DskipTests -DskipAssembly'
+}
+ }
+ stage('Test') {
+steps {
+ sh 'mvn -B test'
+ // step([$class: 'JiraIssueUpdater', issueSelector: [$class:
'DefaultIssueSelector'], scm: scm])
+}
+post {
+ always {
+junit(testResults: '**/surefire-reports/*.xml',
allowEmptyResults: true)
+junit(testResults: '**/failsafe-reports/*.xml',
allowEmptyResults: true)
+ }
+}
+ }
+}
+post {
+ always {
+cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**',
type: 'INCLUDE']]
+ }
+}
+ }
+ stage('JDK 9') {
+agent {
+ label 'ubuntu'
+}
+tools {
+ jdk 'JDK 1.9 (latest)'
+ maven 'Maven (latest)'
+}
+environment {
+ MAVEN_OPTS = "-Xmx1024m"
+}
+stages {
+ stage('Build') {
+steps {
+ sh 'mvn -B clean install -DskipTests -DskipAssembly'
+}
+ }
+ stage('Test') {
+steps {
+ sh 'mvn -B test'
+ // step([$class: 'JiraIssueUpdater', issueSelector: [$class:
'DefaultIssueSelector'], scm: scm])
+}
+post {
+ always {
+junit(testResults: '**/surefire-reports/*.xml',
allowEmptyResults: true)
+junit(testResults: '**/failsafe-reports/*.xml',
allowEmptyResults: true)
+ }
+}
+ }
+}
+post {
+ always {
+cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**',
type: 'INCLUDE']]
+ }
+}
+ }
+ stage('JDK 8') {
+agent {
+ label 'ubuntu'
+}
+tools {
+ jdk 'JDK 1.8 (latest)'
+ maven 'Maven (latest)'
+}
+environment {
+ MAVEN_OPTS = "-Xmx1024m"
+}
+stages {
+ stage('Build') {
+steps {
+ sh 'mvn -B clean install -DskipTests -DskipAssembly'
+}
+ }
+ stage('Test') {
+steps {
+ sh 'mvn -B test'
+ // step([$class: 'JiraIssueUpdater', issueSelector: [$class:
'DefaultIssueSelector'], scm: scm])
+}
+post {
+ always {
+junit(testResults: '**/surefire-reports/*.xml',
allowEmptyResults: true)
+junit(testResults: '**/failsafe-reports/*.xml',
allowEmptyResults: true)
+ }
+}
+ }
+ stage('Build Source & JavaDoc') {
+when {
+ branch 'master'
+}
+steps {
+ dir("local-snapshots-dir/") {
+deleteDir()
+ }
+ sh 'mvn -B source:jar javadoc:jar -DskipAssembbly'
+}
+ }
+}
+stage('Deploy Snapshot') {
+ when {
+branch 'master'
+ }
+ steps {
+withCredentials([file(credentialsId:
'lukaszlenart-reposito
[cxf] branch master updated: Update Swagger UI to 3.30.0
This is an automated email from the ASF dual-hosted git repository. deki 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 45ac631 Update Swagger UI to 3.30.0 45ac631 is described below commit 45ac63164794165bb2fe8364cca5bfa71b8f096d Author: Dennis Kieselhorst AuthorDate: Wed Jul 22 21:18:44 2020 +0200 Update Swagger UI to 3.30.0 --- distribution/src/main/release/samples/pom.xml | 2 +- parent/pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index 80fe370..d19341e 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -34,7 +34,7 @@ 2.2.3.RELEASE 9.4.30.v20200611 4.5.9 -3.28.0 +3.30.0 1.24.1 9.0.37 diff --git a/parent/pom.xml b/parent/pom.xml index 3cb79ab..242fb69 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -197,7 +197,7 @@ 5.3.3.RELEASE 5.2.8.RELEASE 1.8.3 -3.25.5 +3.30.0 2.1.3 1.6.2 27.0-jre
[cxf] branch master updated: CXF-8301: added spring-boot-starter-validation as per https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.3-Release-Notes#validation-starter-no-longer-includ
This is an automated email from the ASF dual-hosted git repository.
deki 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 b4fe6a1 CXF-8301: added spring-boot-starter-validation as per
https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.3-Release-Notes#validation-starter-no-longer-included-in-web-starters
b4fe6a1 is described below
commit b4fe6a1f375df372a15603073fdb3f5a68e73383
Author: Dennis Kieselhorst
AuthorDate: Wed Jul 22 20:17:24 2020 +0200
CXF-8301: added spring-boot-starter-validation as per
https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.3-Release-Notes#validation-starter-no-longer-included-in-web-starters
---
integration/spring-boot/starter-jaxrs/pom.xml | 4
integration/spring-boot/starter-jaxws/pom.xml | 4
parent/pom.xml| 5 +
3 files changed, 13 insertions(+)
diff --git a/integration/spring-boot/starter-jaxrs/pom.xml
b/integration/spring-boot/starter-jaxrs/pom.xml
index f617e36..6b2b30f 100644
--- a/integration/spring-boot/starter-jaxrs/pom.xml
+++ b/integration/spring-boot/starter-jaxrs/pom.xml
@@ -78,5 +78,9 @@
jakarta.validation
jakarta.validation-api
+
+org.springframework.boot
+spring-boot-starter-validation
+
diff --git a/integration/spring-boot/starter-jaxws/pom.xml
b/integration/spring-boot/starter-jaxws/pom.xml
index 1f8a145..143e2a8 100644
--- a/integration/spring-boot/starter-jaxws/pom.xml
+++ b/integration/spring-boot/starter-jaxws/pom.xml
@@ -73,5 +73,9 @@
jakarta.validation
jakarta.validation-api
+
+org.springframework.boot
+spring-boot-starter-validation
+
diff --git a/parent/pom.xml b/parent/pom.xml
index 0099bcf..3cb79ab 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1362,6 +1362,11 @@
${cxf.spring.boot.version}
+org.springframework.boot
+spring-boot-starter-validation
+${cxf.spring.boot.version}
+
+
org.springframework.security
spring-security-web
${cxf.spring.security.version}
[cxf] branch master updated: CXF-8301: Upgrade to Spring Boot 2.3.1
This is an automated email from the ASF dual-hosted git repository. deki 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 f6d7593 CXF-8301: Upgrade to Spring Boot 2.3.1 f6d7593 is described below commit f6d7593cc52cc406ba4d837b4eeca042ec796909 Author: Dennis Kieselhorst AuthorDate: Wed Jul 22 14:46:25 2020 +0200 CXF-8301: Upgrade to Spring Boot 2.3.1 --- distribution/src/main/release/samples/pom.xml | 2 +- parent/pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index 6e8fe12..80fe370 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -30,7 +30,7 @@ true UTF-8 -2.2.8.RELEASE +2.3.1.RELEASE 2.2.3.RELEASE 9.4.30.v20200611 4.5.9 diff --git a/parent/pom.xml b/parent/pom.xml index 2be06c2..9c3b378 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -190,7 +190,7 @@ 1.7.30 1.26 2.3_2 -2.2.8.RELEASE +2.3.1.RELEASE 2.3.3.RELEASE spring-test 1.2.1
[cxf] branch master updated: synced dependency versions in samples with CXF parent
This is an automated email from the ASF dual-hosted git repository. deki 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 f650921 synced dependency versions in samples with CXF parent f650921 is described below commit f65092143ec9b069c5db03ba1eb71aeb76cc0306 Author: Dennis Kieselhorst AuthorDate: Wed Jul 22 09:49:39 2020 +0200 synced dependency versions in samples with CXF parent --- distribution/src/main/release/samples/pom.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index ddf5f0e..6e8fe12 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -30,11 +30,11 @@ true UTF-8 -2.2.7.RELEASE - 2.2.1.RELEASE -9.4.28.v20200408 - 4.5.8 -3.25.3 +2.2.8.RELEASE + 2.2.3.RELEASE +9.4.30.v20200611 + 4.5.9 +3.28.0 1.24.1 9.0.37
[cxf] branch master updated: CXF-8301: replaced deprecated OutputCapture class to allow compilation with Spring Boot 2.3.x
This is an automated email from the ASF dual-hosted git repository.
deki 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 bcce011 CXF-8301: replaced deprecated OutputCapture class to allow
compilation with Spring Boot 2.3.x
bcce011 is described below
commit bcce0112112ab8c75a339a69e5445eb9a5c2c92f
Author: Dennis Kieselhorst
AuthorDate: Wed Jul 22 09:46:28 2020 +0200
CXF-8301: replaced deprecated OutputCapture class to allow compilation with
Spring Boot 2.3.x
---
.../src/test/java/sample/ws/service/SampleWsApplicationTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
b/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
index 8eb7ea0..944a7f7 100644
---
a/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
+++
b/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
@@ -32,7 +32,7 @@ import org.junit.runner.RunWith;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.ws.client.core.WebServiceTemplate;
@@ -48,7 +48,7 @@ public class SampleWsApplicationTest {
//CHECKSTYLE:OFF
@Rule
-public OutputCapture output = new OutputCapture(); // SUPPRESS CHECKSTYLE
+public OutputCaptureRule output = new OutputCaptureRule(); // SUPPRESS
CHECKSTYLE
//CHECKSTYLE:ON
private WebServiceTemplate webServiceTemplate = new WebServiceTemplate();
[cxf] branch master updated: Update Woodstox to 6.2.1 and Stax-API to 4.2.1
This is an automated email from the ASF dual-hosted git repository. deki 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 52edc68 Update Woodstox to 6.2.1 and Stax-API to 4.2.1 52edc68 is described below commit 52edc68ce786ae42accb285570c545438be9cee7 Author: Dennis Kieselhorst AuthorDate: Tue Jul 21 21:46:51 2020 +0200 Update Woodstox to 6.2.1 and Stax-API to 4.2.1 --- parent/pom.xml | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 3d743d4..54481ac 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -214,8 +214,8 @@ 2.0.2 2.2 2.23.2 -6.2.0 -4.2 +6.2.1 +4.2.1 1.6.3 2.3.0 2.7.2 @@ -833,6 +833,10 @@ junit junit + +javax.enterprise +cdi-api +
[cxf] branch master updated (3b11ad4 -> 7c59556)
This is an automated email from the ASF dual-hosted git repository. deki pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from 3b11ad4 Changing Catalog files to use XML format add 59d5e10 CXF-8206 Update to saaj-impl 1.5.2 new 7c59556 Merge pull request #672 from apache/saaj-impl The 1 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: core/pom.xml | 2 ++ distribution/src/main/release/samples/pom.xml | 3 ++- osgi/karaf/features/src/main/resources/features.xml | 12 +++- parent/pom.xml| 18 +- .../org/apache/cxf/systest/ws/x509/X509TokenTest.java | 19 +++ 5 files changed, 23 insertions(+), 31 deletions(-)
[cxf] 01/01: Merge pull request #672 from apache/saaj-impl
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git commit 7c5955664473347c17882ced921e14f9b9e643b7 Merge: 3b11ad4 59d5e10 Author: Dennis Kieselhorst AuthorDate: Wed Jul 15 21:02:12 2020 +0200 Merge pull request #672 from apache/saaj-impl CXF-8206 Update to saaj-impl 1.5.2 core/pom.xml | 2 ++ distribution/src/main/release/samples/pom.xml | 3 ++- osgi/karaf/features/src/main/resources/features.xml | 12 +++- parent/pom.xml| 18 +- .../org/apache/cxf/systest/ws/x509/X509TokenTest.java | 19 +++ 5 files changed, 23 insertions(+), 31 deletions(-)
[cxf] branch master updated: support xbean-asm8 shade
This is an automated email from the ASF dual-hosted git repository.
deki 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 ffb3dd0 support xbean-asm8 shade
new dbf838d Merge pull request #668 from rmannibucau/patch-2
ffb3dd0 is described below
commit ffb3dd02e3f97f379b3f78a543dd915548e71789
Author: Romain Manni-Bucau
AuthorDate: Fri May 1 09:02:13 2020 +0200
support xbean-asm8 shade
---
core/src/main/java/org/apache/cxf/common/util/ASMHelper.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
b/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
index c3afe46..fcb3a98 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
@@ -93,6 +93,7 @@ public class ASMHelper {
if (cwClass == null) {
//try the "real" asm first, then the others
tryClass("org.objectweb.asm.ClassWriter");
+tryClass("org.apache.xbean.asm8.ClassWriter");
tryClass("org.apache.xbean.asm7.ClassWriter");
tryClass("org.apache.xbean.asm5.ClassWriter");
tryClass("org.apache.xbean.asm6.ClassWriter");
[cxf] branch master updated: update Maven minor version
This is an automated email from the ASF dual-hosted git repository. deki 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 375b065 update Maven minor version 375b065 is described below commit 375b065fa6c6fdc73b2d137654f5b60cc3464793 Author: Dennis Kieselhorst AuthorDate: Sun Apr 19 12:11:03 2020 +0200 update Maven minor version --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2c07488..1c8cc60 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -159,7 +159,7 @@ 1.1.2 1.2.3 8.2.0 -3.6.2 +3.6.3 1.2 1.4.1 1.1.2
[cxf] branch master updated: add old json-api coordinates to banned dependencies (Jakarta dependency should be used instead)
This is an automated email from the ASF dual-hosted git repository. deki 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 6f9303c add old json-api coordinates to banned dependencies (Jakarta dependency should be used instead) 6f9303c is described below commit 6f9303c1e94800ac453cc10e5268024fd2831418 Author: Dennis Kieselhorst AuthorDate: Sun Apr 12 15:36:21 2020 +0200 add old json-api coordinates to banned dependencies (Jakarta dependency should be used instead) --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 9a098a5..be98bdc 100644 --- a/pom.xml +++ b/pom.xml @@ -686,6 +686,8 @@ javax.annotation:javax.annotation-api javax.servlet:servlet-api + javax.json:javax.json-api +
[cxf] branch master updated: add old servlet-api coordinates to banned dependencies (Jakarta dependency should be used instead)
This is an automated email from the ASF dual-hosted git repository. deki 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 b5d0c54 add old servlet-api coordinates to banned dependencies (Jakarta dependency should be used instead) b5d0c54 is described below commit b5d0c54ed4f8d647e2094807f54470ada0e11c99 Author: Dennis Kieselhorst AuthorDate: Sun Apr 12 11:55:59 2020 +0200 add old servlet-api coordinates to banned dependencies (Jakarta dependency should be used instead) --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 1651b62..9a098a5 100644 --- a/pom.xml +++ b/pom.xml @@ -685,6 +685,7 @@ com.sun.activation:javax.activation javax.annotation:javax.annotation-api + javax.servlet:servlet-api
[cxf] 01/01: Merge pull request #657 from apache/CXF-8151_bean-validation
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git commit 55de869117d93853e5dccaee878e86a38d6f057b Merge: bc31b97 61c6740 Author: Dennis Kieselhorst AuthorDate: Thu Apr 9 08:33:43 2020 +0200 Merge pull request #657 from apache/CXF-8151_bean-validation [CXF-8151] Upgrade to Bean Validation 2.x and Hibernate Validator 6.1.0 core/pom.xml | 4 ++-- distribution/javadoc/pom.xml | 4 ++-- .../samples/jax_rs/description_swagger2_web/pom.xml| 4 ++-- integration/spring-boot/autoconfigure/pom.xml | 16 +--- integration/spring-boot/starter-jaxrs/pom.xml | 4 ++-- integration/spring-boot/starter-jaxws/pom.xml | 4 ++-- osgi/itests/pom.xml| 2 +- osgi/karaf/features/src/main/resources/features.xml| 11 ++- parent/pom.xml | 18 +- rt/frontend/jaxrs/pom.xml | 4 ++-- rt/rs/description-swagger/pom.xml | 1 + systests/cdi/base/pom.xml | 4 ++-- systests/cdi/cdi-owb/pom.xml | 6 +++--- systests/cdi/cdi-weld/pom.xml | 6 +++--- systests/cdi/pom.xml | 2 +- systests/jaxrs/pom.xml | 6 +++--- systests/spring-boot/pom.xml | 9 - tools/wadlto/jaxrs/pom.xml | 4 ++-- 18 files changed, 48 insertions(+), 61 deletions(-)
[cxf] branch master updated (bc31b97 -> 55de869)
This is an automated email from the ASF dual-hosted git repository. deki pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from bc31b97 CXF-8254 - NPE in WebFaultOutInterceptor handleMessage method add 95dc2d0 [CXF-8151] Upgrade to Bean Validation 2.x and Hibernate Validator 6.1.0 add aa99567 [CXF-8151] Upgrade to Swagger Core 2.1.2 add f1fa1e7 [CXF-8151] also update Swagger 1.x to 1.6.1 add 22a365b [CXF-8151] Upgrade to classgraph 4.8.25 add 0af6ac0 [CXF-8151] Upgrade to hibernate-validator 6.1.2.Final add 694741b Karaf features: downgrade javax.validation for swagger2 add 61c6740 [CXF-8151] Upgrade to validation-api 2.0.2 new 55de869 Merge pull request #657 from apache/CXF-8151_bean-validation The 1 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: core/pom.xml | 4 ++-- distribution/javadoc/pom.xml | 4 ++-- .../samples/jax_rs/description_swagger2_web/pom.xml| 4 ++-- integration/spring-boot/autoconfigure/pom.xml | 16 +--- integration/spring-boot/starter-jaxrs/pom.xml | 4 ++-- integration/spring-boot/starter-jaxws/pom.xml | 4 ++-- osgi/itests/pom.xml| 2 +- osgi/karaf/features/src/main/resources/features.xml| 11 ++- parent/pom.xml | 18 +- rt/frontend/jaxrs/pom.xml | 4 ++-- rt/rs/description-swagger/pom.xml | 1 + systests/cdi/base/pom.xml | 4 ++-- systests/cdi/cdi-owb/pom.xml | 6 +++--- systests/cdi/cdi-weld/pom.xml | 6 +++--- systests/cdi/pom.xml | 2 +- systests/jaxrs/pom.xml | 6 +++--- systests/spring-boot/pom.xml | 9 - tools/wadlto/jaxrs/pom.xml | 4 ++-- 18 files changed, 48 insertions(+), 61 deletions(-)
[cxf] branch master updated (de221ef -> bcb05eb)
This is an automated email from the ASF dual-hosted git repository. deki pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from de221ef Updating to Spring Security 5.3.1.RELEASE add 797fa44 [CXF-7949] Upgrade to Jakarta Servlet API 4.0.3 add daf7c2a [CXF-7949] Remove cxf.servlet-api-2.5.* properties add 5bc1e0e [CXF-7949] Upgrade to Tomcat 9.0.30 add 4a56c1e [CXF-7949] fix tests used embded Tomcat add 12b80dc Update to Tomcat 9.0.31 add 2e7df5d Update to tomcat 9.0.33 new bcb05eb Merge pull request #626 from apache/CXF-7949_jakarta-servlet The 1 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: .../src/main/release/samples/oauth/client/pom.xml | 4 +-- .../src/main/release/samples/ws_eventing/pom.xml | 6 ++-- .../cxf/osgi/itests/NoAriesBlueprintTest.java | 2 +- parent/pom.xml | 15 +++-- rt/frontend/jaxrs/pom.xml | 4 +-- .../jaxrs/impl/tl/ThreadLocalServletContext.java | 28 rt/transports/http-netty/netty-server/pom.xml | 1 + systests/cdi/base/pom.xml | 4 --- .../cdi/base/tomcat/AbstractTomcatServer.java | 30 + systests/cdi/cdi-owb/pom.xml | 4 --- systests/cdi/cdi-weld/pom.xml | 2 +- systests/cdi/pom.xml | 38 +- systests/rs-sse/pom.xml| 12 --- .../jaxrs/sse/tomcat/AbstractTomcatServer.java | 37 +++-- systests/rs-sse/rs-sse-undertow/pom.xml| 5 +++ 15 files changed, 68 insertions(+), 124 deletions(-)
[cxf] 01/01: Merge pull request #626 from apache/CXF-7949_jakarta-servlet
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git commit bcb05eb7d1c26dfd427523a2ca5c62c676591763 Merge: de221ef 2e7df5d Author: Dennis Kieselhorst AuthorDate: Fri Apr 3 10:52:41 2020 +0200 Merge pull request #626 from apache/CXF-7949_jakarta-servlet CXF-7949: Jakarta Servlet API .../src/main/release/samples/oauth/client/pom.xml | 4 +-- .../src/main/release/samples/ws_eventing/pom.xml | 6 ++-- .../cxf/osgi/itests/NoAriesBlueprintTest.java | 2 +- parent/pom.xml | 15 +++-- rt/frontend/jaxrs/pom.xml | 4 +-- .../jaxrs/impl/tl/ThreadLocalServletContext.java | 28 rt/transports/http-netty/netty-server/pom.xml | 1 + systests/cdi/base/pom.xml | 4 --- .../cdi/base/tomcat/AbstractTomcatServer.java | 30 + systests/cdi/cdi-owb/pom.xml | 4 --- systests/cdi/cdi-weld/pom.xml | 2 +- systests/cdi/pom.xml | 38 +- systests/rs-sse/pom.xml| 12 --- .../jaxrs/sse/tomcat/AbstractTomcatServer.java | 37 +++-- systests/rs-sse/rs-sse-undertow/pom.xml| 5 +++ 15 files changed, 68 insertions(+), 124 deletions(-)
[cxf] 02/06: [CXF-7949] Remove cxf.servlet-api-2.5.* properties
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch CXF-7949_jakarta-servlet
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit daf7c2a073f8ae11613bc8e2f02a2225f6162d5f
Author: Dennis Kieselhorst
AuthorDate: Sun Jan 19 18:03:55 2020 +0100
[CXF-7949] Remove cxf.servlet-api-2.5.* properties
---
parent/pom.xml| 7 ---
rt/transports/http-netty/netty-server/pom.xml | 1 +
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 39e0b26..df8b46d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -186,8 +186,6 @@
1.7R2
1.3.8
2.2.19
-
geronimo-servlet_2.5_spec
-1.2
jakarta.servlet-api
jakarta.servlet
4.0.3
@@ -2149,11 +2147,6 @@
${cxf.servlet-api.version}
-org.apache.geronimo.specs
-${cxf.servlet-api-2.5.artifact}
-${cxf.servlet-api-2.5.version}
-
-
org.apache.geronimo.javamail
geronimo-javamail_1.4_mail
1.8.4
diff --git a/rt/transports/http-netty/netty-server/pom.xml
b/rt/transports/http-netty/netty-server/pom.xml
index 21a4d14..05ef60b 100644
--- a/rt/transports/http-netty/netty-server/pom.xml
+++ b/rt/transports/http-netty/netty-server/pom.xml
@@ -65,6 +65,7 @@
org.apache.geronimo.specs
geronimo-servlet_2.5_spec
+1.2
org.apache.aries.blueprint
[cxf] branch CXF-7949_jakarta-servlet updated (40f5d8d -> 2e7df5d)
This is an automated email from the ASF dual-hosted git repository. deki pushed a change to branch CXF-7949_jakarta-servlet in repository https://gitbox.apache.org/repos/asf/cxf.git. discard 40f5d8d Merge branch 'master-apache' into CXF-7949_jakarta-servlet omit 03a6e4f Update to tomcat 9.0.33 omit bbe076c Merge remote-tracking branch 'origin/master' into CXF-7949_jakarta-servlet omit 36f7194 fix org.apache.cxf.osgi.itests-felix omit 95b89ec Merge remote-tracking branch 'origin/master' into CXF-7949_jakarta-servlet omit 6cf8723 Update to Tomcat 9.0.31 omit 8312bc3 Merge remote-tracking branch 'origin/master' into CXF-7949_jakarta-servlet omit 92ff806 Merge branch 'master-apache' into CXF-7949_jakarta-servlet omit 61658050 [CXF-7949] fix tests used embded Tomcat omit 2ef4c7a [CXF-7949] Upgrade to Tomcat 9.0.30 omit d4ee432 [CXF-7949] Remove cxf.servlet-api-2.5.* properties omit 2669521 [CXF-7949] Upgrade to Jakarta Servlet API 4.0.3 new 797fa44 [CXF-7949] Upgrade to Jakarta Servlet API 4.0.3 new daf7c2a [CXF-7949] Remove cxf.servlet-api-2.5.* properties new 5bc1e0e [CXF-7949] Upgrade to Tomcat 9.0.30 new 4a56c1e [CXF-7949] fix tests used embded Tomcat new 12b80dc Update to Tomcat 9.0.31 new 2e7df5d Update to tomcat 9.0.33 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (40f5d8d) \ N -- N -- N refs/heads/CXF-7949_jakarta-servlet (2e7df5d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 6 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:
[cxf] 06/06: Update to tomcat 9.0.33
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch CXF-7949_jakarta-servlet in repository https://gitbox.apache.org/repos/asf/cxf.git commit 2e7df5d8cdbc5b1bb596ced069e80d85b0284b10 Author: Alexey Markevich AuthorDate: Wed Mar 18 18:19:17 2020 +0300 Update to tomcat 9.0.33 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 414c1fd..0d23919 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -204,7 +204,7 @@ 1.6.0 27.0-jre 1.24 -9.0.31 +9.0.33 1.3 [1.4,3.0) 2.0.30.Final
[cxf] 01/06: [CXF-7949] Upgrade to Jakarta Servlet API 4.0.3
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch CXF-7949_jakarta-servlet
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 797fa441e318dfa1214f7edaa6e090cd52095bae
Author: Dennis Kieselhorst
AuthorDate: Sun Jan 19 18:01:29 2020 +0100
[CXF-7949] Upgrade to Jakarta Servlet API 4.0.3
---
.../src/main/release/samples/oauth/client/pom.xml | 4 ++--
.../src/main/release/samples/ws_eventing/pom.xml | 6 ++---
.../cxf/osgi/itests/NoAriesBlueprintTest.java | 2 +-
parent/pom.xml | 6 ++---
rt/frontend/jaxrs/pom.xml | 4 ++--
.../jaxrs/impl/tl/ThreadLocalServletContext.java | 28 ++
6 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/distribution/src/main/release/samples/oauth/client/pom.xml
b/distribution/src/main/release/samples/oauth/client/pom.xml
index cf4cafd..4c78932 100644
--- a/distribution/src/main/release/samples/oauth/client/pom.xml
+++ b/distribution/src/main/release/samples/oauth/client/pom.xml
@@ -84,8 +84,8 @@
20100527
-javax.servlet
-javax.servlet-api
+jakarta.servlet
+jakarta.servlet-api
standard
diff --git a/distribution/src/main/release/samples/ws_eventing/pom.xml
b/distribution/src/main/release/samples/ws_eventing/pom.xml
index 95b7aed..93461a0 100644
--- a/distribution/src/main/release/samples/ws_eventing/pom.xml
+++ b/distribution/src/main/release/samples/ws_eventing/pom.xml
@@ -62,9 +62,9 @@
${project.version}
-javax.servlet
-javax.servlet-api
-3.1.0
+jakarta.servlet
+jakarta.servlet-api
+4.0.3
provided
diff --git
a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
index 10ff3d2..e6f0d34 100644
---
a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
+++
b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
@@ -72,7 +72,7 @@ public class NoAriesBlueprintTest extends OSGiTestSupport {
mavenBundle("org.apache.cxf",
"cxf-rt-bindings-xml").versionAsInProject(),
mavenBundle("org.apache.cxf",
"cxf-rt-bindings-soap").versionAsInProject(),
mavenBundle("org.apache.cxf",
"cxf-rt-frontend-simple").versionAsInProject(),
-mavenBundle("javax.servlet",
"javax.servlet-api").versionAsInProject(),
+mavenBundle("jakarta.servlet",
"jakarta.servlet-api").versionAsInProject(),
mavenBundle("org.apache.cxf",
"cxf-rt-transports-http").versionAsInProject(),
mavenBundle("org.apache.cxf",
"cxf-rt-frontend-jaxws").versionAsInProject(),
junitBundles(),
diff --git a/parent/pom.xml b/parent/pom.xml
index 34ebe0b..39e0b26 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -188,9 +188,9 @@
2.2.19
geronimo-servlet_2.5_spec
1.2
-javax.servlet-api
-javax.servlet
-3.1.0
+
jakarta.servlet-api
+jakarta.servlet
+4.0.3
1.7.29
1.25
2.3_2
diff --git a/rt/frontend/jaxrs/pom.xml b/rt/frontend/jaxrs/pom.xml
index 2ef4789..5c16df0 100644
--- a/rt/frontend/jaxrs/pom.xml
+++ b/rt/frontend/jaxrs/pom.xml
@@ -120,8 +120,8 @@
${project.version}
-javax.servlet
-javax.servlet-api
+jakarta.servlet
+jakarta.servlet-api
${cxf.servlet-api.version}
provided
true
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java
index 687a729..48c6196 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java
@@ -269,4 +269,32 @@ public class ThreadLocalServletContext extends
AbstractThreadLocalProxy
[cxf] 04/06: [CXF-7949] fix tests used embded Tomcat
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch CXF-7949_jakarta-servlet
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 4a56c1e3444b4c8dc51e2f919439c891c63bd903
Author: Alexey Markevich
AuthorDate: Mon Jan 20 15:25:08 2020 +0300
[CXF-7949] fix tests used embded Tomcat
---
systests/cdi/base/pom.xml | 4 ---
.../cdi/base/tomcat/AbstractTomcatServer.java | 30 +
systests/cdi/cdi-owb/pom.xml | 4 ---
systests/cdi/pom.xml | 38 +-
systests/rs-sse/pom.xml| 12 ---
.../jaxrs/sse/tomcat/AbstractTomcatServer.java | 37 +++--
systests/rs-sse/rs-sse-undertow/pom.xml| 5 +++
7 files changed, 26 insertions(+), 104 deletions(-)
diff --git a/systests/cdi/base/pom.xml b/systests/cdi/base/pom.xml
index b6dd4c2..1e80cca 100644
--- a/systests/cdi/base/pom.xml
+++ b/systests/cdi/base/pom.xml
@@ -40,10 +40,6 @@
org.eclipse.jetty
-jetty-plus
-
-
-org.eclipse.jetty
jetty-webapp
diff --git
a/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/tomcat/AbstractTomcatServer.java
b/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/tomcat/AbstractTomcatServer.java
index bc45212..e992639 100644
---
a/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/tomcat/AbstractTomcatServer.java
+++
b/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/tomcat/AbstractTomcatServer.java
@@ -19,21 +19,22 @@
package org.apache.cxf.systests.cdi.base.tomcat;
-import java.io.File;
-import java.io.IOException;
import java.nio.file.Files;
+import java.nio.file.Path;
import org.apache.catalina.startup.Tomcat;
+import org.apache.cxf.helpers.FileUtils;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import static org.junit.Assert.fail;
public abstract class AbstractTomcatServer extends AbstractBusTestServerBase {
-private Tomcat server;
private final String resourcePath;
private final String contextPath;
private final int port;
+private Tomcat server;
+private Path base;
protected AbstractTomcatServer(final String resourcePath, final String
contextPath, int portNumber) {
this.resourcePath = resourcePath;
@@ -47,12 +48,13 @@ public abstract class AbstractTomcatServer extends
AbstractBusTestServerBase {
server = new Tomcat();
server.setPort(port);
+server.getConnector();
try {
-final File base = createTemporaryDirectory();
-server.setBaseDir(base.getAbsolutePath());
+base = Files.createTempDirectory("tmp-");
+server.setBaseDir(base.toString());
-server.getHost().setAppBase(base.getAbsolutePath());
+server.getHost().setAppBase(base.toString());
server.getHost().setAutoDeploy(true);
server.getHost().setDeployOnStartup(true);
@@ -64,21 +66,6 @@ public abstract class AbstractTomcatServer extends
AbstractBusTestServerBase {
}
}
-private static File createTemporaryDirectory() throws IOException {
-final File base = Files.createTempFile("tmp-", "").toFile();
-
-if (!base.delete()) {
-throw new IOException("Cannot (re)create base folder: " +
base.getAbsolutePath());
-}
-
-if (!base.mkdir()) {
-throw new IOException("Cannot create base folder: " +
base.getAbsolutePath());
-}
-
-base.deleteOnExit();
-return base;
-}
-
public void tearDown() throws Exception {
super.tearDown();
@@ -86,6 +73,7 @@ public abstract class AbstractTomcatServer extends
AbstractBusTestServerBase {
server.stop();
server.destroy();
server = null;
+FileUtils.removeDir(base.toFile());
}
}
}
diff --git a/systests/cdi/cdi-owb/pom.xml b/systests/cdi/cdi-owb/pom.xml
index 6074890..866814c 100644
--- a/systests/cdi/cdi-owb/pom.xml
+++ b/systests/cdi/cdi-owb/pom.xml
@@ -86,10 +86,6 @@
org.apache.cxf
-cxf-core
-
-
-org.apache.cxf
cxf-rt-transports-http-jetty
diff --git a/systests/cdi/pom.xml b/systests/cdi/pom.xml
index e8ac98a..9622dc6 100644
--- a/systests/cdi/pom.xml
+++ b/systests/cdi/pom.xml
@@ -33,7 +33,7 @@
https://cxf.apache.org
3.0.1-b11
-2.0.8
+2.0.14
base
@@ -54,11 +54,6 @@
org.eclipse.jetty
-jetty-plus
-${cxf.jetty.version}
-
-
-
[cxf] 03/06: [CXF-7949] Upgrade to Tomcat 9.0.30
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch CXF-7949_jakarta-servlet in repository https://gitbox.apache.org/repos/asf/cxf.git commit 5bc1e0eee7a74f7b47f3c9a4358c56c2f01090f8 Author: Dennis Kieselhorst AuthorDate: Sun Jan 19 18:05:16 2020 +0100 [CXF-7949] Upgrade to Tomcat 9.0.30 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index df8b46d..0acfcf1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -204,7 +204,7 @@ 1.6.0 27.0-jre 1.24 -8.5.53 +9.0.30 1.3 [1.4,3.0) 2.0.30.Final
[cxf] 05/06: Update to Tomcat 9.0.31
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch CXF-7949_jakarta-servlet in repository https://gitbox.apache.org/repos/asf/cxf.git commit 12b80dcd143a56a0d4ee33e22633a4f0a435216e Author: Alexey Markevich AuthorDate: Sun Feb 16 22:32:30 2020 +0300 Update to Tomcat 9.0.31 --- parent/pom.xml| 2 +- systests/cdi/cdi-weld/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 0acfcf1..414c1fd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -204,7 +204,7 @@ 1.6.0 27.0-jre 1.24 -9.0.30 +9.0.31 1.3 [1.4,3.0) 2.0.30.Final diff --git a/systests/cdi/cdi-weld/pom.xml b/systests/cdi/cdi-weld/pom.xml index 6ab25a0..f611782 100644 --- a/systests/cdi/cdi-weld/pom.xml +++ b/systests/cdi/cdi-weld/pom.xml @@ -56,7 +56,7 @@ jboss-el-api_3.0_spec - + org.glassfish javax.el
[cxf] branch CXF-7949_jakarta-servlet updated (03a6e4f -> 40f5d8d)
This is an automated email from the ASF dual-hosted git repository. deki pushed a change to branch CXF-7949_jakarta-servlet in repository https://gitbox.apache.org/repos/asf/cxf.git. from 03a6e4f Update to tomcat 9.0.33 add 1ce6cb7 Removing some unused test code add b899a64 Updating Undertown to 2.0.30 add 4067920 Updating owasp to 5.3.1 add 3026d63 Updating Tika to 1.24 in the samples add 1e3817e Updating Jettison to 1.4.1 add 8f98004 cxf-rt-rs-security-oauth2: use lambdas in JPA add 16cbb21 CXF-8249: SSE client refuses to accept valid stream add 1c7ddfd Updating Spring Security to 5.3.0 add 794949e Adding an @Ignored test for RPC-Literal issue add 2e43632 Bridge/synthetic methods may not have the parameter annotations, search for the actual method to use add b563f7b Prevent SOAPAction spoofing for RPC/Lit services add 19c0024 Fixing checkstyle add a207359 examples: update plugins add dd976dd cxf-systests-microprofile-weld: rollback wiremock-maven-plugin version add 1cf4fed CXF-8250 - Remove createMBServerConnectorFactory functionality from the JMX InstrumentationManager add 93246fa Updating Spring to 5.2.5 add ccb743e Updating Jetty version in samples to 9.4.27.v20200227 add 67dbf83 Fixing samples build add 51417a1 Updating Spring Boot to 2.2.6 add 4ee3180 [CXF-8251]introduce a new property in http-undertow transport so that can enable http/2 if necessary add e73daaa examples: Updating Spring Boot to 2.2.6 add 0841019 Upgrade to Jakarta Xml Ws 2.3.3 add ea3f552 Upgrade to Jakarta Xml Bind 2.3.3 add f4f227b cxf-rt-bindings-corba: move jacorb dependency add 8b11d6b Consolidate getTargetMethod calls add 7aa6e0a Code review comments - use Optional add 0a62ccf Merge pull request #656 from andymc12/consolidateGetTargetMethod add 3921fc2 CXF-8242: Stop blocking executor thread on microprofile rest asynchronous call (#654) add a8fcf81 Adding build number to TCK Jenkins job build name add 5fdadf9 Update Commons Lang version to 3.10 add 12e20a5 Update Swagger UI to 3.25.0 add 2cff3ce Upgrade to Netty 4.1.48.Final add 6bc7f0c Upgrade to Jakarta Mail 1.6.5 add 9c2721f Upgrade to Rxjava2 2.2.19 add 4081929 cxf-services-xkms: update readme add c287485 CXF-8243 JwtAccessTokenValidator using the JWK Set URL (#652) add 7b4622f Adding a test case for TlS trustManager refs in Spring add c6b87a0 CXF-7998: add integration test add 3157955 CXF-8253 - Provide a way to disable TLS trust verification for the OSGi HttpConduitConfigApplier add 4f23c3f CXF-8242: Stop blocking executor thread on microprofile rest asynchronous call. Fixing handler invocation flow. add e0b16df CXF-8242: Stop blocking executor thread on microprofile rest asynchronous call. Fixing JAX-WS handler invocation flow. add de221ef Updating to Spring Security 5.3.1.RELEASE new 40f5d8d Merge branch 'master-apache' into CXF-7949_jakarta-servlet The 1 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: .../org/apache/cxf/endpoint/ClientCallback.java| 79 +++ .../security/AbstractAuthorizingInInterceptor.java | 20 +- .../java/org/apache/cxf/message/MessageUtils.java | 15 ++ .../validation/AbstractValidationInterceptor.java | 13 +- .../apache/cxf/endpoint/ClientCallbackTest.java| 164 + .../org/apache/cxf/message/MessageUtilsTest.java | 83 +++ .../validation/Stax2ValidationUtilsTest.java | 5 - distribution/manifest/pom.xml | 2 +- distribution/pom.xml | 2 +- .../src/main/release/samples/corba/bank/pom.xml| 9 - .../samples/corba/bank_ws_addressing/pom.xml | 13 +- .../jax_rs/description_openapi_v3_osgi/README.txt | 2 +- .../jax_rs/description_swagger2_osgi/README.txt| 2 +- distribution/src/main/release/samples/pom.xml | 22 +- .../main/java/demo/throttling/client/Client.java | 1 - .../main/resources/server-applicationContext.xml | 2 +- maven-plugins/codegen-plugin/pom.xml | 1 + .../Cxf7998Service-1.0.0.wsdl | 43 .../pom.xml| 79 --- .../src/it/jdk-cxf-with-toolchain/pom.xml | 4 +- .../codegen-plugin/src/it/mark-generated/pom.xml | 58 ++--- .../src/it/wsdl-artifact-resolution/pom.xml| 58 ++--- .../karaf/features/src/main/resources/features.xml | 2 +- parent/pom.xml | 55 +++-- pom.xml| 2 +- rt/bindings/corba/pom.xml |
[cxf] 01/01: Merge branch 'master-apache' into CXF-7949_jakarta-servlet
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch CXF-7949_jakarta-servlet in repository https://gitbox.apache.org/repos/asf/cxf.git commit 40f5d8d532cfbd973678723783bf48d1a5e29fd9 Merge: 03a6e4f de221ef Author: Dennis Kieselhorst AuthorDate: Fri Apr 3 08:32:27 2020 +0200 Merge branch 'master-apache' into CXF-7949_jakarta-servlet # Conflicts: # parent/pom.xml .../org/apache/cxf/endpoint/ClientCallback.java| 79 +++ .../security/AbstractAuthorizingInInterceptor.java | 20 +- .../java/org/apache/cxf/message/MessageUtils.java | 15 ++ .../validation/AbstractValidationInterceptor.java | 13 +- .../apache/cxf/endpoint/ClientCallbackTest.java| 164 + .../org/apache/cxf/message/MessageUtilsTest.java | 83 +++ .../validation/Stax2ValidationUtilsTest.java | 5 - distribution/manifest/pom.xml | 2 +- distribution/pom.xml | 2 +- .../src/main/release/samples/corba/bank/pom.xml| 9 - .../samples/corba/bank_ws_addressing/pom.xml | 13 +- .../jax_rs/description_openapi_v3_osgi/README.txt | 2 +- .../jax_rs/description_swagger2_osgi/README.txt| 2 +- distribution/src/main/release/samples/pom.xml | 22 +- .../main/java/demo/throttling/client/Client.java | 1 - .../main/resources/server-applicationContext.xml | 2 +- maven-plugins/codegen-plugin/pom.xml | 1 + .../Cxf7998Service-1.0.0.wsdl | 43 .../pom.xml| 79 --- .../src/it/jdk-cxf-with-toolchain/pom.xml | 4 +- .../codegen-plugin/src/it/mark-generated/pom.xml | 58 ++--- .../src/it/wsdl-artifact-resolution/pom.xml| 58 ++--- .../karaf/features/src/main/resources/features.xml | 2 +- parent/pom.xml | 55 +++-- pom.xml| 2 +- rt/bindings/corba/pom.xml | 17 ++ .../binding/soap/interceptor/Messages.properties | 1 + .../binding/soap/interceptor/RPCInInterceptor.java | 5 + .../cxf/jaxrs/provider/JAXRSDataBinding.java | 16 +- .../apache/cxf/jaxrs/utils/AnnotationUtils.java| 25 +- .../org/apache/cxf/jaxws/JaxwsClientCallback.java | 22 +- .../apache/cxf/jaxws/JaxwsClientCallbackTest.java | 162 + rt/management/pom.xml | 3 +- .../management/jmx/InstrumentationManagerImpl.java | 52 + .../management/jmx/MBServerConnectorFactory.java | 260 - .../cxf/management/utils/ManagementConsole.java| 2 +- .../cxf/management/InstrumentationManagerTest.java | 2 - .../cxf/management/jmx/BusRegistrationTest.java| 6 - .../jmx/JMXManagedComponentManagerTest.java| 23 +- .../jmx/MBServerConnectorFactoryTest.java | 55 - .../cxf/management/jmx/MBServerConnectorTest.java | 57 - .../src/test/resources/managed-spring.xml | 4 - .../src/test/resources/managed-spring3.xml | 4 - .../src/test/resources/no-connector-spring.xml | 1 - .../cxf/jaxrs/client/JaxrsClientCallback.java | 32 ++- .../cxf/jaxrs/client/JaxrsClientCallbackTest.java | 193 +++ .../microprofile/client/MPRestClientCallback.java | 31 +-- .../client/MPRestClientCallbackTest.java | 161 + .../cxf/rs/security/jose/jwt/JoseJwtConsumer.java | 2 +- .../filters/JwsJwksJwtAccessTokenValidator.java| 112 + .../oauth2/grants/code/JPACMTCodeDataProvider.java | 20 +- .../oauth2/grants/code/JPACodeDataProvider.java| 69 +++--- .../oauth2/provider/JPAOAuthDataProvider.java | 214 +++-- .../rs/security/oauth2/services/JwksService.java} | 9 +- .../JwsJwksJwtAccessTokenValidatorTest.java| 90 +++ .../cxf/rs/security/oidc/idp/OidcKeysService.java | 53 + .../jaxrs/sse/client/InboundSseEventProcessor.java | 50 +++- .../interceptor/ClaimsAuthorizingInterceptor.java | 20 +- .../http_undertow/UndertowHTTPServerEngine.java| 17 ++ .../http/osgi/HttpConduitConfigApplier.java| 10 +- .../cxf/transport/https/InsecureTrustManager.java | 68 ++ .../http/osgi/HttpConduitConfigApplierTest.java| 105 + .../org/apache/cxf/ws/rm/managed-manager-bean.xml | 3 - services/xkms/README.txt | 7 +- systests/microprofile/client/weld/pom.xml | 10 +- .../oauth2/filters/OAuth2JwtFiltersTest.java | 11 + .../oidc/filters/JwsSignatureVerifierProvider.java | 44 .../security/oidc/filters/OIDCFiltersTest.java | 49 .../security/oauth2/filters/filters-serverJwt.xml | 21 +- .../security/oauth2/filters/oauth20-serverJwt.xml | 5 +- .../security/oidc/filters/filters-jwks-server.xml | 106 - .../jaxrs/security/oidc/filters/oidc-server.xml| 7 +- .../cxf/systest/jaxrs
[cxf] branch CXF-8151_bean-validation updated: [CXF-8151] also update Swagger 1.x to 1.6.1
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch CXF-8151_bean-validation in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/CXF-8151_bean-validation by this push: new 519add7 [CXF-8151] also update Swagger 1.x to 1.6.1 519add7 is described below commit 519add74a5b4db0ee2b2fd211057f92fba08d7db Author: Dennis Kieselhorst AuthorDate: Fri Apr 3 08:05:01 2020 +0200 [CXF-8151] also update Swagger 1.x to 1.6.1 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index d6610b0..effec80 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -203,7 +203,7 @@ 1.7.6 3.25.0 2.1.2 -1.6.0 +1.6.1 27.0-jre 1.24 8.5.53
[cxf] branch master updated: Update Swagger UI to 3.25.0
This is an automated email from the ASF dual-hosted git repository. deki 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 12e20a5 Update Swagger UI to 3.25.0 12e20a5 is described below commit 12e20a5147f57dde28c1cfb08acbf1ccd8ba3402 Author: Dennis Kieselhorst AuthorDate: Sun Mar 29 19:59:22 2020 +0200 Update Swagger UI to 3.25.0 --- .../main/release/samples/jax_rs/description_openapi_v3_osgi/README.txt | 2 +- .../main/release/samples/jax_rs/description_swagger2_osgi/README.txt| 2 +- distribution/src/main/release/samples/pom.xml | 2 +- parent/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/README.txt b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/README.txt index a557f78..38e5af2 100644 --- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/README.txt +++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/README.txt @@ -48,7 +48,7 @@ for this demo bundle. Optionally, you could install Swagger UI into Karaf OSGi container: - install -s mvn:org.webjars/swagger-ui/3.24.3 + install -s mvn:org.webjars/swagger-ui/3.25.0 Install this demo bundle (using the appropriate bundle version number) diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt index 0f37447..8c074a8 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt @@ -48,7 +48,7 @@ for this demo bundle. Optionally, you could install Swagger UI into Karaf OSGi container: - install -s mvn:org.webjars/swagger-ui/3.24.3 + install -s mvn:org.webjars/swagger-ui/3.25.0 Install this demo bundle (using the appropriate bundle version number) diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index 9fa9a1e..57c188c 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -34,7 +34,7 @@ 2.2.1.RELEASE 9.4.27.v20200227 4.5.8 -3.24.3 +3.25.0 1.24 diff --git a/parent/pom.xml b/parent/pom.xml index e20d8e2..04b8171 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -201,7 +201,7 @@ 5.3.0.RELEASE 5.2.5.RELEASE 1.7.6 -3.24.3 +3.25.0 2.1.1 1.6.0 27.0-jre
[cxf] branch master updated: Update Commons Lang version to 3.10
This is an automated email from the ASF dual-hosted git repository. deki 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 5fdadf9 Update Commons Lang version to 3.10 5fdadf9 is described below commit 5fdadf993bdca0f431ebd4ecb07c0f535fa72ae7 Author: Dennis Kieselhorst AuthorDate: Sun Mar 29 19:55:47 2020 +0200 Update Commons Lang version to 3.10 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 036cb12..e20d8e2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -98,7 +98,7 @@ 1.13 3.2.2 2.1 -3.9 +3.10 1.2 1.8 10.14.2.0
[cxf] branch master updated: Update Velocity version to 2.2
This is an automated email from the ASF dual-hosted git repository. deki 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 92a00fc Update Velocity version to 2.2 92a00fc is described below commit 92a00fc05e2437d2d0cf98099060ba4e1f6dac99 Author: Dennis Kieselhorst AuthorDate: Mon Feb 3 21:55:41 2020 +0100 Update Velocity version to 2.2 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 4ace41d..8ea1890 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -214,7 +214,7 @@ with a qualifier. We do want a range. --> [1.0.0,2) 1.1.0.Final -2.1 +2.2 2.23.2 5.2.1 4.2
[cxf] branch master updated: [CXF-7996] added a testcase, currently failing
This is an automated email from the ASF dual-hosted git repository.
deki 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 74f8ead [CXF-7996] added a testcase, currently failing
74f8ead is described below
commit 74f8eadec22fed12c802cf087cad17163e49c59b
Author: Dennis Kieselhorst
AuthorDate: Sat Feb 1 22:20:59 2020 +0100
[CXF-7996] added a testcase, currently failing
---
.../org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java | 14 ++
1 file changed, 14 insertions(+)
diff --git
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java
index bbcf544..cbb3b94 100644
---
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java
+++
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/LinkBuilderImplTest.java
@@ -26,7 +26,9 @@ import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.core.Link;
import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriBuilderException;
+import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -101,6 +103,18 @@ public class LinkBuilderImplTest {
}
@Test
+@Ignore("to be fixed for TCK")
+public void testNoArgsThrowsUriBuilderExceptionTest() {
+Link.Builder builder = Link.fromUri("http://:@;);
+try {
+Link link = builder.build();
+fail("No exception has been thrown for link " + link);
+} catch (UriBuilderException e) {
+//expected
+}
+}
+
+@Test
public void testSeveralAttributes() throws Exception {
Link.Builder linkBuilder = new LinkBuilderImpl();
Link prevLink =
linkBuilder.uri("http://example.com/page1;).rel("previous").title("A
title").build();
[cxf] branch CXF-7949_jakarta-servlet updated (61658050 -> 92ff806)
This is an automated email from the ASF dual-hosted git repository.
deki pushed a change to branch CXF-7949_jakarta-servlet
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 61658050 [CXF-7949] fix tests used embded Tomcat
add fa1f612 Attempt to fix JAXRS security tests: there is an SSL
configuration change (coming from JAXRSJmsTest) which causes HTTPS-based tests
to fail later on.
add 25dc5dd Updating HTTP core/client
add f1f2610 Removing some unnecessary autoboxing
add 3fc1465 Updating to Spring Boot 2.2.4.RELEASE
add e68d173 samples: organize description_openapi_v3 dependencies
add 465 Updating Jackson
add cc4ea93 Fixing a few minor issues
add 49c1ca3 Fixing Spring Boot tests under JDK14+
add a9eb350 upgrade to jetty 9.4.26.v20200117 (#627)
add 8b2fae2 Another round of minor fixes
add 5042b9f [CXF-7952]MTOM + schema validation creates invalid SOAP FAULT
response
add 3dfe11c CXF-8102: Update to Dropwizard Metrics 4.x (#628)
add 69b805a upgrade to karaf 4.2.8 (#629)
add 1fb179f CXF-8200: Use name() instead of toString() for enums when
generating WADL
add 56b1c95 Fixing build
add 4d95d19 fix OSGi test after Karaf upgrade (#631)
add 5ed6310 CXF-7814: wadl2java: support the JAX-RS 2.1 reactive results
add 356eb73 CXF-7814: wadl2java: support the JAX-RS 2.1 reactive results.
Removing debug output
add f0a5566 avoid checked exception in @PostConstruct method (#632)
add 2851ffc Slight refactor of the StaxSerializer
add f6205b9 Update to maven-surefire-plugin 2.22.2
add 91684eb switch to apache-karaf-minimal in OSGi tests
add 4e981b1 Picking up some Santuario changes
add 1ea897a [CXF-8203] Update to cglib 3.3.0 (#634)
add 92ff806 Merge branch 'master-apache' into CXF-7949_jakarta-servlet
No new revisions were added by this update.
Summary of changes:
.../org/apache/cxf/attachment/Rfc5987Util.java | 2 +-
.../apache/cxf/bus/blueprint/ConfigurerImpl.java | 6 +-
.../cxf/configuration/spring/ConfigurerImpl.java | 9 +-
.../cxf/interceptor/AttachmentOutInterceptor.java | 11 +-
.../samples/jax_rs/description_openapi_v3/pom.xml | 11 --
.../jax_rs/description_openapi_v3_osgi/pom.xml | 20 +--
.../jax_rs/description_openapi_v3_spring/pom.xml | 12 --
.../jax_rs/description_openapi_v3_web/pom.xml | 16 --
distribution/src/main/release/samples/pom.xml | 2 +-
.../cxf7511.wadl => wadl-generate-rx/cxf7814.wadl} | 5 +
.../pom.xml| 9 +-
.../org/apache/cxf/maven_plugin/wadlto/Option.java | 18 ++-
.../apache/cxf/maven_plugin/wadlto/WadlOption.java | 1 +
osgi/itests/pom.xml| 116 +--
.../cxf/osgi/itests/BundlesAndNamespacesTest.java | 10 +-
.../apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 142 --
.../cxf/osgi/itests/jaxrs/JaxRsServiceTest.java| 5 +-
.../cxf/osgi/itests/soap/HttpServiceTest.java | 5 +-
.../cxf/osgi/itests/soap/JmsServiceTest.java | 13 +-
.../karaf/features/src/main/resources/features.xml | 5 +-
parent/pom.xml | 30 ++--
pom.xml| 2 +-
.../cxf/aegis/util/stax/JDOMStreamWriter.java | 6 +-
rt/features/metrics/pom.xml| 6 +
.../metrics/codahale/CodahaleMetricsProvider.java | 4 +-
.../cxf/jaxrs/provider/XSLTJaxbProvider.java | 13 +-
.../cxf/jaxws/handler/HandlerChainInvoker.java | 3 -
.../ResponseTimeMessageInInterceptor.java | 2 +-
.../ResponseTimeMessageInvokerInterceptor.java | 4 +-
.../ResponseTimeMessageOutInterceptor.java | 2 +-
.../cxf/management/utils/ManagementConsole.java| 21 +--
.../apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 8 +-
.../{AbstractStore.java => BookOrderEnum.java} | 17 ++-
.../org/apache/cxf/jaxrs/model/wadl/BookStore.java | 1 +
.../cxf/jaxrs/model/wadl/WadlGeneratorTest.java| 4 +-
.../apache/cxf/microprofile/client/Validator.java | 2 -
.../jwe/EcdhAesWrapKeyEncryptionAlgorithm.java | 9 --
.../jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java | 6 -
.../oauth/provider/DefaultOAuthValidator.java | 6 +-
.../oidc/rp/OidcClientCodeRequestFilter.java | 2 +-
.../http_jetty/JettyHTTPServerEngine.java | 24 +--
.../JettyHTTPServerEngineBeanDefinitionParser.java | 4 +-
.../http_undertow/UndertowHTTPServerEngine.java| 4 +-
...dertowHTTPServerEngineBeanDefinitionParser.java | 4 +-
.../http/policy/impl/ClientPolicyCalculator.java | 22 +--
.../websocket/ahc/AhcWebSocketConduit.java | 2 +-
.../cxf/ws/security/wss4j/StaxSerializer.java | 75 +-
.../cxf/ws/security/wss4j/WSS4JInInterceptor.java | 8 +-
.../cxf/ws/security/wss4j/WSS4JOutInterceptor.java
[cxf] 02/03: [CXF-7949] Remove cxf.servlet-api-2.5.* properties
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch CXF-7949_jakarta-servlet
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d4ee4328c4a7fc60ed77af2fccf09ce0e725b436
Author: Dennis Kieselhorst
AuthorDate: Sun Jan 19 18:03:55 2020 +0100
[CXF-7949] Remove cxf.servlet-api-2.5.* properties
---
parent/pom.xml| 7 ---
rt/transports/http-netty/netty-server/pom.xml | 1 +
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index af49137..2f0c415 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -184,8 +184,6 @@
1.7R2
1.3.8
2.2.11
-
geronimo-servlet_2.5_spec
-1.2
jakarta.servlet-api
jakarta.servlet
4.0.3
@@ -2147,11 +2145,6 @@
${cxf.servlet-api.version}
-org.apache.geronimo.specs
-${cxf.servlet-api-2.5.artifact}
-${cxf.servlet-api-2.5.version}
-
-
org.apache.geronimo.javamail
geronimo-javamail_1.4_mail
1.8.4
diff --git a/rt/transports/http-netty/netty-server/pom.xml
b/rt/transports/http-netty/netty-server/pom.xml
index 99f3867..e0d57b3 100644
--- a/rt/transports/http-netty/netty-server/pom.xml
+++ b/rt/transports/http-netty/netty-server/pom.xml
@@ -65,6 +65,7 @@
org.apache.geronimo.specs
geronimo-servlet_2.5_spec
+1.2
org.apache.aries.blueprint
[cxf] branch CXF-7949_jakarta-servlet created (now 2ef4c7a)
This is an automated email from the ASF dual-hosted git repository. deki pushed a change to branch CXF-7949_jakarta-servlet in repository https://gitbox.apache.org/repos/asf/cxf.git. at 2ef4c7a [CXF-7949] Upgrade to Tomcat 9.0.30 This branch includes the following new commits: new 2669521 [CXF-7949] Upgrade to Jakarta Servlet API 4.0.3 new d4ee432 [CXF-7949] Remove cxf.servlet-api-2.5.* properties new 2ef4c7a [CXF-7949] Upgrade to Tomcat 9.0.30 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.
[cxf] 03/03: [CXF-7949] Upgrade to Tomcat 9.0.30
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch CXF-7949_jakarta-servlet in repository https://gitbox.apache.org/repos/asf/cxf.git commit 2ef4c7ab1578989f94461867f5c17ef15960c167 Author: Dennis Kieselhorst AuthorDate: Sun Jan 19 18:05:16 2020 +0100 [CXF-7949] Upgrade to Tomcat 9.0.30 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2f0c415..3eca0a8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -202,7 +202,7 @@ 1.6.0 27.0-jre 1.23 -8.5.50 +9.0.30 1.3 [1.4,3.0) 2.0.28.Final
[cxf] branch master updated: [CXF-8193] upgrade to jetty 9.4.25.v20191220
This is an automated email from the ASF dual-hosted git repository. deki 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 b9732e5 [CXF-8193] upgrade to jetty 9.4.25.v20191220 new dc7cbfb Merge remote-tracking branch 'origin/master' into master-apache b9732e5 is described below commit b9732e5a2d4cead834af8246a35b863aa7b8c811 Author: Dennis Kieselhorst AuthorDate: Sun Jan 19 11:18:01 2020 +0100 [CXF-8193] upgrade to jetty 9.4.25.v20191220 --- distribution/src/main/release/samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index 59d5ced..0fa9c3d 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -32,7 +32,7 @@ UTF-8 2.2.3.RELEASE 2.2.1.RELEASE -9.4.24.v20191120 +9.4.25.v20191220 4.5.8 3.24.3 1.23
[cxf] 01/01: Merge pull request #623 from apache/CXF-8159_swagger-update
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git commit d9dea3e07e1f2ba5d43768313232f205c90e8b29 Merge: f589986 5c81c3e Author: Dennis Kieselhorst AuthorDate: Mon Jan 13 10:43:12 2020 +0100 Merge pull request #623 from apache/CXF-8159_swagger-update CXF-8159: Update to Swagger 2.1.1 / 1.6.0 parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[cxf] branch master updated (f589986 -> d9dea3e)
This is an automated email from the ASF dual-hosted git repository. deki pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from f589986 CXF-7996: Jakarta EE TCKs and compatibility. Adding the template and initial Jenkinsfile definition add 5c81c3e [CXF-8159] Update to Swagger 2.1.1 / 1.6.0 new d9dea3e Merge pull request #623 from apache/CXF-8159_swagger-update The 1 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: parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[cxf] 01/01: [CXF-8159] Update to Swagger 2.1.1 / 1.6.0
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch CXF-8159_swagger-update in repository https://gitbox.apache.org/repos/asf/cxf.git commit 5c81c3e82990ae0906a6e2b48746726f894618a1 Author: Dennis Kieselhorst AuthorDate: Sat Jan 11 21:44:46 2020 +0100 [CXF-8159] Update to Swagger 2.1.1 / 1.6.0 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 68ba89a..564f5bb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -200,8 +200,8 @@ 5.2.2.RELEASE 1.7.6 3.24.3 -2.0.10 -1.5.24 +2.1.1 +1.6.0 27.0-jre 1.23 8.5.50
[cxf] branch CXF-8159_swagger-update created (now 5c81c3e)
This is an automated email from the ASF dual-hosted git repository. deki pushed a change to branch CXF-8159_swagger-update in repository https://gitbox.apache.org/repos/asf/cxf.git. at 5c81c3e [CXF-8159] Update to Swagger 2.1.1 / 1.6.0 This branch includes the following new commits: new 5c81c3e [CXF-8159] Update to Swagger 2.1.1 / 1.6.0 The 1 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.
[cxf] branch master updated: [CXF-7910] fix distribution
This is an automated email from the ASF dual-hosted git repository. deki 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 2bd5324 [CXF-7910] fix distribution 2bd5324 is described below commit 2bd5324d6d09e35345af4013bb5f4f07113b03d2 Author: Dennis Kieselhorst AuthorDate: Fri Jan 10 11:57:41 2020 +0100 [CXF-7910] fix distribution --- distribution/pom.xml | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index c5347a1..89d8f4f 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -423,24 +423,23 @@ spring-web -javax.xml.ws -jaxws-api -2.3.0 - - -javax.xml.bind -jaxb-api - - +jakarta.xml.ws +jakarta.xml.ws-api +2.3.2 jakarta.xml.bind jakarta.xml.bind-api -org.apache.geronimo.specs -geronimo-ws-metadata_2.0_spec -1.1.3 +jakarta.jws +jakarta.jws-api +1.1.1 + + +jakarta.xml.soap +jakarta.xml.soap-api +1.4.1
[cxf] branch master updated (6fabd55 -> 6d59a80)
This is an automated email from the ASF dual-hosted git repository. deki pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from 6fabd55 Merge pull request #500 from apache/CXF-7910_jakarta_jaxws-api new 214e375 CXF-8165: Upgrade to Spring Framework 5.2.x and Spring Security 5.2.x new 119b687 CXF-8134: Upgrade to Spring Boot 2.2 new 6d59a80 [CXF-7910] fix distribution-manifest 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: distribution/manifest/pom.xml | 23 +++--- .../spring_boot_scan/eureka-registry/pom.xml | 2 +- distribution/src/main/release/samples/pom.xml | 4 ++-- parent/pom.xml | 6 +++--- 4 files changed, 17 insertions(+), 18 deletions(-)
[cxf] 03/03: [CXF-7910] fix distribution-manifest
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git commit 6d59a806aca3cd81e7e86df401afd771274c3141 Author: Dennis Kieselhorst AuthorDate: Fri Jan 10 08:40:06 2020 +0100 [CXF-7910] fix distribution-manifest --- distribution/manifest/pom.xml | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/distribution/manifest/pom.xml b/distribution/manifest/pom.xml index f172380..17a7ef3 100644 --- a/distribution/manifest/pom.xml +++ b/distribution/manifest/pom.xml @@ -338,24 +338,23 @@ true -javax.xml.ws -jaxws-api -2.3.0 - - -javax.xml.bind -jaxb-api - - +jakarta.xml.ws +jakarta.xml.ws-api +2.3.2 jakarta.xml.bind jakarta.xml.bind-api -org.apache.geronimo.specs -geronimo-ws-metadata_2.0_spec -1.1.3 +jakarta.jws +jakarta.jws-api +1.1.1 + + +jakarta.xml.soap +jakarta.xml.soap-api +1.4.1
[cxf] 02/03: CXF-8134: Upgrade to Spring Boot 2.2
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 119b68779316174145b168fc538f1747e06a51ee
Author: Dennis Kieselhorst
AuthorDate: Fri Jan 10 08:32:42 2020 +0100
CXF-8134: Upgrade to Spring Boot 2.2
---
.../release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml | 2 +-
distribution/src/main/release/samples/pom.xml | 4 ++--
parent/pom.xml| 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
index 91be24d..4683a2f 100644
---
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
+++
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
@@ -32,10 +32,10 @@
-
org.springframework.cloud
spring-cloud-starter-netflix-eureka-server
+${spring.cloud.eureka.version}
org.slf4j
diff --git a/distribution/src/main/release/samples/pom.xml
b/distribution/src/main/release/samples/pom.xml
index 030cb28..c1d6b27 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -30,8 +30,8 @@
true
UTF-8
-2.1.3.RELEASE
-
2.0.2.RELEASE
+2.2.2.RELEASE
+
2.2.1.RELEASE
9.4.24.v20191120
4.5.8
3.24.3
diff --git a/parent/pom.xml b/parent/pom.xml
index 2472979..ddcf5ec 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -192,7 +192,7 @@
1.7.29
1.25
2.3_2
-2.1.11.RELEASE
+2.2.2.RELEASE
2.3.2.RELEASE
spring-test
1.2.1
[cxf] 01/03: CXF-8165: Upgrade to Spring Framework 5.2.x and Spring Security 5.2.x
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git commit 214e375e1a3771ece687294c4313da0641bea99b Author: Dennis Kieselhorst AuthorDate: Fri Jan 10 08:31:03 2020 +0100 CXF-8165: Upgrade to Spring Framework 5.2.x and Spring Security 5.2.x --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 364a370..2472979 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -196,8 +196,8 @@ 2.3.2.RELEASE spring-test 1.2.1 - 5.1.7.RELEASE -5.1.12.RELEASE + 5.2.1.RELEASE +5.2.2.RELEASE 1.7.6 3.24.3 2.0.10
[cxf] 01/01: [CXF-8151] Upgrade to Bean Validation 2.x and Hibernate Validator 6.1.0
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch CXF-8151_bean-validation
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ede9a9ef93719eef0a25ff52c79167f82e031422
Author: Dennis Kieselhorst
AuthorDate: Fri Jan 10 08:24:51 2020 +0100
[CXF-8151] Upgrade to Bean Validation 2.x and Hibernate Validator 6.1.0
---
core/pom.xml | 4 ++--
distribution/javadoc/pom.xml | 4 ++--
.../release/samples/jax_rs/description_swagger2_web/pom.xml| 4 ++--
integration/spring-boot/autoconfigure/pom.xml | 4 ++--
integration/spring-boot/starter-jaxrs/pom.xml | 4 ++--
integration/spring-boot/starter-jaxws/pom.xml | 4 ++--
osgi/karaf/features/src/main/resources/features.xml| 6 +++---
parent/pom.xml | 10 +-
rt/frontend/jaxrs/pom.xml | 4 ++--
systests/cdi/base/pom.xml | 4 ++--
systests/cdi/cdi-owb/pom.xml | 4 ++--
systests/cdi/cdi-weld/pom.xml | 4 ++--
systests/jaxrs/pom.xml | 4 ++--
systests/spring-boot/pom.xml | 9 -
tools/wadlto/jaxrs/pom.xml | 4 ++--
15 files changed, 32 insertions(+), 41 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 82da697..5fd9bfd 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -88,8 +88,8 @@
test
-javax.validation
-validation-api
+jakarta.validation
+jakarta.validation-api
true
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 19bdc8a..df4eb25 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -139,8 +139,8 @@
log4j
-javax.validation
-validation-api
+jakarta.validation
+jakarta.validation-api
${cxf.asm.groupId}
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
index bb7f6df..55ca2b6 100644
---
a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
@@ -88,8 +88,8 @@ under the License.
spring-web
-javax.validation
-validation-api
+jakarta.validation
+jakarta.validation-api
diff --git a/integration/spring-boot/autoconfigure/pom.xml
b/integration/spring-boot/autoconfigure/pom.xml
index d7a5136..74c3b1c 100644
--- a/integration/spring-boot/autoconfigure/pom.xml
+++ b/integration/spring-boot/autoconfigure/pom.xml
@@ -99,8 +99,8 @@
true
-javax.validation
-validation-api
+jakarta.validation
+jakarta.validation-api
true
diff --git a/integration/spring-boot/starter-jaxrs/pom.xml
b/integration/spring-boot/starter-jaxrs/pom.xml
index 7359f0d..f617e36 100644
--- a/integration/spring-boot/starter-jaxrs/pom.xml
+++ b/integration/spring-boot/starter-jaxrs/pom.xml
@@ -75,8 +75,8 @@
${project.version}
-javax.validation
-validation-api
+jakarta.validation
+jakarta.validation-api
diff --git a/integration/spring-boot/starter-jaxws/pom.xml
b/integration/spring-boot/starter-jaxws/pom.xml
index 69f1f6e..1f8a145 100644
--- a/integration/spring-boot/starter-jaxws/pom.xml
+++ b/integration/spring-boot/starter-jaxws/pom.xml
@@ -70,8 +70,8 @@
${project.version}
-javax.validation
-validation-api
+jakarta.validation
+jakarta.validation-api
diff --git a/osgi/karaf/features/src/main/resources/features.xml
b/osgi/karaf/features/src/main/resources/features.xml
index 00829d7..f3ea8d3 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -314,7 +314,7 @@
mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger-ui/${project.version}
mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger/${project.version}
mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${cxf.jackson.version}
-mvn:javax.validation/validation-api/${cxf.validation.api.version}
+mvn:jakarta.validation/jakarta.validation-api/${cxf.validation.api.version
[cxf] branch CXF-8151_bean-validation created (now ede9a9e)
This is an automated email from the ASF dual-hosted git repository. deki pushed a change to branch CXF-8151_bean-validation in repository https://gitbox.apache.org/repos/asf/cxf.git. at ede9a9e [CXF-8151] Upgrade to Bean Validation 2.x and Hibernate Validator 6.1.0 This branch includes the following new commits: new ede9a9e [CXF-8151] Upgrade to Bean Validation 2.x and Hibernate Validator 6.1.0 The 1 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.
[cxf] 01/01: Merge pull request #500 from apache/CXF-7910_jakarta_jaxws-api
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git commit 6fabd55129e5bf6c0768a61aa649411dfdd98ddd Merge: e00fb55 64584f3 Author: Dennis Kieselhorst AuthorDate: Fri Jan 10 07:08:40 2020 +0100 Merge pull request #500 from apache/CXF-7910_jakarta_jaxws-api [CXF-7910] Change JAX-WS javax to jakarta artifact dependencies distribution/javadoc/pom.xml | 4 +- .../release/samples/jax_rs/minimal_osgi/pom.xml| 4 +- distribution/src/main/release/samples/pom.xml | 26 integration/spring-boot/starter-jaxrs/pom.xml | 12 integration/spring-boot/starter-jaxws/pom.xml | 12 .../src/it/jdk-cxf-with-toolchain/pom.xml | 18 +++--- .../codegen-plugin/src/it/mark-generated/pom.xml | 20 +++--- .../src/it/wsdl-artifact-resolution/pom.xml| 20 +++--- osgi/karaf/features/pom.xml| 8 +++ .../karaf/features/src/main/resources/features.xml | 12 ++-- osgi/repository/pom.xml| 6 ++ parent/pom.xml | 75 +++--- pom.xml| 7 ++ rt/frontend/jaxrs/pom.xml | 4 +- rt/rs/extensions/search/pom.xml| 12 rt/rs/microprofile-client/pom.xml | 4 +- rt/rs/security/http-signature/pom.xml | 4 +- rt/rs/security/oauth-parent/oauth2/pom.xml | 16 +++-- rt/rs/security/sso/oidc/pom.xml| 20 -- services/wsn/wsn-core/pom.xml | 22 ++- systests/cdi/base/pom.xml | 6 ++ systests/jaxrs/pom.xml | 8 +++ systests/microprofile/client/tracing/pom.xml | 4 ++ systests/rs-http-sci/pom.xml | 6 ++ systests/rs-security/pom.xml | 8 +++ systests/rs-sse/rs-sse-jetty/pom.xml | 6 ++ systests/tracing/pom.xml | 10 ++- systests/wsdl_maven/codegen/pom.xml| 6 ++ tools/javato/ws/pom.xml| 8 +-- 29 files changed, 269 insertions(+), 99 deletions(-)
[cxf] branch master updated (e00fb55 -> 6fabd55)
This is an automated email from the ASF dual-hosted git repository. deki pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from e00fb55 [CXF-8189]be able to set maven-compiler-plugin source/target version seperately for different JDK add 1448dd0 [CXF-7910] Change JAX-WS javax to jakarta artifact dependencies add 5fd6e46 [CXF-7910] Update SAAJ Impl to 1.4 add fcd22cd [CXF-7910] use servicemix specs for 2.3 add 129a02d [CXF-7910] add jakarta.xml.soap-api and jakarta.jws-api to fix OSGi errors, use existing cxf.specs.jaxws.api.version property add 4ba8ca2 [CXF-7910] add temporary exclusion until cxf-xjc-runtime has been released add 24af0f4 [CXF-7910] use jakarta.xml.soap-api and jakarta.jws-api add 00a8313 update saaj-impl to ee4j release version add 97efd8a update saaj-impl servicemix bundle to 1.5.1_1 add 75bd4e8 fixed merge error add bed309f [CXF-7910]use saaj-impl 1.3.0 to make build pass with JDK8 and JDK11 add 0c81f1b [CXF-7910] make maven-enforcer-plugin happy add 544604a Merge branch 'master' into CXF-7910_jakarta_jaxws-api add 4926f24 Merge branch 'master' into CXF-7910_jakarta_jaxws-api add 96cdc14 Merge remote-tracking branch 'origin/master' into CXF-7910_jakarta_jaxws-api add 505b762 CXF-7910: integrate latest servicemix releases add bc4ea13 [CXF-7910] use Jakarta activation add 49d34cf CXF-7910: align saaj-impl for samples with version from parent pom add 64584f3 CXF-7910: replace javax.annotation-api with jakarta.annotation-api new 6fabd55 Merge pull request #500 from apache/CXF-7910_jakarta_jaxws-api The 1 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: distribution/javadoc/pom.xml | 4 +- .../release/samples/jax_rs/minimal_osgi/pom.xml| 4 +- distribution/src/main/release/samples/pom.xml | 26 integration/spring-boot/starter-jaxrs/pom.xml | 12 integration/spring-boot/starter-jaxws/pom.xml | 12 .../src/it/jdk-cxf-with-toolchain/pom.xml | 18 +++--- .../codegen-plugin/src/it/mark-generated/pom.xml | 20 +++--- .../src/it/wsdl-artifact-resolution/pom.xml| 20 +++--- osgi/karaf/features/pom.xml| 8 +++ .../karaf/features/src/main/resources/features.xml | 12 ++-- osgi/repository/pom.xml| 6 ++ parent/pom.xml | 75 +++--- pom.xml| 7 ++ rt/frontend/jaxrs/pom.xml | 4 +- rt/rs/extensions/search/pom.xml| 12 rt/rs/microprofile-client/pom.xml | 4 +- rt/rs/security/http-signature/pom.xml | 4 +- rt/rs/security/oauth-parent/oauth2/pom.xml | 16 +++-- rt/rs/security/sso/oidc/pom.xml| 20 -- services/wsn/wsn-core/pom.xml | 22 ++- systests/cdi/base/pom.xml | 6 ++ systests/jaxrs/pom.xml | 8 +++ systests/microprofile/client/tracing/pom.xml | 4 ++ systests/rs-http-sci/pom.xml | 6 ++ systests/rs-security/pom.xml | 8 +++ systests/rs-sse/rs-sse-jetty/pom.xml | 6 ++ systests/tracing/pom.xml | 10 ++- systests/wsdl_maven/codegen/pom.xml| 6 ++ tools/javato/ws/pom.xml| 8 +-- 29 files changed, 269 insertions(+), 99 deletions(-)
[cxf] branch CXF-7910_jakarta_jaxws-api updated: CXF-7910: replace javax.annotation-api with jakarta.annotation-api
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch CXF-7910_jakarta_jaxws-api
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/CXF-7910_jakarta_jaxws-api by
this push:
new 64584f3 CXF-7910: replace javax.annotation-api with
jakarta.annotation-api
64584f3 is described below
commit 64584f32c8a4632344a1e062e0fc969dfd88e41e
Author: Dennis Kieselhorst
AuthorDate: Thu Jan 9 21:13:21 2020 +0100
CXF-7910: replace javax.annotation-api with jakarta.annotation-api
---
distribution/javadoc/pom.xml | 4 ++--
distribution/src/main/release/samples/pom.xml| 6 +++---
integration/spring-boot/starter-jaxrs/pom.xml| 12
integration/spring-boot/starter-jaxws/pom.xml| 12
.../codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml | 6 +++---
maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml | 6 +++---
.../codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml | 6 +++---
osgi/karaf/features/pom.xml | 4
osgi/karaf/features/src/main/resources/features.xml | 4 ++--
parent/pom.xml | 10 +-
pom.xml | 4 ++--
rt/frontend/jaxrs/pom.xml| 4 ++--
rt/rs/extensions/search/pom.xml | 8
rt/rs/microprofile-client/pom.xml| 4 ++--
rt/rs/security/http-signature/pom.xml| 4 ++--
rt/rs/security/oauth-parent/oauth2/pom.xml | 4
rt/rs/security/sso/oidc/pom.xml | 8 ++--
services/wsn/wsn-core/pom.xml| 4
systests/cdi/base/pom.xml| 6 ++
systests/jaxrs/pom.xml | 8
systests/microprofile/client/tracing/pom.xml | 4
systests/rs-http-sci/pom.xml | 6 ++
systests/rs-security/pom.xml | 4
systests/rs-sse/rs-sse-jetty/pom.xml | 6 ++
systests/tracing/pom.xml | 10 --
25 files changed, 121 insertions(+), 33 deletions(-)
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 9d7de33..19bdc8a 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -55,8 +55,8 @@
jakarta.ws.rs-api
-javax.annotation
-javax.annotation-api
+jakarta.annotation
+jakarta.annotation-api
org.apache.ws.xmlschema
diff --git a/distribution/src/main/release/samples/pom.xml
b/distribution/src/main/release/samples/pom.xml
index 138a0a2..030cb28 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -256,9 +256,9 @@
${cxf.jaxb.version}
-javax.annotation
-javax.annotation-api
-1.3.1
+jakarta.annotation
+jakarta.annotation-api
+1.3.5
jakarta.xml.ws
diff --git a/integration/spring-boot/starter-jaxrs/pom.xml
b/integration/spring-boot/starter-jaxrs/pom.xml
index 9001cea..7359f0d 100644
--- a/integration/spring-boot/starter-jaxrs/pom.xml
+++ b/integration/spring-boot/starter-jaxrs/pom.xml
@@ -37,10 +37,22 @@
org.springframework.boot
spring-boot-starter
+
+
+javax.annotation
+javax.annotation-api
+
+
org.springframework.boot
spring-boot-starter-web
+
+
+javax.annotation
+javax.annotation-api
+
+
org.apache.cxf
diff --git a/integration/spring-boot/starter-jaxws/pom.xml
b/integration/spring-boot/starter-jaxws/pom.xml
index 4635a50..69f1f6e 100644
--- a/integration/spring-boot/starter-jaxws/pom.xml
+++ b/integration/spring-boot/starter-jaxws/pom.xml
@@ -37,10 +37,22 @@
org.springframework.boot
spring-boot-starter
+
+
+javax.annotation
+javax.annotation-api
+
+
org.springframework.boot
spring-boot-starter-web
+
+
+javax.annotation
[cxf] branch CXF-7910_jakarta_jaxws-api updated: CXF-7910: align saaj-impl for samples with version from parent pom
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch CXF-7910_jakarta_jaxws-api in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/CXF-7910_jakarta_jaxws-api by this push: new 49d34cf CXF-7910: align saaj-impl for samples with version from parent pom 49d34cf is described below commit 49d34cf3a1583932779d39766b055bf49359da53 Author: Dennis Kieselhorst AuthorDate: Thu Jan 9 12:22:53 2020 +0100 CXF-7910: align saaj-impl for samples with version from parent pom --- distribution/src/main/release/samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index 7a91310..138a0a2 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -278,7 +278,7 @@ com.sun.xml.messaging.saaj saaj-impl -1.5.1 +1.3.23 org.apache.geronimo.specs
[cxf] branch CXF-7910_jakarta_jaxws-api updated: [CXF-7910] use Jakarta activation
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch CXF-7910_jakarta_jaxws-api
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/CXF-7910_jakarta_jaxws-api by
this push:
new bc4ea13 [CXF-7910] use Jakarta activation
bc4ea13 is described below
commit bc4ea132eafb8d6668b07667f7acfcd94f1f7d62
Author: Dennis Kieselhorst
AuthorDate: Wed Jan 8 11:34:49 2020 +0100
[CXF-7910] use Jakarta activation
---
distribution/src/main/release/samples/pom.xml | 6 +++---
osgi/karaf/features/pom.xml | 4
parent/pom.xml| 4 ++--
pom.xml | 4
rt/rs/extensions/search/pom.xml | 4
rt/rs/security/oauth-parent/oauth2/pom.xml| 12
rt/rs/security/sso/oidc/pom.xml | 12
services/wsn/wsn-core/pom.xml | 8
systests/rs-security/pom.xml | 4
9 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml
b/distribution/src/main/release/samples/pom.xml
index c5f3f34..7a91310 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -266,9 +266,9 @@
2.3.2
-javax.activation
-javax.activation-api
-1.2.0
+jakarta.activation
+jakarta.activation-api
+1.2.1
jakarta.jws
diff --git a/osgi/karaf/features/pom.xml b/osgi/karaf/features/pom.xml
index 4829175..f9e3a35 100644
--- a/osgi/karaf/features/pom.xml
+++ b/osgi/karaf/features/pom.xml
@@ -41,6 +41,10 @@
javax.xml.bind
jaxb-api
+
+com.sun.activation
+javax.activation
+
diff --git a/parent/pom.xml b/parent/pom.xml
index 9fe5168..8409903 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2884,8 +2884,8 @@
com.sun.activation
-javax.activation
-1.2.0
+jakarta.activation
+1.2.1
jakarta.jws
diff --git a/pom.xml b/pom.xml
index dc58d2f..8d71e07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -686,6 +686,10 @@
javax.xml.ws:jaxws-api
javax.jws:javax.jws-api
javax.xml.soap:javax.xml.soap-api
+
javax.activation:javax.activation-api
+
com.sun.activation:javax.activation
+
diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml
index baa81da..b45594c 100644
--- a/rt/rs/extensions/search/pom.xml
+++ b/rt/rs/extensions/search/pom.xml
@@ -143,6 +143,10 @@
javax.xml.bind
jaxb-api
+
+javax.activation
+javax.activation-api
+
diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml
b/rt/rs/security/oauth-parent/oauth2/pom.xml
index 98ef41d..bfa251b 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -123,10 +123,14 @@
test
true
-
-javax.xml.bind
-jaxb-api
-
+
+javax.xml.bind
+jaxb-api
+
+
+javax.activation
+javax.activation-api
+
diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml
index cc20747..17a1dae 100644
--- a/rt/rs/security/sso/oidc/pom.xml
+++ b/rt/rs/security/sso/oidc/pom.xml
@@ -85,10 +85,14 @@
${cxf.hibernate.em.version}
test
-
-javax.xml.bind
-jaxb-api
-
+
+javax.xml.bind
+jaxb-api
+
+
+javax.activation
+javax.activation-api
+
diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml
index fa35277..ba13435 100644
--- a/services/wsn/wsn-core/pom.xml
+++ b/services/wsn/wsn-core/pom.xml
@@ -136,6 +136,14 @@
javax.xml.stream
stax-api
[cxf] branch master updated: Revert (sorry wrong branch) "CXF-7910: re-add banned dependencies (were removed during merging)"
This is an automated email from the ASF dual-hosted git repository. deki 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 bb5ca3b Revert (sorry wrong branch) "CXF-7910: re-add banned dependencies (were removed during merging)" bb5ca3b is described below commit bb5ca3b0f6b2e74912f6f4ec94c36f8fc9a6595b Author: Dennis Kieselhorst AuthorDate: Tue Jan 7 13:47:14 2020 +0100 Revert (sorry wrong branch) "CXF-7910: re-add banned dependencies (were removed during merging)" This reverts commit d4d4b1e7 --- pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pom.xml b/pom.xml index dc58d2f..f46697d 100644 --- a/pom.xml +++ b/pom.xml @@ -683,9 +683,6 @@ javax.ws.rs:javax.ws.rs-api javax.xml.bind:jaxb-api com.sun.xml.bind:jaxb-core -javax.xml.ws:jaxws-api -javax.jws:javax.jws-api - javax.xml.soap:javax.xml.soap-api
[cxf] branch master updated: CXF-7910: re-add banned dependencies (were removed during merging)
This is an automated email from the ASF dual-hosted git repository. deki 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 d4d4b1e CXF-7910: re-add banned dependencies (were removed during merging) d4d4b1e is described below commit d4d4b1e740a48103811e33094adb19d5c22ca108 Author: Dennis Kieselhorst AuthorDate: Tue Jan 7 13:45:01 2020 +0100 CXF-7910: re-add banned dependencies (were removed during merging) --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index f46697d..dc58d2f 100644 --- a/pom.xml +++ b/pom.xml @@ -683,6 +683,9 @@ javax.ws.rs:javax.ws.rs-api javax.xml.bind:jaxb-api com.sun.xml.bind:jaxb-core +javax.xml.ws:jaxws-api +javax.jws:javax.jws-api + javax.xml.soap:javax.xml.soap-api
[cxf] 02/02: CXF-7910: integrate latest servicemix releases
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch CXF-7910_jakarta_jaxws-api
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 505b76285bae4b9d9827eb8191ce0a08d6623d42
Author: Dennis Kieselhorst
AuthorDate: Tue Jan 7 11:23:59 2020 +0100
CXF-7910: integrate latest servicemix releases
---
distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml | 2 +-
osgi/karaf/features/src/main/resources/features.xml | 4 ++--
parent/pom.xml| 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
b/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
index 0c12a62..4c27628 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
@@ -86,7 +86,7 @@
org.apache.servicemix.specs
org.apache.servicemix.specs.jaxws-api-2.3
-2.3_1
+2.3_2
com.fasterxml.woodstox
diff --git a/osgi/karaf/features/src/main/resources/features.xml
b/osgi/karaf/features/src/main/resources/features.xml
index ea4198e..89500f1 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -25,10 +25,10 @@
mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${cxf.servicemix.specs.version}
mvn:javax.annotation/javax.annotation-api/${cxf.javax.annotation-api.version}
mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${cxf.servicemix.specs.version}
-mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.3/2.3_1
+mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.3/${cxf.servicemix.specs.jaxb.version}
mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.3/${cxf.specs.jaxws.api.version}
mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/${cxf.servicemix.jaxrs.specs.version}
-mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.4/1.4_1-SNAPSHOT
+mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.4/1.4_1
mvn:jakarta.jws/jakarta.jws-api/1.1.1
mvn:javax.mail/mail/${cxf.javax.mail.version}
mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}
diff --git a/parent/pom.xml b/parent/pom.xml
index 8c139a3..9fe5168 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -191,7 +191,7 @@
3.1.0
1.7.29
1.25
-2.3_1
+2.3_2
2.1.11.RELEASE
2.3.2.RELEASE
spring-test
@@ -257,7 +257,7 @@
2.9.1
2.3_1
1.5.2_2
-
2.3_1
+
2.3_2
2.9.0
1.6.3_1
2.7.2_3
[cxf] 01/02: Merge remote-tracking branch 'origin/master' into CXF-7910_jakarta_jaxws-api
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch CXF-7910_jakarta_jaxws-api in repository https://gitbox.apache.org/repos/asf/cxf.git commit 96cdc143498a4935b999616653e4e4ad42f0c0f8 Merge: 4926f24 e72ad77 Author: Dennis Kieselhorst AuthorDate: Tue Jan 7 10:42:38 2020 +0100 Merge remote-tracking branch 'origin/master' into CXF-7910_jakarta_jaxws-api # Conflicts: # parent/pom.xml .../cxf/attachment/AttachmentDeserializer.java | 19 +++--- .../main/java/org/apache/cxf/bus/ManagedBus.java | 9 ++- .../java/org/apache/cxf/bus/spring/SpringBus.java | 2 +- .../cxf/common/injection/ResourceInjector.java | 8 +-- .../org/apache/cxf/common/util/StringUtils.java| 23 --- .../cxf/feature/transform/XSLTOutInterceptor.java | 4 +- .../main/java/org/apache/cxf/helpers/NSDecl.java | 2 +- .../cxf/service/model/BindingOperationInfo.java| 2 +- .../apache/cxf/service/model/MessagePartInfo.java | 2 +- .../apache/cxf/service/model/OperationInfo.java| 2 +- .../apache/cxf/common/util/StringUtilsTest.java| 23 +++ .../pom.xml| 2 +- .../samples/jax_rs/description_openapi_v3/pom.xml | 2 +- .../jax_rs/description_openapi_v3_web/pom.xml | 2 +- .../samples/jax_rs/description_swagger2/pom.xml| 2 +- .../jax_rs/description_swagger2_web/pom.xml| 2 +- .../release/samples/jax_rs/minimal_osgi/README.txt | 2 +- .../release/samples/jax_rs/minimal_osgi/pom.xml| 1 - .../release/samples/jax_rs/spring_boot/pom.xml | 2 +- .../jax_rs/spring_boot_scan/application/pom.xml| 2 +- .../spring_boot_scan/eureka-registry/pom.xml | 2 +- distribution/src/main/release/samples/pom.xml | 10 ++- .../apache/cxf/connector/CXFConnectionParam.java | 14 ++-- .../AbstractManagedConnectionImpl.java | 2 +- .../apache/cxf/jca/outbound/CXFConnectionSpec.java | 45 +++-- .../jca/outbound/ManagedConnectionFactoryImpl.java | 8 +-- .../cxf/maven_plugin/AbstractCodegenMojo.java | 78 +++--- osgi/itests/pom.xml| 4 +- parent/pom.xml | 12 ++-- pom.xml| 2 +- .../java/org/apache/cxf/aegis/AegisContext.java| 7 +- .../apache/cxf/aegis/type/AbstractTypeCreator.java | 5 +- .../org/apache/cxf/aegis/type/basic/BeanType.java | 3 +- .../org/apache/cxf/jaxb/JAXBEncoderDecoder.java| 3 +- .../org/apache/cxf/jaxrs/impl/UriBuilderImpl.java | 21 +++--- .../model/OperationResourceInfoComparator.java | 78 ++ ...va => OperationResourceInfoComparatorBase.java} | 55 --- .../apache/cxf/jaxrs/provider/ProviderFactory.java | 13 ++-- .../jaxrs/servlet/CXFNonSpringJaxrsServlet.java| 3 +- .../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 57 +--- .../test/java/org/apache/cxf/jaxrs/BaseApi.java| 24 +++ .../java/org/apache/cxf/jaxrs/BaseRequest.java | 25 +++ .../java/org/apache/cxf/jaxrs/BaseResponse.java| 25 +++ .../java/org/apache/cxf/jaxrs/CustomerService.java | 26 +++- .../apache/cxf/jaxrs/CustomerServiceRequest.java | 28 .../apache/cxf/jaxrs/CustomerServiceResource.java | 24 ++- .../apache/cxf/jaxrs/CustomerServiceResponse.java | 20 +- .../java/org/apache/cxf/jaxrs/CustomizedApi.java | 25 --- .../java/org/apache/cxf/jaxrs/GenericService.java | 21 +- .../cxf/jaxrs/SelectMethodCandidatesTest.java | 63 + .../org/apache/cxf/jaxrs/client/ClientState.java | 6 +- .../jaxrs/openapi/OpenApiCustomizedResource.java | 13 ++-- .../apache/cxf/jaxrs/openapi/OpenApiFeature.java | 4 +- .../ext/search/AbstractSearchConditionParser.java | 8 +-- .../jaxrs/ext/search/PrimitiveSearchCondition.java | 8 +-- .../visitor/AbstractSearchConditionVisitor.java| 8 +-- .../security/jose/jwe/AbstractJweEncryption.java | 4 +- .../cxf/rs/security/jose/jwe/JweJsonProducer.java | 20 +- .../rs/security/jose/jwe/JweJsonProducerTest.java | 5 +- .../cxf/rs/security/oauth2/common/OAuthError.java | 1 - .../rs/security/oauth2/common/OAuthPermission.java | 2 +- .../org/apache/cxf/transport/http/Headers.java | 13 ++-- .../apache/cxf/transport/servlet/CXFServlet.java | 12 ++-- .../apache/cxf/transport/jms/JMSConfiguration.java | 10 ++- .../apache/cxf/transport/jms/uri/JMSEndpoint.java | 31 - .../org/apache/cxf/transport/jms/util/JMSUtil.java | 6 +- .../apache/cxf/ws/addressing/soap/MAPCodec.java| 21 +++--- .../java/org/apache/cxf/ws/rm/EncoderDecoder.java | 21 +++--- .../cxf/ws/rm/soap/RetransmissionQueueImpl.java| 6 +- .../ws/security/tokenstore/TokenStoreUtils.java| 13 ++-- .../policyhandlers/AbstractBindingBuilder.java | 24 +++ .../xkms/x509/repo/ldap/LdapCertificateRepo.java | 4 +- .../cxf/systests/
[cxf] branch CXF-7910_jakarta_jaxws-api updated (4926f24 -> 505b762)
This is an automated email from the ASF dual-hosted git repository. deki pushed a change to branch CXF-7910_jakarta_jaxws-api in repository https://gitbox.apache.org/repos/asf/cxf.git. from 4926f24 Merge branch 'master' into CXF-7910_jakarta_jaxws-api add fab7fc9 Update geronimo-openapi to 1.0.12 add 8723ff4 Revert "CXF-8134: Upgrade to Spring Boot 2.2" add d076d44 Revert "CXF-8165: Upgrade to Spring Framework 5.2.x and Spring Security 5.2.x" add 3e58250 use StringUtils.capitalize add cf941bf CXF-8174: Incorrect service method resolution (#616) add 360f1d6 CXF-8186: On connection refused, XSLTOutInterceptor mangles the error (#618) add fe3adcb Fixing checkstyle violations add 723bb16 minor StringBuilder improvements add ef7f9b1 Update Jetty version add d3c23af Update Bouncycastle version add 2f47c80 Revert "Update Jetty version" (due to missing Content-Type in response) add 325ed04 improved test assertions add aefdc07 Consolidating Swagger UI version in the samples add c32c69a CXF-8185 Generated Ephemeral Public Key missing in JWE Headers when Json Serialization is used (#617) add 4c39a21 Update maven-jar-plugin add 61aeaff Some javadoc fixes add cac05c6 CXF-8185 - Tidy up add 5f2317c CXF-8097: Equal candidates for handling the current request (HEAD / GET). Extracting base comparator and updating documentation. add f977f50 CXF-8097: Equal candidates for handling the current request (HEAD / GET). Minor refactorings. add 9c48667 cxf-rt-frontend-jaxrs: fix warning 'boxed variable is never null' add eff15d9 Javadoc updates add e72ad77 CXF-8187 - Codegen-Plugin failed when maven is executed on jdk9+ with Toolchains specifying jdk 8 new 96cdc14 Merge remote-tracking branch 'origin/master' into CXF-7910_jakarta_jaxws-api new 505b762 CXF-7910: integrate latest servicemix releases 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: .../cxf/attachment/AttachmentDeserializer.java | 19 +++--- .../main/java/org/apache/cxf/bus/ManagedBus.java | 9 ++- .../java/org/apache/cxf/bus/spring/SpringBus.java | 2 +- .../cxf/common/injection/ResourceInjector.java | 8 +-- .../org/apache/cxf/common/util/StringUtils.java| 23 --- .../cxf/feature/transform/XSLTOutInterceptor.java | 4 +- .../main/java/org/apache/cxf/helpers/NSDecl.java | 2 +- .../cxf/service/model/BindingOperationInfo.java| 2 +- .../apache/cxf/service/model/MessagePartInfo.java | 2 +- .../apache/cxf/service/model/OperationInfo.java| 2 +- .../apache/cxf/common/util/StringUtilsTest.java| 23 +++ .../pom.xml| 2 +- .../samples/jax_rs/description_openapi_v3/pom.xml | 2 +- .../jax_rs/description_openapi_v3_web/pom.xml | 2 +- .../samples/jax_rs/description_swagger2/pom.xml| 2 +- .../jax_rs/description_swagger2_web/pom.xml| 2 +- .../release/samples/jax_rs/minimal_osgi/README.txt | 2 +- .../release/samples/jax_rs/minimal_osgi/pom.xml| 3 +- .../release/samples/jax_rs/spring_boot/pom.xml | 2 +- .../jax_rs/spring_boot_scan/application/pom.xml| 2 +- .../spring_boot_scan/eureka-registry/pom.xml | 2 +- distribution/src/main/release/samples/pom.xml | 10 ++- .../apache/cxf/connector/CXFConnectionParam.java | 14 ++-- .../AbstractManagedConnectionImpl.java | 2 +- .../apache/cxf/jca/outbound/CXFConnectionSpec.java | 45 +++-- .../jca/outbound/ManagedConnectionFactoryImpl.java | 8 +-- .../cxf/maven_plugin/AbstractCodegenMojo.java | 78 +++--- osgi/itests/pom.xml| 4 +- .../karaf/features/src/main/resources/features.xml | 4 +- parent/pom.xml | 16 ++--- pom.xml| 2 +- .../java/org/apache/cxf/aegis/AegisContext.java| 7 +- .../apache/cxf/aegis/type/AbstractTypeCreator.java | 5 +- .../org/apache/cxf/aegis/type/basic/BeanType.java | 3 +- .../org/apache/cxf/jaxb/JAXBEncoderDecoder.java| 3 +- .../org/apache/cxf/jaxrs/impl/UriBuilderImpl.java | 21 +++--- .../model/OperationResourceInfoComparator.java | 78 ++ ...va => OperationResourceInfoComparatorBase.java} | 55 --- .../apache/cxf/jaxrs/provider/ProviderFactory.java | 13 ++-- .../jaxrs/servlet/CXFNonSpringJaxrsServlet.java| 3 +- .../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 57 +--- .../test/java/org/apache/cxf/jaxrs/BaseApi.java| 23 +++ ...ilderWrongAnnotations.java => BaseRequest.java} | 14 ++-- ...lderWrongAnnotations.java
[cxf] 02/02: improved test assertions
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 325ed0436bc9cfa9150b3504a54b5911b47e3266
Author: Dennis Kieselhorst
AuthorDate: Thu Jan 2 09:06:16 2020 +0100
improved test assertions
---
parent/pom.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java | 9 +++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 58c175c..93e8460 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -149,7 +149,7 @@
1.4.0
[9.2,10)
${cxf.jetty9.version}
-9.4.24.v20191120
+9.4.24.v20191120
3.1
2.9.4
1.1.13
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java
index d2f5c2c..ce005aa 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java
@@ -22,6 +22,8 @@ package org.apache.cxf.systest.jaxrs;
import java.util.HashMap;
import java.util.Map;
+import javax.ws.rs.core.MediaType;
+
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.ext.xml.XMLSource;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -31,6 +33,7 @@ import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class JAXRSRequestDispatcherTest extends
AbstractBusClientServerTestBase {
@@ -65,8 +68,10 @@ public class JAXRSRequestDispatcherTest extends
AbstractBusClientServerTestBase
namespaces.put("books", "http://www.w3.org/books;);
String value =
source.getValue("xhtml:html/xhtml:body/xhtml:ul/books:bookTag", namespaces);
assertEquals("CXF Rocks", value);
-String ct =
client.getResponse().getMetadata().getFirst("Content-Type").toString();
-assertEquals("text/html", ct);
+Object contentType =
client.getResponse().getMetadata().getFirst("Content-Type");
+assertNotNull("Content-Type should be present", contentType);
+assertEquals("text/html", contentType.toString());
+assertEquals(MediaType.TEXT_HTML_TYPE,
client.getResponse().getMediaType());
}
@Test
[cxf] branch master updated (d3c23af -> 325ed04)
This is an automated email from the ASF dual-hosted git repository. deki pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from d3c23af Update Bouncycastle version new 2f47c80 Revert "Update Jetty version" (due to missing Content-Type in response) new 325ed04 improved test assertions 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: distribution/src/main/release/samples/pom.xml| 2 +- parent/pom.xml | 2 +- .../org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java | 9 +++-- 3 files changed, 9 insertions(+), 4 deletions(-)
[cxf] 01/02: Revert "Update Jetty version" (due to missing Content-Type in response)
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2f47c807b37758e10fb2d6c7746fd3f40451b566
Author: Dennis Kieselhorst
AuthorDate: Thu Jan 2 08:55:54 2020 +0100
Revert "Update Jetty version" (due to missing Content-Type in response)
This reverts commit ef7f9b1d
---
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml
b/distribution/src/main/release/samples/pom.xml
index 8ed643a..91fbe05 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -32,7 +32,7 @@
UTF-8
2.1.3.RELEASE
2.0.2.RELEASE
-9.4.25.v20191220
+9.4.24.v20191120
4.5.8
1.23
diff --git a/parent/pom.xml b/parent/pom.xml
index 4dd0318..58c175c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -149,7 +149,7 @@
1.4.0
[9.2,10)
${cxf.jetty9.version}
-9.4.25.v20191220
+9.4.24.v20191120
3.1
2.9.4
1.1.13
[cxf] branch master updated: Update Bouncycastle version
This is an automated email from the ASF dual-hosted git repository. deki 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 d3c23af Update Bouncycastle version d3c23af is described below commit d3c23afc74d604e17e5a45843fca0ce906b9c214 Author: Dennis Kieselhorst AuthorDate: Wed Jan 1 20:29:08 2020 +0100 Update Bouncycastle version --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9112f89..4dd0318 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -87,7 +87,7 @@ 1.9.1 [2.4,3.0) 2.5.2 -1.62 +1.64 2.10.0 5.6.9 2.14.2
[cxf] branch master updated: Update Jetty version
This is an automated email from the ASF dual-hosted git repository.
deki 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 ef7f9b1 Update Jetty version
ef7f9b1 is described below
commit ef7f9b1d16ec71ea1186701e20818607ce7d2bba
Author: Dennis Kieselhorst
AuthorDate: Mon Dec 30 21:49:28 2019 +0100
Update Jetty version
---
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml
b/distribution/src/main/release/samples/pom.xml
index 91fbe05..8ed643a 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -32,7 +32,7 @@
UTF-8
2.1.3.RELEASE
2.0.2.RELEASE
-9.4.24.v20191120
+9.4.25.v20191220
4.5.8
1.23
diff --git a/parent/pom.xml b/parent/pom.xml
index 8d36712..9112f89 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -149,7 +149,7 @@
1.4.0
[9.2,10)
${cxf.jetty9.version}
-9.4.24.v20191120
+9.4.25.v20191220
3.1
2.9.4
1.1.13
[cxf] 02/02: Revert "CXF-8165: Upgrade to Spring Framework 5.2.x and Spring Security 5.2.x"
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git commit d076d4494d96d268a196d4d48602b36d7086680d Author: Dennis Kieselhorst AuthorDate: Mon Dec 23 10:01:47 2019 +0100 Revert "CXF-8165: Upgrade to Spring Framework 5.2.x and Spring Security 5.2.x" This reverts commit 9d97e0d5 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 83d7a58..8d36712 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -196,8 +196,8 @@ 2.3.2.RELEASE spring-test 1.2.1 - 5.2.1.RELEASE -5.2.2.RELEASE + 5.1.7.RELEASE +5.1.12.RELEASE 1.7.6 3.24.3 2.0.10
[cxf] branch master updated (fab7fc9 -> d076d44)
This is an automated email from the ASF dual-hosted git repository. deki pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from fab7fc9 Update geronimo-openapi to 1.0.12 new 8723ff4 Revert "CXF-8134: Upgrade to Spring Boot 2.2" new d076d44 Revert "CXF-8165: Upgrade to Spring Framework 5.2.x and Spring Security 5.2.x" 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: .../release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml | 2 +- distribution/src/main/release/samples/pom.xml | 4 ++-- parent/pom.xml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-)
[cxf] 01/02: Revert "CXF-8134: Upgrade to Spring Boot 2.2"
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 8723ff4f63020ba966268561b689fd9eb4349fda
Author: Dennis Kieselhorst
AuthorDate: Mon Dec 23 10:01:14 2019 +0100
Revert "CXF-8134: Upgrade to Spring Boot 2.2"
This reverts commit 85ba0e6e
---
.../release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml | 2 +-
distribution/src/main/release/samples/pom.xml | 4 ++--
parent/pom.xml| 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
index 4683a2f..91be24d 100644
---
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
+++
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
@@ -32,10 +32,10 @@
+
org.springframework.cloud
spring-cloud-starter-netflix-eureka-server
-${spring.cloud.eureka.version}
org.slf4j
diff --git a/distribution/src/main/release/samples/pom.xml
b/distribution/src/main/release/samples/pom.xml
index 41f11b9..91fbe05 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -30,8 +30,8 @@
true
UTF-8
-2.2.2.RELEASE
-
2.2.1.RELEASE
+2.1.3.RELEASE
+
2.0.2.RELEASE
9.4.24.v20191120
4.5.8
1.23
diff --git a/parent/pom.xml b/parent/pom.xml
index 1283aba..83d7a58 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -192,7 +192,7 @@
1.7.29
1.25
1.2
-2.2.2.RELEASE
+2.1.11.RELEASE
2.3.2.RELEASE
spring-test
1.2.1
[cxf] branch CXF-8134_CXF-8165_spring-dep-upgrade created (now fab7fc9)
This is an automated email from the ASF dual-hosted git repository. deki pushed a change to branch CXF-8134_CXF-8165_spring-dep-upgrade in repository https://gitbox.apache.org/repos/asf/cxf.git. at fab7fc9 Update geronimo-openapi to 1.0.12 No new revisions were added by this update.
[cxf] branch master updated: Update geronimo-openapi to 1.0.12
This is an automated email from the ASF dual-hosted git repository. deki 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 fab7fc9 Update geronimo-openapi to 1.0.12 fab7fc9 is described below commit fab7fc9e2dfbe32cc9988b16f2aa03e4bfff28e3 Author: Dennis Kieselhorst AuthorDate: Mon Dec 23 07:16:22 2019 +0100 Update geronimo-openapi to 1.0.12 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index f6e32be..1283aba 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -116,7 +116,7 @@ 1.1.1 1.2 3.1.4 -1.0.11 +1.0.12 1.0.4 20.0 1.3
[cxf] branch CXF-7910_jakarta_jaxws-api updated (544604a -> 4926f24)
This is an automated email from the ASF dual-hosted git repository. deki pushed a change to branch CXF-7910_jakarta_jaxws-api in repository https://gitbox.apache.org/repos/asf/cxf.git. from 544604a Merge branch 'master' into CXF-7910_jakarta_jaxws-api add 4fe5007 update Swagger-UI version add 9d97e0d CXF-8165: Upgrade to Spring Framework 5.2.x and Spring Security 5.2.x add 85ba0e6 CXF-8134: Upgrade to Spring Boot 2.2 add 4926f24 Merge branch 'master' into CXF-7910_jakarta_jaxws-api No new revisions were added by this update. Summary of changes: .../main/release/samples/jax_rs/description_openapi_v3/pom.xml| 2 +- .../release/samples/jax_rs/description_openapi_v3_osgi/README.txt | 2 +- .../release/samples/jax_rs/description_openapi_v3_web/pom.xml | 2 +- .../src/main/release/samples/jax_rs/description_swagger2/pom.xml | 2 +- .../release/samples/jax_rs/description_swagger2_osgi/README.txt | 2 +- .../main/release/samples/jax_rs/description_swagger2_web/pom.xml | 2 +- distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml | 2 +- .../release/samples/jax_rs/spring_boot_scan/application/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml | 2 +- distribution/src/main/release/samples/pom.xml | 4 ++-- parent/pom.xml| 8 11 files changed, 15 insertions(+), 15 deletions(-)
[cxf] branch master updated: CXF-8134: Upgrade to Spring Boot 2.2
This is an automated email from the ASF dual-hosted git repository.
deki 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 85ba0e6 CXF-8134: Upgrade to Spring Boot 2.2
85ba0e6 is described below
commit 85ba0e6e65374df37b253f32a183b336b6d64991
Author: Dennis Kieselhorst
AuthorDate: Sun Dec 22 21:47:08 2019 +0100
CXF-8134: Upgrade to Spring Boot 2.2
---
.../release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml | 2 +-
distribution/src/main/release/samples/pom.xml | 4 ++--
parent/pom.xml| 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
index 91be24d..4683a2f 100644
---
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
+++
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
@@ -32,10 +32,10 @@
-
org.springframework.cloud
spring-cloud-starter-netflix-eureka-server
+${spring.cloud.eureka.version}
org.slf4j
diff --git a/distribution/src/main/release/samples/pom.xml
b/distribution/src/main/release/samples/pom.xml
index 91fbe05..41f11b9 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -30,8 +30,8 @@
true
UTF-8
-2.1.3.RELEASE
-
2.0.2.RELEASE
+2.2.2.RELEASE
+
2.2.1.RELEASE
9.4.24.v20191120
4.5.8
1.23
diff --git a/parent/pom.xml b/parent/pom.xml
index 1187c02..f6e32be 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -192,7 +192,7 @@
1.7.29
1.25
1.2
-2.1.11.RELEASE
+2.2.2.RELEASE
2.3.2.RELEASE
spring-test
1.2.1
[cxf] branch master updated: CXF-8165: Upgrade to Spring Framework 5.2.x and Spring Security 5.2.x
This is an automated email from the ASF dual-hosted git repository. deki 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 9d97e0d CXF-8165: Upgrade to Spring Framework 5.2.x and Spring Security 5.2.x 9d97e0d is described below commit 9d97e0d5b7f4e0ed3ebf531b389b38f6f3c111ed Author: Dennis Kieselhorst AuthorDate: Sun Dec 22 20:53:01 2019 +0100 CXF-8165: Upgrade to Spring Framework 5.2.x and Spring Security 5.2.x --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 1dda5d8..1187c02 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -196,8 +196,8 @@ 2.3.2.RELEASE spring-test 1.2.1 - 5.1.7.RELEASE -5.1.12.RELEASE + 5.2.1.RELEASE +5.2.2.RELEASE 1.7.6 3.24.3 2.0.10
[cxf] branch master updated: update Swagger-UI version
This is an automated email from the ASF dual-hosted git repository. deki 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 4fe5007 update Swagger-UI version 4fe5007 is described below commit 4fe500756ea2c6947579f44c3bb096783e9c1513 Author: Dennis Kieselhorst AuthorDate: Sun Dec 22 19:18:07 2019 +0100 update Swagger-UI version --- .../src/main/release/samples/jax_rs/description_openapi_v3/pom.xml | 2 +- .../main/release/samples/jax_rs/description_openapi_v3_osgi/README.txt | 2 +- .../src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml | 2 +- .../src/main/release/samples/jax_rs/description_swagger2/pom.xml| 2 +- .../main/release/samples/jax_rs/description_swagger2_osgi/README.txt| 2 +- .../src/main/release/samples/jax_rs/description_swagger2_web/pom.xml| 2 +- distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml| 2 +- .../main/release/samples/jax_rs/spring_boot_scan/application/pom.xml| 2 +- parent/pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml b/distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml index 892efe6..160f408 100644 --- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml @@ -63,7 +63,7 @@ org.webjars swagger-ui -3.23.0 +3.24.3 org.apache.cxf diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/README.txt b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/README.txt index 217c8bd..a557f78 100644 --- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/README.txt +++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/README.txt @@ -48,7 +48,7 @@ for this demo bundle. Optionally, you could install Swagger UI into Karaf OSGi container: - install -s mvn:org.webjars/swagger-ui/3.23.0 + install -s mvn:org.webjars/swagger-ui/3.24.3 Install this demo bundle (using the appropriate bundle version number) diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml index 37d36b5..d79a851 100644 --- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml @@ -56,7 +56,7 @@ under the License. org.webjars swagger-ui -3.24.0 +3.24.3 org.apache.cxf diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml index 9d9488f..e3d8d4c 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml @@ -63,7 +63,7 @@ org.webjars swagger-ui -3.23.0 +3.24.3 org.apache.cxf diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt index 61a04fb..0f37447 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt @@ -48,7 +48,7 @@ for this demo bundle. Optionally, you could install Swagger UI into Karaf OSGi container: - install -s mvn:org.webjars/swagger-ui/3.23.0 + install -s mvn:org.webjars/swagger-ui/3.24.3 Install this demo bundle (using the appropriate bundle version number) diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml index 6b9e707..701f96e 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml @@ -56,7 +56,7 @@ under the License. org.webjars swagger-ui -3.24.0 +3.24.3 org.apache.cxf diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml index 7b78839..4d3abc6 100644 --- a/distribution/src/main/release/samples/jax_rs
[cxf] branch master updated: [CXF-8110] Update to Jakarta RESTful Web Services API 2.1.6
This is an automated email from the ASF dual-hosted git repository.
deki 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 f0ad8c3 [CXF-8110] Update to Jakarta RESTful Web Services API 2.1.6
f0ad8c3 is described below
commit f0ad8c3079c37c7f1b9eaf0be0ee42ff5ddf5325
Author: Dennis Kieselhorst
AuthorDate: Sat Sep 7 15:25:34 2019 +0200
[CXF-8110] Update to Jakarta RESTful Web Services API 2.1.6
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 78cd012..0ec8a57 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -137,7 +137,7 @@
3.25.0-GA
1.3.2
3.0.0
-2.1.5
+2.1.6
${cxf.jaxb.version}
2.3.2
${cxf.jaxb.version}
[cxf] branch master updated: [CXF-7601] update geronimo-openapi to 1.0.11
This is an automated email from the ASF dual-hosted git repository. deki 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 65869ba [CXF-7601] update geronimo-openapi to 1.0.11 65869ba is described below commit 65869badeefe7eedd60fbc8b7d7c614a3c6d59a8 Author: Dennis Kieselhorst AuthorDate: Sat Sep 7 14:57:24 2019 +0200 [CXF-7601] update geronimo-openapi to 1.0.11 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 75a90c1..78cd012 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -116,7 +116,7 @@ 1.1.1 1.2 3.1.4 -1.0.9 +1.0.11 1.0.4 20.0 1.3
[cxf] branch CXF-7601_microProfileOpenApi deleted (was 64915c3)
This is an automated email from the ASF dual-hosted git repository. deki pushed a change to branch CXF-7601_microProfileOpenApi in repository https://gitbox.apache.org/repos/asf/cxf.git. was 64915c3 update parent to 3.4.0-SNAPSHOT The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[cxf] branch master updated (563b1ec -> bf81196)
This is an automated email from the ASF dual-hosted git repository.
deki pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 563b1ec Adding OAuth PKCE Digest tests
add 7b333d0 [CXF-7601] Add support for Microprofile OpenAPI
implementation (as an alternative to Swagger Core 2.0)
add 1c55f92 update new module to 3.3.1-SNAPSHOT
add 3886940 update to latest geronimo-openapi-impl release
add 3b96065 [CXF-7601] Add support for Microprofile OpenAPI
implementation (as an alternative to Swagger Core 2.0)
add 5aa0660 Rebased against latest master, added a sample project for
OpenAPI v3.0 using microprofile implementation
add 09ddfde Upgrading Apache Johnzon dependencies to 1.1.11
add 0c7ab09 update to latest geronimo-openapi-impl release
add e1b8126 Accomodate recent microprofile OpenApi changes
add bb6a56e Merge branch 'master-apache' into CXF-7601_microProfileOpenApi
add 64915c3 update parent to 3.4.0-SNAPSHOT
new bf81196 Merge pull request #571 from
apache/CXF-7601_microProfileOpenApi
The 1 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:
.../README.txt | 32 ++
.../pom.xml| 22 +-
.../java/demo/jaxrs/openapi/server/AppConfig.java | 35 ++
.../main/java/demo/jaxrs/openapi/server/Item.java | 0
.../java/demo/jaxrs/openapi/server/Sample.java | 81 ++--
.../java/demo/jaxrs/openapi/server/Server.java | 18 +-
.../resources/META-INF/cxf/org.apache.cxf.Logger | 0
.../src/main/resources/logback.xml | 0
distribution/src/main/release/samples/pom.xml | 1 +
osgi/itests-felix/pom.xml | 2 +-
parent/pom.xml | 25 +-
.../pom.xml| 49 ++-
.../microprofile/openapi/OpenApiEndpoint.java | 23 +-
.../jaxrs/microprofile/openapi/OpenApiFeature.java | 455 +
.../cxf/jaxrs/microprofile}/openapi/SwaggerUi.java | 13 +-
rt/rs/pom.xml | 1 +
rt/rs/security/jcs-parent/jcs/pom.xml | 2 +-
rt/rs/security/jcs-parent/pom.xml | 2 +-
.../wsdl_maven/codegen/src/it/cxf-4004/pom.xml | 2 +-
.../wsdl_maven/codegen/src/it/it-parent/pom.xml| 2 +-
20 files changed, 654 insertions(+), 111 deletions(-)
create mode 100644
distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/README.txt
copy
distribution/src/main/release/samples/jax_rs/{description_openapi_v3_spring =>
description_openapi_microprofile_spring}/pom.xml (84%)
create mode 100644
distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/src/main/java/demo/jaxrs/openapi/server/AppConfig.java
copy distribution/src/main/release/samples/jax_rs/{description_openapi_v3_web
=>
description_openapi_microprofile_spring}/src/main/java/demo/jaxrs/openapi/server/Item.java
(100%)
copy distribution/src/main/release/samples/jax_rs/{description_openapi_v3 =>
description_openapi_microprofile_spring}/src/main/java/demo/jaxrs/openapi/server/Sample.java
(68%)
copy
distribution/src/main/release/samples/jax_rs/{description_openapi_v3_spring =>
description_openapi_microprofile_spring}/src/main/java/demo/jaxrs/openapi/server/Server.java
(68%)
copy {systests/rs-sse/rs-sse-base =>
distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring}/src/main/resources/META-INF/cxf/org.apache.cxf.Logger
(100%)
copy distribution/src/main/release/samples/jax_rs/{description_swagger2_spring
=> description_openapi_microprofile_spring}/src/main/resources/logback.xml
(100%)
copy rt/rs/{description-swagger => description-microprofile-openapi}/pom.xml
(73%)
copy
distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleResource.java
=>
rt/rs/description-microprofile-openapi/src/main/java/org/apache/cxf/jaxrs/microprofile/openapi/OpenApiEndpoint.java
(64%)
create mode 100644
rt/rs/description-microprofile-openapi/src/main/java/org/apache/cxf/jaxrs/microprofile/openapi/OpenApiFeature.java
copy rt/rs/{description-openapi-v3/src/main/java/org/apache/cxf/jaxrs =>
description-microprofile-openapi/src/main/java/org/apache/cxf/jaxrs/microprofile}/openapi/SwaggerUi.java
(78%)
[cxf] 01/01: Merge pull request #571 from apache/CXF-7601_microProfileOpenApi
This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git commit bf81196008d0ba72ac37e5704e3b65417eaac0e7 Merge: 563b1ec 64915c3 Author: Dennis Kieselhorst AuthorDate: Thu Aug 15 22:07:45 2019 +0200 Merge pull request #571 from apache/CXF-7601_microProfileOpenApi [CXF-7601] Add support for Microprofile OpenAPI implementation .../README.txt | 32 ++ .../pom.xml| 98 + .../java/demo/jaxrs/openapi/server/AppConfig.java | 35 ++ .../main/java/demo/jaxrs/openapi/server/Item.java | 49 +++ .../java/demo/jaxrs/openapi/server/Sample.java | 162 .../java/demo/jaxrs/openapi/server/Server.java | 37 ++ .../resources/META-INF/cxf/org.apache.cxf.Logger | 1 + .../src/main/resources/logback.xml | 16 + distribution/src/main/release/samples/pom.xml | 1 + osgi/itests-felix/pom.xml | 2 +- parent/pom.xml | 25 +- rt/rs/description-microprofile-openapi/pom.xml | 93 + .../microprofile/openapi/OpenApiEndpoint.java | 43 ++ .../jaxrs/microprofile/openapi/OpenApiFeature.java | 455 + .../cxf/jaxrs/microprofile/openapi/SwaggerUi.java | 47 +++ rt/rs/pom.xml | 1 + rt/rs/security/jcs-parent/jcs/pom.xml | 2 +- rt/rs/security/jcs-parent/pom.xml | 2 +- .../wsdl_maven/codegen/src/it/cxf-4004/pom.xml | 2 +- .../wsdl_maven/codegen/src/it/it-parent/pom.xml| 2 +- 20 files changed, 1099 insertions(+), 6 deletions(-)
