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/08/08 23:24:45 UTC

[cxf] branch 3.5.x-fixes updated (e3edd50169 -> 71452ef59a)

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 e3edd50169 CXF-8457: Provide OpenTelemetry support (fix JDK-8 compilation issues)
     new a2b9e73032 Bump org.webjars:swagger-ui from 5.2.0 to 5.3.1 (#1371)
     new 71452ef59a 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                                 | 7 +++++++
 distribution/src/main/release/samples/pom.xml | 2 +-
 parent/pom.xml                                | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)


[cxf] 02/02: 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 71452ef59af36082c4215c7d2d8945c42bbcedfc
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Aug 8 19:24:30 2023 -0400

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index da2bd42ba8..3a6b83e4f1 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -48,10 +48,12 @@ B 21bf42d906765fffb015f86d49e7b535d927bc56
 B 223aa652a4e39bf511ed7cf0fe32556fc140d476
 B 2279fcb96413302d9875d450283d9231bf0ce31b
 B 22d817d86fb576479f6095a43d8f64521350b53d
+B 24143cf0fe15a9d6b8fcd435afeec6b91f61a47b
 B 2438f7ebd983959935f5fb770caa4ad48ed3b0fb
 B 264b9a1dfa2241d7dc4d30a5520ef405fd36e9c9
 B 26aa8c8cfc103a5c51aed74a657880c6724c25a5
 B 295243b58b774ecb0304913ef6dbdef51a820e20
+B 299510ec53ee346f8f8bcbcd0899c44c0c84c138
 B 29f4825ed3b086867ff4ff286c6008104efed067
 B 2af064bc7025d815cd02ba979eeb4eccc7775a6a
 B 2b4a9f3abe30c92542e217d1077ea5c77119f328
@@ -476,6 +478,7 @@ M 905f4f91e4d0b5c4d145729f16bad90b1847f0be
 M 90a2082380d1656c42bd6087906e1c048ee493bf
 M 90ec7283673a9aae874b2d4e9a077701300ac0de
 M 91c97378d9a64166b3099cad6a9f842d18c5bcad
+M 929a72545f8d729f4320eb5b871ab63738503ab4
 M 937d6ca1fad9e39fa9684ea62c924b461b57d177
 M 94fdc50f4436b6a14a2e2c22a615cf710b2cabef
 M 96e71237bae2eb987a5fbe67d21e9e1e19f2d158
@@ -513,6 +516,7 @@ M adb6d3b5565d83b7612f3eededd9723dd2d6b5f2
 M adfe67ca302ba3c4ddf40a734493cf75d3439b9b
 M aeaf2276fd852ad0932730477de81ce520e0d1af
 M aeeda25db3725df954a3bc48f52e3c7687807428
+M b081968a6c6af43b1cd181d4a3369eca1d969c17
 M b207c718e84bed8120bb114f1d79f575094c3a14
 M b3503705c584c5b29a5e4e7a64b909c3609f7529
 M b5faf57b6f696c1487fc6f12795e9113f1f804a6
@@ -559,6 +563,7 @@ M d86920ce70dfe74836f18180dc5d47c8437f0250
 M d891059f0de95a27e69179a0bfa0e80eb251bb3f
 M da73da6c8011d7d76c275a1636bbe64849072563
 M db6fcc8871fd8469907f3bfadfa6f1824e52a966
+M dc7541fe5a7bbed90c48c35bba959fcb0dd345a1
 M dec561cf2c2a6628071a6ca74a2ff917afff9868
 M e216f887e073d9fc6a595b8443682c6a66b27227
 M e272423b0ab885aa886901850360c04d11eb5ba2
@@ -578,6 +583,7 @@ M f25e81b813d776475641eb1a0875cb3bc9f45e51
 M f339bcce2cea60cbb31fc296109e47bf66f61b39
 M f466c1d881a996e45267f3b2e3210f0ebccdfdd4
 M f50fd2ee733928a565bf98ead200780732ef03fe
+M f51640f89ad939d39316de5c0944dd4b93783dad
 M f54de185fcd6dfc69b1dd6609d0486ed06b68b19
 M f55be99cd50d9d1fe527bbeb55135174b7fab79b
 M f76b1119d03504e2d26d7417e659e271f9db541f
@@ -588,6 +594,7 @@ M fbcacf7722037030770e70bcc705e925d85d1672
 M fc9fd3185d026f26a2a6e7e9a74fc6e16e0a6cee
 M fd261453cf08ac22d2c5be3c2fe4100438c740a5
 M fdce18b90cb73dc6f4a5dc41fe9e7e60670bb694
+M fe0adf45056e3ddcee7df136867cb0031f4391b6
 M fe9e88be954b889653aca8a0792552fca523dc4e
 M ff640769c1e6efc175b864ade495eb8ca5dc2c7e
 M ff80c36e14f6b1f04ac38ac2203d2f0c48cbfaef


[cxf] 01/02: Bump org.webjars:swagger-ui from 5.2.0 to 5.3.1 (#1371)

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 a2b9e730324fdfda4d85aeaccf8142b09b374174
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue Aug 8 16:50:37 2023 -0400

    Bump org.webjars:swagger-ui from 5.2.0 to 5.3.1 (#1371)
    
    Bumps [org.webjars:swagger-ui](https://github.com/webjars/swagger-ui) from 5.2.0 to 5.3.1.
    - [Commits](https://github.com/webjars/swagger-ui/compare/swagger-ui-5.2.0...swagger-ui-5.3.1)
    
    ---
    updated-dependencies:
    - dependency-name: org.webjars:swagger-ui
      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 9c8dc0c1b935f3aa9f67db878fad7d4dbd1474fc)
    (cherry picked from commit 929a72545f8d729f4320eb5b871ab63738503ab4)
    
    # Conflicts:
    #       parent/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 644dd9144b..c82f32003b 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -35,7 +35,7 @@
         <cxf.jetty9.version>9.4.51.v20230217</cxf.jetty9.version>
         <cxf.netty.version>4.1.96.Final</cxf.netty.version>
         <cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
-        <cxf.swagger.ui.version>5.2.0</cxf.swagger.ui.version>
+        <cxf.swagger.ui.version>5.3.1</cxf.swagger.ui.version>
         <cxf.tika.version>2.7.0</cxf.tika.version>
         <cxf.tomcat.version>9.0.78</cxf.tomcat.version>
         <graalvm.version>21.1.0</graalvm.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index de18a09da5..face89b8e4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -211,7 +211,7 @@
         <cxf.spring.security.version>5.6.12</cxf.spring.security.version>
         <cxf.spring.version>5.3.29</cxf.spring.version>
         <cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
-        <cxf.swagger.ui.version>5.2.0</cxf.swagger.ui.version>
+        <cxf.swagger.ui.version>5.3.1</cxf.swagger.ui.version>
         <cxf.swagger.v3.version>2.1.13</cxf.swagger.v3.version>
         <cxf.swagger2.version>1.6.11</cxf.swagger2.version>
         <cxf.swagger2.guava.version>31.1-jre</cxf.swagger2.guava.version>