You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2019/08/06 14:00:56 UTC
[cxf] branch 3.2.x-fixes updated (b09b435 -> e57fea9)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from b09b435 [CXF-8083]ensure java2swagger-plugin|java2ws-plugin m2e compatible
new 717630f Update jackston to get latest CVE patches
new f6e503e Couple of other dependency updates
new dc52dc6 Updating Jackson databind version
new a1ab5fc Recording .gitmergeinfo Changes
new e57fea9 Updating Spring + Tika
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 | 11 +++++++++++
osgi/karaf/features/src/main/resources/features.xml | 2 +-
parent/pom.xml | 14 +++++++-------
3 files changed, 19 insertions(+), 8 deletions(-)
[cxf] 02/05: Couple of other dependency updates
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit f6e503e1907eb7837fe2b8d6eea0b7a445086c6f
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Wed Jul 31 16:24:18 2019 -0400
Couple of other dependency updates
(cherry picked from commit 0b41ab1647b06aedbb3db9812cdca6b2102b640c)
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index d9a8fb9..b387a10 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -47,7 +47,7 @@
<!-- stuff related to ASM -->
<cxf.asm.groupId>org.ow2.asm</cxf.asm.groupId>
<cxf.asm.artifactId>asm</cxf.asm.artifactId>
- <cxf.asm.version>7.0</cxf.asm.version>
+ <cxf.asm.version>7.1</cxf.asm.version>
<cxf.osgi.asm.version>[3.0,8)</cxf.osgi.asm.version>
<!-- OSGi related properties -->
<cxf.fragment.host />
@@ -79,7 +79,7 @@
<cxf.cglib.bundle.version>2.2_2</cxf.cglib.bundle.version>
<cxf.cglib.osgi.version>[2.1.3,3.0.0)</cxf.cglib.osgi.version>
<cxf.classmate.version>1.1.0</cxf.classmate.version>
- <cxf.commons-codec.version>1.12</cxf.commons-codec.version>
+ <cxf.commons-codec.version>1.13</cxf.commons-codec.version>
<cxf.commons-collections.version>3.2.2</cxf.commons-collections.version>
<cxf.commons-lang3.version>3.8.1</cxf.commons-lang3.version>
<cxf.commons-text.version>1.6</cxf.commons-text.version>
[cxf] 03/05: Updating Jackson databind version
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit dc52dc63339e222b278b36280efe0022dc7b19f3
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Aug 6 11:11:19 2019 +0100
Updating Jackson databind version
(cherry picked from commit a7638c1562631b9c66c0de8a35b0cb47f2622d8a)
# 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 b387a10..aaeb640 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -98,7 +98,7 @@
<cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range>
<cxf.hsqldb.version>2.4.1</cxf.hsqldb.version>
<cxf.jackson.version>2.9.9</cxf.jackson.version>
- <cxf.jackson.databind.version>2.9.9.2</cxf.jackson.databind.version>
+ <cxf.jackson.databind.version>2.9.9.3</cxf.jackson.databind.version>
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
<cxf.kerby.version>1.1.1</cxf.kerby.version>
<cxf.logback.classic.version>1.2.3</cxf.logback.classic.version>
[cxf] 04/05: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit a1ab5fc3ab37fd94505f93311223814a7e45fcce
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Aug 6 13:59:36 2019 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9c9f8aa..b037bc2 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -39,6 +39,7 @@ B 0f5db0ee9efde0fcf12bb2236a31548a8cca0979
B 1031e06a4441e4d63f9fc1fb7b63ef4052ee16d8
B 1101c8a68efc43999a9516e257b71da99c1ed707
B 1159eff075501259554b811a44ffa87200a67aa9
+B 11f78d0382a7123a428cefe5f5598ee51cbf47cb
B 13915430cb5abc554b777a3894884670f89d184e
B 13e1dae57f5609259f935bfe5e280862e266dcb2
B 1411add1829a172d2c5add7fecc2502450986673
@@ -222,6 +223,7 @@ B 5a5d6eab2748d03508d51ee036701244ad0cfe25
B 5a72b4170110d58fb6186fd7ce9f5339b9550f5e
B 5b11f39743278a06fdf174e89b0178a7f9d86fbb
B 5b2f078eda2ede0f6afb12b146869403c1c2d3fb
+B 5c4d446b66597dde2bf70e8971112547273bbf29
B 5ce20d7f3c7bf0c028f290a9a92704662adc8832
B 5cf3301c9bbf655a05cb7fcc0ed29d5cc2269142
B 5d164a22c1934f6c499d12146c6ab9d59b13e6ee
@@ -249,6 +251,7 @@ B 64dd999db1c712cd54f003a76abe1d221a1e3295
B 64e00d57016e7066858fc061ca9d1f16a7a025ae
B 64f28032da4c509ecfa1661351f83672b6691664
B 65297e7f2a7a13f90b0f90fee8baebd3f742ad87
+B 65c771ec6d2c686d712dfd8384cdfcef3eb4ebd4
B 65cdeda9a3089c93a45262e2ea6ec4e14abafceb
B 66317cc113752a2129d914ad5c5e7c00bc6fa60e
B 6650dc0d114e229737ba85a1e28c146e24c7c606
@@ -385,6 +388,7 @@ B 9d532c0c6be68fb08460c2bc51c076395e658210
B 9d54d3dc5154b8c95077e6e58f3dfd614e83c7d1
B 9db243c1aa44732996514200b490eb63683540b4
B a079c5ee91dcfa167243658f110e99c9d61178f3
+B a0863e63b2c874307b2a8401a2dccbd95b724a3e
B a0f75306424f54d325ad3e83ccab34aecbd85ab9
B a1559f898885138592ad7104d2c32e7f61b06211
B a2c3ac7231ef1c71b105f43922016b7167f9ca5b
@@ -404,6 +408,7 @@ B a790e5a484fe549f89ed3897b598cd1cf9ebe5b2
B a7c1285a44f1be74b442048eedc7a1c31c8e4e9b
B a85896eaf6d22b6ac3dff41e299be809dbc7612c
B a8a56cb4e394dd1d7e99c7398968b8cbe061e500
+B a8b17dd9fa263564f29f4e2b254d1e9e9bdf5a6f
B a94bbb4fea70c9b5fdd0c61d9e15a6fdbd9bc30c
B a95593cf274215d32734ab4d328be606568820ae
B a9c0c7705f70054a70eb3e95439d2a37731e0332
@@ -439,6 +444,7 @@ B b5ba5a7d58b2fc4ea767effb24bf3d26737586b2
B b5bcbc94a357e0074b1dfb3152f71244cf0e82c8
B b6bc48cfbf3d6aef488890a3e9c9c00a3642bdff
B b6e9e297a253e8b6e285e009d57ab8964065939a
+B b7ae6e7c10ba8901e76749aeb6ebd90dc78a0e5d
B b8236c923ba409087e8db6132963924151918efc
B b86a13abd8839680580e06341bb1d502b296ae8e
B b86ca5b0052f1c92531401dc4a2666a7802494d5
@@ -511,6 +517,7 @@ B ced81577a753b150e7afab30e3ddaeb44659221f
B cf3ac555a69d37970325035f774f1c9a99502f35
B cfab2ec2eced0dc0b026bc4bfbeeb18fff28e1b6
B cff773f4f750b7bdc3f955c1a5b1b5f4a311dd71
+B d1494e91f0c3cd7e6922f72befb75ace5faae1fa
B d1769b796fdf20e0fb1f72c1db5fd965f1b721ca
B d1b4a9356e840071b012ff61efbf2c01914b8dc8
B d22aff30192d828b71a2fa7f9ffdc31c9f29324b
@@ -556,6 +563,7 @@ B e63ce74570117d17552c5cfe9823bc93237583f2
B e6b7675f45d6155d46725557cc0669810923d15e
B e6ee67539aeb4629bdf972784d02cfda99e72287
B e7220f44ff3a42d33e715295ec50e3b51008fce5
+B e8375daf5057f4e171dd3fd258794b17815ee0c4
B e9261069513b1947e16bf485182c328c07160e1c
B e93148a7b4f8940ee63c1bfcd625bcf351d18d94
B e9d4d65a2bdc1e258d5fd1d470abbf68c1ee4d07
@@ -621,6 +629,7 @@ B ffff30fdd8fc1b5987158d7d9fec8349b9d735d2
M 05b8db050b158d82aad57081a0dbb5e7c92cc3b1
M 08a054913f04448bfa56b12e11816365369318b5
M 08c1b24ee15812c5f8d5a9ac9780a4289f07daf0
+M 0b41ab1647b06aedbb3db9812cdca6b2102b640c
M 0b920d7275800e651b2c48c982b1977249516ddf
M 0dc54f4549a68a573e38e0d01396efbb46e87f41
M 0ef506e13f227ce325e09ae5042e003df32c1e0f
@@ -675,6 +684,7 @@ M 9bca6952c145b6ec6d2fb5726676ad7c3d67b7f7
M 9c02f616f6aec1cf43f1d6bac810d606dab98a72
M 9e1788a8e08264a2735ba5373a96f09215d60769
M a3ef872d21cc20059622fab6fec4f6b9d1ac6ceb
+M a7638c1562631b9c66c0de8a35b0cb47f2622d8a
M a8132de2a0204a1247f3e63e9140aa7a34bdf628
M ac561c4a2b27bd8b427ff1f91d19c7929a8222ab
M ad5c6ad246f9155fec7096de7701de02d757c0f2
@@ -688,6 +698,7 @@ M d1315732be55b89c25f66213d1f0a0e0567d8abc
M d1470dd0e14aa001dde1227bfb456a8b4cf0061e
M d419ae389ab4b42bf57106db99758dd8d3b11bca
M d520059ce1d04448fb2354966a7e16b39c3fcbda
+M dd11a60cc247b261ab96c7dfd314eff571e03eef
M e60e8ab5d7414a0dc581c5666873e1ab0413b107
M eaa14b96ea5275ff9ee27cf937cd498ca3dcd47f
M eda37b0df9af9df3df8378c744900b75cbbac6e5
[cxf] 01/05: Update jackston to get latest CVE patches
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 717630fda61a9e253b8c20274d385ecbcd1deef8
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Wed Jul 31 15:25:11 2019 -0400
Update jackston to get latest CVE patches
(cherry picked from commit dd11a60cc247b261ab96c7dfd314eff571e03eef)
# Conflicts:
# parent/pom.xml
---
osgi/karaf/features/src/main/resources/features.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 4bbdd48..b698acd 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -279,7 +279,7 @@
<bundle start-level="35">mvn:org.yaml/snakeyaml/${cxf.snakeyaml.version}</bundle>
<bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.version}</bundle>
<bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-annotations/${cxf.jackson.version}</bundle>
- <bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-databind/${cxf.jackson.version}</bundle>
+ <bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-databind/${cxf.jackson.databind.version}</bundle>
<bundle start-level="35">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${cxf.jackson.version}</bundle>
<bundle start-level="35">mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${cxf.jackson.version}</bundle>
<!-- <bundle start-level="35">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${cxf.jackson.version}</bundle> -->
diff --git a/parent/pom.xml b/parent/pom.xml
index bcd24e0..d9a8fb9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -98,7 +98,7 @@
<cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range>
<cxf.hsqldb.version>2.4.1</cxf.hsqldb.version>
<cxf.jackson.version>2.9.9</cxf.jackson.version>
- <cxf.jackson.databind.version>2.9.9.1</cxf.jackson.databind.version>
+ <cxf.jackson.databind.version>2.9.9.2</cxf.jackson.databind.version>
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
<cxf.kerby.version>1.1.1</cxf.kerby.version>
<cxf.logback.classic.version>1.2.3</cxf.logback.classic.version>
[cxf] 05/05: Updating Spring + Tika
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e57fea9b0ee78439ec15bcbc3e501e4a5d21e8ab
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Aug 6 14:01:28 2019 +0100
Updating Spring + Tika
---
parent/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index aaeb640..2919d4f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -157,9 +157,9 @@
<cxf.servlet-api-2.5.version>1.2</cxf.servlet-api-2.5.version>
<cxf.slf4j.version>1.7.26</cxf.slf4j.version>
<cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
- <cxf.spring.version>4.3.24.RELEASE</cxf.spring.version>
- <cxf.spring.boot.version>1.5.21.RELEASE</cxf.spring.boot.version>
- <cxf.spring.security.version>4.2.12.RELEASE</cxf.spring.security.version>
+ <cxf.spring.version>4.3.25.RELEASE</cxf.spring.version>
+ <cxf.spring.boot.version>1.5.22.RELEASE</cxf.spring.boot.version>
+ <cxf.spring.security.version>4.2.13.RELEASE</cxf.spring.security.version>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
<cxf.spring.ldap.version>2.3.2.RELEASE</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
@@ -222,7 +222,7 @@
<cxf.dom4j.bundle.version>1.6.1_5</cxf.dom4j.bundle.version>
<cxf.jdom.bundle.version>1.1_4</cxf.jdom.bundle.version>
<cxf.olingo.version>2.0.11</cxf.olingo.version>
- <cxf.tika.version>1.21</cxf.tika.version>
+ <cxf.tika.version>1.22</cxf.tika.version>
<cxf.jexl.version>2.1.1</cxf.jexl.version>
<cxf.htrace.version>4.2.0-incubating</cxf.htrace.version>
<cxf.zest.version>2.1</cxf.zest.version>