(cxf) branch main updated (fafb226d98 -> c49fc2d35b)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from fafb226d98 Bump org.eclipse.persistence:org.eclipse.persistence.moxy (#1977) add c49fc2d35b Bump cxf.hazelcast.version from 5.4.0 to 5.5.0 (#1980) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf) branch main updated: Bump org.eclipse.persistence:org.eclipse.persistence.moxy (#1977)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new fafb226d98 Bump org.eclipse.persistence:org.eclipse.persistence.moxy (#1977) fafb226d98 is described below commit fafb226d98d7cb797c0831c532e667c17c2950db Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jul 23 08:25:39 2024 -0400 Bump org.eclipse.persistence:org.eclipse.persistence.moxy (#1977) Bumps [org.eclipse.persistence:org.eclipse.persistence.moxy](https://github.com/eclipse-ee4j/eclipselink) from 4.0.3 to 4.0.4. - [Release notes](https://github.com/eclipse-ee4j/eclipselink/releases) - [Commits](https://github.com/eclipse-ee4j/eclipselink/compare/4.0.3...4.0.4) --- updated-dependencies: - dependency-name: org.eclipse.persistence:org.eclipse.persistence.moxy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 434f2015ea..e299574fb9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -2046,7 +2046,7 @@ org.eclipse.persistence org.eclipse.persistence.moxy -4.0.3 +4.0.4 provided true
(cxf) branch main updated: Bump cxf.wiremock.version from 3.8.0 to 3.9.0 (#1976)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 60273e60cb Bump cxf.wiremock.version from 3.8.0 to 3.9.0 (#1976) 60273e60cb is described below commit 60273e60cbd10d75c36aa2dd712d49c04bbe5b28 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jul 23 08:25:15 2024 -0400 Bump cxf.wiremock.version from 3.8.0 to 3.9.0 (#1976) Bumps `cxf.wiremock.version` from 3.8.0 to 3.9.0. Updates `org.wiremock:wiremock-standalone` from 3.8.0 to 3.9.0 - [Release notes](https://github.com/wiremock/wiremock/releases) - [Commits](https://github.com/wiremock/wiremock/compare/3.8.0...3.9.0) Updates `org.wiremock:wiremock-jetty12` from 3.8.0 to 3.9.0 - [Release notes](https://github.com/wiremock/wiremock/releases) - [Commits](https://github.com/wiremock/wiremock/compare/3.8.0...3.9.0) --- updated-dependencies: - dependency-name: org.wiremock:wiremock-standalone dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.wiremock:wiremock-jetty12 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index ae3055d867..434f2015ea 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -232,7 +232,7 @@ 3.0.2 2.3 2.0.0 -3.8.0 +3.9.0 7.0.0 4.2.1 1.6.3
(cxf-build-utils) branch main updated (30a0154 -> 92698e6)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-build-utils.git from 30a0154 Bump org.apache:apache from 32 to 33 (#108) add 92698e6 Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.7.0 to 3.8.0 (#109) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf) branch main updated (399a5e8bd5 -> c339ddf635)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from 399a5e8bd5 Bump github/codeql-action from 3.25.12 to 3.25.13 (#1974) add c339ddf635 Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.7.0 to 3.8.0 (#1975) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
(cxf) branch main updated: Bump github/codeql-action from 3.25.12 to 3.25.13 (#1974)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 399a5e8bd5 Bump github/codeql-action from 3.25.12 to 3.25.13 (#1974) 399a5e8bd5 is described below commit 399a5e8bd55d1e98cf236058a6cff9b41560c64e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jul 22 09:12:59 2024 -0400 Bump github/codeql-action from 3.25.12 to 3.25.13 (#1974) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.12 to 3.25.13. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/4fa2a7953630fd2f3fb380f21be14ede0169dd4f...2d790406f505036ef40ecba973cc774a50395aac) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/scorecards.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 06ac7f285f..70b0d91c51 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 + uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13 with: languages: java #config-file: ./.github/codeql/codeql-cxf-config.yml @@ -72,4 +72,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 + uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 30df946aaf..e4c9049cf8 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -57,6 +57,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" -uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f #tag=v2 +uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac #tag=v2 with: sarif_file: results.sarif
(cxf) branch main updated: Bump cxf.netty.version from 4.1.111.Final to 4.1.112.Final (#1973)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new f73955b83d Bump cxf.netty.version from 4.1.111.Final to 4.1.112.Final (#1973) f73955b83d is described below commit f73955b83dbdf3830d3250cb56d7ee05b324890d Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jul 22 08:41:19 2024 -0400 Bump cxf.netty.version from 4.1.111.Final to 4.1.112.Final (#1973) Bumps `cxf.netty.version` from 4.1.111.Final to 4.1.112.Final. Updates `io.netty:netty-codec-http` from 4.1.111.Final to 4.1.112.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.111.Final...netty-4.1.112.Final) Updates `io.netty:netty-codec-http2` from 4.1.111.Final to 4.1.112.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.111.Final...netty-4.1.112.Final) Updates `io.netty:netty-codec-socks` from 4.1.111.Final to 4.1.112.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.111.Final...netty-4.1.112.Final) Updates `io.netty:netty-handler-proxy` from 4.1.111.Final to 4.1.112.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.111.Final...netty-4.1.112.Final) --- updated-dependencies: - dependency-name: io.netty:netty-codec-http dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-codec-http2 dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: io.netty:netty-codec-socks dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: io.netty:netty-handler-proxy dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- 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 389052e9a1..437503e30a 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -34,7 +34,7 @@ 3.3.2 4.1.3 12.0.11 -4.1.111.Final +4.1.112.Final 4.5.14 5.17.14 2.9.1 diff --git a/parent/pom.xml b/parent/pom.xml index 688293ea35..ead1fc4cfb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -187,7 +187,7 @@ 2022.7 3.2.0 [4,5) -4.1.111.Final +4.1.112.Final 2.0.46.Final 2.0.12 3.2.2
(cxf) branch 3.5.x-fixes updated (fdfe6ce2be -> 61a21bdb5a)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from fdfe6ce2be Recording .gitmergeinfo Changes new 420280f342 CXF-9037: NPE when using com.ctc.wstx.returnNullForDefaultNamespace=true (#1962) new 61a21bdb5a Recording .gitmergeinfo Changes The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmergeinfo | 2 ++ .../java/org/apache/cxf/staxutils/StaxSource.java | 5 +++ .../org/apache/cxf/staxutils/StaxUtilsTest.java| 37 ++ 3 files changed, 44 insertions(+)
(cxf) 02/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 61a21bdb5ab25520a85de00d3a55fd3abb8fb097 Author: Andriy Redko AuthorDate: Fri Jul 19 21:26:04 2024 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index ef04d8bb32..0957ebf0bf 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -415,6 +415,7 @@ B d507cf3d50321c5f2745d90e1688503097329635 B d54d574bd86eb6141a159f20f86d64fea4efa0fa B d572688cc5f0467fd1ec68fc5163706c50ce70ba B d5895b3a227279bc913816cf1c95bacfa3931979 +B d6198d5ac1bb9297a71bc7f01e20693cd1a24e3f B d6c36b4dcabade57d0266313ab3745bedf5fb57c B d6c8dd8413ec8cf9f729fd7f539858de82f6af61 B d735757f556a567f27bfa030dcd33936c5d4ce3f @@ -881,6 +882,7 @@ M a903a5392b3cd2b5925c6afa46f289b3b94a694a M a95d8494cbabc9aa9b0919ee7efe71a920ed9f90 M a99701a0395b820df183884d814c70ca3092fa92 M aa09f875b0f71f1374535396f05910da7e90a3d6 +M aa6042815b0b1f318f369455210cd52f7e5a89ab M aa74b1f2c53b89b4bd7107cd7ec06588bae55b81 M ab04ccabc1a99bc0ecda91b6408dae30b4f3093f M ab2a6810a86d9d5b10dd2d429ad2b34dc8cbc99e
(cxf) 01/02: CXF-9037: NPE when using com.ctc.wstx.returnNullForDefaultNamespace=true (#1962)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 420280f342a85d18f59d7864fad7917cb9757b88 Author: Andriy Redko AuthorDate: Fri Jul 19 17:18:09 2024 -0400 CXF-9037: NPE when using com.ctc.wstx.returnNullForDefaultNamespace=true (#1962) * CXF-9037: NPE when using com.ctc.wstx.returnNullForDefaultNamespace=true * Address code review comments (cherry picked from commit 6b31ab01eaf234411503d781b42b7828d85a2cb6) (cherry picked from commit 1c88633158d6c034ef2566be6fa7e07969dd5278) (cherry picked from commit 3184b1ea9c4bd7546b725d2ce1e7c7b5df7bfe42) --- .../java/org/apache/cxf/staxutils/StaxSource.java | 5 +++ .../org/apache/cxf/staxutils/StaxUtilsTest.java| 37 ++ 2 files changed, 42 insertions(+) diff --git a/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java b/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java index f74058406d..2416d5596b 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java +++ b/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java @@ -142,6 +142,11 @@ public class StaxSource extends SAXSource implements XMLReader { if (nsUri == null) { nsUri = ""; } +// see please "com.ctc.wstx.returnNullForDefaultNamespace" property +if (nsPrefix == null) { +nsPrefix = ""; +} + contentHandler.startPrefixMapping(nsPrefix, nsUri); } contentHandler.startElement(uri == null ? "" : uri, localName, qname, getAttributes()); diff --git a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java index 1e97337c75..d2272da7b4 100644 --- a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java +++ b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java @@ -25,6 +25,7 @@ import java.io.InputStream; import java.io.StringReader; import java.io.StringWriter; import java.io.Writer; +import java.nio.charset.StandardCharsets; import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilderFactory; @@ -47,11 +48,14 @@ import org.w3c.dom.Element; import org.xml.sax.InputSource; +import com.ctc.wstx.stax.WstxInputFactory; + import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.helpers.IOUtils; import org.junit.Test; +import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertEquals; @@ -242,6 +246,39 @@ public class StaxUtilsTest { cycleString(testString); } + +@Test +public void testNullForDefaultNamespace() throws Exception { +final String bodyXml = "\n" ++ "http://schemas.xmlsoap.org/soap/envelope/\;>\n" ++ " \n" ++ "http://test.com/test\;>\n" ++ "\n" ++ "\n" ++ " \n" ++ "\n"; + +try (ByteArrayInputStream in = new ByteArrayInputStream(bodyXml.getBytes(StandardCharsets.UTF_8))) { +final WstxInputFactory factory = new WstxInputFactory(); +factory.setProperty("com.ctc.wstx.returnNullForDefaultNamespace", "true"); + +final Source beforeSource = new StaxSource(factory.createXMLStreamReader(in)); +StringWriter writer = new StringWriter(); +StreamResult result = new StreamResult(writer); + +TransformerFactory tf = TransformerFactory.newInstance(); + +Transformer transformer = tf.newTransformer(); +transformer.setOutputProperty(OutputKeys.INDENT, "yes"); +transformer.setOutputProperty(OutputKeys.STANDALONE, "yes"); +transformer.setOutputProperty(OutputKeys.CDATA_SECTION_ELEMENTS, "Q{http://test.com/test}reqBody;); + transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount;, "4"); + +transformer.transform(beforeSource, result); +assertThat(writer.toString(), startsWith("")); +} +} + private void cycleString(String s) throws Exception { StringReader reader = new StringReader(s); DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
(cxf) branch 3.6.x-fixes updated: CXF-9037: NPE when using com.ctc.wstx.returnNullForDefaultNamespace=true (#1962)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/3.6.x-fixes by this push: new 3184b1ea9c CXF-9037: NPE when using com.ctc.wstx.returnNullForDefaultNamespace=true (#1962) 3184b1ea9c is described below commit 3184b1ea9c4bd7546b725d2ce1e7c7b5df7bfe42 Author: Andriy Redko AuthorDate: Fri Jul 19 17:18:09 2024 -0400 CXF-9037: NPE when using com.ctc.wstx.returnNullForDefaultNamespace=true (#1962) * CXF-9037: NPE when using com.ctc.wstx.returnNullForDefaultNamespace=true * Address code review comments (cherry picked from commit 6b31ab01eaf234411503d781b42b7828d85a2cb6) (cherry picked from commit 1c88633158d6c034ef2566be6fa7e07969dd5278) --- .../java/org/apache/cxf/staxutils/StaxSource.java | 5 +++ .../org/apache/cxf/staxutils/StaxUtilsTest.java| 37 ++ 2 files changed, 42 insertions(+) diff --git a/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java b/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java index f74058406d..2416d5596b 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java +++ b/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java @@ -142,6 +142,11 @@ public class StaxSource extends SAXSource implements XMLReader { if (nsUri == null) { nsUri = ""; } +// see please "com.ctc.wstx.returnNullForDefaultNamespace" property +if (nsPrefix == null) { +nsPrefix = ""; +} + contentHandler.startPrefixMapping(nsPrefix, nsUri); } contentHandler.startElement(uri == null ? "" : uri, localName, qname, getAttributes()); diff --git a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java index 1e97337c75..d2272da7b4 100644 --- a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java +++ b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java @@ -25,6 +25,7 @@ import java.io.InputStream; import java.io.StringReader; import java.io.StringWriter; import java.io.Writer; +import java.nio.charset.StandardCharsets; import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilderFactory; @@ -47,11 +48,14 @@ import org.w3c.dom.Element; import org.xml.sax.InputSource; +import com.ctc.wstx.stax.WstxInputFactory; + import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.helpers.IOUtils; import org.junit.Test; +import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertEquals; @@ -242,6 +246,39 @@ public class StaxUtilsTest { cycleString(testString); } + +@Test +public void testNullForDefaultNamespace() throws Exception { +final String bodyXml = "\n" ++ "http://schemas.xmlsoap.org/soap/envelope/\;>\n" ++ " \n" ++ "http://test.com/test\;>\n" ++ "\n" ++ "\n" ++ " \n" ++ "\n"; + +try (ByteArrayInputStream in = new ByteArrayInputStream(bodyXml.getBytes(StandardCharsets.UTF_8))) { +final WstxInputFactory factory = new WstxInputFactory(); +factory.setProperty("com.ctc.wstx.returnNullForDefaultNamespace", "true"); + +final Source beforeSource = new StaxSource(factory.createXMLStreamReader(in)); +StringWriter writer = new StringWriter(); +StreamResult result = new StreamResult(writer); + +TransformerFactory tf = TransformerFactory.newInstance(); + +Transformer transformer = tf.newTransformer(); +transformer.setOutputProperty(OutputKeys.INDENT, "yes"); +transformer.setOutputProperty(OutputKeys.STANDALONE, "yes"); +transformer.setOutputProperty(OutputKeys.CDATA_SECTION_ELEMENTS, "Q{http://test.com/test}reqBody;); + transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount;, "4"); + +transformer.transform(beforeSource, result); +assertThat(writer.toString(), startsWith("")); +} +} + private void cycleString(String s) throws Exception { StringReader reader = new StringReader(s); DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
(cxf) branch 4.0.x-fixes updated: CXF-9037: NPE when using com.ctc.wstx.returnNullForDefaultNamespace=true (#1962)
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 The following commit(s) were added to refs/heads/4.0.x-fixes by this push: new 1c88633158 CXF-9037: NPE when using com.ctc.wstx.returnNullForDefaultNamespace=true (#1962) 1c88633158 is described below commit 1c88633158d6c034ef2566be6fa7e07969dd5278 Author: Andriy Redko AuthorDate: Fri Jul 19 17:18:09 2024 -0400 CXF-9037: NPE when using com.ctc.wstx.returnNullForDefaultNamespace=true (#1962) * CXF-9037: NPE when using com.ctc.wstx.returnNullForDefaultNamespace=true * Address code review comments (cherry picked from commit 6b31ab01eaf234411503d781b42b7828d85a2cb6) --- .../java/org/apache/cxf/staxutils/StaxSource.java | 5 +++ .../org/apache/cxf/staxutils/StaxUtilsTest.java| 37 ++ 2 files changed, 42 insertions(+) diff --git a/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java b/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java index f74058406d..2416d5596b 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java +++ b/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java @@ -142,6 +142,11 @@ public class StaxSource extends SAXSource implements XMLReader { if (nsUri == null) { nsUri = ""; } +// see please "com.ctc.wstx.returnNullForDefaultNamespace" property +if (nsPrefix == null) { +nsPrefix = ""; +} + contentHandler.startPrefixMapping(nsPrefix, nsUri); } contentHandler.startElement(uri == null ? "" : uri, localName, qname, getAttributes()); diff --git a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java index 1e97337c75..d2272da7b4 100644 --- a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java +++ b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java @@ -25,6 +25,7 @@ import java.io.InputStream; import java.io.StringReader; import java.io.StringWriter; import java.io.Writer; +import java.nio.charset.StandardCharsets; import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilderFactory; @@ -47,11 +48,14 @@ import org.w3c.dom.Element; import org.xml.sax.InputSource; +import com.ctc.wstx.stax.WstxInputFactory; + import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.helpers.IOUtils; import org.junit.Test; +import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertEquals; @@ -242,6 +246,39 @@ public class StaxUtilsTest { cycleString(testString); } + +@Test +public void testNullForDefaultNamespace() throws Exception { +final String bodyXml = "\n" ++ "http://schemas.xmlsoap.org/soap/envelope/\;>\n" ++ " \n" ++ "http://test.com/test\;>\n" ++ "\n" ++ "\n" ++ " \n" ++ "\n"; + +try (ByteArrayInputStream in = new ByteArrayInputStream(bodyXml.getBytes(StandardCharsets.UTF_8))) { +final WstxInputFactory factory = new WstxInputFactory(); +factory.setProperty("com.ctc.wstx.returnNullForDefaultNamespace", "true"); + +final Source beforeSource = new StaxSource(factory.createXMLStreamReader(in)); +StringWriter writer = new StringWriter(); +StreamResult result = new StreamResult(writer); + +TransformerFactory tf = TransformerFactory.newInstance(); + +Transformer transformer = tf.newTransformer(); +transformer.setOutputProperty(OutputKeys.INDENT, "yes"); +transformer.setOutputProperty(OutputKeys.STANDALONE, "yes"); +transformer.setOutputProperty(OutputKeys.CDATA_SECTION_ELEMENTS, "Q{http://test.com/test}reqBody;); + transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount;, "4"); + +transformer.transform(beforeSource, result); +assertThat(writer.toString(), startsWith("")); +} +} + private void cycleString(String s) throws Exception { StringReader reader = new StringReader(s); DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
(cxf) branch main updated: CXF-9037: NPE when using com.ctc.wstx.returnNullForDefaultNamespace=true (#1962)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 6b31ab01ea CXF-9037: NPE when using com.ctc.wstx.returnNullForDefaultNamespace=true (#1962) 6b31ab01ea is described below commit 6b31ab01eaf234411503d781b42b7828d85a2cb6 Author: Andriy Redko AuthorDate: Fri Jul 19 17:18:09 2024 -0400 CXF-9037: NPE when using com.ctc.wstx.returnNullForDefaultNamespace=true (#1962) * CXF-9037: NPE when using com.ctc.wstx.returnNullForDefaultNamespace=true * Address code review comments --- .../java/org/apache/cxf/staxutils/StaxSource.java | 5 +++ .../org/apache/cxf/staxutils/StaxUtilsTest.java| 37 ++ 2 files changed, 42 insertions(+) diff --git a/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java b/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java index f74058406d..2416d5596b 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java +++ b/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java @@ -142,6 +142,11 @@ public class StaxSource extends SAXSource implements XMLReader { if (nsUri == null) { nsUri = ""; } +// see please "com.ctc.wstx.returnNullForDefaultNamespace" property +if (nsPrefix == null) { +nsPrefix = ""; +} + contentHandler.startPrefixMapping(nsPrefix, nsUri); } contentHandler.startElement(uri == null ? "" : uri, localName, qname, getAttributes()); diff --git a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java index 1e97337c75..d2272da7b4 100644 --- a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java +++ b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java @@ -25,6 +25,7 @@ import java.io.InputStream; import java.io.StringReader; import java.io.StringWriter; import java.io.Writer; +import java.nio.charset.StandardCharsets; import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilderFactory; @@ -47,11 +48,14 @@ import org.w3c.dom.Element; import org.xml.sax.InputSource; +import com.ctc.wstx.stax.WstxInputFactory; + import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.helpers.IOUtils; import org.junit.Test; +import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertEquals; @@ -242,6 +246,39 @@ public class StaxUtilsTest { cycleString(testString); } + +@Test +public void testNullForDefaultNamespace() throws Exception { +final String bodyXml = "\n" ++ "http://schemas.xmlsoap.org/soap/envelope/\;>\n" ++ " \n" ++ "http://test.com/test\;>\n" ++ "\n" ++ "\n" ++ " \n" ++ "\n"; + +try (ByteArrayInputStream in = new ByteArrayInputStream(bodyXml.getBytes(StandardCharsets.UTF_8))) { +final WstxInputFactory factory = new WstxInputFactory(); +factory.setProperty("com.ctc.wstx.returnNullForDefaultNamespace", "true"); + +final Source beforeSource = new StaxSource(factory.createXMLStreamReader(in)); +StringWriter writer = new StringWriter(); +StreamResult result = new StreamResult(writer); + +TransformerFactory tf = TransformerFactory.newInstance(); + +Transformer transformer = tf.newTransformer(); +transformer.setOutputProperty(OutputKeys.INDENT, "yes"); +transformer.setOutputProperty(OutputKeys.STANDALONE, "yes"); +transformer.setOutputProperty(OutputKeys.CDATA_SECTION_ELEMENTS, "Q{http://test.com/test}reqBody;); + transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount;, "4"); + +transformer.transform(beforeSource, result); +assertThat(writer.toString(), startsWith("")); +} +} + private void cycleString(String s) throws Exception { StringReader reader = new StringReader(s); DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
(cxf) branch 3.6.x-fixes updated (335bedc37a -> d6198d5ac1)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 335bedc37a Recording .gitmergeinfo Changes new aa6042815b Update Hazelcast to 5.3.8 new d6198d5ac1 Recording .gitmergeinfo Changes The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmergeinfo | 2 ++ parent/pom.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
(cxf) 02/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit d6198d5ac1bb9297a71bc7f01e20693cd1a24e3f Author: Andriy Redko AuthorDate: Thu Jul 18 20:02:20 2024 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index ee0e71cad4..1fe59d6dd8 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -164,6 +164,7 @@ B c4f3d9665f242bfcf143388933ddb89dd725bd3b B c56c9797b8bc92570d48e6618fe8f450a0d188db B c58b508fd044acb1ff5da4d80009710b54567dea B c59992c6fe6ec3205de0499d2beb91ffbcdd760a +B c5d8d3cdedb56d3fe6d457bec56b8323a3a25306 B c788d82cb02b3257d3ec560de0df4a6130ba93e9 B c7b4aa0adcf465b43f5088a9be6ec5969e47a6db B c9c962bce36e24c38e7bc1fe0982b5592dc4bcb8 @@ -1070,6 +1071,7 @@ M d4e50c4167cdf2e06972ad90e507ef9423d00664 M d4f4b7712b3c8c5c684fa4fa0a28758d9a27cef3 M d505b2327c8695054d775d034c3e4c1ec9af7490 M d5cbaed0117b679a2b4c391278720183ca090861 +M d5efa019dbb7c8db071b37670b568ad5bfdf5aa0 M d6201134428dc4b219071e271a99b62c6f959a58 M d62ffb116bf1725f9c1eaa66f1e32a1e0dafae6e M d66b5b11e90859eb94599d664edc170ddbdf7dd8
(cxf) 01/02: Update Hazelcast to 5.3.8
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit aa6042815b0b1f318f369455210cd52f7e5a89ab Author: Andriy Redko AuthorDate: Thu Jul 18 17:47:12 2024 -0400 Update Hazelcast to 5.3.8 (cherry picked from commit d5efa019dbb7c8db071b37670b568ad5bfdf5aa0) # 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 4e2ca4aa29..3c6c10bf5f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -117,7 +117,7 @@ 1.1.4 32.1.3-jre 2.2 -5.3.6 +5.3.8 5.6.15.Final 6.2.5.Final 2.5.0
(cxf) 01/02: Recording .gitmergeinfo Changes
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 c5d8d3cdedb56d3fe6d457bec56b8323a3a25306 Author: Andriy Redko AuthorDate: Thu Jul 18 17:37:14 2024 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 58e0b9c724..77a6e16430 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -62,6 +62,7 @@ M 8d280d87deacdde9038d4828fd083706fac0d2f5 M 8d86ed8474e985a2f6f9fe2be488bc80488bb9de M 8fa7deb41bca82eb987a36d9d34f8e600fea0f48 M 9168edf91ea4322b7e63a6d77276204efef3a7de +M 9240d8d1dc248f796b10f128b65281aa4645f2b4 M 94a851c1942e0348fd28a6f1923bdcc5992cd975 M 94d649af6f76058334250334dd2b85fa555824fb M 99c88879b905c0fab21a4901d7da1a090db56c1b
(cxf) branch 4.0.x-fixes updated (3f7b2f9d3e -> d5efa019db)
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 3f7b2f9d3e Recording .gitmergeinfo Changes new c5d8d3cded Recording .gitmergeinfo Changes new d5efa019db Update Hazelcast to 5.3.8 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmergeinfo | 1 + parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
(cxf) 02/02: Update Hazelcast to 5.3.8
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 d5efa019dbb7c8db071b37670b568ad5bfdf5aa0 Author: Andriy Redko AuthorDate: Thu Jul 18 17:47:12 2024 -0400 Update Hazelcast to 5.3.8 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 67c2a6da8d..9db7717bd2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -121,7 +121,7 @@ 2.0.1 32.1.3-jre 2.2 -5.3.7 +5.3.8 6.1.7.Final 7.0.5.Final 2.7.3
(cxf) branch main updated: Update Spring Boot to 3.3.2
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 9240d8d1dc Update Spring Boot to 3.3.2 9240d8d1dc is described below commit 9240d8d1dc248f796b10f128b65281aa4645f2b4 Author: Andriy Redko AuthorDate: Thu Jul 18 16:19:03 2024 -0400 Update Spring Boot to 3.3.2 --- 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 0103da8410..389052e9a1 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -31,7 +31,7 @@ true UTF-8 -3.3.1 +3.3.2 4.1.3 12.0.11 4.1.111.Final diff --git a/parent/pom.xml b/parent/pom.xml index 4870f30011..688293ea35 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -212,7 +212,7 @@ 2.0.13 2.2 2.3_2 -3.3.1 +3.3.2 3.2.4 spring-test 6.3.1
(cxf) 02/06: Bump github/codeql-action from 3.25.11 to 3.25.12 (#1963)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 90acfc2a70b0b3ed0e0df127eb1a12083355038a Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jul 15 09:22:53 2024 -0400 Bump github/codeql-action from 3.25.11 to 3.25.12 (#1963) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.11 to 3.25.12. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/b611370bb5703a7efb587f9d136a52ea24c5c38c...4fa2a7953630fd2f3fb380f21be14ede0169dd4f) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 9cdc5e53db22c0362ed63080fe82399adc06f2b2) # Conflicts: # .github/workflows/scorecards.yml (cherry picked from commit c94ad179f845eb6bf5ecb93448fb4bd6f88df54d) (cherry picked from commit e0ab67861fb105fbf98124d87400b4e87208f2bf) --- .github/workflows/codeql-analysis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 62c4011470..57e19b890f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -54,7 +54,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 with: languages: ${{ matrix.language }} #config-file: ./.github/codeql/codeql-cxf-config.yml @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
(cxf) 05/06: Bump org.owasp:dependency-check-maven from 10.0.2 to 10.0.3 (#1971)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit d6e831305dea21a5c038f6f0a0d4c40882537df5 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Jul 17 10:17:25 2024 -0400 Bump org.owasp:dependency-check-maven from 10.0.2 to 10.0.3 (#1971) Bumps [org.owasp:dependency-check-maven](https://github.com/jeremylong/DependencyCheck) from 10.0.2 to 10.0.3. - [Release notes](https://github.com/jeremylong/DependencyCheck/releases) - [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md) - [Commits](https://github.com/jeremylong/DependencyCheck/compare/v10.0.2...v10.0.3) --- updated-dependencies: - dependency-name: org.owasp:dependency-check-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 00cf7b3974b4be5fcf3e34b080ab7e4d8518ef82) (cherry picked from commit 1cf147f02c1c3e6d3baaa581923a5a54de939962) # Conflicts: # pom.xml (cherry picked from commit 8e70e7d9b804bbe9a06d65ef6a574a9b933fb1bb) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd18caac11..a2e50f1373 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 1.8 UTF-8 scp://people.apache.org/www/cxf.apache.org/maven-site -10.0.2 +10.0.3
(cxf) branch 3.5.x-fixes updated (af950b0a15 -> fdfe6ce2be)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from af950b0a15 [maven-release-plugin] prepare for next development iteration new 0031213803 Bump org.apache.maven.plugins:maven-release-plugin from 3.1.0 to 3.1.1 (#1964) new 90acfc2a70 Bump github/codeql-action from 3.25.11 to 3.25.12 (#1963) new 4cd99d36bd Bump org.apache.maven.plugins:maven-project-info-reports-plugin (#1969) new 011463fe8a Update Apache Tomcat to 9.0.91 new d6e831305d Bump org.owasp:dependency-check-maven from 10.0.2 to 10.0.3 (#1971) new fdfe6ce2be Recording .gitmergeinfo Changes 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: .github/workflows/codeql-analysis.yml | 4 ++-- .gitmergeinfo | 9 + distribution/src/main/release/samples/pom.xml | 2 +- parent/pom.xml| 2 +- pom.xml | 8 5 files changed, 17 insertions(+), 8 deletions(-)
(cxf) 06/06: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit fdfe6ce2be78331344c44ddcb35ebdbe14931d23 Author: Andriy Redko AuthorDate: Wed Jul 17 19:43:58 2024 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 9 + 1 file changed, 9 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index fa7c99ff70..ef04d8bb32 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -99,6 +99,7 @@ B 31a541e3f92493422efc0f7adec366539e9e60e9 B 31ae3578f0a2e840ecb886cd6fe435f5e659abd4 B 33459b852ea56c85f526e863deb52ccb3b33964f B 335b7880918b3ba148d9e239421aedb5de4db814 +B 335bedc37a9c3bf4df69a2365abbd407948519a3 B 33e606c55927f34f3a2414bd1386931745357f38 B 3428dd1423198b22d7662dcc8d9553a58835c130 B 3457c8555d1ecb49cf13e29a60f7ab01ec5f2ff4 @@ -180,6 +181,7 @@ B 5b94f07f24035393aef95d11a6eb0bd646bb139b B 5bfcf58aeb8bd4825fd84d4ea10a5d2c4072798f B 5c08fbd9c0494cd8b355590477278adb45c389c0 B 5d6eedf32fd49a7f9cedc916084ad44dbec74846 +B 5e70fb8910d85becd21c082672fe5a23525dda20 B 5e7433512c2b4ca1d0dc3329926ed154e9678924 B 5e7f4272c98df43c37a7a96bbf3cbb3a321cb871 B 5fea9eb68552aca554c506a55013b0ef6f19bb16 @@ -200,9 +202,11 @@ B 682079d86b0a967ab6db6954cd1678cf97558cef B 684f998febd740fb9002b96b95d79b889fac6d2f B 687100fad7c18746da6130c2b04b734b97f7cf52 B 69c132f2d9eb4f390c27f4c2cd877594398c8f3f +B 6b27aec74e5329b60e84ff2478c854bf2acf3db5 B 6b3ecdde7e4cad0cd11652056653d3a8c10139e4 B 6c4eae9ec9f00826b88dbcdb475b9ac67e082f4c B 6d64fdb0d9219ca829f29a2f38480033b60a4c98 +B 6eb44019e2dd1391cab33b9b8c032a08e64e83f5 B 6ec1c32313891c081036dfee82e7bc5e0c59f168 B 6ecc77ef1bd88fd5434949f26bc31903d880d4d2 B 6eff04bec73f00eed4f11cca017b47efbb2fba66 @@ -213,6 +217,7 @@ B 718f5a602a932e58d2528a913b3d4b62e5990e3d B 740c1aaad57a59ba66a9a2147d8be1737b924aa0 B 74b205c590e08ad68546f102ca317fd3fe76e47f B 752fbd67181d7ae2bf68a632857e5c2f7c6dec6f +B 75adf4aa92c76f9cf5ecc61a5ea40e31e446e704 B 75d4379352ab441051bb3556490623d42a6ecf03 B 76e3c86ac68eef73680cbe62c614289f179c34b9 B 77f5bf4fc221fb07b33c21bf5a2386d58085d6d8 @@ -510,6 +515,7 @@ M 0a34a18cf9dd47f315e406c5cac4908ba78b9d31 M 0b9a55685abc679afbe6905a95b3a96abced57bb M 0cd2e9f1344a65998de0a3592b6c699b123c8384 M 0d148c31a6264884878d5cc82d972af4046e15d1 +M 0e53639a315db36d8cc72d833f3c4fd88f883aa1 M 0ef213c580b7aa33bd2bb6b2be8a0d1d87de8f05 M 0f2b22f554f402cbd19327194cccd33963686ba7 M 101afcaf01814ac166f6091eb76bb9b18a96fff9 @@ -537,6 +543,7 @@ M 1799bba4e9cc6b6220c20bff9a185afe57c2406b M 18f1791fa72dba0a7f2ed784d0dfbbb5e9923306 M 19e4039acfa543f8e2ddadc6378b07fd04a4a422 M 1a13214e84bcc48e2a893acfb0127a370d75406d +M 1a19fcd4c5311bd7d969eed3f0d5e7631c809e29 M 1a4649fa6386315a4c5e83c5e9ef0ccc3517318a M 1b4c763d8d8da47ed05f618ac5650ee10c10edbf M 1d125604a756ee0c4da875545013c70355f77542 @@ -808,6 +815,7 @@ M 8c9663b8d8547c085cdfdf8455ebc2d652cf8a42 M 8cc27337e48fd90142b3b4251b469b1026598bef M 8d51dc8111e0083f1bbba311b9676872c8178a8a M 8e2ce5d61df95daaaeee0209e9c9d768ca8bf6a2 +M 8e70e7d9b804bbe9a06d65ef6a574a9b933fb1bb M 8ef05ab891bfa009b279870d195dd767b2dd428d M 8f9828618b5e79573a23cd1ad2f7fa4e0e62d2b4 M 8fbb408a21c7f573d5b8cfc8ea05112e06152635 @@ -857,6 +865,7 @@ M a44c0f50b9d451b9f6201602722297f5b132b1dd M a49390ca95dfc21f280ee7068efc1f90089d92df M a4b17b86195a737c35fa98089d5684826605ca69 M a4bcbe87bdc69af1bd3367089d1be4bcaa66282e +M a51665b06668b1aae994b2548409aba60e7682a4 M a529faa54dc55f8b489908730d229b37da6638ed M a53805dfb325f693cbfc4ea0e253b0a7c741d139 M a5691920bcbd6768390acb372496032122cbd4d5
(cxf) 01/06: Bump org.apache.maven.plugins:maven-release-plugin from 3.1.0 to 3.1.1 (#1964)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 0031213803735ab4097214f329abcc13c5c41389 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jul 15 09:22:40 2024 -0400 Bump org.apache.maven.plugins:maven-release-plugin from 3.1.0 to 3.1.1 (#1964) Bumps [org.apache.maven.plugins:maven-release-plugin](https://github.com/apache/maven-release) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/apache/maven-release/releases) - [Commits](https://github.com/apache/maven-release/compare/maven-release-3.1.0...maven-release-3.1.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-release-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 8f764c36754fb57fbd9657f630ffea7576871b06) (cherry picked from commit 82fbc26e7377ccf5b4378945deb97d01f889ff5f) (cherry picked from commit 68a205b466fb44fbcd6926ea88c2d8597915ebc0) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a1c7b75bb9..a2ef08f91b 100644 --- a/pom.xml +++ b/pom.xml @@ -455,7 +455,7 @@ org.apache.maven.plugins maven-release-plugin -3.1.0 +3.1.1 false clean install
(cxf) 04/06: Update Apache Tomcat to 9.0.91
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 011463fe8a9373a622e70248e539bd3fdd589dec Author: Andriy Redko AuthorDate: Tue Jul 16 22:04:33 2024 -0400 Update Apache Tomcat to 9.0.91 (cherry picked from commit 1a19fcd4c5311bd7d969eed3f0d5e7631c809e29) # Conflicts: # distribution/src/main/release/samples/pom.xml --- 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 4c31e65f74..739a63bc12 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -37,7 +37,7 @@ 4.5.14 5.17.14 2.9.1 -9.0.90 +9.0.91 21.1.0 1.9.22.1 5.17.0 diff --git a/parent/pom.xml b/parent/pom.xml index 3ee9620a2b..3b39245abf 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -219,7 +219,7 @@ 31.1-jre 1.0.1 2.9.1 -9.0.90 +9.0.91 1.8 [1.4,3.0) [3.3,4.0)
(cxf) 03/06: Bump org.apache.maven.plugins:maven-project-info-reports-plugin (#1969)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 4cd99d36bd42138d47de671052dd2bc88a16ec1c Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jul 16 07:51:37 2024 -0400 Bump org.apache.maven.plugins:maven-project-info-reports-plugin (#1969) Bumps [org.apache.maven.plugins:maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) from 3.6.1 to 3.6.2. - [Commits](https://github.com/apache/maven-project-info-reports-plugin/compare/maven-project-info-reports-plugin-3.6.1...maven-project-info-reports-plugin-3.6.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-project-info-reports-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 9a2d336431012af73a432c073e91851504f000ac) (cherry picked from commit b8c95eac558af5b98e220675ac775c3e65de80d7) (cherry picked from commit 75c300d727aa23da378038f7a65ee842c47df86f) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a2ef08f91b..fd18caac11 100644 --- a/pom.xml +++ b/pom.xml @@ -559,7 +559,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin -3.6.1 +3.6.2 org.apache.maven.plugins @@ -742,7 +742,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin -3.6.1 +3.6.2 false
(cxf) 01/03: Bump org.owasp:dependency-check-maven from 10.0.2 to 10.0.3 (#1971)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 8e70e7d9b804bbe9a06d65ef6a574a9b933fb1bb Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Jul 17 10:17:25 2024 -0400 Bump org.owasp:dependency-check-maven from 10.0.2 to 10.0.3 (#1971) Bumps [org.owasp:dependency-check-maven](https://github.com/jeremylong/DependencyCheck) from 10.0.2 to 10.0.3. - [Release notes](https://github.com/jeremylong/DependencyCheck/releases) - [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md) - [Commits](https://github.com/jeremylong/DependencyCheck/compare/v10.0.2...v10.0.3) --- updated-dependencies: - dependency-name: org.owasp:dependency-check-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 00cf7b3974b4be5fcf3e34b080ab7e4d8518ef82) (cherry picked from commit 1cf147f02c1c3e6d3baaa581923a5a54de939962) # Conflicts: # pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a8c0fb8a0..46418f4a07 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 11 UTF-8 scp://people.apache.org/www/cxf.apache.org/maven-site -10.0.2 +10.0.3
(cxf) branch 3.6.x-fixes updated (1a19fcd4c5 -> 335bedc37a)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 1a19fcd4c5 Update Apache Tomcat to 9.0.91 new 8e70e7d9b8 Bump org.owasp:dependency-check-maven from 10.0.2 to 10.0.3 (#1971) new a51665b066 Allow JDK23 compatibility for Subject#getSubject (#1972) new 335bedc37a Recording .gitmergeinfo Changes The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmergeinfo | 2 ++ pom.xml | 2 +- .../apache/cxf/ext/logging/event/DefaultLogEventMapper.java | 13 ++--- 3 files changed, 13 insertions(+), 4 deletions(-)
(cxf) 03/03: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 335bedc37a9c3bf4df69a2365abbd407948519a3 Author: Andriy Redko AuthorDate: Wed Jul 17 17:22:07 2024 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 464c15df4f..ee0e71cad4 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -57,6 +57,7 @@ B 3b700961ead8a1c23ef945275bfe4defe22ea81d B 3bb3b0dbe55e2d29b489ea983f6f15fd140bd010 B 3ca892e21d2c2a778099ac77c262fff9cd34e266 B 3d5564dbff38b782837e291871cd210351acbfc2 +B 3f7b2f9d3e4f1d66d0139b4176c6847833f3ea07 B 400ed2294f316c46f5bce5190314e6ab1f504ba8 B 40ad2263e5c080bf3b55542bf3ee052fa7465733 B 419e1849157cfe0146227dfc3e8da7c693c71045 @@ -329,6 +330,7 @@ M 1b078aa212ee17050bad33dc7d6f61b22785afad M 1ba515ec4125aa0f104a251a7b4f386400fa0d95 M 1c17991a4b6ae93a4634583919692ff3da483c81 M 1cab5596a0bf99e111c238030349325636cfeca2 +M 1cf147f02c1c3e6d3baaa581923a5a54de939962 M 1d61fa26cd6663e35955b569d87cca6b2dc6ff40 M 1d92d5abc7913e0ef77f234ee0200d4b0e72ca85 M 1dd5d810b8ae7d13aef2d7138950aea224943913
(cxf) 02/03: Allow JDK23 compatibility for Subject#getSubject (#1972)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit a51665b06668b1aae994b2548409aba60e7682a4 Author: Francesco Chicchiriccò AuthorDate: Wed Jul 17 16:41:07 2024 +0200 Allow JDK23 compatibility for Subject#getSubject (#1972) (cherry picked from commit 0dca7da44a34858592243622d6d67329a0a46f79) (cherry picked from commit 3076490674f3a6b7f97fdfe6366c42a82a5a8079) --- .../apache/cxf/ext/logging/event/DefaultLogEventMapper.java | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java index dd7897d45a..2e77c8df64 100644 --- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java +++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java @@ -141,9 +141,16 @@ public class DefaultLogEventMapper { } private Iterator getJAASPrincipals() { -Subject subject = Subject.getSubject(AccessController.getContext()); -return subject != null && subject.getPrincipals() != null -? subject.getPrincipals().iterator() : Collections.emptyIterator(); +try { +Subject subject = Subject.getSubject(AccessController.getContext()); +return subject != null && subject.getPrincipals() != null +? subject.getPrincipals().iterator() : Collections.emptyIterator(); +} catch (UnsupportedOperationException e) { +// JDK 23: The terminally deprecated method Subject.getSubject(AccessControlContext) has been re-specified +// to throw UnsupportedOperationException if invoked when a Security Manager is not allowed. +// see https://jdk.java.net/23/release-notes#JDK-8296244 +return Collections.emptyIterator(); +} } private Map getHeaders(Message message) {
(cxf) 02/03: Allow JDK23 compatibility for Subject#getSubject (#1972)
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 3076490674f3a6b7f97fdfe6366c42a82a5a8079 Author: Francesco Chicchiriccò AuthorDate: Wed Jul 17 16:41:07 2024 +0200 Allow JDK23 compatibility for Subject#getSubject (#1972) (cherry picked from commit 0dca7da44a34858592243622d6d67329a0a46f79) --- .../apache/cxf/ext/logging/event/DefaultLogEventMapper.java | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java index dd7897d45a..2e77c8df64 100644 --- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java +++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java @@ -141,9 +141,16 @@ public class DefaultLogEventMapper { } private Iterator getJAASPrincipals() { -Subject subject = Subject.getSubject(AccessController.getContext()); -return subject != null && subject.getPrincipals() != null -? subject.getPrincipals().iterator() : Collections.emptyIterator(); +try { +Subject subject = Subject.getSubject(AccessController.getContext()); +return subject != null && subject.getPrincipals() != null +? subject.getPrincipals().iterator() : Collections.emptyIterator(); +} catch (UnsupportedOperationException e) { +// JDK 23: The terminally deprecated method Subject.getSubject(AccessControlContext) has been re-specified +// to throw UnsupportedOperationException if invoked when a Security Manager is not allowed. +// see https://jdk.java.net/23/release-notes#JDK-8296244 +return Collections.emptyIterator(); +} } private Map getHeaders(Message message) {
(cxf) 03/03: Recording .gitmergeinfo Changes
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 3f7b2f9d3e4f1d66d0139b4176c6847833f3ea07 Author: Andriy Redko AuthorDate: Wed Jul 17 17:19:15 2024 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 29b4f1af68..58e0b9c724 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1,4 +1,5 @@ origin/main +M 00cf7b3974b4be5fcf3e34b080ab7e4d8518ef82 M 039aeefd977be64c2ddda8dbff4cf605d302684a M 04644b02a4f96e2896d16948dfaa4f09b75ee55a M 0a35e128c6986a6c91e89b774b9a13841c397311 @@ -15,6 +16,7 @@ M 22b4825062439d0494b399d1ed89ba978450c81b M 22bd868f6b57b1121e2542e2d8e60f86c26c54b0 M 2b500aab12654c1b1704870096f6ab86e3beff83 M 2c73505856b6afb071aec6c00e482bfd82a7a7f5 +M 2d7a1d2b158f13efd87b75d7b4959730d4968f91 M 2e61db4b5014fe6d7e8309301788585936375476 M 2ed3a54a39244463e11ef8831efe8913e033d85e M 30d54b937e1f039e991e0a0887d47352976849df
(cxf) 01/03: Bump org.owasp:dependency-check-maven from 10.0.2 to 10.0.3 (#1971)
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 1cf147f02c1c3e6d3baaa581923a5a54de939962 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Jul 17 10:17:25 2024 -0400 Bump org.owasp:dependency-check-maven from 10.0.2 to 10.0.3 (#1971) Bumps [org.owasp:dependency-check-maven](https://github.com/jeremylong/DependencyCheck) from 10.0.2 to 10.0.3. - [Release notes](https://github.com/jeremylong/DependencyCheck/releases) - [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md) - [Commits](https://github.com/jeremylong/DependencyCheck/compare/v10.0.2...v10.0.3) --- updated-dependencies: - dependency-name: org.owasp:dependency-check-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 00cf7b3974b4be5fcf3e34b080ab7e4d8518ef82) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dda658ccb7..19c4f2f78d 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 11 UTF-8 scp://people.apache.org/www/cxf.apache.org/maven-site -10.0.2 +10.0.3 clean install
(cxf) branch 4.0.x-fixes updated (0776f10055 -> 3f7b2f9d3e)
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 0776f10055 Recording .gitmergeinfo Changes new 1cf147f02c Bump org.owasp:dependency-check-maven from 10.0.2 to 10.0.3 (#1971) new 3076490674 Allow JDK23 compatibility for Subject#getSubject (#1972) new 3f7b2f9d3e Recording .gitmergeinfo Changes The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmergeinfo | 2 ++ pom.xml | 2 +- .../apache/cxf/ext/logging/event/DefaultLogEventMapper.java | 13 ++--- 3 files changed, 13 insertions(+), 4 deletions(-)
(cxf) branch main updated (00cf7b3974 -> 2d7a1d2b15)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from 00cf7b3974 Bump org.owasp:dependency-check-maven from 10.0.2 to 10.0.3 (#1971) add 2d7a1d2b15 Bump cxf.undertow.version from 2.3.14.Final to 2.3.15.Final (#1970) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf) branch main updated: Bump org.owasp:dependency-check-maven from 10.0.2 to 10.0.3 (#1971)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 00cf7b3974 Bump org.owasp:dependency-check-maven from 10.0.2 to 10.0.3 (#1971) 00cf7b3974 is described below commit 00cf7b3974b4be5fcf3e34b080ab7e4d8518ef82 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Jul 17 10:17:25 2024 -0400 Bump org.owasp:dependency-check-maven from 10.0.2 to 10.0.3 (#1971) Bumps [org.owasp:dependency-check-maven](https://github.com/jeremylong/DependencyCheck) from 10.0.2 to 10.0.3. - [Release notes](https://github.com/jeremylong/DependencyCheck/releases) - [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md) - [Commits](https://github.com/jeremylong/DependencyCheck/compare/v10.0.2...v10.0.3) --- updated-dependencies: - dependency-name: org.owasp:dependency-check-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 938125bb09..2ea3349679 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 17 UTF-8 scp://people.apache.org/www/cxf.apache.org/maven-site -10.0.2 +10.0.3 clean install
(cxf) branch 3.6.x-fixes updated: Update Apache Tomcat to 9.0.91
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/3.6.x-fixes by this push: new 1a19fcd4c5 Update Apache Tomcat to 9.0.91 1a19fcd4c5 is described below commit 1a19fcd4c5311bd7d969eed3f0d5e7631c809e29 Author: Andriy Redko AuthorDate: Tue Jul 16 22:04:33 2024 -0400 Update Apache Tomcat to 9.0.91 --- 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 ae226ca2f1..5681875f37 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -37,7 +37,7 @@ 4.5.14 5.17.14 2.9.1 -9.0.90 +9.0.91 9.11.1 1.9.22.1 5.17.0 diff --git a/parent/pom.xml b/parent/pom.xml index c50487a35f..4e2ca4aa29 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -216,7 +216,7 @@ 32.1.3-jre 1.0.1 2.9.1 -9.0.90 +9.0.91 1.8 [1.4,3.0) [3.3,4.0)
(cxf-build-utils) branch main updated: Bump org.apache:apache from 32 to 33 (#108)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-build-utils.git The following commit(s) were added to refs/heads/main by this push: new 30a0154 Bump org.apache:apache from 32 to 33 (#108) 30a0154 is described below commit 30a0154adb426e31bf4d90add74f3042a7de63d3 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jul 16 18:45:45 2024 -0400 Bump org.apache:apache from 32 to 33 (#108) Bumps [org.apache:apache](https://github.com/apache/maven-apache-parent) from 32 to 33. - [Release notes](https://github.com/apache/maven-apache-parent/releases) - [Commits](https://github.com/apache/maven-apache-parent/commits) --- updated-dependencies: - dependency-name: org.apache:apache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e2ededf..57bd033 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.apache apache -32 +33 4.0.0
(cxf-build-utils) branch main updated (c293117 -> 0309971)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-build-utils.git from c293117 Bump org.apache.maven.plugins:maven-surefire-report-plugin (#107) add 0309971 Bump org.apache.maven.plugins:maven-project-info-reports-plugin (#106) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-build-utils) branch main updated (b72525e -> c293117)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-build-utils.git from b72525e Bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.0 to 3.3.1 (#105) add c293117 Bump org.apache.maven.plugins:maven-surefire-report-plugin (#107) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-build-utils) branch main updated (ec19bb4 -> b72525e)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-build-utils.git from ec19bb4 Bump org.apache.maven.plugins:maven-release-plugin from 3.0.1 to 3.1.1 (#104) add b72525e Bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.0 to 3.3.1 (#105) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf) 01/04: Bump org.apache.maven.plugins:maven-release-plugin from 3.1.0 to 3.1.1 (#1964)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 68a205b466fb44fbcd6926ea88c2d8597915ebc0 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jul 15 09:22:40 2024 -0400 Bump org.apache.maven.plugins:maven-release-plugin from 3.1.0 to 3.1.1 (#1964) Bumps [org.apache.maven.plugins:maven-release-plugin](https://github.com/apache/maven-release) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/apache/maven-release/releases) - [Commits](https://github.com/apache/maven-release/compare/maven-release-3.1.0...maven-release-3.1.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-release-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 8f764c36754fb57fbd9657f630ffea7576871b06) (cherry picked from commit 82fbc26e7377ccf5b4378945deb97d01f889ff5f) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7580dc4c99..b920ee1469 100644 --- a/pom.xml +++ b/pom.xml @@ -454,7 +454,7 @@ org.apache.maven.plugins maven-release-plugin -3.1.0 +3.1.1 false clean install
(cxf) branch 3.6.x-fixes updated (75adf4aa92 -> 5e70fb8910)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 75adf4aa92 Recording .gitmergeinfo Changes new 68a205b466 Bump org.apache.maven.plugins:maven-release-plugin from 3.1.0 to 3.1.1 (#1964) new e0ab67861f Bump github/codeql-action from 3.25.11 to 3.25.12 (#1963) new 75c300d727 Bump org.apache.maven.plugins:maven-project-info-reports-plugin (#1969) new 5e70fb8910 Recording .gitmergeinfo Changes The 4 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 ++-- .gitmergeinfo | 10 ++ pom.xml | 6 +++--- 3 files changed, 15 insertions(+), 5 deletions(-)
(cxf) 04/04: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 5e70fb8910d85becd21c082672fe5a23525dda20 Author: Andriy Redko AuthorDate: Tue Jul 16 15:50:36 2024 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 10 ++ 1 file changed, 10 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index da2852757f..464c15df4f 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -6,6 +6,7 @@ B 0194b82a60d9db30c858121af8e70f7d7fa1e5d9 B 02310e95fe74c0c031f540f3284e4a9bd856ced2 B 0394808f2f31a60b41835b88d8be1628b344018b B 04bc5be2435c025bf5c37975bd493405bc91f6ca +B 0776f10055c221a8d1beb6db4ac709fa9ba7a42b B 077f37412efa7bf857c6c34b6a2defb84fc587b4 B 0847c4b1d71bfba060d7e1c88a04b530c9aa5bb5 B 09211352a70bef5e309f9e93a9548eb9657e0673 @@ -270,6 +271,7 @@ M 0d301de6bfe9cf3345963ce6a991b2d984df M 0d671bdd4504777596089359a9709a5607e935f5 M 0d7017c1258dcb24f1b282dc4b4a1297e22f0bf3 M 0dfa2cbdedd867fe8b8c99053035eba405724650 +M 0e3ef75a23d6cc950db9c36f6877d706ca91ba22 M 0e863bb147452ad3819c4ca8456ca8afc46d6b16 M 0ea3b9cf2f2137f9e68ef81aea862fb345b6d56f M 0edc6a8f2e4051e24ccc65ee30dd05fe7f3b05c9 @@ -302,6 +304,7 @@ M 159f0e1eb48d9f185c41b748feb5da92d1d04dcb M 161e0db8029828c1ad139c7577b4f6ddfd287ad1 M 1654e0d45ac3ccaaa7eb53cc9ede8331424cf2fc M 167214335d2bb10e22210faef36603ba7ee4047d +M 16c96ebdec6461af39d3826b4b241234efb5b149 M 179f339622232adee54e9eb6a604ef1048c6d267 M 17d58fb7671f24919f852bbefce739ca36f6e763 M 1815072952a76ad1315a57a99a8835c96f4cd467 @@ -689,6 +692,7 @@ M 7226804d39d494a3229319fcc85a95173f8fec00 M 732b168c9003c3bb7fe113c92287efb5cd42d10b M 7331c6dac952ff347008925ffd6a30a985b9e9df M 7348591d44cfa91244dea299bd698c8b908eac01 +M 73a6fe3ef20173713da5f0f813d4a61395b3441f M 73b44e4ac485f5795d1d55e8d29a0ebac3cd31ec M 74069a140737603a0a59435de308401c4351a80b M 740be8651b75d010ae1b7348cc4a0e26e1821c5b @@ -737,6 +741,7 @@ M 8196761b0336ab21d94d5601c4b296beaa460f6e M 81f2683bfe081b44514a57bb80f0b1ca4986742e M 8207f6bf9c0e4f1833ba20ba61adb6bff0921253 M 82bae36fd9a04d9bdd897f89f0b7988c3be2b9e6 +M 82fbc26e7377ccf5b4378945deb97d01f889ff5f M 8323d4cb042ac4b6b073e8ee44d6dc4489e5 M 8394701f3327adaac409d950a1756eca9fc7a0c8 M 83ccd1fc299ade2b744f9c4f07b7a86a81374bc7 @@ -903,12 +908,14 @@ M ab3a3678528fdbe01c2f6c68aa90068fbc5d9538 M ac0a857f8f046068deacebe2c61f52e8e59e05de M ac271acc035224d6e372e55535f5049072534a00 M ac74c726758bfa34402c4b833859390c03c1f2eb +M aca5b5be11eef71eb087aa36fefdf83d3da46128 M acac34dc49241c461f05ca23d9d361dc2a4f8784 M acc610299dc7e3d32e658649766d26452d15dea8 M ace3b1901cb64a6f98e51dc9bbffe7cbeb4f4c1c M ad8d6659fbc0f44fa635769d9da2dee2e5e2a016 M adbdb96ffca1989f3127b82c18752671df0a5019 M ae2fd1e8166595031df48d95f1160d49f3fd506e +M af0d9acfee29f6d56df8a31d89bc67bb98f7796b M af21744e02a97cc081f3392579238c10d18b7152 M af2eb7077ce837c5dea11a61397bae9269fde90b M af7038490d5685a456d9f7e9e424a228416d1bf5 @@ -950,6 +957,7 @@ M b608027f5f352affd3d2228ae4733b47049f2590 M b63a72288a45062ab8bf41744954f70f164c6b71 M b660f71147311745fb7aee2e8834f30d12e98037 M b67138f8caece4c98e3c44437409d4be4d3801da +M b6b479c7fa246e3b3638c42f3ae6b41b8623441b M b6e3ab83a37cfb777d6eebf9711e552027bde37a M b77681d2e0801733087170665b6386bc99bb2276 M b7c645595a720784790e923077e513382fab10a2 @@ -1019,6 +1027,7 @@ M c7df294c70172a6a449c71e4cd05593a00c8e940 M c7e0ccf1a42c0a1587f4523abad696500ba60533 M c8201744c3c911b136a6fda0348aa747c2eadfd7 M c91d62bfe90c493c7db9de2d40515f4b0ef6c482 +M c94ad179f845eb6bf5ecb93448fb4bd6f88df54d M c95efd4bafcd8cca67804b74d133604727786803 M c9b3b07adac650679bb3539e18b0c556ce687b28 M ca0ec620534ae915230815f324f0c0df313e6f5f @@ -1134,6 +1143,7 @@ M e88b6f5d0f6f1a40311317ed18f204073ac66556 M e8b690d3bf15860b2576e325574157e5ce23ec28 M e8e59a1b96f0f8a30cbb68736abccf8a5e3319db M e8ea9fbbff58bde7dac7c8336a25c9bb92bad62e +M e9171862590c8681d1de27147e12f9e6f1cf4f01 M e91a5107dd9ec8046f17c6570d799d16985476c0 M e926c47df7219e72d17d4f532bd8641fa28921d9 M ea012b527e5fac40dc2245705232d7cfd16e11da
(cxf) 02/04: Bump github/codeql-action from 3.25.11 to 3.25.12 (#1963)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit e0ab67861fb105fbf98124d87400b4e87208f2bf Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jul 15 09:22:53 2024 -0400 Bump github/codeql-action from 3.25.11 to 3.25.12 (#1963) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.11 to 3.25.12. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/b611370bb5703a7efb587f9d136a52ea24c5c38c...4fa2a7953630fd2f3fb380f21be14ede0169dd4f) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 9cdc5e53db22c0362ed63080fe82399adc06f2b2) # Conflicts: # .github/workflows/scorecards.yml (cherry picked from commit c94ad179f845eb6bf5ecb93448fb4bd6f88df54d) --- .github/workflows/codeql-analysis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 51354bb54f..0e182e952e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -61,7 +61,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 with: languages: ${{ matrix.language }} #config-file: ./.github/codeql/codeql-cxf-config.yml @@ -89,4 +89,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
(cxf) 03/04: Bump org.apache.maven.plugins:maven-project-info-reports-plugin (#1969)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 75c300d727aa23da378038f7a65ee842c47df86f Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jul 16 07:51:37 2024 -0400 Bump org.apache.maven.plugins:maven-project-info-reports-plugin (#1969) Bumps [org.apache.maven.plugins:maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) from 3.6.1 to 3.6.2. - [Commits](https://github.com/apache/maven-project-info-reports-plugin/compare/maven-project-info-reports-plugin-3.6.1...maven-project-info-reports-plugin-3.6.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-project-info-reports-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 9a2d336431012af73a432c073e91851504f000ac) (cherry picked from commit b8c95eac558af5b98e220675ac775c3e65de80d7) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b920ee1469..6a8c0fb8a0 100644 --- a/pom.xml +++ b/pom.xml @@ -558,7 +558,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin -3.6.1 +3.6.2 org.apache.maven.plugins @@ -744,7 +744,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin -3.6.1 +3.6.2 false
(cxf) 01/05: Bump org.apache.maven.plugins:maven-release-plugin from 3.1.0 to 3.1.1 (#1964)
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 82fbc26e7377ccf5b4378945deb97d01f889ff5f Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jul 15 09:22:40 2024 -0400 Bump org.apache.maven.plugins:maven-release-plugin from 3.1.0 to 3.1.1 (#1964) Bumps [org.apache.maven.plugins:maven-release-plugin](https://github.com/apache/maven-release) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/apache/maven-release/releases) - [Commits](https://github.com/apache/maven-release/compare/maven-release-3.1.0...maven-release-3.1.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-release-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 8f764c36754fb57fbd9657f630ffea7576871b06) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 30c0a503c5..f9ce6a8187 100644 --- a/pom.xml +++ b/pom.xml @@ -454,7 +454,7 @@ org.apache.maven.plugins maven-release-plugin -3.1.0 +3.1.1 false ${preparationGoals}
(cxf) branch 4.0.x-fixes updated (8c7c5e7aa4 -> 0776f10055)
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 8c7c5e7aa4 Recording .gitmergeinfo Changes new 82fbc26e73 Bump org.apache.maven.plugins:maven-release-plugin from 3.1.0 to 3.1.1 (#1964) new c94ad179f8 Bump github/codeql-action from 3.25.11 to 3.25.12 (#1963) new b8c95eac55 Bump org.apache.maven.plugins:maven-project-info-reports-plugin (#1969) new e917186259 Update Apache Tomcat to 10.1.26 new 0776f10055 Recording .gitmergeinfo Changes The 5 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 ++-- .gitmergeinfo | 6 ++ distribution/src/main/release/samples/pom.xml | 2 +- parent/pom.xml| 2 +- pom.xml | 6 +++--- 5 files changed, 13 insertions(+), 7 deletions(-)
(cxf) 03/05: Bump org.apache.maven.plugins:maven-project-info-reports-plugin (#1969)
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 b8c95eac558af5b98e220675ac775c3e65de80d7 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jul 16 07:51:37 2024 -0400 Bump org.apache.maven.plugins:maven-project-info-reports-plugin (#1969) Bumps [org.apache.maven.plugins:maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) from 3.6.1 to 3.6.2. - [Commits](https://github.com/apache/maven-project-info-reports-plugin/compare/maven-project-info-reports-plugin-3.6.1...maven-project-info-reports-plugin-3.6.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-project-info-reports-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 9a2d336431012af73a432c073e91851504f000ac) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f9ce6a8187..dda658ccb7 100644 --- a/pom.xml +++ b/pom.xml @@ -558,7 +558,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin -3.6.1 +3.6.2 org.apache.maven.plugins @@ -745,7 +745,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin -3.6.1 +3.6.2 false
(cxf) 05/05: Recording .gitmergeinfo Changes
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 0776f10055c221a8d1beb6db4ac709fa9ba7a42b Author: Andriy Redko AuthorDate: Tue Jul 16 12:50:40 2024 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 6 ++ 1 file changed, 6 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 00f9c16668..29b4f1af68 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -17,6 +17,7 @@ M 2b500aab12654c1b1704870096f6ab86e3beff83 M 2c73505856b6afb071aec6c00e482bfd82a7a7f5 M 2e61db4b5014fe6d7e8309301788585936375476 M 2ed3a54a39244463e11ef8831efe8913e033d85e +M 30d54b937e1f039e991e0a0887d47352976849df M 3194e058bde505738093191819de399e5bcb013c M 32b2732b6884de3c60322f20657419db1d838e8a M 3414297730d61914ec574eeae51f0c49a630d74b @@ -24,11 +25,13 @@ M 369465b3243f0f01ec86a6911a9c216d46de8fb4 M 388cf563fef2ff90d5701113ac38cebdd2bd185d M 3896935619e1bbdc3ba8dce54755be646f53cab4 M 3e9348f48df34adc5600d2197edfc41f2c9dc981 +M 3f8e439fc58d00e3fd342a243d6ad6a0c7b3c32e M 415869c2eeba4d814677ab447df81d41c110f6ed M 477aa5572cec985bbc8ac8e19316eb1890d2b8fd M 48cc0d2602049bc05618d156accfbdd1076be9c9 M 493725700f70c97b8955deaca861ae72e5fa9073 M 4ab8fcaef7288cbb4ef287d13dde9feaa0b65873 +M 4ad78c7c98c13aa5479e21fef066b9e0826691dc M 4bd222d322451cef832e783fe8f887fcab68a2e1 M 4be33dce0cad5353a094fe08aba49989b93eb99b M 50058598b0caddc83b4a23b2454af25d1c23a76e @@ -60,7 +63,9 @@ M 9168edf91ea4322b7e63a6d77276204efef3a7de M 94a851c1942e0348fd28a6f1923bdcc5992cd975 M 94d649af6f76058334250334dd2b85fa555824fb M 99c88879b905c0fab21a4901d7da1a090db56c1b +M 9cdc5e53db22c0362ed63080fe82399adc06f2b2 M 9e499509931af040026c908444bacbea93bade6e +M 9e8aee89845f16952dddf855b4d5f0159d189348 M 9ffcd078281da628e9ee78447b222e1d430baea3 M a0ad89088d2865836ec6d34b4fe8a58aa7684621 M a10d62ef17f1d748f63e32dfd23f3ad4c1bb85f6 @@ -110,5 +115,6 @@ M f39be2c1e7ae02c555bb6b0d59c5e68c86e33550 M f3bfb4f76e83ca3bd58c8d934ecbaea4f98d3284 M f5069f2c7d5a761f3231129dd936486af1e80bdd M f59149412650a48bee86534d75778c74906f169d +M f919a6fc1a0f86ae2b0ec1eb3ca813ca77a5ded0 M fab33b61dbf8aca70d446a144373d28a2421533d M fcecec5e53f0fa56ae787cfa5a871edf26166e88
(cxf) 04/05: Update Apache Tomcat to 10.1.26
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 e9171862590c8681d1de27147e12f9e6f1cf4f01 Author: Andriy Redko AuthorDate: Tue Jul 16 12:46:45 2024 -0400 Update Apache Tomcat to 10.1.26 (cherry picked from commit 9e8aee89845f16952dddf855b4d5f0159d189348) --- 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 bf23a4833a..95ca253729 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -38,7 +38,7 @@ 4.5.14 5.17.14 2.9.1 -10.1.25 +10.1.26 4.0.3.Final 2.11.0 9.11.1 diff --git a/parent/pom.xml b/parent/pom.xml index 3150c7afdc..67c2a6da8d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -220,7 +220,7 @@ 5.17.14 2.2.22 2.9.1 -10.1.25 +10.1.26 1.8 2.2.20.Final
(cxf) 02/05: Bump github/codeql-action from 3.25.11 to 3.25.12 (#1963)
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 c94ad179f845eb6bf5ecb93448fb4bd6f88df54d Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jul 15 09:22:53 2024 -0400 Bump github/codeql-action from 3.25.11 to 3.25.12 (#1963) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.11 to 3.25.12. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/b611370bb5703a7efb587f9d136a52ea24c5c38c...4fa2a7953630fd2f3fb380f21be14ede0169dd4f) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 9cdc5e53db22c0362ed63080fe82399adc06f2b2) # Conflicts: # .github/workflows/scorecards.yml --- .github/workflows/codeql-analysis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 739e6af284..f3ca2adc51 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 with: languages: java #config-file: ./.github/codeql/codeql-cxf-config.yml @@ -72,4 +72,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
(cxf) branch main updated: Update Apache Tomcat to 10.1.26
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 9e8aee8984 Update Apache Tomcat to 10.1.26 9e8aee8984 is described below commit 9e8aee89845f16952dddf855b4d5f0159d189348 Author: Andriy Redko AuthorDate: Tue Jul 16 12:46:45 2024 -0400 Update Apache Tomcat to 10.1.26 --- 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 8684d7eed3..0103da8410 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -38,7 +38,7 @@ 4.5.14 5.17.14 2.9.1 -10.1.25 +10.1.26 4.0.3.Final 2.11.0 9.11.1 diff --git a/parent/pom.xml b/parent/pom.xml index 5ef005ca1c..56442a0d40 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -221,7 +221,7 @@ 5.17.14 2.2.22 2.9.1 -10.1.25 +10.1.26 1.8 2.3.14.Final 3.0.3
(cxf) branch main updated: Bump org.apache.maven.plugins:maven-project-info-reports-plugin (#1969)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 9a2d336431 Bump org.apache.maven.plugins:maven-project-info-reports-plugin (#1969) 9a2d336431 is described below commit 9a2d336431012af73a432c073e91851504f000ac Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jul 16 07:51:37 2024 -0400 Bump org.apache.maven.plugins:maven-project-info-reports-plugin (#1969) Bumps [org.apache.maven.plugins:maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) from 3.6.1 to 3.6.2. - [Commits](https://github.com/apache/maven-project-info-reports-plugin/compare/maven-project-info-reports-plugin-3.6.1...maven-project-info-reports-plugin-3.6.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-project-info-reports-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7a11be6304..938125bb09 100644 --- a/pom.xml +++ b/pom.xml @@ -564,7 +564,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin -3.6.1 +3.6.2 org.apache.maven.plugins @@ -756,7 +756,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin -3.6.1 +3.6.2 false
(cxf) branch main updated: Bump com.h2database:h2 from 2.2.224 to 2.3.230 (#1968)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 4ad78c7c98 Bump com.h2database:h2 from 2.2.224 to 2.3.230 (#1968) 4ad78c7c98 is described below commit 4ad78c7c98c13aa5479e21fef066b9e0826691dc Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jul 16 07:51:00 2024 -0400 Bump com.h2database:h2 from 2.2.224 to 2.3.230 (#1968) Bumps [com.h2database:h2](https://github.com/h2database/h2database) from 2.2.224 to 2.3.230. - [Release notes](https://github.com/h2database/h2database/releases) - [Commits](https://github.com/h2database/h2database/compare/version-2.2.224...version-2.3.230) --- updated-dependencies: - dependency-name: com.h2database:h2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- 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 4bd2ac1a4b..8684d7eed3 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -48,7 +48,7 @@ 3.4.0 2.1 2.31.0 -2.2.224 +2.3.230 5.13.1.Final 2.6.7 4.7.0
(cxf-build-utils) branch main updated (5093076 -> ec19bb4)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-build-utils.git from 5093076 Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.4.2 (#100) add ec19bb4 Bump org.apache.maven.plugins:maven-release-plugin from 3.0.1 to 3.1.1 (#104) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-build-utils) branch main updated (32b7d89 -> 5093076)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-build-utils.git from 32b7d89 Bump org.apache.maven.plugins:maven-clean-plugin from 3.3.2 to 3.4.0 (#101) add 5093076 Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.4.2 (#100) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-build-utils) branch main updated (5b9107f -> 32b7d89)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf-build-utils.git from 5b9107f Bump org.apache.maven.plugins:maven-dependency-plugin (#102) add 32b7d89 Bump org.apache.maven.plugins:maven-clean-plugin from 3.3.2 to 3.4.0 (#101) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cxf-build-utils) branch main updated: Bump org.apache.maven.plugins:maven-dependency-plugin (#102)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-build-utils.git The following commit(s) were added to refs/heads/main by this push: new 5b9107f Bump org.apache.maven.plugins:maven-dependency-plugin (#102) 5b9107f is described below commit 5b9107f5aecc1a73ac7d5d949c05344b8398c9ba Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jul 15 18:08:26 2024 -0400 Bump org.apache.maven.plugins:maven-dependency-plugin (#102) Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.7.0 to 3.7.1. - [Release notes](https://github.com/apache/maven-dependency-plugin/releases) - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.7.0...maven-dependency-plugin-3.7.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eb405b7..20308a8 100644 --- a/pom.xml +++ b/pom.xml @@ -190,7 +190,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.7.0 + 3.7.1 org.apache.maven.plugins
(cxf) branch main updated: Bump github/codeql-action from 3.25.11 to 3.25.12 (#1963)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 9cdc5e53db Bump github/codeql-action from 3.25.11 to 3.25.12 (#1963) 9cdc5e53db is described below commit 9cdc5e53db22c0362ed63080fe82399adc06f2b2 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jul 15 09:22:53 2024 -0400 Bump github/codeql-action from 3.25.11 to 3.25.12 (#1963) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.11 to 3.25.12. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/b611370bb5703a7efb587f9d136a52ea24c5c38c...4fa2a7953630fd2f3fb380f21be14ede0169dd4f) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/scorecards.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 5f738fef96..06ac7f285f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,7 +44,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 with: languages: java #config-file: ./.github/codeql/codeql-cxf-config.yml @@ -72,4 +72,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index c37b7cc8ee..30df946aaf 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -57,6 +57,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" -uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c #tag=v2 +uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f #tag=v2 with: sarif_file: results.sarif
(cxf) branch main updated: Bump org.apache.maven.plugins:maven-release-plugin from 3.1.0 to 3.1.1 (#1964)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 8f764c3675 Bump org.apache.maven.plugins:maven-release-plugin from 3.1.0 to 3.1.1 (#1964) 8f764c3675 is described below commit 8f764c36754fb57fbd9657f630ffea7576871b06 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jul 15 09:22:40 2024 -0400 Bump org.apache.maven.plugins:maven-release-plugin from 3.1.0 to 3.1.1 (#1964) Bumps [org.apache.maven.plugins:maven-release-plugin](https://github.com/apache/maven-release) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/apache/maven-release/releases) - [Commits](https://github.com/apache/maven-release/compare/maven-release-3.1.0...maven-release-3.1.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-release-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5d8c4ebe96..7a11be6304 100644 --- a/pom.xml +++ b/pom.xml @@ -460,7 +460,7 @@ org.apache.maven.plugins maven-release-plugin -3.1.0 +3.1.1 false ${preparationGoals}
(cxf) branch main updated: Bump org.apache.camel.springboot:camel-spring-boot-dependencies (#1965)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 3f8e439fc5 Bump org.apache.camel.springboot:camel-spring-boot-dependencies (#1965) 3f8e439fc5 is described below commit 3f8e439fc58d00e3fd342a243d6ad6a0c7b3c32e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jul 15 09:22:26 2024 -0400 Bump org.apache.camel.springboot:camel-spring-boot-dependencies (#1965) Bumps org.apache.camel.springboot:camel-spring-boot-dependencies from 4.6.0 to 4.7.0. --- updated-dependencies: - dependency-name: org.apache.camel.springboot:camel-spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- 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 4764fae660..4bd2ac1a4b 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -51,7 +51,7 @@ 2.2.224 5.13.1.Final 2.6.7 -4.6.0 +4.7.0
(cxf) branch 4.0.x-fixes updated: CXF-9038: Run Jakarta RESTful Web Services 3.0 TCK
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 The following commit(s) were added to refs/heads/4.0.x-fixes by this push: new b6b479c7fa CXF-9038: Run Jakarta RESTful Web Services 3.0 TCK b6b479c7fa is described below commit b6b479c7fa246e3b3638c42f3ae6b41b8623441b Author: Andriy Redko AuthorDate: Sun Jul 14 21:43:24 2024 -0400 CXF-9038: Run Jakarta RESTful Web Services 3.0 TCK --- tck/ts.jte.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tck/ts.jte.template b/tck/ts.jte.template index 65d137d98c..8cd4c36845 100644 --- a/tck/ts.jte.template +++ b/tck/ts.jte.template @@ -403,7 +403,7 @@ s1as.admin.port=${glassfish.admin.port} ## web.home=${GF_HOME} jaxrs_impl.classes=${web.home}/domains/domain1/lib/cxf-rt-rs-client-${version}.jar:${web.home}/domains/domain1/lib/cxf-core-${version}.jar:${web.home}/domains/domain1/lib/cxf-rt-transports-http-${version}.jar:${web.home}/domains/domain1/lib/cxf-rt-frontend-jaxrs-${version}.jar:${web.home}/domains/domain1/lib/cxf-rt-rs-sse-${version}.jar -jaxrs.classes=${web.home}/modules/jakarta.ws.rs-api.jar:${web.home}/modules/jakarta.annotation-api.jar:${web.home}/modules/jakarta.validation-api.jar:${web.home}/modules/jakarta.xml.bind-api.jar:${web.home}/modules/bean-validator.jar:${web.home}/modules/jakarta.json.jar:${web.home}/modules/jakarta.interceptor-api.jar:${web.home}/modules/jakarta.ejb-api.jar:${web.home}/modules/jakarta.inject.jar:${web.home}/modules/jakarta.activation.jar:${web.home}/modules/cdi-api.jar:${web.home}/modules [...] +jaxrs.classes=${web.home}/modules/jakarta.ws.rs-api.jar:${web.home}/modules/jakarta.annotation-api.jar:${web.home}/modules/jakarta.validation-api.jar:${web.home}/modules/jakarta.xml.bind-api.jar:${web.home}/modules/bean-validator.jar:${web.home}/modules/jakarta.json.jar:${web.home}/modules/jakarta.interceptor-api.jar:${web.home}/modules/jakarta.ejb-api.jar:${web.home}/modules/jakarta.inject.jar:${web.home}/modules/jakarta.activation.jar:${web.home}/modules/cdi-api.jar:${web.home}/modules [...] jaxrs_impl_lib=${web.home}/domains/domain1/lib/cxf-rt-frontend-jaxrs-${version}.jar:${web.home}/domains/domain1/lib/cxf-rt-rs-sse-${version}.jar servlet_adaptor=org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.class
(cxf) branch 4.0.x-fixes updated: CXF-9038: Run Jakarta RESTful Web Services 3.0 TCK
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 The following commit(s) were added to refs/heads/4.0.x-fixes by this push: new af0d9acfee CXF-9038: Run Jakarta RESTful Web Services 3.0 TCK af0d9acfee is described below commit af0d9acfee29f6d56df8a31d89bc67bb98f7796b Author: Andriy Redko AuthorDate: Sun Jul 14 13:32:33 2024 -0400 CXF-9038: Run Jakarta RESTful Web Services 3.0 TCK --- tck/ts.jte.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tck/ts.jte.template b/tck/ts.jte.template index f29f5e081c..65d137d98c 100644 --- a/tck/ts.jte.template +++ b/tck/ts.jte.template @@ -403,7 +403,7 @@ s1as.admin.port=${glassfish.admin.port} ## web.home=${GF_HOME} jaxrs_impl.classes=${web.home}/domains/domain1/lib/cxf-rt-rs-client-${version}.jar:${web.home}/domains/domain1/lib/cxf-core-${version}.jar:${web.home}/domains/domain1/lib/cxf-rt-transports-http-${version}.jar:${web.home}/domains/domain1/lib/cxf-rt-frontend-jaxrs-${version}.jar:${web.home}/domains/domain1/lib/cxf-rt-rs-sse-${version}.jar -jaxrs.classes=${web.home}/modules/jakarta.ws.rs-api.jar:${web.home}/modules/jakarta.annotation-api.jar:${web.home}/modules/jakarta.validation-api.jar:${web.home}/modules/jakarta.xml.bind-api.jar:${web.home}/modules/bean-validator.jar:${web.home}/modules/jakarta.json.jar:${web.home}/modules/jakarta.interceptor-api.jar:${web.home}/modules/jakarta.ejb-api.jar:${web.home}/modules/jakarta.inject.jar:${web.home}/modules/jakarta.activation.jar:${web.home}/modules/cdi-api.jar:${web.home}/modules [...] +jaxrs.classes=${web.home}/modules/jakarta.ws.rs-api.jar:${web.home}/modules/jakarta.annotation-api.jar:${web.home}/modules/jakarta.validation-api.jar:${web.home}/modules/jakarta.xml.bind-api.jar:${web.home}/modules/bean-validator.jar:${web.home}/modules/jakarta.json.jar:${web.home}/modules/jakarta.interceptor-api.jar:${web.home}/modules/jakarta.ejb-api.jar:${web.home}/modules/jakarta.inject.jar:${web.home}/modules/jakarta.activation.jar:${web.home}/modules/cdi-api.jar:${web.home}/modules [...] jaxrs_impl_lib=${web.home}/domains/domain1/lib/cxf-rt-frontend-jaxrs-${version}.jar:${web.home}/domains/domain1/lib/cxf-rt-rs-sse-${version}.jar servlet_adaptor=org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.class
(cxf) branch 4.0.x-fixes updated: CXF-9038: Run Jakarta RESTful Web Services 3.0 TCK
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 The following commit(s) were added to refs/heads/4.0.x-fixes by this push: new 16c96ebdec CXF-9038: Run Jakarta RESTful Web Services 3.0 TCK 16c96ebdec is described below commit 16c96ebdec6461af39d3826b4b241234efb5b149 Author: Andriy Redko AuthorDate: Sun Jul 14 11:36:56 2024 -0400 CXF-9038: Run Jakarta RESTful Web Services 3.0 TCK --- tck/ts.jte.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tck/ts.jte.template b/tck/ts.jte.template index c0a4fc4712..f29f5e081c 100644 --- a/tck/ts.jte.template +++ b/tck/ts.jte.template @@ -403,7 +403,7 @@ s1as.admin.port=${glassfish.admin.port} ## web.home=${GF_HOME} jaxrs_impl.classes=${web.home}/domains/domain1/lib/cxf-rt-rs-client-${version}.jar:${web.home}/domains/domain1/lib/cxf-core-${version}.jar:${web.home}/domains/domain1/lib/cxf-rt-transports-http-${version}.jar:${web.home}/domains/domain1/lib/cxf-rt-frontend-jaxrs-${version}.jar:${web.home}/domains/domain1/lib/cxf-rt-rs-sse-${version}.jar -jaxrs.classes=${web.home}/modules/jakarta.ws.rs-api.jar:${web.home}/modules/jakarta.annotation-api.jar:${web.home}/modules/bean-validator.jar:${web.home}/modules/jakarta.json.jar:${web.home}/modules/jakarta.interceptor-api.jar:${web.home}/modules/jakarta.ejb-api.jar:${web.home}/modules/jakarta.inject.jar:${web.home}/modules/jakarta.activation.jar:${web.home}/modules/cdi-api.jar:${web.home}/modules/jakarta.json.bind-api.jar:${web.home}/lib/woodstox-core-6.2.6.jar:${web.home}/lib/stax2-api [...] +jaxrs.classes=${web.home}/modules/jakarta.ws.rs-api.jar:${web.home}/modules/jakarta.annotation-api.jar:${web.home}/modules/jakarta.validation-api.jar:${web.home}/modules/jakarta.xml.bind-api.jar:${web.home}/modules/bean-validator.jar:${web.home}/modules/jakarta.json.jar:${web.home}/modules/jakarta.interceptor-api.jar:${web.home}/modules/jakarta.ejb-api.jar:${web.home}/modules/jakarta.inject.jar:${web.home}/modules/jakarta.activation.jar:${web.home}/modules/cdi-api.jar:${web.home}/modules [...] jaxrs_impl_lib=${web.home}/domains/domain1/lib/cxf-rt-frontend-jaxrs-${version}.jar:${web.home}/domains/domain1/lib/cxf-rt-rs-sse-${version}.jar servlet_adaptor=org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.class
(cxf) branch 4.0.x-fixes updated: CXF-9038: Run Jakarta RESTful Web Services 3.0 TCK
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 The following commit(s) were added to refs/heads/4.0.x-fixes by this push: new 0e3ef75a23 CXF-9038: Run Jakarta RESTful Web Services 3.0 TCK 0e3ef75a23 is described below commit 0e3ef75a23d6cc950db9c36f6877d706ca91ba22 Author: Andriy Redko AuthorDate: Sat Jul 13 18:53:03 2024 -0400 CXF-9038: Run Jakarta RESTful Web Services 3.0 TCK --- tck/Jenkinsfile | 40 +--- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/tck/Jenkinsfile b/tck/Jenkinsfile index 92a827d0eb..f5e1c4f107 100644 --- a/tck/Jenkinsfile +++ b/tck/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { } environment { -ANT_OPTS = "-Xmx2G -Djava.endorsed.dirs=${JAKARTA_JARS}/endorsed -Djavax.xml.accessExternalStylesheet=all -Djavax.xml.accessExternalSchema=all -DenableExternalEntityProcessing=true -Djavax.xml.accessExternalDTD=file,http" +ANT_OPTS = "-Djavax.xml.accessExternalStylesheet=all -Djavax.xml.accessExternalSchema=all -DenableExternalEntityProcessing=true -Djavax.xml.accessExternalDTD=file,http" } stages { @@ -43,7 +43,7 @@ pipeline { stage('Download JakartaEE TCK') { steps { checkout([$class: 'GitSCM', - branches: [[name: 'refs/tags/9.1.x']], + branches: [[name: 'refs/tags/9.1.0']], userRemoteConfigs: [[url: 'https://github.com/eclipse-ee4j/jakartaee-tck']], extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'jakartaee-tck']] ]) @@ -61,11 +61,11 @@ pipeline { stage('Download Apache CXF bits') { steps { echo "Using Apache CXF version: " + params.Version - sh "mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org -Dartifact=org.apache.cxf:cxf-core:${params.Version}:jar -Dtransitive=false -Ddest=glassfish6/glassfish/lib" - sh "mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org -Dartifact=org.apache.cxf:cxf-rt-frontend-jaxrs:${params.Version}:jar -Dtransitive=false -Ddest=glassfish6/glassfish/lib" - sh "mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org -Dartifact=org.apache.cxf:cxf-rt-rs-client:${params.Version}:jar -Dtransitive=false -Ddest=glassfish6/glassfish/lib" - sh "mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org -Dartifact=org.apache.cxf:cxf-rt-rs-sse:${params.Version}:jar -Dtransitive=false -Ddest=glassfish6/glassfish/lib" - sh "mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org -Dartifact=org.apache.cxf:cxf-rt-transports-http:${params.Version}:jar -Dtransitive=false -Ddest=glassfish6/glassfish/lib" + sh "mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org -Dartifact=org.apache.cxf:cxf-core:${params.Version}:jar -Dtransitive=false -Ddest=glassfish6/glassfish/domains/domain1/lib" + sh "mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org -Dartifact=org.apache.cxf:cxf-rt-frontend-jaxrs:${params.Version}:jar -Dtransitive=false -Ddest=glassfish6/glassfish/domains/domain1/lib" + sh "mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org -Dartifact=org.apache.cxf:cxf-rt-rs-client:${params.Version}:jar -Dtransitive=false -Ddest=glassfish6/glassfish/domains/domain1/lib" + sh "mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org -Dartifact=org.apache.cxf:cxf-rt-rs-sse:${params.Version}:jar -Dtransitive=false -Ddest=glassfish6/glassfish/domains/domain1/lib" + sh "mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org -Dartifact=org.apache.cxf:cxf-rt-transports-http:${params.Version}:jar -Dtransitive=fals
(cxf) branch 4.0.x-fixes updated: CXF-9038: Run Jakarta RESTful Web Services 3.0 TCK
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 The following commit(s) were added to refs/heads/4.0.x-fixes by this push: new aca5b5be11 CXF-9038: Run Jakarta RESTful Web Services 3.0 TCK aca5b5be11 is described below commit aca5b5be11eef71eb087aa36fefdf83d3da46128 Author: Andriy Redko AuthorDate: Sat Jul 13 14:03:42 2024 -0400 CXF-9038: Run Jakarta RESTful Web Services 3.0 TCK --- tck/Jenkinsfile | 51 ++- tck/ts.jte.template | 38 +- 2 files changed, 55 insertions(+), 34 deletions(-) diff --git a/tck/Jenkinsfile b/tck/Jenkinsfile index 05ec0b5b03..92a827d0eb 100644 --- a/tck/Jenkinsfile +++ b/tck/Jenkinsfile @@ -10,14 +10,14 @@ pipeline { } environment { -ANT_OPTS = "-Djavax.xml.accessExternalSchema=all" +ANT_OPTS = "-Xmx2G -Djava.endorsed.dirs=${JAKARTA_JARS}/endorsed -Djavax.xml.accessExternalStylesheet=all -Djavax.xml.accessExternalSchema=all -DenableExternalEntityProcessing=true -Djavax.xml.accessExternalDTD=file,http" } stages { stage("Initialization") { steps { script { -currentBuild.displayName = "#${BUILD_NUMBER} CXF ${params.Version} JAX-RS 2.1 TCK" +currentBuild.displayName = "#${BUILD_NUMBER} CXF ${params.Version} JAX-RS 3.0 TCK" } } } @@ -43,29 +43,29 @@ pipeline { stage('Download JakartaEE TCK') { steps { checkout([$class: 'GitSCM', - branches: [[name: 'refs/tags/8.0.2']], + branches: [[name: 'refs/tags/9.1.x']], userRemoteConfigs: [[url: 'https://github.com/eclipse-ee4j/jakartaee-tck']], extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'jakartaee-tck']] ]) } } - stage('Download Glassfish 5.1.0') { // for display purposes + stage('Download Glassfish 6.2.5') { // for display purposes steps { - sh 'wget https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/5.1.0/glassfish-5.1.0.zip' - sh 'unzip glassfish-5.1.0.zip' - sh 'rm glassfish-5.1.0.zip' + sh 'wget https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.5/glassfish-6.2.5.zip' + sh 'unzip glassfish-6.2.5.zip' + sh 'rm glassfish-6.2.5.zip' } } stage('Download Apache CXF bits') { steps { echo "Using Apache CXF version: " + params.Version - sh "mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org -Dartifact=org.apache.cxf:cxf-core:${params.Version}:jar -Dtransitive=false -Ddest=glassfish5/glassfish/lib" - sh "mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org -Dartifact=org.apache.cxf:cxf-rt-frontend-jaxrs:${params.Version}:jar -Dtransitive=false -Ddest=glassfish5/glassfish/lib" - sh "mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org -Dartifact=org.apache.cxf:cxf-rt-rs-client:${params.Version}:jar -Dtransitive=false -Ddest=glassfish5/glassfish/lib" - sh "mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org -Dartifact=org.apache.cxf:cxf-rt-rs-sse:${params.Version}:jar -Dtransitive=false -Ddest=glassfish5/glassfish/lib" - sh "mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org -Dartifact=org.apache.cxf:cxf-rt-transports-http:${params.Version}:jar -Dtransitive=false -Ddest=glassfish5/glassfish/lib" + sh "mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org -Dartifact=org.apache.cxf:cxf-core:${params.Version}:jar -Dtransitive=false -Ddest=glassfish6/glassfish/lib" + sh "mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org -Dartifact=org.apache.cxf:cxf-rt-frontend-jaxrs:${params.Version}:jar -Dtransitive=false -Ddest=glassfish6
(cxf) branch main updated (c8349d4aac -> f919a6fc1a)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from c8349d4aac update CXF 4.0.5 release notes add 30d54b937e Update Spring Framework to 6.1.11 add f919a6fc1a Update Spring Cloud Eureka to 4.1.3 No new revisions were added by this update. Summary of changes: distribution/src/main/release/samples/pom.xml | 2 +- parent/pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
(cxf) branch 3.5.x-fixes updated (a6abc16a37 -> 4a6a1a4d7e)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from a6abc16a37 Update Project Reactor to 3.4.40 new 03314e1750 Bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.0 to 3.3.1 (#1959) new f550d95898 Bump org.apache.maven.plugins:maven-surefire-report-plugin (#1960) new 4a6a1a4d7e Recording .gitmergeinfo Changes The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmergeinfo | 2 ++ distribution/src/main/release/samples/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-)
(cxf) 03/03: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 4a6a1a4d7ede671ef9763f17f8ac8ba6ac656e1d Author: Andriy Redko AuthorDate: Thu Jul 11 12:00:59 2024 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index fab9638c63..fa7c99ff70 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -90,6 +90,7 @@ B 2b8842320a6cabcb95aec8476e34fdc4ce4525e1 B 2ba0d3038c9542ad59ec671bc17a6c0bac749f11 B 2c01bf7aa1554ef8869b8d8ad30835c9b0cabaad B 2c48413cfa4dbd746b49b4b08b0d15eb8077a7d6 +B 2c938bdbd4067f26eb1e6ada4f5832b79d3c2f6a B 2e9a4e78e33eed61bac4b175a43b8a3536266fb2 B 2edc84a1f6c08726a43e1a17975fea59bf4f3b85 B 2f9cc772e84b5563e82db73ef5f181978e725e83 @@ -1008,6 +1009,7 @@ M de65deb8a600b7953008c171753ef68f127731e9 M dec561cf2c2a6628071a6ca74a2ff917afff9868 M dee4fedb2caa9dc0bc0101d0b7165beddc4a03db M df42352ec9642b4e587889aa5644aa5b869d4ae7 +M df8894bb70b2c81a4ae07a6bcf22c3b2ef09e2ed M dfad73da9490a99deee7369ea1c7609431427046 M e00f92dc768cec07b6fb76463bb15c2dc16db720 M e14f7a994aa067d420856cf3fab183b4c82a2e75
(cxf) 02/03: Bump org.apache.maven.plugins:maven-surefire-report-plugin (#1960)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit f550d9589866215b081b3aa10a504d397a5173be Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Jul 11 07:39:53 2024 -0400 Bump org.apache.maven.plugins:maven-surefire-report-plugin (#1960) Bumps [org.apache.maven.plugins:maven-surefire-report-plugin](https://github.com/apache/maven-surefire) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.0...surefire-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-report-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit cc8195aa427fc74687d65e84c534637d591cd005) (cherry picked from commit 223635bce3dbf15be7df66709f55d73ddc424957) (cherry picked from commit c72e7ab85df91cd43219655b2fa2573bcf857312) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bba7f806c7..50b64f45cf 100644 --- a/pom.xml +++ b/pom.xml @@ -554,7 +554,7 @@ org.apache.maven.plugins maven-surefire-report-plugin -3.3.0 +3.3.1 org.apache.maven.plugins
(cxf) 01/03: Bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.0 to 3.3.1 (#1959)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 03314e17508e7f9f18baa13f1850889220dfce43 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Jul 11 07:39:39 2024 -0400 Bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.0 to 3.3.1 (#1959) Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.0...surefire-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit f42f0bc308e6c65aa2d51e04dcde19c142ca9a42) (cherry picked from commit 92f3e4ed279c1e4ab33b5d485ed5cd53ce09ec54) (cherry picked from commit e2d3682f6705c72b74f773cdffc4fa09558d216c) --- distribution/src/main/release/samples/pom.xml | 2 +- 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 a3efbed483..91fee55e21 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -222,7 +222,7 @@ org.apache.maven.plugins maven-surefire-plugin -3.3.0 +3.3.1 org.apache.maven.plugins diff --git a/pom.xml b/pom.xml index 70838b5314..bba7f806c7 100644 --- a/pom.xml +++ b/pom.xml @@ -484,7 +484,7 @@ org.apache.maven.plugins maven-surefire-plugin -3.3.0 +3.3.1 org.apache.maven.plugins
(cxf) branch 3.6.x-fixes updated (2c938bdbd4 -> c72e7ab85d)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 2c938bdbd4 Recording .gitmergeinfo Changes new e2d3682f67 Bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.0 to 3.3.1 (#1959) new c72e7ab85d Bump org.apache.maven.plugins:maven-surefire-report-plugin (#1960) 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 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
(cxf) 01/02: Bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.0 to 3.3.1 (#1959)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit e2d3682f6705c72b74f773cdffc4fa09558d216c Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Jul 11 07:39:39 2024 -0400 Bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.0 to 3.3.1 (#1959) Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.0...surefire-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit f42f0bc308e6c65aa2d51e04dcde19c142ca9a42) (cherry picked from commit 92f3e4ed279c1e4ab33b5d485ed5cd53ce09ec54) --- distribution/src/main/release/samples/pom.xml | 2 +- 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 53a8306c69..6b86342a58 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -223,7 +223,7 @@ org.apache.maven.plugins maven-surefire-plugin -3.3.0 +3.3.1 org.apache.maven.plugins diff --git a/pom.xml b/pom.xml index 48981c6fa7..b73155405e 100644 --- a/pom.xml +++ b/pom.xml @@ -484,7 +484,7 @@ org.apache.maven.plugins maven-surefire-plugin -3.3.0 +3.3.1 org.apache.maven.plugins
(cxf) 02/02: Bump org.apache.maven.plugins:maven-surefire-report-plugin (#1960)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit c72e7ab85df91cd43219655b2fa2573bcf857312 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Jul 11 07:39:53 2024 -0400 Bump org.apache.maven.plugins:maven-surefire-report-plugin (#1960) Bumps [org.apache.maven.plugins:maven-surefire-report-plugin](https://github.com/apache/maven-surefire) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.0...surefire-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-report-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit cc8195aa427fc74687d65e84c534637d591cd005) (cherry picked from commit 223635bce3dbf15be7df66709f55d73ddc424957) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b73155405e..083b8b0082 100644 --- a/pom.xml +++ b/pom.xml @@ -553,7 +553,7 @@ org.apache.maven.plugins maven-surefire-report-plugin -3.3.0 +3.3.1 org.apache.maven.plugins
(cxf) 01/02: Bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.0 to 3.3.1 (#1959)
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 92f3e4ed279c1e4ab33b5d485ed5cd53ce09ec54 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Jul 11 07:39:39 2024 -0400 Bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.0 to 3.3.1 (#1959) Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.0...surefire-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit f42f0bc308e6c65aa2d51e04dcde19c142ca9a42) --- distribution/src/main/release/samples/pom.xml | 2 +- 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 9cab802915..0a3970efa2 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -223,7 +223,7 @@ org.apache.maven.plugins maven-surefire-plugin -3.3.0 +3.3.1 org.apache.maven.plugins diff --git a/pom.xml b/pom.xml index 757563f5f3..0ae4887d8e 100644 --- a/pom.xml +++ b/pom.xml @@ -484,7 +484,7 @@ org.apache.maven.plugins maven-surefire-plugin -3.3.0 +3.3.1 org.apache.maven.plugins
(cxf) branch 4.0.x-fixes updated (4fc3dc27fd -> 223635bce3)
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 4fc3dc27fd Fix flaky testGetGenericBookManyClientsInParallel & testGetGenericBookSingleClientInParallel test cases (under JDK-21 and above) new 92f3e4ed27 Bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.0 to 3.3.1 (#1959) new 223635bce3 Bump org.apache.maven.plugins:maven-surefire-report-plugin (#1960) 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 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
(cxf) 02/02: Bump org.apache.maven.plugins:maven-surefire-report-plugin (#1960)
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 223635bce3dbf15be7df66709f55d73ddc424957 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Jul 11 07:39:53 2024 -0400 Bump org.apache.maven.plugins:maven-surefire-report-plugin (#1960) Bumps [org.apache.maven.plugins:maven-surefire-report-plugin](https://github.com/apache/maven-surefire) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.0...surefire-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-report-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit cc8195aa427fc74687d65e84c534637d591cd005) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0ae4887d8e..01a84db4cb 100644 --- a/pom.xml +++ b/pom.xml @@ -553,7 +553,7 @@ org.apache.maven.plugins maven-surefire-report-plugin -3.3.0 +3.3.1 org.apache.maven.plugins
(cxf) branch main updated: Bump org.apache.maven.plugins:maven-surefire-report-plugin (#1960)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new cc8195aa42 Bump org.apache.maven.plugins:maven-surefire-report-plugin (#1960) cc8195aa42 is described below commit cc8195aa427fc74687d65e84c534637d591cd005 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Jul 11 07:39:53 2024 -0400 Bump org.apache.maven.plugins:maven-surefire-report-plugin (#1960) Bumps [org.apache.maven.plugins:maven-surefire-report-plugin](https://github.com/apache/maven-surefire) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.0...surefire-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-report-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 803674356e..5d8c4ebe96 100644 --- a/pom.xml +++ b/pom.xml @@ -559,7 +559,7 @@ org.apache.maven.plugins maven-surefire-report-plugin -3.3.0 +3.3.1 org.apache.maven.plugins
(cxf) branch main updated: Bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.0 to 3.3.1 (#1959)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new f42f0bc308 Bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.0 to 3.3.1 (#1959) f42f0bc308 is described below commit f42f0bc308e6c65aa2d51e04dcde19c142ca9a42 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Jul 11 07:39:39 2024 -0400 Bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.0 to 3.3.1 (#1959) Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.0...surefire-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- distribution/src/main/release/samples/pom.xml | 2 +- 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 9ed76f0335..f9f20932b2 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -227,7 +227,7 @@ org.apache.maven.plugins maven-surefire-plugin -3.3.0 +3.3.1 org.apache.maven.plugins diff --git a/pom.xml b/pom.xml index 315d21d077..803674356e 100644 --- a/pom.xml +++ b/pom.xml @@ -490,7 +490,7 @@ org.apache.maven.plugins maven-surefire-plugin -3.3.0 +3.3.1 org.apache.maven.plugins
(cxf) 01/02: Fix flaky testGetGenericBookManyClientsInParallel & testGetGenericBookSingleClientInParallel test cases (under JDK-21 and above)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit df8894bb70b2c81a4ae07a6bcf22c3b2ef09e2ed Author: Andriy Redko AuthorDate: Wed Jul 10 20:30:46 2024 -0400 Fix flaky testGetGenericBookManyClientsInParallel & testGetGenericBookSingleClientInParallel test cases (under JDK-21 and above) (cherry picked from commit cfee0995b3a8c36b565cdf2f17c5cbe7a402b0a7) (cherry picked from commit 4fc3dc27fd71ffe01373052de0b97cc73d71) --- .../systest/jaxrs/JAXRS20ClientServerBookTest.java| 19 --- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java index bfb350b5ca..00a51fc3cc 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java @@ -99,6 +99,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.Matchers.lessThan; +import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -164,8 +165,11 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase .mapToObj(id -> threadMXBean.getThreadInfo(id)) .filter(Objects::nonNull) .filter(t -> t.getThreadName().startsWith("HttpClient-")) +.filter(t -> t.getThreadName().endsWith("-SelectorManager")) .count(); +// Capture the number of client threads at start +final long expectedHttpClientThreads = captureHttpClientThreads.get(); final Collection clients = new ArrayList<>(); try { final String target = "http://localhost:; + PORT + "/bookstore/genericbooks/123"; @@ -198,8 +202,8 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase clients.forEach(WebClient::close); // Since JDK-21, HttpClient Implements AutoCloseable -if (Runtime.version().feature() > 21) { -assertThat(httpClientThreads.get(), equalTo(0L)); +if (Runtime.version().feature() >= 21) { +assertThat(captureHttpClientThreads.get(), lessThanOrEqualTo(expectedHttpClientThreads)); } } @@ -215,10 +219,11 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase .mapToObj(id -> threadMXBean.getThreadInfo(id)) .filter(Objects::nonNull) .filter(t -> t.getThreadName().startsWith("HttpClient-")) +.filter(t -> t.getThreadName().endsWith("-SelectorManager")) .count(); // Capture the number of client threads at start -final long httpClientThreads = captureHttpClientThreads.get(); +final long expectedHttpClientThreads = captureHttpClientThreads.get(); final WebClient client = WebClient.create(target, true); try { final Collection> futures = new ArrayList<>(); @@ -245,13 +250,13 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase pool.shutdown(); // Since JDK-21, HttpClient Implements AutoCloseable -if (pool.awaitTermination(2, TimeUnit.MINUTES) && Runtime.version().feature() > 21) { -assertThat(captureHttpClientThreads.get(), equalTo(httpClientThreads)); +if (pool.awaitTermination(2, TimeUnit.MINUTES) && Runtime.version().feature() >= 21) { +assertThat(captureHttpClientThreads.get(), lessThanOrEqualTo(expectedHttpClientThreads)); } else { pool.shutdownNow(); // Since JDK-21, HttpClient Implements AutoCloseable -if (pool.awaitTermination(2, TimeUnit.MINUTES) && Runtime.version().feature() > 21) { -assertThat(captureHttpClientThreads.get(), equalTo(httpClientThreads)); +if (pool.awaitTermination(2, TimeUnit.MINUTES) && Runtime.version().feature() >= 21) { +assertThat(captureHttpClientThreads.get(), lessThanOrEqualTo(expectedHttpClientThreads)); } } }
(cxf) branch 3.6.x-fixes updated (3bbd25205b -> 2c938bdbd4)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 3bbd25205b Change .gitmergeinfo source branch to origin/4.0.x-fixes new df8894bb70 Fix flaky testGetGenericBookManyClientsInParallel & testGetGenericBookSingleClientInParallel test cases (under JDK-21 and above) new 2c938bdbd4 Recording .gitmergeinfo Changes The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmergeinfo | 114 + .../systest/jaxrs/JAXRS20ClientServerBookTest.java | 19 ++-- 2 files changed, 126 insertions(+), 7 deletions(-)
(cxf) 02/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 2c938bdbd4067f26eb1e6ada4f5832b79d3c2f6a Author: Andriy Redko AuthorDate: Wed Jul 10 20:35:24 2024 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 114 ++ 1 file changed, 114 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index e5ac6d82b6..3ef8739194 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -7,7 +7,9 @@ B 02310e95fe74c0c031f540f3284e4a9bd856ced2 B 0394808f2f31a60b41835b88d8be1628b344018b B 04bc5be2435c025bf5c37975bd493405bc91f6ca B 077f37412efa7bf857c6c34b6a2defb84fc587b4 +B 0847c4b1d71bfba060d7e1c88a04b530c9aa5bb5 B 09211352a70bef5e309f9e93a9548eb9657e0673 +B 0acadd4d9846811ff4dae3771fc1af7037a28b26 B 0c265936f7c8da9cb68cb3353e4dd7a001f4006a B 0cbff3172141d315968382979b473ca77dc1422f B 0ecf85b387b5def229a997c60416f37cd987e8f3 @@ -15,6 +17,9 @@ B 0edc6a8f2e4051e24ccc65ee30dd05fe7f3b05c9 B 0f2a3fdf5ac92e4789f8099b75fe2fc841fdb048 B 0f2f9d35779a8e3387bb76d8d3b1ecd688a0c1da B 0f43bd534763f9ebe6ac8c2a0746bd257f5edc30 +B 0f7476b8b74d76892068dc917afe58df2732da0c +B 1150ad4a6438eb95e2da2597e2b0d1a4a8acf36d +B 13ebc069b2b09b6d1f2e7926187a08a022090274 B 145b3a3fd6b598693a155ba329c720265e72b08f B 1480c40d6de78230fde044002aff8ca798f14213 B 14b45d215535f4c69261dc8cdc5342b93c3c1235 @@ -26,18 +31,23 @@ B 1d92d5abc7913e0ef77f234ee0200d4b0e72ca85 B 1f62de8deb593a6e76514fb6e340b91afbaf493e B 217d8a7cd6ab50593afbd3dfd539992f7dc3844d B 24984eacaf4568b893ab71ebbded1100bdc060c8 +B 2520022b8a5a9f2583257c62197314cbfaf9788a B 253186a0d19c628e84e0558dd950a6d6b9e5be93 B 2a9fff8ebb48f040e3c5092d0084470298fba61f B 2be8e0126914cbbec926259ebb84573f4d0f9e56 B 2d45e69e4802c625fe6239f8fbdee390ca83f36a B 2dfd3bf93e1db856f456058ea0d1ab3d0eb380af +B 2e95ed7154fcfa6ffb766e1f79bbf6d60ade2b10 +B 30a4a0380167c4d1b1912885bf444120e61477b0 B 30b8b01da0cbd72d784fbbb0710efe252293caec B 31c8076321503aa16897701795cf334891dd1bab +B 335656e391742e6c48abe7824a07a4e0bfc1b9a6 B 34430af2299ae57407e61a759f8ef88f54493bb2 B 3457c8555d1ecb49cf13e29a60f7ab01ec5f2ff4 B 34f37609eb464b46e76f1f5d5340f9799df1008a B 352adc456a199854ff9b80fa27d9d53e8a3dbc98 B 354f09f05ef61722e9d62f5c6c4fb777d7ef9c97 +B 35e758152ebc3dfd12fea080f16503c4bc8a7047 B 396c32848ff70a7cd77bfcd5ea80a4b4abe4c20c B 3983c304fcec6b40d60f3c804dd6537cf3b4d2c1 B 3a25cab6172083d26f2cc5f29a134c11214d5131 @@ -75,6 +85,7 @@ B 5e88225f5b45ca03416e616e77f602e62b25ace5 B 60aa618e06d0bbaadd7bc65d3cd3503673e53a6b B 60f00a123ee85f6865e24ee35a91e4ec6eced62c B 6266242cb5e720efdd0add51842ea953376494f9 +B 62726aec4d9b70547d948dd17974e95d101b2311 B 634758b2e0352a489e39cb96c9b834369fcb444f B 647408469988d9e244086efc839b2f6ab5e42cd7 B 64d861dd27daa09363144f5b6d0de367dd369ae1 @@ -83,9 +94,14 @@ B 69cb869d65cc2db3e804f6c8b735ac29fcbbe706 B 6c3110c4277f47f6854734182be1ece4a2a2f623 B 6c613504356a35065bd8ba63e168008e7fdb287e B 6d3286cb9fa4810d5ad8e24581fb6bddf800f584 +B 6d8fac334eee56b8e8b7bb1b3f2504a06cbae53d B 6dfaa3dc68347b418bab519bff3247a0551655fa B 6edb241db2de6e46b71b0b30f4de2dce9ac66f09 +B 71e11c0a5e35bf7474dadb22c08788ba0d91d3ee +B 74f2150627dcf63611974c1403ab699b4f97513d +B 7686878e906b9817279a98c80ffcb4949cdbdd26 B 79ee9824ee30b1b710d7385efc3cec736b4a5c54 +B 7ccc93a79dd7e9aea66c1fa05f36e3697deb1564 B 7dca49b11f913ff0cbbde40153fc52cd6bcc0aa1 B 7f4c668a04211e044c69fe51c0053567e39a13d6 B 7f683ba748e2133af0f93f1d77df5921b4e86011 @@ -104,14 +120,18 @@ B 98fee994fc05cf2d6a563f995aeaae4f25e54d35 B 990d3332d34fbfff4291256d0cd5eadedb510bc2 B 9b97793fa0ba0fccefdd82bcbe7322d354d43c8c B 9d8e7d5131deb3056e14e6e63bad67c87bc7bd9a +B 9dcf2ea4cdb23be54103a03d3632c52f42ff4589 B 9e15038746a2eded8345243e9eaa112bc56da463 +B a075179b535572e07a74fa42c86f70b212176e1c B a25da60afef8051cab6b8b0a733346dad718f65a B a35573688627269ee7f3bd2341dfabd6ec413b39 B a3bd17dc5476c2f200a80207ae33674ac906b992 B a43d30df5cc78535812339bec9663c4d60241d79 +B a638e8ce30f2179721d481117f00047b5c96c638 B a6501f782cd2b392f09edb4ccb99a83acd2e75a2 B a7bdc11a62b1810b436ce70e60fcc252ab41337d B acb1230211b4498733b6d5307eaf1c29ea8c8822 +B b00cb694edcd3c1b7125a42b7183e7a89e5890bf B b01e28638ccba9ca17d5b067ab3933b6cbebdb46 B b067ecf705094a7b66a98639465c38f2a55f7d15 B b0f9122a9ecc9dc48a49072e54c8fa1a59c59eb3 @@ -136,15 +156,19 @@ B c3e949c49605f7eaf68dca4f76ebb40fa429ba3c B c4ae7ea784051f36b6a79bfc4cc0e7de6c3a9881 B c4f3d9665f242bfcf143388933ddb89dd725bd3b B c56c9797b8bc92570d48e6618fe8f450a0d188db +B c58b508fd044acb1ff5da4d80009710b54567dea +B c59992c6fe6ec3205de0499d2beb91ffbcdd760a B c788d82cb02b3257d3ec560de0df4a6130ba93e9 B c7b4aa0adcf465b43f5088a9be6ec5969e47a6db B c9c962bce36e24c38e7bc1fe0982b5592dc4bcb8 B cad4f0b76bb79f82a5ef4bc7e435e93996eb884b B cb00226811f39d36b4f91106be94fd889c426005 +B
(cxf) branch 4.0.x-fixes updated: Fix flaky testGetGenericBookManyClientsInParallel & testGetGenericBookSingleClientInParallel test cases (under JDK-21 and above)
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 The following commit(s) were added to refs/heads/4.0.x-fixes by this push: new 4fc3dc27fd Fix flaky testGetGenericBookManyClientsInParallel & testGetGenericBookSingleClientInParallel test cases (under JDK-21 and above) 4fc3dc27fd is described below commit 4fc3dc27fd71ffe01373052de0b97cc73d71 Author: Andriy Redko AuthorDate: Wed Jul 10 20:30:46 2024 -0400 Fix flaky testGetGenericBookManyClientsInParallel & testGetGenericBookSingleClientInParallel test cases (under JDK-21 and above) (cherry picked from commit cfee0995b3a8c36b565cdf2f17c5cbe7a402b0a7) --- .../systest/jaxrs/JAXRS20ClientServerBookTest.java| 19 --- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java index bee4c88c16..7362f4f7e8 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java @@ -99,6 +99,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.Matchers.lessThan; +import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -164,8 +165,11 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase .mapToObj(id -> threadMXBean.getThreadInfo(id)) .filter(Objects::nonNull) .filter(t -> t.getThreadName().startsWith("HttpClient-")) +.filter(t -> t.getThreadName().endsWith("-SelectorManager")) .count(); +// Capture the number of client threads at start +final long expectedHttpClientThreads = captureHttpClientThreads.get(); final Collection clients = new ArrayList<>(); try { final String target = "http://localhost:; + PORT + "/bookstore/genericbooks/123"; @@ -198,8 +202,8 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase clients.forEach(WebClient::close); // Since JDK-21, HttpClient Implements AutoCloseable -if (Runtime.version().feature() > 21) { -assertThat(httpClientThreads.get(), equalTo(0L)); +if (Runtime.version().feature() >= 21) { +assertThat(captureHttpClientThreads.get(), lessThanOrEqualTo(expectedHttpClientThreads)); } } @@ -215,10 +219,11 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase .mapToObj(id -> threadMXBean.getThreadInfo(id)) .filter(Objects::nonNull) .filter(t -> t.getThreadName().startsWith("HttpClient-")) +.filter(t -> t.getThreadName().endsWith("-SelectorManager")) .count(); // Capture the number of client threads at start -final long httpClientThreads = captureHttpClientThreads.get(); +final long expectedHttpClientThreads = captureHttpClientThreads.get(); final WebClient client = WebClient.create(target, true); try { final Collection> futures = new ArrayList<>(); @@ -245,13 +250,13 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase pool.shutdown(); // Since JDK-21, HttpClient Implements AutoCloseable -if (pool.awaitTermination(2, TimeUnit.MINUTES) && Runtime.version().feature() > 21) { -assertThat(captureHttpClientThreads.get(), equalTo(httpClientThreads)); +if (pool.awaitTermination(2, TimeUnit.MINUTES) && Runtime.version().feature() >= 21) { +assertThat(captureHttpClientThreads.get(), lessThanOrEqualTo(expectedHttpClientThreads)); } else { pool.shutdownNow(); // Since JDK-21, HttpClient Implements AutoCloseable -if (pool.awaitTermination(2, TimeUnit.MINUTES) && Runtime.version().feature() > 21) { -assertThat(captureHttpClientThreads.get(), equalTo(httpClientThreads)); +if (pool.awaitTermination(2, TimeUnit.MINUTES) && Runtime.version().feature() >= 21) { +assertThat(captureHttpClientThreads.get(), lessThanOrEqualTo(expectedHttpClientThreads)); } } }
(cxf) branch main updated: Fix flaky testGetGenericBookManyClientsInParallel & testGetGenericBookSingleClientInParallel test cases (under JDK-21 and above)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new cfee0995b3 Fix flaky testGetGenericBookManyClientsInParallel & testGetGenericBookSingleClientInParallel test cases (under JDK-21 and above) cfee0995b3 is described below commit cfee0995b3a8c36b565cdf2f17c5cbe7a402b0a7 Author: Andriy Redko AuthorDate: Wed Jul 10 20:30:46 2024 -0400 Fix flaky testGetGenericBookManyClientsInParallel & testGetGenericBookSingleClientInParallel test cases (under JDK-21 and above) --- .../systest/jaxrs/JAXRS20ClientServerBookTest.java| 19 --- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java index bee4c88c16..7362f4f7e8 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java @@ -99,6 +99,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.Matchers.lessThan; +import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -164,8 +165,11 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase .mapToObj(id -> threadMXBean.getThreadInfo(id)) .filter(Objects::nonNull) .filter(t -> t.getThreadName().startsWith("HttpClient-")) +.filter(t -> t.getThreadName().endsWith("-SelectorManager")) .count(); +// Capture the number of client threads at start +final long expectedHttpClientThreads = captureHttpClientThreads.get(); final Collection clients = new ArrayList<>(); try { final String target = "http://localhost:; + PORT + "/bookstore/genericbooks/123"; @@ -198,8 +202,8 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase clients.forEach(WebClient::close); // Since JDK-21, HttpClient Implements AutoCloseable -if (Runtime.version().feature() > 21) { -assertThat(httpClientThreads.get(), equalTo(0L)); +if (Runtime.version().feature() >= 21) { +assertThat(captureHttpClientThreads.get(), lessThanOrEqualTo(expectedHttpClientThreads)); } } @@ -215,10 +219,11 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase .mapToObj(id -> threadMXBean.getThreadInfo(id)) .filter(Objects::nonNull) .filter(t -> t.getThreadName().startsWith("HttpClient-")) +.filter(t -> t.getThreadName().endsWith("-SelectorManager")) .count(); // Capture the number of client threads at start -final long httpClientThreads = captureHttpClientThreads.get(); +final long expectedHttpClientThreads = captureHttpClientThreads.get(); final WebClient client = WebClient.create(target, true); try { final Collection> futures = new ArrayList<>(); @@ -245,13 +250,13 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase pool.shutdown(); // Since JDK-21, HttpClient Implements AutoCloseable -if (pool.awaitTermination(2, TimeUnit.MINUTES) && Runtime.version().feature() > 21) { -assertThat(captureHttpClientThreads.get(), equalTo(httpClientThreads)); +if (pool.awaitTermination(2, TimeUnit.MINUTES) && Runtime.version().feature() >= 21) { +assertThat(captureHttpClientThreads.get(), lessThanOrEqualTo(expectedHttpClientThreads)); } else { pool.shutdownNow(); // Since JDK-21, HttpClient Implements AutoCloseable -if (pool.awaitTermination(2, TimeUnit.MINUTES) && Runtime.version().feature() > 21) { -assertThat(captureHttpClientThreads.get(), equalTo(httpClientThreads)); +if (pool.awaitTermination(2, TimeUnit.MINUTES) && Runtime.version().feature() >= 21) { +assertThat(captureHttpClientThreads.get(), lessThanOrEqualTo(expectedHttpClientThreads)); } } }
(cxf) 06/07: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 6ce3577dcc131b045914dcd2ea5b19c5e0286468 Author: Andriy Redko AuthorDate: Wed Jul 10 16:17:58 2024 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 9 + 1 file changed, 9 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 4a25fbf2eb..fab9638c63 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -205,6 +205,7 @@ B 6d64fdb0d9219ca829f29a2f38480033b60a4c98 B 6ec1c32313891c081036dfee82e7bc5e0c59f168 B 6ecc77ef1bd88fd5434949f26bc31903d880d4d2 B 6eff04bec73f00eed4f11cca017b47efbb2fba66 +B 6f42a4d5e51bcc2dfe905d7d9b3dc182f46e3408 B 703fdc183a1f204a7fce982f468a7c8f0de65d80 B 7157608c785cc378a1a5226f5bcc20faec9ec8a0 B 718f5a602a932e58d2528a913b3d4b62e5990e3d @@ -562,6 +563,7 @@ M 26820de8c34f56fc8fb67ca31818fd8c50716376 M 274609cead278eba3ed2c95bf02649e18cf7a492 M 27521a6a68a1db621ea65051ca2da6b251edb6e5 M 275af06b63778db104c6ac4fa888c01bc3e73c3e +M 284617cec530385fc45805fa137f49bc2e50c38c M 28619eec5e848d620ef740416a606bd4951b2a91 M 28a1ac7d0f8d0b6c6ee56c7a543232e187a09035 M 28a64c46105bfa14abe4a217d9b45c41561eba3e @@ -615,6 +617,8 @@ M 3b414b889a87654522e02de74a23a1f434127746 M 3b5ea3c9e256a7373912f00f52344a1cded19bd5 M 3ba3ce8f7bd1a86d2063761bd7a8df323f98c448 M 3bbc4eaff5702f229118e5f6b61bfe8fc418fde3 +M 3bbd25205b93d4d84abe48840314c81b21a3f042 +M 3c59c9f241553c041701d9f1df5b66e1ad5629fd M 3c95abf3be5c52a4b800f8139f8633088f0c9be7 M 3cd95b17c5753daaa122dcb6a5663f21e4311ab7 M 3d40d621a8212c92e4a38355f8bfe19fec2b8e85 @@ -642,6 +646,7 @@ M 4493c7a3ec03b14abd07d623abc8f9bdc04a817a M 44f938a4cdd4f4bfc3dbcd0b3c450c3c7286b889 M 46a11ff843851c22fa76b77325a2889cb4e3d93e M 477c6b17943c86f6cf60e7b798595131fd2a531d +M 480abad68fd026633b77574a1dfc5ea377ca70c5 M 485413b2c2f0f57e13ab4b91940334a5a3bebc01 M 4a28f6cb1c9451dc7bcb62324f19d9c5af216040 M 4aa61e9f22fb328c9f67c60ff20cc5a57be680b8 @@ -769,6 +774,7 @@ M 7bfd4be162b1fb1408881912a452238acf809a66 M 7ce7ebb281c5cb9f335de28c30fdf97fac9b852c M 7f0b15bfabec530828cda27a035f5bceda565716 M 7f68430d2cc69ed3f3ee532121eb45df1c45d2ab +M 7f7d4a4a06fd6f29a4b0f1690765a8383135bbb3 M 7fb5cdd08ab862f60bb867086e0d667bf4333f37 M 7fe994996d400b97a824f21c4e7e3b6a67bc05bc M 806b0be50b703fd6f7292a0afc716b1f7612b896 @@ -874,6 +880,7 @@ M ac44f0cd0e1536df9a9c5c5c436c5d1e8cef263b M ac4e5c1a5e4b57f58ed3129455f3fdc2a86d60cc M ac5210e61d5a8d40c2ee9a3512f3e2ce3adc7e4a M ac7b514e336b7dfd3642c5140c24dca0fa7bdf6d +M ac99550bfdd3eb909d2bade6759ab3f4664be3e1 M acc74209fd321f12fa27dac0f0854cd1841ba388 M ad2ccdda2a819bc44b8938ea3d98d3d079298d71 M ad8f02a3550cf5580a79dc5e2a03bf35b5dee33a @@ -987,6 +994,7 @@ M d8ac520f6089397a0801c20ccb502a5c3faef5b0 M d8d9b2d14341a79a95d64dc4ccdded810851c25c M da023814778f38a1dff4ce1572f43e0c66277f0a M da38965e316064ddf61720d2383d6faa0cfb2d0a +M da64ddaeb7bf88a69ec04c2c3c6185bf558d2434 M da73da6c8011d7d76c275a1636bbe64849072563 M da7d9ff2385016f307629031993da1cd20b69dd5 M db2bb9ffdee75230d430f90fdbf5c6594b6954d3 @@ -1011,6 +1019,7 @@ M e35f359699a87e41bc9287d761a82a042d342dc3 M e4bd3c2822a46c42d9751c4cdb6ed5b713a77d6f M e5106ca398aee0860d8fe69f0df11692e5c3ad2b M e54a4073dc7796738d2ef9a622b66d0ed8183bd4 +M e56984747b44a19920d6d6354fa9a6b390f1dd19 M e59e123ada4bdf42cfc7eac8fdb3f88607f97a25 M e5d991d95eeffcdbd2cbff01233c14bbef11a5e6 M e60d84d2ad4a4e95be19eb5d326dcae1133eefb3
(cxf) 04/07: Bump org.assertj:assertj-core from 3.26.0 to 3.26.3 (#1958)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 2832994eb12f6b77f52eb826ebcf794a0f761876 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Jul 10 09:02:18 2024 -0400 Bump org.assertj:assertj-core from 3.26.0 to 3.26.3 (#1958) Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.0 to 3.26.3. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.26.0...assertj-build-3.26.3) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit e2497a3a96276fbca69ba279b85b852695a0c14c) # Conflicts: # parent/pom.xml (cherry picked from commit da64ddaeb7bf88a69ec04c2c3c6185bf558d2434) # 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 50af8fc151..6212a86b43 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -86,7 +86,7 @@ 1.1.14.Final 2.0.1.Final 1.9.22.1 -3.26.0 +3.26.3 [2.4,3.0) 2.6.1 1.78.1
(cxf) branch 3.5.x-fixes updated (4662f93128 -> a6abc16a37)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 4662f93128 [CXF-8997] AbstractSTSTokenTest and TransportBindingTests no longer need to set https protocol to TLSv1 on IBM Java (#1785) new 611e75006c Bump org.codehaus.plexus:plexus-archiver from 4.9.2 to 4.10.0 (#1951) new e4b0e7b60c Bump org.owasp:dependency-check-maven from 10.0.1 to 10.0.2 (#1954) new f713473ce3 Bump cxf.opentelemetry.semconv.version from 1.25.0-alpha to 1.26.0-alpha (#1957) new 2832994eb1 Bump org.assertj:assertj-core from 3.26.0 to 3.26.3 (#1958) new e1a695e4aa Update maven-invoker-plugin to 3.7.0 new 6ce3577dcc Recording .gitmergeinfo Changes new a6abc16a37 Update Project Reactor to 3.4.40 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 | 9 + parent/pom.xml | 10 +- pom.xml| 2 +- 3 files changed, 15 insertions(+), 6 deletions(-)
(cxf) 05/07: Update maven-invoker-plugin to 3.7.0
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit e1a695e4aa87f1ecd6a449051c76c39dd580219a Author: Andriy Redko AuthorDate: Wed Jul 10 09:15:54 2024 -0400 Update maven-invoker-plugin to 3.7.0 (cherry picked from commit fac0cbdc8f08f2305f36248b3ad8e831b4531e20) (cherry picked from commit 284617cec530385fc45805fa137f49bc2e50c38c) # 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 6212a86b43..2265f3d918 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -588,7 +588,7 @@ org.apache.maven.plugins maven-invoker-plugin -3.6.0 +3.7.0
(cxf) 02/07: Bump org.owasp:dependency-check-maven from 10.0.1 to 10.0.2 (#1954)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit e4b0e7b60cb073240f20668941e4d1cb8cee0348 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jul 8 08:25:42 2024 -0400 Bump org.owasp:dependency-check-maven from 10.0.1 to 10.0.2 (#1954) Bumps [org.owasp:dependency-check-maven](https://github.com/jeremylong/DependencyCheck) from 10.0.1 to 10.0.2. - [Release notes](https://github.com/jeremylong/DependencyCheck/releases) - [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md) - [Commits](https://github.com/jeremylong/DependencyCheck/compare/v10.0.1...v10.0.2) --- updated-dependencies: - dependency-name: org.owasp:dependency-check-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit e8e59a1b96f0f8a30cbb68736abccf8a5e3319db) # Conflicts: # pom.xml (cherry picked from commit e56984747b44a19920d6d6354fa9a6b390f1dd19) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 74e342316e..70838b5314 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 1.8 UTF-8 scp://people.apache.org/www/cxf.apache.org/maven-site -10.0.1 +10.0.2
(cxf) 01/07: Bump org.codehaus.plexus:plexus-archiver from 4.9.2 to 4.10.0 (#1951)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 611e75006caf86594d7a9536fe3dbfecdd172d9f Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Jul 5 07:35:24 2024 -0400 Bump org.codehaus.plexus:plexus-archiver from 4.9.2 to 4.10.0 (#1951) Bumps [org.codehaus.plexus:plexus-archiver](https://github.com/codehaus-plexus/plexus-archiver) from 4.9.2 to 4.10.0. - [Release notes](https://github.com/codehaus-plexus/plexus-archiver/releases) - [Changelog](https://github.com/codehaus-plexus/plexus-archiver/blob/master/ReleaseNotes.md) - [Commits](https://github.com/codehaus-plexus/plexus-archiver/compare/plexus-archiver-4.9.2...plexus-archiver-4.10.0) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus-archiver dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 9ffcd078281da628e9ee78447b222e1d430baea3) # Conflicts: # parent/pom.xml (cherry picked from commit ac99550bfdd3eb909d2bade6759ab3f4664be3e1) --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 99b24c83eb..860051b4cc 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -191,7 +191,7 @@ 0.33.0 2.0.27 2.2.3 -4.9.2 +4.10.0 3.5.1 1.0.4 3.4.39
(cxf) 07/07: Update Project Reactor to 3.4.40
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit a6abc16a37c70db50a3daada62360daf7abcf65e Author: Andriy Redko AuthorDate: Wed Jul 10 16:19:03 2024 -0400 Update Project Reactor to 3.4.40 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2265f3d918..5119df1c9d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -194,7 +194,7 @@ 4.10.0 3.5.1 1.0.4 -3.4.39 +3.4.40 1.7.15 1.3.8 2.2.21
(cxf) 03/07: Bump cxf.opentelemetry.semconv.version from 1.25.0-alpha to 1.26.0-alpha (#1957)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit f713473ce3676901a803088257c2b33f22f04791 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jul 9 09:51:15 2024 -0400 Bump cxf.opentelemetry.semconv.version from 1.25.0-alpha to 1.26.0-alpha (#1957) Bumps `cxf.opentelemetry.semconv.version` from 1.25.0-alpha to 1.26.0-alpha. Updates `io.opentelemetry.semconv:opentelemetry-semconv` from 1.25.0-alpha to 1.26.0-alpha - [Release notes](https://github.com/open-telemetry/semantic-conventions-java/releases) - [Changelog](https://github.com/open-telemetry/semantic-conventions-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/semantic-conventions-java/commits) Updates `io.opentelemetry.semconv:opentelemetry-semconv-incubating` from 1.25.0-alpha to 1.26.0-alpha - [Release notes](https://github.com/open-telemetry/semantic-conventions-java/releases) - [Changelog](https://github.com/open-telemetry/semantic-conventions-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/semantic-conventions-java/commits) --- updated-dependencies: - dependency-name: io.opentelemetry.semconv:opentelemetry-semconv dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.opentelemetry.semconv:opentelemetry-semconv-incubating dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit a1d666c14567e93b6c231c4a125f8bf845289431) # Conflicts: # parent/pom.xml (cherry picked from commit 968c96090d0df2119f10293516690b06f45f83a9) --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 860051b4cc..50af8fc151 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -187,7 +187,7 @@ [3.1,4) 3.4.6_3 1.34.1 - 1.25.0-alpha + 1.26.0-alpha 0.33.0 2.0.27 2.2.3
(cxf) 02/02: Change .gitmergeinfo source branch to origin/4.0.x-fixes
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 3bbd25205b93d4d84abe48840314c81b21a3f042 Author: Andriy Redko AuthorDate: Wed Jul 10 15:55:55 2024 -0400 Change .gitmergeinfo source branch to origin/4.0.x-fixes --- .gitmergeinfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmergeinfo b/.gitmergeinfo index 6591737243..e5ac6d82b6 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1,4 +1,4 @@ -origin/main +origin/4.0.x-fixes B 00b1c007eef119337217c9dde8de598d88c6544a B 00bbab65e59b8f27366335aec19e50129b7759f0
(cxf) 01/02: Update Project Reactor to 3.5.19
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 480abad68fd026633b77574a1dfc5ea377ca70c5 Author: Andriy Redko AuthorDate: Wed Jul 10 15:54:58 2024 -0400 Update Project Reactor to 3.5.19 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7fd765b568..5241536376 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -191,7 +191,7 @@ 4.10.0 3.5.1 1.0.4 -3.5.18 +3.5.19 1.7.15 1.3.8 2.2.21
(cxf) branch 3.6.x-fixes updated (6f42a4d5e5 -> 3bbd25205b)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 6f42a4d5e5 Recording .gitmergeinfo Changes new 480abad68f Update Project Reactor to 3.5.19 new 3bbd25205b Change .gitmergeinfo source branch to origin/4.0.x-fixes The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmergeinfo | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
(cxf) 03/04: Update maven-invoker-plugin to 3.7.0
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 7169d25320f44fa024caf2cf10dade35776848f5 Author: Andriy Redko AuthorDate: Wed Jul 10 09:15:54 2024 -0400 Update maven-invoker-plugin to 3.7.0 (cherry picked from commit fac0cbdc8f08f2305f36248b3ad8e831b4531e20) --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 920f2d90a6..0147d068f5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -583,12 +583,12 @@ org.apache.maven.plugins maven-invoker-plugin -3.6.0 +3.7.0 org.apache.groovy groovy -4.0.21 +4.0.22
(cxf) 04/04: Recording .gitmergeinfo Changes
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 9dcf2ea4cdb23be54103a03d3632c52f42ff4589 Author: Andriy Redko AuthorDate: Wed Jul 10 15:54:11 2024 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 095271b13c..df59eaa9b6 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -92,6 +92,7 @@ M dc08a738df3e10f133f4dc149c2cdbdf56ed8350 M dd74a63a8e59aa2bc762a41370e444cadae4c899 M dfe8bc122f2f88804f086dc864feaf14046070b2 M e17b6d78ec2e46cbdb7f7760d12ede92c5a63b2f +M e2497a3a96276fbca69ba279b85b852695a0c14c M e60fd15ce98e4f1fe1278a0f29c95600e48700ca M e864b59e951315845b95500d692f17e7670c8a01 M e8b690d3bf15860b2576e325574157e5ce23ec28
(cxf) branch 4.0.x-fixes updated (0b689f360f -> 9dcf2ea4cd)
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 0b689f360f Update Project Reactor to 3.5.19 new 83ccd1fc29 Bump org.assertj:assertj-core from 3.26.0 to 3.26.3 (#1958) new e76b72597c Downgrade to 4.2.0 due to https://github.com/awaitility/awaitility/pull/279 new 7169d25320 Update maven-invoker-plugin to 3.7.0 new 9dcf2ea4cd Recording .gitmergeinfo Changes The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmergeinfo | 1 + parent/pom.xml | 9 + 2 files changed, 6 insertions(+), 4 deletions(-)