cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [cxf] 02/02: Recording .gitmergeinfo Changes
Date Mon, 02 Nov 2020 17:21:32 GMT
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 4809573262295fbcf4983be3afca88e7d4d47e47
Author: Colm O hEigeartaigh <coheigea@apache.org>
AuthorDate: Mon Nov 2 15:51:45 2020 +0000

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo                                 | 4 ++++
 distribution/src/main/release/samples/pom.xml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index a525ee1..b7cb474 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -3,6 +3,7 @@ origin/master
 B 00a83132af1d549508159d503aa6b171c8607341
 B 00aac546bc3288a39edaca94f921737cdcd6653a
 B 02186aebad9329afdcd5fcfcb74d5174f4e8d738
+B 02782356b3b2d0a8bc321667851a0f441784fb9a
 B 07a8053b1ff92a1d8c59f51098b691c65d23eed3
 B 08164e1f0e07c222ae45d320973401833df6ab9c
 B 08410191bfd0133deaafa81138b74460defbd8ca
@@ -132,6 +133,7 @@ B 567fa697621f77fe48082e8f719db4185736614c
 B 56b1c952f4099d5831b0973cceb4f8f9deac9854
 B 582c88e62f3e002478fa31b107f7113a004a5aa3
 B 583f29cf4c0e69b11df770e7449c0a254595adb6
+B 58aa102b07f510cd6dd265ba2fcc35709ef7466b
 B 59d5e10ccf4198fca4a650e6854c99ecd3837170
 B 5bc1e0eee7a74f7b47f3c9a4358c56c2f01090f8
 B 5c649140166d022d300e19d5c8f766b1237252f8
@@ -241,6 +243,7 @@ B a15c1e19669ef1f52d9f470daae8856c52ffc0c8
 B a1b0abe02b943ff43fed5020643ce3b2ccebb12f
 B a207359e74b2f664dbd78855e7e49e0efe3972b8
 B a276fd2cfd6e78326cda060779d9d8568e796313
+B a421613ce5b5bb21bfa22c94a3b3fd42b77c9079
 B a44960c899ed754f2192fcc62b4320b6bbb4b184
 B a4b4085f1c019302b1f1124a60dc1d5af1ce7085
 B a50d2d81dd7d620061ac21b6df7943ad5c6c92cc
@@ -486,6 +489,7 @@ M a9eb350f7cc28347ffeb7a8af44ba661531429f1
 M aa995675095ca648c1458cb8bf82c357160dfe16
 M aabf37788e571426e70250e7a62c7f4502e4d6e9
 M aaf6d041f6d0671a08f38133bfd5196f9ee8ad0b
+M aeb09e380af8e8e298bc569fbb82c33598fdb142
 M aefdc0759e30cb44d1729f08d1f31ff516a14e03
 M b70a3916daf64c15689a30e0a77bdb4c9dbaead4
 M b84270df1eb3a92b9d7e05dfd7231b0580f7bb90
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index f4e8bc5..5ebc398 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -30,7 +30,7 @@
         <!-- don't deploy the samples, kind of pointless -->
         <maven.deploy.skip>true</maven.deploy.skip>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.boot.version>2.1.14.RELEASE</spring.boot.version>
+        <spring.boot.version>2.1.18.RELEASE</spring.boot.version>
         <spring.cloud.eureka.version>2.0.2.RELEASE</spring.cloud.eureka.version>
         <cxf.jetty9.version>9.4.28.v20200408</cxf.jetty9.version>
         <cxf.httpcomponents.client.version>4.5.8</cxf.httpcomponents.client.version>


Mime
View raw message