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/19 22:05:11 UTC
(cxf) branch 3.6.x-fixes updated (791d4b76b7 -> 345dc8adb7)
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 791d4b76b7 Recording .gitmergeinfo Changes
new dc09fb745d Bump cxf.brave.version from 5.16.0 to 5.17.0 (#1584)
new f4d6f77bf8 Bump org.apache.maven.plugins:maven-compiler-plugin (#1589)
new c58a98b407 Update Swagger Core to 2.2.20
new 18a4611e36 Update istack-commons-tools to 3.0.12
new 345dc8adb7 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:
.gitmergeinfo | 4 ++++
distribution/src/main/release/samples/pom.xml | 4 ++--
parent/pom.xml | 6 +++---
pom.xml | 4 ++--
4 files changed, 11 insertions(+), 7 deletions(-)
(cxf) 03/05: Update Swagger Core to 2.2.20
Posted by re...@apache.org.
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 c58a98b407d9e96a44f3f448200edcbd078d3c48
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Dec 19 12:55:33 2023 -0500
Update Swagger Core to 2.2.20
(cherry picked from commit 38f8930b0364511a19da1eef8c1ea11b2c408dfa)
# 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 3545d2881d..99a731ed61 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -210,7 +210,7 @@
<cxf.spring.version>5.3.31</cxf.spring.version>
<cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
<cxf.swagger.ui.version>5.10.3</cxf.swagger.ui.version>
- <cxf.swagger.v3.version>2.2.19</cxf.swagger.v3.version>
+ <cxf.swagger.v3.version>2.2.20</cxf.swagger.v3.version>
<cxf.swagger2.version>1.6.12</cxf.swagger2.version>
<cxf.swagger2.guava.version>32.1.3-jre</cxf.swagger2.guava.version>
<cxf.swagger2.guava.failureaccess.version>1.0.1</cxf.swagger2.guava.failureaccess.version>
(cxf) 02/05: 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.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit f4d6f77bf8a953a915b637685e39caa4890b199d
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)
---
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 822ac9a439..a622c49cca 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -189,7 +189,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>11</source>
<target>11</target>
diff --git a/pom.xml b/pom.xml
index badecd3dd7..8eba399e37 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.11.0</version>
+ <version>3.12.0</version>
<configuration>
<release>${cxf.jdk.version}</release>
<maxmem>256M</maxmem>
@@ -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>
<release>${cxf.jdk.version}</release>
<maxmem>256M</maxmem>
(cxf) 05/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.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 345dc8adb73ed10e1a334dc09b8582456a747400
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Dec 19 16:58:20 2023 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index fdbc0e346d..abec8a6b35 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -232,6 +232,7 @@ M 1654e0d45ac3ccaaa7eb53cc9ede8331424cf2fc
M 167214335d2bb10e22210faef36603ba7ee4047d
M 179f339622232adee54e9eb6a604ef1048c6d267
M 18599e4dc283e4de4d49933e13ff17fd09c61365
+M 186bd4ca3adba7395cd9d6fd1b4c1be025a5af44
M 18772ccd06e30586122665f1f1179cb3e7361eb3
M 188776f6723abb01b4c771e7370a09b844437e8d
M 18f1791fa72dba0a7f2ed784d0dfbbb5e9923306
@@ -310,6 +311,7 @@ M 2ef08e13cee1e66f67033ec44ba7e5469c7a9c09
M 2f05ce4f502106063af8a4c06549bcdc05540e27
M 2f1e5a9b49893711f96644a7cf9745ff8559517a
M 2f5044e10a4487bd9abc6340bdc438df23cd8f1e
+M 2f5788b979d17d058abbe49e363642d8e25dd53c
M 2f76e327b3c1128453e5ce996a802a656859671e
M 2f83718b45318bc107fc8b3e1cc6c1e3ea2d0337
M 3048785bf03baf76750f448777dfb003b5b1c98e
@@ -331,6 +333,7 @@ M 365c644eb6f776ee1d2e6623718ab8a8eab28b97
M 37537290932d3d399819a223142ab190fbafd3f4
M 383c9273a0b88931fef8117c6f0e481fa31734e4
M 38f782eb80c647fc36da50509bb234401d04202c
+M 38f8930b0364511a19da1eef8c1ea11b2c408dfa
M 396c32848ff70a7cd77bfcd5ea80a4b4abe4c20c
M 3983c304fcec6b40d60f3c804dd6537cf3b4d2c1
M 3a25cab6172083d26f2cc5f29a134c11214d5131
@@ -359,6 +362,7 @@ M 4356da0295b57336c96f4d41b3b259eea0c51f8f
M 437f688f1b5823542fae46033b9e8fc756e30fd2
M 44b46bdf065622577b77e397e1d22995f434331c
M 4540d59d1cdca6f0b364bff2f56c488cbd7423de
+M 454d9313fa7ee81a99424cff427a22576dc96186
M 455d8eb0d2449b76c547206425610f5fd588c1de
M 45b9df67131ce5796fe2e7110fe4a62f1249d1db
M 461728895638c4d9bb3718d322b8816d32e267c6
(cxf) 04/05: 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.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 18a4611e366c1f0e6dbf46b9cf3052e90fee0162
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
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 99a731ed61..95004a088a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -248,7 +248,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>
@@ -1639,7 +1639,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/05: 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.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit dc09fb745d22c38b06495abd86591a05c9c2e5f3
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
---
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 699be56be8..822ac9a439 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -40,7 +40,7 @@
<cxf.tomcat.version>9.0.84</cxf.tomcat.version>
<cxf.lucene.version>9.9.1</cxf.lucene.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.camel.version>3.21.1</cxf.camel.version>
<cxf.olingo.version>4.10.0</cxf.olingo.version>
</properties>