You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2023/10/30 20:17:22 UTC
(cxf) branch 3.5.x-fixes updated (c68d2b8811 -> 83b278270b)
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 c68d2b8811 Recording .gitmergeinfo Changes
new 82355b60e2 Bump org.cyclonedx:cyclonedx-maven-plugin from 2.7.9 to 2.7.10 (#1497)
new 7e242528fa Update Olingo to 4.10.0
new b278a64aee Update Santuario to 2.3.4
new 286188998c Recording .gitmergeinfo Changes
new 83b278270b Update HttpComponents Core to 4.4.16
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:
.gitmergeinfo | 3 +++
distribution/src/main/release/samples/jax_rs/odata/pom.xml | 11 ++++-------
distribution/src/main/release/samples/pom.xml | 1 +
parent/pom.xml | 4 ++--
pom.xml | 2 +-
5 files changed, 11 insertions(+), 10 deletions(-)
(cxf) 01/05: Bump org.cyclonedx:cyclonedx-maven-plugin from 2.7.9 to 2.7.10 (#1497)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 82355b60e2fc7562f5351a4bb3daacd16fde4632
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Oct 30 09:18:57 2023 -0400
Bump org.cyclonedx:cyclonedx-maven-plugin from 2.7.9 to 2.7.10 (#1497)
Bumps [org.cyclonedx:cyclonedx-maven-plugin](https://github.com/CycloneDX/cyclonedx-maven-plugin) from 2.7.9 to 2.7.10.
- [Release notes](https://github.com/CycloneDX/cyclonedx-maven-plugin/releases)
- [Commits](https://github.com/CycloneDX/cyclonedx-maven-plugin/compare/cyclonedx-maven-plugin-2.7.9...cyclonedx-maven-plugin-2.7.10)
---
updated-dependencies:
- dependency-name: org.cyclonedx:cyclonedx-maven-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit ee4244116cb49c007bde3ee7ee6a06a4cfb26027)
(cherry picked from commit 8def0e8940f70acaa58c80f27309edd84e1ed600)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0adef1fdfb..dbbef14497 100644
--- a/pom.xml
+++ b/pom.xml
@@ -689,7 +689,7 @@
<plugin>
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId>
- <version>2.7.9</version>
+ <version>2.7.10</version>
<executions>
<execution>
<id>make-bom</id>
(cxf) 04/05: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 286188998c0cb581b2f274fbdd94fcfea34aebf8
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Oct 30 15:35:27 2023 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f6995f2158..4baa762b9d 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -105,6 +105,7 @@ B 3fa88ef9f86f6d9d0eca6c466c22499702e4e5fa
B 3fd58ced7d0cebe1eb7f0e1297e90b4bf51d38bc
B 40c04c10f9cc5855d9170828b32c4169ff7ab00d
B 41b0b0793ce798979d9acfccd21b95fd44990ad4
+B 4321cb82c67aff9265c26dc42ab6ec84493729bd
B 44919916b3747beb059cadd95a34e0bf15202a0d
B 44b60ff6a49811ebfe2cd94b6aff64e785bd3767
B 450be91e2fa03528baae61006a188d3624c19565
@@ -346,6 +347,7 @@ B e3a719290b5eb18db1609218211a1ce59a332462
B e3b97c8fb3a26a7604234b93c3c4a93ed7227cc5
B e424eea4556ae3c20c0ea0f2c8c70594db97a03b
B e494dc257ab73ca50d7228cf2524872d79e906ca
+B e5b64d813c4c36dff86731b28b5334772f9b70b5
B e77527fbb19d006713cde6bc9b1b3996a82cec3b
B e7c2aee206ae5084204502b4744feed5a8e93e04
B e7d5bca0ba38b0f282f9da7f87bf964544b6b66a
@@ -700,6 +702,7 @@ M cda6e86a3a552b88af0ca60b8447b77ec506561d
M cdb3f7dbde40fc9670473b6c38d057594e11bfb6
M ce5ad64a6ed64ec991aba8a1cfc9ee8edf8aafd9
M ce8826bbe5c06569e9f522e7c11f922ea6231e9c
+M ce8cf5ad5677b11ac8319201a958d0bc2f7c3430
M ced6dfdca432f61a8dde6ead6b2c6d50f4cec023
M cf85ed2aa618971bb4858608b189d7888453521f
M cfbad166fe4d519f52c1bf651170f1e3dfcc0237
(cxf) 05/05: Update HttpComponents Core to 4.4.16
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 83b278270be7223d6a6605846d5b70178bc226df
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Oct 30 16:17:06 2023 -0400
Update HttpComponents Core to 4.4.16
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 3b118bd41f..1668567769 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -128,7 +128,7 @@
<cxf.httpcomponents.asyncclient.version>4.1.5</cxf.httpcomponents.asyncclient.version>
<cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
<cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range>
- <cxf.httpcomponents.core.version>4.4.15</cxf.httpcomponents.core.version>
+ <cxf.httpcomponents.core.version>4.4.16</cxf.httpcomponents.core.version>
<cxf.httpcomponents.client5.version>5.1.4</cxf.httpcomponents.client5.version>
<cxf.httpcomponents.core5.version>5.1.5</cxf.httpcomponents.core5.version>
<cxf.jackson.version>2.14.3</cxf.jackson.version>
(cxf) 02/05: Update Olingo to 4.10.0
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 7e242528fa679e3b94c20e28de94770c7cd73459
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Oct 30 13:09:44 2023 -0400
Update Olingo to 4.10.0
(cherry picked from commit ce8cf5ad5677b11ac8319201a958d0bc2f7c3430)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
---
distribution/src/main/release/samples/jax_rs/odata/pom.xml | 11 ++++-------
distribution/src/main/release/samples/pom.xml | 1 +
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/odata/pom.xml b/distribution/src/main/release/samples/jax_rs/odata/pom.xml
index 2fe8a7fa1a..92cd96fa8e 100644
--- a/distribution/src/main/release/samples/jax_rs/odata/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/odata/pom.xml
@@ -28,9 +28,6 @@
<version>3.5.8-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
- <properties>
- <olingo.version>4.7.1</olingo.version>
- </properties>
<profiles>
<profile>
<id>server</id>
@@ -70,22 +67,22 @@
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-commons-api</artifactId>
- <version>${olingo.version}</version>
+ <version>${cxf.olingo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-commons-core</artifactId>
- <version>${olingo.version}</version>
+ <version>${cxf.olingo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-server-api</artifactId>
- <version>${olingo.version}</version>
+ <version>${cxf.olingo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-server-core</artifactId>
- <version>${olingo.version}</version>
+ <version>${cxf.olingo.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 760b4480d8..8e36eb7988 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -41,6 +41,7 @@
<graalvm.version>21.1.0</graalvm.version>
<cxf.aspectj.version>1.9.20.1</cxf.aspectj.version>
<cxf.brave.version>5.16.0</cxf.brave.version>
+ <cxf.olingo.version>4.10.0</cxf.olingo.version>
</properties>
<dependencies>
<dependency>
(cxf) 03/05: Update Santuario to 2.3.4
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b278a64aee45a24506a1b729d416206ab75f430e
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Oct 30 13:11:01 2023 -0400
Update Santuario to 2.3.4
(cherry picked from commit 0efe4bea19b5803f588c44f8d7f0bd1d533ddf76)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 4e8fca6861..3b118bd41f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -277,7 +277,7 @@
<cxf.wsdl4j.bundle.version>1.6.3_1</cxf.wsdl4j.bundle.version>
<cxf.xerces.bundle.version>2.12.2_1</cxf.xerces.bundle.version>
<cxf.xmlresolver.bundle.version>1.2_5</cxf.xmlresolver.bundle.version>
- <cxf.xmlsec.bundle.version>2.3.3</cxf.xmlsec.bundle.version>
+ <cxf.xmlsec.bundle.version>2.3.4</cxf.xmlsec.bundle.version>
<cxf.xpp3.bundle.version>1.1.4c_6</cxf.xpp3.bundle.version>
<cxf.awaitility.version>4.2.0</cxf.awaitility.version>
</properties>