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/03/09 18:54:21 UTC
(cxf) branch CXF-8671 updated (678c993a1a -> 7727aeca0c)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch CXF-8671
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 678c993a1a Merge remote-tracking branch 'origin/main' into CXF-8671
add 0394808f2f Bump santuario and wss4j snapshots to fix broken builds
add 6ff1052204 Bump org.webjars:swagger-ui from 5.10.3 to 5.11.8 (#1710)
add 57157a5b36 Bump com.fasterxml.woodstox:woodstox-core from 6.6.0 to 6.6.1 (#1708)
add 8433b2bbf6 Updating to WSS4J 3.0.3 (#1711)
add 5ec9f2eeca Bump ch.qos.logback:logback-classic from 1.5.0 to 1.5.1 (#1713)
add 1042e9956e Bump com.puppycrawl.tools:checkstyle from 10.13.0 to 10.14.0 (#1714)
add b522d10f50 Bump jakarta.activation:jakarta.activation-api from 2.1.2 to 2.1.3 (#1716)
add d0ac9fb5d4 CXF-8962: HttpClientHTTPConduit sets Content-Type Header for DELETE requests with empty body (#1699)
add 354f09f05e [CXF-8981] Added unit tests for key agreement method (#1715)
add bd1d7aef9a Update release notes for 4.0.4
add 7a503ee7c7 remove SNAPSHOT version
add 9730f744e6 make release preparation goals configurable
add f88b9bf2bc [maven-release-plugin] prepare release cxf-4.0.4
add 1480c40d6d [maven-release-plugin] prepare for next development iteration
add 5c9ebca951 CXF-8983: cxf-services-sts-core should depend on cxf-rt-rs-security-jose (#1725)
add 75d392b19e Bump jakarta.mail:jakarta.mail-api from 2.1.2 to 2.1.3 (#1726)
add d0baeb3ee6 Disable URLDataSource by default for Aegis (#1727)
add ea25bfc07e update release notes
add c252e7cd86 Revert "[maven-release-plugin] prepare for next development iteration"
add 65ed0403a0 Revert "[maven-release-plugin] prepare release cxf-4.0.4"
add 08fea2ea2e [CXF-8984] Check for null before closing input stream (#1728)
add 89db1096de update release_notes
add 6c61350435 [maven-release-plugin] prepare release cxf-4.0.4
add fabe346b8c [maven-release-plugin] rollback the release of cxf-4.0.4
add 52f98447a2 [maven-release-plugin] prepare release cxf-4.0.4
add c3e949c496 [maven-release-plugin] prepare for next development iteration
add 3d88bbb9cc [maven-release-plugin] rollback the release of cxf-4.0.4
add 667cf979a2 Disallowing DTDs for Aegis SourceType (#1729)
add 80e51f015c rollback version from previous failed release:prepare build
add 3bb96d88db Revert "rollback version from previous failed release:prepare build"
add f63251ca18 correct messed up version from previous build
add 40ad2263e5 [maven-release-plugin] prepare release cxf-4.0.4
add b01e28638c [maven-release-plugin] prepare for next development iteration
add f31da17f30 Bump actions/cache from 4.0.0 to 4.0.1 (#1717)
add b2632fe833 Bump actions/setup-java from 4.0.0 to 4.1.0 (#1718)
add 5420d12e43 Bump ch.qos.logback:logback-classic from 1.5.1 to 1.5.3 (#1724)
add 22d3340131 Bump cxf.mockito.version from 5.10.0 to 5.11.0 (#1723)
add 49a769e9ff Bump org.eclipse.angus:angus-activation from 2.0.1 to 2.0.2 (#1722)
add 0db6a043fe Bump org.codehaus.groovy:groovy from 3.0.20 to 3.0.21 (#1720)
new 7727aeca0c Merge remote-tracking branch 'origin/main' into CXF-8671
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:
.github/workflows/codeql-analysis.yml | 4 +-
.github/workflows/pull-request-build.yml | 2 +-
distribution/src/main/release/release_notes.txt | 99 +++----
distribution/src/main/release/samples/pom.xml | 4 +-
parent/pom.xml | 22 +-
pom.xml | 3 +-
.../apache/cxf/aegis/type/mtom/AttachmentUtil.java | 31 ++-
.../org/apache/cxf/aegis/type/xml/SourceType.java | 2 +
.../org/apache/cxf/transport/http/Headers.java | 2 +-
.../cxf/transport/http/HttpClientHTTPConduit.java | 26 +-
rt/ws/security/pom.xml | 1 -
.../ws/security/wss4j/AbstractSecurityTest.java | 9 +
.../cxf/ws/security/wss4j/TestPwdCallback.java | 5 +
.../cxf/ws/security/wss4j/WSS4JInOutTest.java | 86 ++++++
.../wss4j/WSS4JInOutWithAttachmentsTest.java | 289 +++++++++++++++++++++
.../cxf/ws/security/wss4j/edeliver-as4-clean.xml | 62 +++++
rt/ws/security/src/test/resources/wss-ecdh.p12 | Bin 0 -> 8299 bytes
.../src/test/resources/wss-ecdh.properties | 4 +
services/sts/sts-core/pom.xml | 2 +-
...ontinuationServer.java => EmptyBookServer.java} | 17 +-
.../apache/cxf/systest/jaxrs/EmptyBookStore.java | 29 ++-
...st.java => JAXRSClientServerEmptyBookTest.java} | 40 +--
22 files changed, 610 insertions(+), 129 deletions(-)
create mode 100644 rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutWithAttachmentsTest.java
create mode 100644 rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/edeliver-as4-clean.xml
create mode 100644 rt/ws/security/src/test/resources/wss-ecdh.p12
create mode 100644 rt/ws/security/src/test/resources/wss-ecdh.properties
copy systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/{BookContinuationServer.java => EmptyBookServer.java} (73%)
copy rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/BaseApi.java => systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/EmptyBookStore.java (62%)
copy systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/{JAXRSClientServerThrottledTest.java => JAXRSClientServerEmptyBookTest.java} (62%)
(cxf) 01/01: Merge remote-tracking branch 'origin/main' into CXF-8671
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch CXF-8671
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 7727aeca0c0d3e5ec13f58d33daecf1db7944720
Merge: 678c993a1a 0db6a043fe
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Mar 9 13:53:59 2024 -0500
Merge remote-tracking branch 'origin/main' into CXF-8671
.github/workflows/codeql-analysis.yml | 4 +-
.github/workflows/pull-request-build.yml | 2 +-
distribution/src/main/release/release_notes.txt | 99 +++----
distribution/src/main/release/samples/pom.xml | 4 +-
parent/pom.xml | 22 +-
pom.xml | 3 +-
.../apache/cxf/aegis/type/mtom/AttachmentUtil.java | 31 ++-
.../org/apache/cxf/aegis/type/xml/SourceType.java | 2 +
.../org/apache/cxf/transport/http/Headers.java | 2 +-
.../cxf/transport/http/HttpClientHTTPConduit.java | 26 +-
rt/ws/security/pom.xml | 1 -
.../ws/security/wss4j/AbstractSecurityTest.java | 9 +
.../cxf/ws/security/wss4j/TestPwdCallback.java | 5 +
.../cxf/ws/security/wss4j/WSS4JInOutTest.java | 86 ++++++
.../wss4j/WSS4JInOutWithAttachmentsTest.java | 289 +++++++++++++++++++++
.../cxf/ws/security/wss4j/edeliver-as4-clean.xml | 62 +++++
rt/ws/security/src/test/resources/wss-ecdh.p12 | Bin 0 -> 8299 bytes
.../src/test/resources/wss-ecdh.properties | 4 +
services/sts/sts-core/pom.xml | 2 +-
.../apache/cxf/systest/jaxrs/EmptyBookServer.java | 46 ++++
.../apache/cxf/systest/jaxrs/EmptyBookStore.java | 46 ++++
.../jaxrs/JAXRSClientServerEmptyBookTest.java | 63 +++++
22 files changed, 717 insertions(+), 91 deletions(-)
diff --cc distribution/src/main/release/samples/pom.xml
index d427a2399b,fa234e41a4..16987de17f
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@@ -31,12 -31,12 +31,12 @@@
<!-- don't deploy the samples, kind of pointless -->
<maven.deploy.skip>true</maven.deploy.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cxf.spring.boot.version>3.0.13</cxf.spring.boot.version>
- <cxf.spring.cloud.eureka.version>4.0.3</cxf.spring.cloud.eureka.version>
- <cxf.jetty11.version>11.0.20</cxf.jetty11.version>
+ <cxf.spring.boot.version>3.2.3</cxf.spring.boot.version>
+ <cxf.spring.cloud.eureka.version>4.1.0</cxf.spring.cloud.eureka.version>
- <cxf.jetty12.version>12.0.6</cxf.jetty12.version>
++ <cxf.jetty12.version>12.0.7</cxf.jetty12.version>
<cxf.netty.version>4.1.107.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
- <cxf.swagger.ui.version>5.10.3</cxf.swagger.ui.version>
+ <cxf.swagger.ui.version>5.11.8</cxf.swagger.ui.version>
<cxf.tika.version>2.7.0</cxf.tika.version>
<cxf.tomcat.version>10.1.18</cxf.tomcat.version>
<cxf.jboss.weld.version>4.0.3.Final</cxf.jboss.weld.version>
diff --cc parent/pom.xml
index b1c12f6759,bcfba72d4b..0da784e787
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@@ -136,13 -136,12 +136,13 @@@
<cxf.jackson.databind.version>2.16.1</cxf.jackson.databind.version>
<cxf.jacorb.version>3.9</cxf.jacorb.version>
<cxf.jaeger.version>1.8.1</cxf.jaeger.version>
- <cxf.jakarta.activation.version>2.1.2</cxf.jakarta.activation.version>
- <cxf.jakarta.mail.version>2.1.2</cxf.jakarta.mail.version>
+ <cxf.jakarta.activation.version>2.1.3</cxf.jakarta.activation.version>
+ <cxf.jakarta.mail.version>2.1.3</cxf.jakarta.mail.version>
<cxf.jakarta.injectapi.version>2.0.1</cxf.jakarta.injectapi.version>
+ <cxf.jakarta.interceptorapi.version>2.1.0</cxf.jakarta.interceptorapi.version>
<cxf.jakarta.jwsapi.version>3.0.0</cxf.jakarta.jwsapi.version>
- <cxf.jakarta.soapapi.version>2.0.1</cxf.jakarta.soapapi.version>
- <cxf.jakarta.wsapi.version>3.0.1</cxf.jakarta.wsapi.version>
+ <cxf.jakarta.soapapi.version>3.0.1</cxf.jakarta.soapapi.version>
+ <cxf.jakarta.wsapi.version>4.0.1</cxf.jakarta.wsapi.version>
<cxf.jakarta.jms.version>3.1.0</cxf.jakarta.jms.version>
<cxf.jakarta.transaction.version>2.0.1</cxf.jakarta.transaction.version>
<cxf.jakarta.ejb.version>4.0.1</cxf.jakarta.ejb.version>
@@@ -162,8 -161,8 +162,8 @@@
<cxf.jcache.version>1.1.1</cxf.jcache.version>
<cxf.jdom.version>1.0</cxf.jdom.version>
<cxf.jettison.version>1.5.4</cxf.jettison.version>
- <cxf.jetty12.version>12.0.6</cxf.jetty12.version>
- <cxf.jetty11.version>11.0.20</cxf.jetty11.version>
- <cxf.jetty.version>${cxf.jetty11.version}</cxf.jetty.version>
++ <cxf.jetty12.version>12.0.7</cxf.jetty12.version>
+ <cxf.jetty.version>${cxf.jetty12.version}</cxf.jetty.version>
<cxf.jexl.version>3.3</cxf.jexl.version>
<cxf.joda.time.version>2.10.10</cxf.joda.time.version>
<cxf.johnzon.version>1.2.21</cxf.johnzon.version>
@@@ -175,16 -174,16 +175,16 @@@
<cxf.kerby.version>2.0.3</cxf.kerby.version>
<cxf.ldapsdk.version>6.0.11</cxf.ldapsdk.version>
<cxf.littleproxy.version>1.1.2</cxf.littleproxy.version>
- <cxf.logback.classic.version>1.5.0</cxf.logback.classic.version>
+ <cxf.logback.classic.version>1.5.3</cxf.logback.classic.version>
<cxf.lucene.version>9.10.0</cxf.lucene.version>
<cxf.maven.core.version>3.9.6</cxf.maven.core.version>
- <cxf.micrometer.version>1.10.13</cxf.micrometer.version>
- <cxf.micrometer-tracing.version>1.0.12</cxf.micrometer-tracing.version>
- <cxf.microprofile.config.version>3.0.3</cxf.microprofile.config.version>
+ <cxf.micrometer.version>1.12.3</cxf.micrometer.version>
+ <cxf.micrometer-tracing.version>1.2.3</cxf.micrometer-tracing.version>
+ <cxf.microprofile.config.version>3.1</cxf.microprofile.config.version>
<cxf.microprofile.rest.client.version>3.0.1</cxf.microprofile.rest.client.version>
- <cxf.microprofile.openapi.version>3.0</cxf.microprofile.openapi.version>
+ <cxf.microprofile.openapi.version>3.1.1</cxf.microprofile.openapi.version>
<cxf.mina.version>2.2.1</cxf.mina.version>
- <cxf.mockito.version>5.10.0</cxf.mockito.version>
+ <cxf.mockito.version>5.11.0</cxf.mockito.version>
<cxf.msv.version>2022.7</cxf.msv.version>
<cxf.neethi.version>3.2.0</cxf.neethi.version>
<cxf.netty.version.range>[4,5)</cxf.netty.version.range>
@@@ -213,13 -211,13 +213,13 @@@
<cxf.slf4j.version>2.0.12</cxf.slf4j.version>
<cxf.snakeyaml.version>2.2</cxf.snakeyaml.version>
<cxf.specs.jaxws.api.version>2.3_2</cxf.specs.jaxws.api.version>
- <cxf.spring.boot.version>3.0.13</cxf.spring.boot.version>
- <cxf.spring.ldap.version>3.0.6</cxf.spring.ldap.version>
+ <cxf.spring.boot.version>3.2.3</cxf.spring.boot.version>
+ <cxf.spring.ldap.version>3.2.2</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
- <cxf.spring.security.version>6.0.8</cxf.spring.security.version>
- <cxf.spring.version>6.0.17</cxf.spring.version>
+ <cxf.spring.security.version>6.2.1</cxf.spring.security.version>
+ <cxf.spring.version>6.1.4</cxf.spring.version>
<cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
- <cxf.swagger.ui.version>5.10.3</cxf.swagger.ui.version>
+ <cxf.swagger.ui.version>5.11.8</cxf.swagger.ui.version>
<cxf.swagger.v3.version>2.2.20</cxf.swagger.v3.version>
<cxf.tika.version>2.7.0</cxf.tika.version>
<cxf.tomcat.version>10.1.18</cxf.tomcat.version>
@@@ -253,9 -251,9 +253,9 @@@
<cxf.dom4j.bundle.version>2.1.3_1</cxf.dom4j.bundle.version>
<cxf.fastinfoset.bundle.version>1.2.18_1</cxf.fastinfoset.bundle.version>
<cxf.felix.configadmin.version>1.2.4</cxf.felix.configadmin.version>
- <cxf.istack.version>3.0.12</cxf.istack.version>
- <cxf.jakarta.angus.mail.version>1.0.0</cxf.jakarta.angus.mail.version>
+ <cxf.istack.version>4.2.0</cxf.istack.version>
- <cxf.jakarta.angus.mail.version>1.0.0</cxf.jakarta.angus.mail.version>
- <cxf.jakarta.angus.activation.version>2.0.1</cxf.jakarta.angus.activation.version>
++ <cxf.jakarta.angus.mail.version>2.0.3</cxf.jakarta.angus.mail.version>
+ <cxf.jakarta.angus.activation.version>2.0.2</cxf.jakarta.angus.activation.version>
<cxf.jasypt.bundle.version>1.9.3_1</cxf.jasypt.bundle.version>
<cxf.jaxb.bundle.version>2.3.2_1</cxf.jaxb.bundle.version>
<cxf.jaxb.context.class.property>none</cxf.jaxb.context.class.property>