You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2024/05/09 12:11:07 UTC
(cxf) branch 4.0.x-fixes updated (5bb65af6a8 -> 1150ad4a64)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 5bb65af6a8 Bump com.fasterxml.jackson.core:jackson-databind from 2.17.0 to 2.17.1 (#1851)
new 34430d07b7 Bump org.mozilla:rhino from 1.7.14 to 1.7.15 (#1852)
new 51f76f129e Bump org.apache.maven.plugins:maven-deploy-plugin from 3.1.1 to 3.1.2 (#1853)
new 66db3c1610 [CXF-9006] Skip WSS40 cer validation check when on Red Hat JDK (#1836)
new 0642a9bb19 Bump org.jboss.logging:jboss-logging from 3.5.3.Final to 3.6.0.Final (#1855)
new 2d1dbd8a9a Use URI factory to parse WSDL location (#1858)
new aef0a143f0 Bump org.apache.maven.plugins:maven-plugin-plugin from 3.12.0 to 3.13.0 (#1860)
new 1150ad4a64 Recording .gitmergeinfo Changes
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 5 +++++
parent/pom.xml | 4 ++--
pom.xml | 4 ++--
.../test/resources/trustedAuthorityValidator/wss40.cer | Bin 956 -> 1097 bytes
.../resources/trustedAuthorityValidator/wss40CA.cer | Bin 794 -> 1077 bytes
.../resources/trustedAuthorityValidator/wss40CACRL.cer | Bin 345 -> 666 bytes
.../resources/trustedAuthorityValidator/wss40rev.cer | Bin 956 -> 1097 bytes
.../tools/wsdlto/frontend/jaxws/template/service.vm | 3 ++-
8 files changed, 11 insertions(+), 5 deletions(-)
(cxf) 01/07: Bump org.mozilla:rhino from 1.7.14 to 1.7.15 (#1852)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 34430d07b735468f0254c8dfba89ec7a912b9eeb
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue May 7 07:29:08 2024 -0400
Bump org.mozilla:rhino from 1.7.14 to 1.7.15 (#1852)
Bumps [org.mozilla:rhino](https://github.com/mozilla/rhino) from 1.7.14 to 1.7.15.
- [Release notes](https://github.com/mozilla/rhino/releases)
- [Changelog](https://github.com/mozilla/rhino/blob/master/RELEASE-NOTES.md)
- [Commits](https://github.com/mozilla/rhino/commits)
---
updated-dependencies:
- dependency-name: org.mozilla:rhino
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 48cc0d2602049bc05618d156accfbdd1076be9c9)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index ab29b7d19e..650d2258e7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -200,7 +200,7 @@
<cxf.plexus-utils.version>3.5.1</cxf.plexus-utils.version>
<cxf.reactivestreams.version>1.0.4</cxf.reactivestreams.version>
<cxf.reactor.version>3.5.16</cxf.reactor.version>
- <cxf.rhino.version>1.7.14</cxf.rhino.version>
+ <cxf.rhino.version>1.7.15</cxf.rhino.version>
<cxf.rxjava.version>1.3.8</cxf.rxjava.version>
<cxf.rxjava2.version>2.2.21</cxf.rxjava2.version>
<cxf.rxjava3.version>3.1.8</cxf.rxjava3.version>
(cxf) 06/07: Bump org.apache.maven.plugins:maven-plugin-plugin from 3.12.0 to 3.13.0 (#1860)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit aef0a143f0861a748886e766b0ab88e124aa8cd3
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Thu May 9 07:33:53 2024 -0400
Bump org.apache.maven.plugins:maven-plugin-plugin from 3.12.0 to 3.13.0 (#1860)
Bumps [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.12.0 to 3.13.0.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.12.0...maven-plugin-tools-3.13.0)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-plugin-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit db7514f272175f4f93984e53dae1e22d4e0ad02e)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a11d902fc0..09f306d5db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -563,7 +563,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.12.0</version>
+ <version>3.13.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
(cxf) 04/07: Bump org.jboss.logging:jboss-logging from 3.5.3.Final to 3.6.0.Final (#1855)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0642a9bb192d99c647fd5758397a3e438361d0da
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed May 8 08:29:12 2024 -0400
Bump org.jboss.logging:jboss-logging from 3.5.3.Final to 3.6.0.Final (#1855)
Bumps [org.jboss.logging:jboss-logging](https://github.com/jboss-logging/jboss-logging) from 3.5.3.Final to 3.6.0.Final.
- [Release notes](https://github.com/jboss-logging/jboss-logging/releases)
- [Commits](https://github.com/jboss-logging/jboss-logging/compare/3.5.3.Final...3.6.0.Final)
---
updated-dependencies:
- dependency-name: org.jboss.logging:jboss-logging
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 4ab8fcaef7288cbb4ef287d13dde9feaa0b65873)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 650d2258e7..dd35e8683a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -155,7 +155,7 @@
<cxf.jaxb.version>3.0.1</cxf.jaxb.version>
<cxf.jaxb.xjc.version>${cxf.jaxb.runtime.version}</cxf.jaxb.xjc.version>
<cxf.jaxen.version>2.0.0</cxf.jaxen.version>
- <cxf.jboss.logging.version>3.5.3.Final</cxf.jboss.logging.version>
+ <cxf.jboss.logging.version>3.6.0.Final</cxf.jboss.logging.version>
<cxf.jboss.weld.version>4.0.3.Final</cxf.jboss.weld.version>
<cxf.jboss.narayana.version>5.13.1.Final</cxf.jboss.narayana.version>
<cxf.jcache.version>1.1.1</cxf.jcache.version>
(cxf) 05/07: Use URI factory to parse WSDL location (#1858)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2d1dbd8a9a3dd602653cd7bf7f0106e97fe2e5cd
Author: Francisco Mateo <ci...@users.noreply.github.com>
AuthorDate: Thu May 9 06:33:19 2024 -0500
Use URI factory to parse WSDL location (#1858)
(cherry picked from commit 17d58fb7671f24919f852bbefce739ca36f6e763)
---
.../org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
index a57e420324..2d1b969f3e 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
@@ -24,6 +24,7 @@ package $service.PackageName;
#if ($wsdlLocation != "" && not($useGetResource) && not($wsdlLocation.startsWith("classpath:")))
import java.net.MalformedURLException;
#end
+import java.net.URI;
import java.net.URL;
#if ($markGenerated == "true")
import jakarta.annotation.Generated;
@@ -120,7 +121,7 @@ public class ${service.Name} extends ${serviceSuperclass} {
#else
URL url = null;
try {
- url = new URL("$wsdlLocation");
+ url = URI.create("$wsdlLocation").toURL();
} catch (MalformedURLException e) {
#if ($serviceTarget == "cxf")
LogUtils.getL7dLogger(${service.Name}.class)
(cxf) 02/07: Bump org.apache.maven.plugins:maven-deploy-plugin from 3.1.1 to 3.1.2 (#1853)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 51f76f129e299ebb8b78ebe989b8a0b1a59e6d3d
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue May 7 07:29:23 2024 -0400
Bump org.apache.maven.plugins:maven-deploy-plugin from 3.1.1 to 3.1.2 (#1853)
Bumps [org.apache.maven.plugins:maven-deploy-plugin](https://github.com/apache/maven-deploy-plugin) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/apache/maven-deploy-plugin/releases)
- [Commits](https://github.com/apache/maven-deploy-plugin/compare/maven-deploy-plugin-3.1.1...maven-deploy-plugin-3.1.2)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-deploy-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 978b5b9867d06d3af20671cb9370451ac11f9ac6)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0df2c517d0..a11d902fc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -548,7 +548,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
(cxf) 07/07: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1150ad4a6438eb95e2da2597e2b0d1a4a8acf36d
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu May 9 07:38:38 2024 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 2cc033c439..0ac7aa61c6 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1,5 +1,6 @@
origin/main
M 04644b02a4f96e2896d16948dfaa4f09b75ee55a
+M 0b53df25a3002b972a4cf65b890fa78e1e4989cc
M 0ea3b9cf2f2137f9e68ef81aea862fb345b6d56f
M 18c8d17917ca884b7c8e4e1b20591ced2366ca38
M 22bd868f6b57b1121e2542e2d8e60f86c26c54b0
@@ -7,16 +8,20 @@ M 2c73505856b6afb071aec6c00e482bfd82a7a7f5
M 32b2732b6884de3c60322f20657419db1d838e8a
M 3414297730d61914ec574eeae51f0c49a630d74b
M 477aa5572cec985bbc8ac8e19316eb1890d2b8fd
+M 48cc0d2602049bc05618d156accfbdd1076be9c9
+M 4ab8fcaef7288cbb4ef287d13dde9feaa0b65873
M 59a167fdd6dabbd872dae8fbc7620b3a70137038
M 6cdf415aa83d9453b6fe25d8d85fa31af2da5184
M 81115252cc4815c383c5713795f41fe7a9b6dc2f
M a57e914546a0624c78c823547d9a4cc8d7b3389f
M acc610299dc7e3d32e658649766d26452d15dea8
M af85f026d6c57aa79263e46657aba7e5d2d590ea
+M c56b1f1c2f491d855bb54f6ef714b75a83bd1202
M c662d7feabf74310c33aad3dd57b28bb650d36ce
M cbb76ba80791779b3bdc163c0762812947181f97
M dc08a738df3e10f133f4dc149c2cdbdf56ed8350
M dd74a63a8e59aa2bc762a41370e444cadae4c899
+M e17b6d78ec2e46cbdb7f7760d12ede92c5a63b2f
M ef0df72cd206e45e7cf494037951fc5132679a0b
M f39be2c1e7ae02c555bb6b0d59c5e68c86e33550
M f3bfb4f76e83ca3bd58c8d934ecbaea4f98d3284
(cxf) 03/07: [CXF-9006] Skip WSS40 cer validation check when on Red Hat JDK (#1836)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 66db3c16105448c54421eca04a0f25c4c70aa458
Author: Jamie Goodyear <jg...@apache.org>
AuthorDate: Tue May 7 11:49:24 2024 -0230
[CXF-9006] Skip WSS40 cer validation check when on Red Hat JDK (#1836)
* [CXF-9006] Skip WSS40 cer validation check when on Red Hat JDK
* [CXF-9006] Updated WSS40 certificates
* Restore white space count on assert wss40 valid
(cherry picked from commit b8156fae4f76da4f1fa8d5cec438f330e2ea608b)
---
.../test/resources/trustedAuthorityValidator/wss40.cer | Bin 956 -> 1097 bytes
.../resources/trustedAuthorityValidator/wss40CA.cer | Bin 794 -> 1077 bytes
.../resources/trustedAuthorityValidator/wss40CACRL.cer | Bin 345 -> 666 bytes
.../resources/trustedAuthorityValidator/wss40rev.cer | Bin 956 -> 1097 bytes
4 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40.cer b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40.cer
index f916206813..581309ec77 100644
Binary files a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40.cer and b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40.cer differ
diff --git a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CA.cer b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CA.cer
index 0faeb68b2a..90923a0f3e 100644
Binary files a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CA.cer and b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CA.cer differ
diff --git a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CACRL.cer b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CACRL.cer
index 0d46cca8e6..cd46d13d88 100644
Binary files a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CACRL.cer and b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CACRL.cer differ
diff --git a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40rev.cer b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40rev.cer
index ef2ff551e7..70dfb44cdd 100644
Binary files a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40rev.cer and b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40rev.cer differ