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/12/20 15:10:01 UTC
(cxf) branch 3.5.x-fixes updated (161a527a37 -> 1b4a112eee)
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 161a527a37 Recording .gitmergeinfo Changes
new 1406bee81e Bump cxf.brave.version from 5.16.0 to 5.17.0 (#1584)
new 58843ec2a6 Bump org.apache.maven.plugins:maven-compiler-plugin (#1589)
new f4fff2c7a0 Update istack-commons-tools to 3.0.12
new b8732f0b06 Bump cxf.zipkin-reporter.version from 2.17.0 to 2.17.1 (#1587)
new 6b9fb21210 Bump cxf.brave.version from 5.16.0 to 5.17.0 (#1592)
new 12c267921f Bump org.apache.maven.plugins:maven-project-info-reports-plugin (#1595)
new 1b4a112eee Recording .gitmergeinfo Changes
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 6 ++++++
distribution/src/main/release/samples/pom.xml | 4 ++--
parent/pom.xml | 8 ++++----
pom.xml | 8 ++++----
4 files changed, 16 insertions(+), 10 deletions(-)
(cxf) 03/07: Update istack-commons-tools to 3.0.12
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 f4fff2c7a0aeacf9ebf2082c261fd1350de72c9c
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Dec 19 15:50:37 2023 -0500
Update istack-commons-tools to 3.0.12
(cherry picked from commit 454d9313fa7ee81a99424cff427a22576dc96186)
# Conflicts:
# parent/pom.xml
(cherry picked from commit 18a4611e366c1f0e6dbf46b9cf3052e90fee0162)
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index c4512994a4..61f7b47d22 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -251,7 +251,7 @@
<cxf.dom4j.bundle.version>2.1.3_1</cxf.dom4j.bundle.version>
<cxf.fastinfoset.bundle.version>1.2.18_1</cxf.fastinfoset.bundle.version>
<cxf.felix.configadmin.version>1.2.4</cxf.felix.configadmin.version>
- <cxf.istack.bundle.version>3.0.7</cxf.istack.bundle.version>
+ <cxf.istack.bundle.version>3.0.12</cxf.istack.bundle.version>
<cxf.jakarta.mail.version>1.6.7</cxf.jakarta.mail.version>
<cxf.jasypt.bundle.version>1.9.3_1</cxf.jasypt.bundle.version>
<cxf.jaxb.bundle.version>2.3.2_1</cxf.jaxb.bundle.version>
@@ -1632,7 +1632,7 @@
<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-tools</artifactId>
- <version>3.0.11</version>
+ <version>${cxf.istack.bundle.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
(cxf) 01/07: Bump cxf.brave.version from 5.16.0 to 5.17.0 (#1584)
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 1406bee81e16c3a14a0548e2c7e955c75e9fb161
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue Dec 19 09:07:07 2023 -0500
Bump cxf.brave.version from 5.16.0 to 5.17.0 (#1584)
Bumps `cxf.brave.version` from 5.16.0 to 5.17.0.
Updates `io.zipkin.brave:brave-context-slf4j` from 5.16.0 to 5.17.0
Updates `io.zipkin.brave:brave-instrumentation-httpclient` from 5.16.0 to 5.17.0
Updates `io.zipkin.brave:brave-instrumentation-httpasyncclient` from 5.16.0 to 5.17.0
Updates `io.zipkin.brave:brave-instrumentation-okhttp3` from 5.16.0 to 5.17.0
---
updated-dependencies:
- dependency-name: io.zipkin.brave:brave-context-slf4j
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: io.zipkin.brave:brave-instrumentation-httpclient
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: io.zipkin.brave:brave-instrumentation-httpasyncclient
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: io.zipkin.brave:brave-instrumentation-okhttp3
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 2f5788b979d17d058abbe49e363642d8e25dd53c)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
(cherry picked from commit dc09fb745d22c38b06495abd86591a05c9c2e5f3)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
---
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 9067ade263..32360d3730 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -39,7 +39,7 @@
<cxf.tomcat.version>9.0.84</cxf.tomcat.version>
<graalvm.version>21.1.0</graalvm.version>
<cxf.aspectj.version>1.9.21</cxf.aspectj.version>
- <cxf.brave.version>5.16.0</cxf.brave.version>
+ <cxf.brave.version>5.17.0</cxf.brave.version>
<cxf.olingo.version>4.10.0</cxf.olingo.version>
</properties>
<dependencies>
(cxf) 06/07: Bump org.apache.maven.plugins:maven-project-info-reports-plugin (#1595)
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 12c267921f4ee6c7f33fb3355dda00c218eaed43
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Dec 20 09:33:29 2023 -0500
Bump org.apache.maven.plugins:maven-project-info-reports-plugin (#1595)
Bumps [org.apache.maven.plugins:maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) from 3.4.3 to 3.5.0.
- [Commits](https://github.com/apache/maven-project-info-reports-plugin/compare/maven-project-info-reports-plugin-3.4.3...maven-project-info-reports-plugin-3.5.0)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-project-info-reports-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 1a4f3eef5cbb1035a251e059b9e515174f05921b)
(cherry picked from commit 38a83b9a0d9e0f02488dd2a94eff9f5cc26d4176)
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6be12432b9..73ea344386 100644
--- a/pom.xml
+++ b/pom.xml
@@ -551,7 +551,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.4.5</version>
+ <version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -738,7 +738,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.4.3</version>
+ <version>3.5.0</version>
<configuration>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
(cxf) 04/07: Bump cxf.zipkin-reporter.version from 2.17.0 to 2.17.1 (#1587)
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 b8732f0b061ad2e8db21965332c69ca439353bca
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue Dec 19 09:06:55 2023 -0500
Bump cxf.zipkin-reporter.version from 2.17.0 to 2.17.1 (#1587)
Bumps `cxf.zipkin-reporter.version` from 2.17.0 to 2.17.1.
Updates `io.zipkin.reporter2:zipkin-reporter-brave` from 2.17.0 to 2.17.1
- [Release notes](https://github.com/openzipkin/zipkin-reporter-java/releases)
- [Changelog](https://github.com/openzipkin/zipkin-reporter-java/blob/master/RELEASE.md)
- [Commits](https://github.com/openzipkin/zipkin-reporter-java/compare/2.17.0...2.17.1)
Updates `io.zipkin.reporter2:zipkin-sender-urlconnection` from 2.17.0 to 2.17.1
- [Release notes](https://github.com/openzipkin/zipkin-reporter-java/releases)
- [Changelog](https://github.com/openzipkin/zipkin-reporter-java/blob/master/RELEASE.md)
- [Commits](https://github.com/openzipkin/zipkin-reporter-java/compare/2.17.0...2.17.1)
---
updated-dependencies:
- dependency-name: io.zipkin.reporter2:zipkin-reporter-brave
dependency-type: direct:development
update-type: version-update:semver-patch
- dependency-name: io.zipkin.reporter2:zipkin-sender-urlconnection
dependency-type: direct:development
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 4309a4a1f94f50d77825dd57ab964d436cab63b8)
# Conflicts:
# parent/pom.xml
(cherry picked from commit 686b7d9f8a6f9312dc3e09d58e4bbf38be0367cd)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 61f7b47d22..b918c0d3ae 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -90,7 +90,7 @@
<cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
<cxf.atmosphere.version>2.6.1</cxf.atmosphere.version>
<cxf.bcprov.version>1.77</cxf.bcprov.version>
- <cxf.brave.reporter.version>2.16.4</cxf.brave.reporter.version>
+ <cxf.brave.reporter.version>2.17.1</cxf.brave.reporter.version>
<cxf.brave.version>5.16.0</cxf.brave.version>
<cxf.brave.zipkin.version>2.24.2</cxf.brave.zipkin.version>
<cxf.cda.api.osgi.range>[1.1,2)</cxf.cda.api.osgi.range>
(cxf) 05/07: Bump cxf.brave.version from 5.16.0 to 5.17.0 (#1592)
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 6b9fb212101ff6ee1df14645580db60c4ab34fe4
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue Dec 19 22:40:39 2023 -0500
Bump cxf.brave.version from 5.16.0 to 5.17.0 (#1592)
Bumps `cxf.brave.version` from 5.16.0 to 5.17.0.
Updates `io.zipkin.brave:brave` from 5.16.0 to 5.17.0
- [Release notes](https://github.com/openzipkin/brave/releases)
- [Changelog](https://github.com/openzipkin/brave/blob/master/RELEASE.md)
- [Commits](https://github.com/openzipkin/brave/compare/5.16.0...5.17.0)
Updates `io.zipkin.brave:brave-instrumentation-http` from 5.16.0 to 5.17.0
---
updated-dependencies:
- dependency-name: io.zipkin.brave:brave
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: io.zipkin.brave:brave-instrumentation-http
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit c13efe30f6179813b60d2975a9f00742981178a6)
# Conflicts:
# parent/pom.xml
(cherry picked from commit 13bfd423e675b3275e8f07d7159c6ba0bb7ac9f7)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index b918c0d3ae..7c5f0ae94b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -91,7 +91,7 @@
<cxf.atmosphere.version>2.6.1</cxf.atmosphere.version>
<cxf.bcprov.version>1.77</cxf.bcprov.version>
<cxf.brave.reporter.version>2.17.1</cxf.brave.reporter.version>
- <cxf.brave.version>5.16.0</cxf.brave.version>
+ <cxf.brave.version>5.17.0</cxf.brave.version>
<cxf.brave.zipkin.version>2.24.2</cxf.brave.zipkin.version>
<cxf.cda.api.osgi.range>[1.1,2)</cxf.cda.api.osgi.range>
<cxf.cdi.api.version>2.0.2</cxf.cdi.api.version>
(cxf) 07/07: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1b4a112eee4f831fc5b7a091b301e31f3df6c07d
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Dec 20 10:03:18 2023 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index deb0375bb2..5cb8846c0c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -92,6 +92,7 @@ B 335b7880918b3ba148d9e239421aedb5de4db814
B 33e606c55927f34f3a2414bd1386931745357f38
B 3428dd1423198b22d7662dcc8d9553a58835c130
B 3457c8555d1ecb49cf13e29a60f7ab01ec5f2ff4
+B 345dc8adb73ed10e1a334dc09b8582456a747400
B 349ebb71310462ba6fb007941997f5fe75acf91a
B 35f84e49c8a39dbbe14e972c9ecb24c2066d07c8
B 3678d853f696a7c23de57b2c68dcf0e738c24cd2
@@ -268,6 +269,7 @@ B a2965420765203db3bcaa11188b4ae66a47f41d1
B a375e335cb04700580cb048ab25c9a4486a632d9
B a4c31985a4fdf040916f46ec4f23fb5e7524abc6
B a58099d69ba41557fd2bcfa75f3b6bedf116a39c
+B a59810ddd2222677d34a39a8068bb7355310a893
B a618b7583dee9cba94debbad1c244556697494bd
B a6501f782cd2b392f09edb4ccb99a83acd2e75a2
B a7d75d268fcb99efd11b0201f2c754483f303dd6
@@ -411,6 +413,7 @@ M 01cf70330332480c5c29c8c3d715503f83253bac
M 0203ba6ede0b5aa3785c950598a25feccd62df6f
M 024240b5a6157dc632c346f79ee0ba8149112ff8
M 02be25361d4f90485cebcd32ce41df8aa4249cbb
+M 032e12e2e934ee193b7028fa5640898045bcb15f
M 039ef658541017e2b8ddeaa0f49d771564e7d1f2
M 03e554cf370fc4543a1a611c525e787527e8a02f
M 03f5ea8eb1e1edd6502cb5df2d28b618422a572b
@@ -746,6 +749,7 @@ M c3bbfbcfa2a55fecb6d47098d11d2f529f13af5f
M c3fa8f19ed721b21e1e18133e9eb20b2906a5eaf
M c46f22ab11dc809f059054ab209d2ecfb952015f
M c4c9de9f13d3a65e3f532e2a72dc784ed3f36366
+M c58a98b407d9e96a44f3f448200edcbd078d3c48
M c5b7db5a4cceb3df6094ee38215725fd4ecc2b8c
M c5d2a50d28b47780311d91df390fa2a1836e41eb
M c5d7c3c02823d5d8b09e35161213a77abe10dc4d
@@ -797,6 +801,7 @@ M da73da6c8011d7d76c275a1636bbe64849072563
M db2bb9ffdee75230d430f90fdbf5c6594b6954d3
M db3d8e3d673adef8dd6cf1cba49fa8df7e049c55
M db6fcc8871fd8469907f3bfadfa6f1824e52a966
+M dc09fb745d22c38b06495abd86591a05c9c2e5f3
M dc7541fe5a7bbed90c48c35bba959fcb0dd345a1
M dec561cf2c2a6628071a6ca74a2ff917afff9868
M dee4fedb2caa9dc0bc0101d0b7165beddc4a03db
@@ -829,6 +834,7 @@ M f339bcce2cea60cbb31fc296109e47bf66f61b39
M f33c1dd2dd554faffbe4a8c7c27b71007be5bba8
M f387e39f3e72084845ff4df41e36d2bdf58accc1
M f466c1d881a996e45267f3b2e3210f0ebccdfdd4
+M f4d6f77bf8a953a915b637685e39caa4890b199d
M f50fd2ee733928a565bf98ead200780732ef03fe
M f51640f89ad939d39316de5c0944dd4b93783dad
M f51ede17d7fec86ae5df8f130911347e52a3265d
(cxf) 02/07: Bump org.apache.maven.plugins:maven-compiler-plugin (#1589)
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 58843ec2a6308b877a352df63ec3c3ae22edebd5
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue Dec 19 09:08:00 2023 -0500
Bump org.apache.maven.plugins:maven-compiler-plugin (#1589)
Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.11.0 to 3.12.0.
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.11.0...maven-compiler-plugin-3.12.0)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-compiler-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 186bd4ca3adba7395cd9d6fd1b4c1be025a5af44)
(cherry picked from commit f4d6f77bf8a953a915b637685e39caa4890b199d)
# Conflicts:
# pom.xml
---
distribution/src/main/release/samples/pom.xml | 2 +-
pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 32360d3730..c935c67af2 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -187,7 +187,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.11.0</version>
+ <version>3.12.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
diff --git a/pom.xml b/pom.xml
index 4eb4846092..6be12432b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,7 +216,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.10.1</version>
+ <version>3.12.0</version>
<configuration>
<source>${cxf.jdk.version}</source>
<target>${cxf.jdk.version}</target>
@@ -486,7 +486,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.11.0</version>
+ <version>3.12.0</version>
<configuration>
<source>${cxf.jdk.version}</source>
<target>${cxf.jdk.version}</target>