[cxf] branch 3.3.x-fixes updated (9932955 -> f52ab63)

2021-09-16 Thread reta
This is an automated email from the ASF dual-hosted git repository.

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


from 9932955  Updating Tomcat to 8.5.71
 new 0fc430e  CXF-7543: JAX-RS Features not used in proxies or WebClients 
(#849)
 new f52ab63  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  |  4 +
 .../cxf/jaxrs/client/JAXRSClientFactoryBean.java   | 41 ++
 .../JAXRSClientFactoryBeanDefinitionParser.java| 59 ++
 .../cxf/jaxrs/client/cache/ClientCacheTest.java| 23 ++
 .../client/spring/JAXRSClientFactoryBeanTest.java  | 34 
 .../client/spring/SpringParameterHandler.java} | 14 +++-
 .../org/apache/cxf/jaxrs/client/spring/clients.xml |  6 ++
 .../client/MicroProfileClientFactoryBean.java  | 14 +++-
 .../client/CxfTypeSafeClientBuilderTest.java   | 41 ++
 .../client/MicroProfileClientFactoryBeanTest.java  | 94 ++
 10 files changed, 324 insertions(+), 6 deletions(-)
 copy 
rt/{frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/CustomerParameterHandler.java
 => 
rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/SpringParameterHandler.java}
 (76%)
 create mode 100644 
rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/MicroProfileClientFactoryBeanTest.java


[cxf] 01/02: CXF-7543: JAX-RS Features not used in proxies or WebClients (#849)

2021-09-16 Thread reta
This is an automated email from the ASF dual-hosted git repository.

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

commit 0fc430e8822c570af64099ba2d3727eba57fbc78
Author: Andriy Redko 
AuthorDate: Thu Sep 16 20:05:21 2021 -0400

CXF-7543: JAX-RS Features not used in proxies or WebClients (#849)

(cherry picked from commit bf25a931a96a6eb6cac47651bef1f2ff4fb442bc)
(cherry picked from commit 4f46a32f698d4089fb8b0c11ae095d53821d50f8)

# Conflicts:
#   
rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilderTest.java
---
 .../cxf/jaxrs/client/JAXRSClientFactoryBean.java   | 41 ++
 .../JAXRSClientFactoryBeanDefinitionParser.java| 59 ++
 .../cxf/jaxrs/client/cache/ClientCacheTest.java| 23 ++
 .../client/spring/JAXRSClientFactoryBeanTest.java  | 34 
 .../client/spring/SpringParameterHandler.java  | 58 +
 .../org/apache/cxf/jaxrs/client/spring/clients.xml |  6 ++
 .../client/MicroProfileClientFactoryBean.java  | 14 +++-
 .../client/CxfTypeSafeClientBuilderTest.java   | 41 ++
 .../client/MicroProfileClientFactoryBeanTest.java  | 94 ++
 9 files changed, 367 insertions(+), 3 deletions(-)

diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
index 747bdac..30f1f85 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
@@ -24,12 +24,19 @@ import java.lang.reflect.Type;
 import java.net.URI;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Logger;
 
 import javax.ws.rs.CookieParam;
 import javax.ws.rs.HeaderParam;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.core.Configurable;
+import javax.ws.rs.core.Configuration;
+import javax.ws.rs.core.Feature;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.ext.ParamConverter;
 import javax.ws.rs.ext.ParamConverterProvider;
@@ -45,6 +52,8 @@ import org.apache.cxf.endpoint.UpfrontConduitSelector;
 import org.apache.cxf.jaxrs.AbstractJAXRSFactoryBean;
 import org.apache.cxf.jaxrs.JAXRSServiceFactoryBean;
 import org.apache.cxf.jaxrs.JAXRSServiceImpl;
+import org.apache.cxf.jaxrs.impl.ConfigurableImpl;
+import org.apache.cxf.jaxrs.impl.FeatureContextImpl;
 import org.apache.cxf.jaxrs.impl.MetadataMap;
 import org.apache.cxf.jaxrs.model.ClassResourceInfo;
 import org.apache.cxf.jaxrs.utils.AnnotationUtils;
@@ -403,6 +412,10 @@ public class JAXRSClientFactoryBean extends 
AbstractJAXRSFactoryBean {
 });
 }
 }
+
+protected > Configurable getConfigurableFor(C 
context) {
+return new ConfigurableImpl<>(context, RuntimeType.CLIENT);
+}
 
 protected void applyFeatures(AbstractClient client) {
 if (getFeatures() != null) {
@@ -410,6 +423,34 @@ public class JAXRSClientFactoryBean extends 
AbstractJAXRSFactoryBean {
 feature.initialize(client.getConfiguration(), getBus());
 });
 }
+
+// Process JAX-RS features which are passed through as providers 
+final Set providers = new HashSet<>();
+for (final Object provider: getProviders()) {
+if (provider instanceof Feature) {
+final Feature feature = (Feature)provider;
+final FeatureContextImpl context = new FeatureContextImpl();
+final Configurable configurable = 
getConfigurableFor(context);
+final Configuration configuration = 
configurable.getConfiguration();
+final Set registered = configuration.getInstances();
+
+if (!configuration.isRegistered(feature)) {
+configurable.register(feature);
+
+// Disregarding if the feature is enabled or disabled, 
register only newly added providers,
+// excluding pre-existing ones and the feature instance 
itself.
+final Set added = new 
HashSet(configuration.getInstances());
+added.remove(feature);
+added.removeAll(registered);
+
+providers.addAll(added);
+}
+}
+}
+
+if (!providers.isEmpty()) {
+setProviders(Arrays.asList(providers));
+}
 }
 
 /**
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
 

[cxf] 02/02: Recording .gitmergeinfo Changes

2021-09-16 Thread reta
This is an automated email from the ASF dual-hosted git repository.

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

commit f52ab63732a50a8cf5a285f80242b7456dd4dcc4
Author: Andriy Redko 
AuthorDate: Thu Sep 16 21:29:48 2021 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index cfac1e7..e583e3a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -481,6 +481,7 @@ B af75fc2d12ad3a8a08b5f21ded9b17052c7396d3
 B af8ac0ef7d7871af15aed635ce324edf5317edd5
 B aff07408d17c2729b852e1b7239ae2d6a9728a0d
 B b0b6347409eb8a44e4099bbf5e5351f45c726b40
+B b0cdc26653ed616519ff47735eb179c6b2779d9a
 B b0df863bd1b3afae3f7af5c4693caa5c16729d99
 B b1ab732fb0d10056c125fce80b5e79aad7b26cc3
 B b1efa0e20ad8208294836e2e80a912b3f184cb4b
@@ -723,6 +724,7 @@ M 04fe61b2a9931d23eaad336192fe2c3dc429c2aa
 M 061104df8a9435ea618b1cba9f78b76793a7db57
 M 067f1afd5e29c0b6601a6df0e44862f52e548476
 M 09ddfdeaef6f32537dba23fa6d7ef36992b3217b
+M 0ac822f9f66e8f721c4668bf8ccd42a2b37d5eb8
 M 0b69090f97e262d8c107d82781dcba49fa15626d
 M 0bdb9613d9fb15feaea5e925ab86122194aa6843
 M 0c182f592250fe03fec460cbc15727e22b96675c
@@ -819,6 +821,7 @@ M 4b43096d1d79d3ba8e169eff1f09b38ea3ec929e
 M 4ba356d5b2889dace05dc58761ef12810c00e2f4
 M 4c3c5196be3e9295c31b5bc592ebc8f911c93c6d
 M 4d95d191ad25559deca8d5f010d5021446c1beed
+M 4f46a32f698d4089fb8b0c11ae095d53821d50f8
 M 4fa9dd5faa934ad7c778a346b311b095764cec3a
 M 50359bf9aec79b5e3c27ce9e2e9ddf07351b1bf6
 M 507719b5f70a2fba0a83b2f260fd588ffe546200
@@ -899,6 +902,7 @@ M 861c6ae9e63ba01cd5f6ae398a83a2d09a1b1364
 M 871c816db8350996560b7bd6c36dd1e9bbc5f4f4
 M 8751a7c9e70b23a48e6048de5d75e113218adf94
 M 8798b83cef186439b72ff02d9bafa37f9658404e
+M 888ae63e8f59bdd9c99f95234b3a9dc98d29cb5b
 M 88907f141ee80792627da3cc7846d1562f6c0238
 M 8ab434d7b12daa69c68aaad386be939d8ecb6780
 M 8ad7a9bbe1d9c257ff0ca9e99862095c9be7302d


[cxf] 01/02: CXF-7543: JAX-RS Features not used in proxies or WebClients (#849)

2021-09-16 Thread reta
This is an automated email from the ASF dual-hosted git repository.

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

commit 4f46a32f698d4089fb8b0c11ae095d53821d50f8
Author: Andriy Redko 
AuthorDate: Thu Sep 16 20:05:21 2021 -0400

CXF-7543: JAX-RS Features not used in proxies or WebClients (#849)

(cherry picked from commit bf25a931a96a6eb6cac47651bef1f2ff4fb442bc)
---
 .../cxf/jaxrs/client/JAXRSClientFactoryBean.java   | 41 ++
 .../JAXRSClientFactoryBeanDefinitionParser.java| 59 ++
 .../cxf/jaxrs/client/cache/ClientCacheTest.java| 23 ++
 .../client/spring/JAXRSClientFactoryBeanTest.java  | 34 
 .../client/spring/SpringParameterHandler.java  | 58 +
 .../org/apache/cxf/jaxrs/client/spring/clients.xml |  6 ++
 .../client/MicroProfileClientFactoryBean.java  | 14 +++-
 .../client/CxfTypeSafeClientBuilderTest.java   | 42 ++
 .../client/MicroProfileClientFactoryBeanTest.java  | 94 ++
 9 files changed, 368 insertions(+), 3 deletions(-)

diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
index 13d3c28..ccf547c 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
@@ -24,12 +24,19 @@ import java.lang.reflect.Type;
 import java.net.URI;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Logger;
 
 import javax.ws.rs.CookieParam;
 import javax.ws.rs.HeaderParam;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.core.Configurable;
+import javax.ws.rs.core.Configuration;
+import javax.ws.rs.core.Feature;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.ext.ParamConverter;
 import javax.ws.rs.ext.ParamConverterProvider;
@@ -45,6 +52,8 @@ import org.apache.cxf.endpoint.UpfrontConduitSelector;
 import org.apache.cxf.jaxrs.AbstractJAXRSFactoryBean;
 import org.apache.cxf.jaxrs.JAXRSServiceFactoryBean;
 import org.apache.cxf.jaxrs.JAXRSServiceImpl;
+import org.apache.cxf.jaxrs.impl.ConfigurableImpl;
+import org.apache.cxf.jaxrs.impl.FeatureContextImpl;
 import org.apache.cxf.jaxrs.impl.MetadataMap;
 import org.apache.cxf.jaxrs.model.ClassResourceInfo;
 import org.apache.cxf.jaxrs.utils.AnnotationUtils;
@@ -403,6 +412,10 @@ public class JAXRSClientFactoryBean extends 
AbstractJAXRSFactoryBean {
 });
 }
 }
+
+protected > Configurable getConfigurableFor(C 
context) {
+return new ConfigurableImpl<>(context, RuntimeType.CLIENT);
+}
 
 protected void applyFeatures(AbstractClient client) {
 if (getFeatures() != null) {
@@ -410,6 +423,34 @@ public class JAXRSClientFactoryBean extends 
AbstractJAXRSFactoryBean {
 feature.initialize(client.getConfiguration(), getBus());
 });
 }
+
+// Process JAX-RS features which are passed through as providers 
+final Set providers = new HashSet<>();
+for (final Object provider: getProviders()) {
+if (provider instanceof Feature) {
+final Feature feature = (Feature)provider;
+final FeatureContextImpl context = new FeatureContextImpl();
+final Configurable configurable = 
getConfigurableFor(context);
+final Configuration configuration = 
configurable.getConfiguration();
+final Set registered = configuration.getInstances();
+
+if (!configuration.isRegistered(feature)) {
+configurable.register(feature);
+
+// Disregarding if the feature is enabled or disabled, 
register only newly added providers,
+// excluding pre-existing ones and the feature instance 
itself.
+final Set added = new 
HashSet(configuration.getInstances());
+added.remove(feature);
+added.removeAll(registered);
+
+providers.addAll(added);
+}
+}
+}
+
+if (!providers.isEmpty()) {
+setProviders(Arrays.asList(providers));
+}
 }
 
 /**
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
index 4f93423..1fb0912 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
+++ 

[cxf] 02/02: Recording .gitmergeinfo Changes

2021-09-16 Thread reta
This is an automated email from the ASF dual-hosted git repository.

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

commit b0cdc26653ed616519ff47735eb179c6b2779d9a
Author: Andriy Redko 
AuthorDate: Thu Sep 16 20:37:33 2021 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 54a2d87..30c334c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -97,6 +97,7 @@ M 15185954d24578b3a848afe5bf258d9774ff03b6
 M 16df606f5ea05ad8fe5c3ab54cc4e3684067d84d
 M 1820f1a94b08ba840c3868ac3e1f3b7751540a08
 M 1955e0d57557bd682d0e7fe6bd68d3fb973c4af0
+M 1b48b239be3807e843c56939f663ae935a53f6f5
 M 1c7c39771adb05f1fa8678e20b97f1c735f2601c
 M 2871e80043c2452cf9aca3925a07360b8775c508
 M 299d6a844b99a69555355b2f9baca3e6ec13a918
@@ -117,6 +118,7 @@ M 4576030871f0f52e7295ce7d41888d8b976c7c11
 M 4680528c0f9379ee51a0758ab52ad2e6de2cb0a6
 M 4852a50d335817c50882f641197fd189207571eb
 M 4b714edc4805395974da2ff9c683b61ec9b23db9
+M 4b76fac643915ec9e3409f00c1ce62ba83994265
 M 4c3c5196be3e9295c31b5bc592ebc8f911c93c6d
 M 4dc7c95796c89ec6d33d99b2df202cb71124a741
 M 504cb84e0bf6043d3b787def4070c0649dd51c32
@@ -187,6 +189,7 @@ M c29b1c23a7e09f9fe2c5412d0b9ece1bafb7c89c
 M c2e6f351383602c5c40405049fb83a52a0b3ccff
 M c7786d4e78999cb08fd668b24a7fac480bf7b5e0
 M ca5d02bf9581a28971c8b8d021732972dce5377e
+M cc4f758e89da58b2f47c95fb68df186e0533ca74
 M ccb76b7c2c02b0f295405fd9bb0b585544c40869
 M cf2f79a5de150773b8dd1c4975de7e679a6d4d17
 M d2f8db651c418c82b08bc69900d9b90c5d9625bc


[cxf] branch 3.4.x-fixes updated (888ae63 -> b0cdc26)

2021-09-16 Thread reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.


from 888ae63  Update Spring Framework to 5.2.17.RELEASE
 new 4f46a32  CXF-7543: JAX-RS Features not used in proxies or WebClients 
(#849)
 new b0cdc26  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  |  3 +
 .../cxf/jaxrs/client/JAXRSClientFactoryBean.java   | 41 ++
 .../JAXRSClientFactoryBeanDefinitionParser.java| 59 ++
 .../cxf/jaxrs/client/cache/ClientCacheTest.java| 23 ++
 .../client/spring/JAXRSClientFactoryBeanTest.java  | 34 
 .../client/spring/SpringParameterHandler.java} | 17 ++--
 .../org/apache/cxf/jaxrs/client/spring/clients.xml |  6 ++
 .../client/MicroProfileClientFactoryBean.java  | 14 +++-
 .../client/CxfTypeSafeClientBuilderTest.java   | 42 ++
 .../client/MicroProfileClientFactoryBeanTest.java  | 94 ++
 10 files changed, 324 insertions(+), 9 deletions(-)
 copy 
rt/{frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/PriorityCustomerParameterHandler.java
 => 
rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/SpringParameterHandler.java}
 (76%)
 create mode 100644 
rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/MicroProfileClientFactoryBeanTest.java


[cxf] branch master updated: CXF-7543: JAX-RS Features not used in proxies or WebClients (#849)

2021-09-16 Thread reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
 new bf25a93  CXF-7543: JAX-RS Features not used in proxies or WebClients 
(#849)
bf25a93 is described below

commit bf25a931a96a6eb6cac47651bef1f2ff4fb442bc
Author: Andriy Redko 
AuthorDate: Thu Sep 16 20:05:21 2021 -0400

CXF-7543: JAX-RS Features not used in proxies or WebClients (#849)
---
 .../cxf/jaxrs/client/JAXRSClientFactoryBean.java   | 41 ++
 .../JAXRSClientFactoryBeanDefinitionParser.java| 59 ++
 .../cxf/jaxrs/client/cache/ClientCacheTest.java| 23 ++
 .../client/spring/JAXRSClientFactoryBeanTest.java  | 34 
 .../client/spring/SpringParameterHandler.java  | 58 +
 .../org/apache/cxf/jaxrs/client/spring/clients.xml |  6 ++
 .../client/MicroProfileClientFactoryBean.java  | 14 +++-
 .../client/CxfTypeSafeClientBuilderTest.java   | 42 ++
 .../client/MicroProfileClientFactoryBeanTest.java  | 94 ++
 9 files changed, 368 insertions(+), 3 deletions(-)

diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
index 13d3c28..ccf547c 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
@@ -24,12 +24,19 @@ import java.lang.reflect.Type;
 import java.net.URI;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Logger;
 
 import javax.ws.rs.CookieParam;
 import javax.ws.rs.HeaderParam;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.core.Configurable;
+import javax.ws.rs.core.Configuration;
+import javax.ws.rs.core.Feature;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.ext.ParamConverter;
 import javax.ws.rs.ext.ParamConverterProvider;
@@ -45,6 +52,8 @@ import org.apache.cxf.endpoint.UpfrontConduitSelector;
 import org.apache.cxf.jaxrs.AbstractJAXRSFactoryBean;
 import org.apache.cxf.jaxrs.JAXRSServiceFactoryBean;
 import org.apache.cxf.jaxrs.JAXRSServiceImpl;
+import org.apache.cxf.jaxrs.impl.ConfigurableImpl;
+import org.apache.cxf.jaxrs.impl.FeatureContextImpl;
 import org.apache.cxf.jaxrs.impl.MetadataMap;
 import org.apache.cxf.jaxrs.model.ClassResourceInfo;
 import org.apache.cxf.jaxrs.utils.AnnotationUtils;
@@ -403,6 +412,10 @@ public class JAXRSClientFactoryBean extends 
AbstractJAXRSFactoryBean {
 });
 }
 }
+
+protected > Configurable getConfigurableFor(C 
context) {
+return new ConfigurableImpl<>(context, RuntimeType.CLIENT);
+}
 
 protected void applyFeatures(AbstractClient client) {
 if (getFeatures() != null) {
@@ -410,6 +423,34 @@ public class JAXRSClientFactoryBean extends 
AbstractJAXRSFactoryBean {
 feature.initialize(client.getConfiguration(), getBus());
 });
 }
+
+// Process JAX-RS features which are passed through as providers 
+final Set providers = new HashSet<>();
+for (final Object provider: getProviders()) {
+if (provider instanceof Feature) {
+final Feature feature = (Feature)provider;
+final FeatureContextImpl context = new FeatureContextImpl();
+final Configurable configurable = 
getConfigurableFor(context);
+final Configuration configuration = 
configurable.getConfiguration();
+final Set registered = configuration.getInstances();
+
+if (!configuration.isRegistered(feature)) {
+configurable.register(feature);
+
+// Disregarding if the feature is enabled or disabled, 
register only newly added providers,
+// excluding pre-existing ones and the feature instance 
itself.
+final Set added = new 
HashSet(configuration.getInstances());
+added.remove(feature);
+added.removeAll(registered);
+
+providers.addAll(added);
+}
+}
+}
+
+if (!providers.isEmpty()) {
+setProviders(Arrays.asList(providers));
+}
 }
 
 /**
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
index 6543ddc..5c6989d 100644
--- 

[cxf-fediz] 02/04: update commons-dbcp2 to 2.9.0

2021-09-16 Thread buhhunyx
This is an automated email from the ASF dual-hosted git repository.

buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git

commit 5e05f00f23b3c05e6125f4e54b3539f4fd7b7ecb
Author: Alexey Markevich 
AuthorDate: Thu Sep 16 09:25:41 2021 +0300

update commons-dbcp2 to 2.9.0
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 86a50d6..b83fc5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
 
 2.0.0.AM26
 2.0.3
-2.8.0
+2.9.0
 1.2
 1.9
 1.7


[cxf-fediz] 04/04: Update Spring Framework to 5.3.10

2021-09-16 Thread buhhunyx
This is an automated email from the ASF dual-hosted git repository.

buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git

commit 4b68fe70d854827196187602b699bab99678ede0
Author: Alexey Markevich 
AuthorDate: Thu Sep 16 09:19:34 2021 +0300

Update Spring Framework to 5.3.10
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2c68bf6..ccd718a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
 3.2.0
 3.1.0
 1.7.30
-5.3.9
+5.3.10
 2.3.4.RELEASE
 5.5.2
 2.5.1.RELEASE


[cxf-fediz] branch master updated (c483ef8 -> 4b68fe7)

2021-09-16 Thread buhhunyx
This is an automated email from the ASF dual-hosted git repository.

buhhunyx pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git.


from c483ef8  Updating Tomcat to 9.0.53
 new c468874  update htmlunit to 2.52.0
 new 5e05f00  update commons-dbcp2 to 2.9.0
 new f658190  update openjpa to 3.2.0
 new 4b68fe7  Update Spring Framework to 5.3.10

The 4 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:
 pom.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)


[cxf-fediz] 01/04: update htmlunit to 2.52.0

2021-09-16 Thread buhhunyx
This is an automated email from the ASF dual-hosted git repository.

buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git

commit c4688748818e43448443f42651708f264c9b290a
Author: Alexey Markevich 
AuthorDate: Thu Sep 16 09:22:57 2021 +0300

update htmlunit to 2.52.0
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1fa2c03..86a50d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
 3.8.1
 1.1.1
 2.5.2
-2.47.1
+2.52.0
 2.11.4
 2.3.3
 9.4.43.v20210629


[cxf-fediz] 03/04: update openjpa to 3.2.0

2021-09-16 Thread buhhunyx
This is an automated email from the ASF dual-hosted git repository.

buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git

commit f658190fbe44301fc69210578eb3c33eaed5ae63
Author: Alexey Markevich 
AuthorDate: Thu Sep 16 09:26:40 2021 +0300

update openjpa to 3.2.0
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b83fc5f..2c68bf6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
 4.13.2
 2.0.1
 1.2.17
-3.1.2
+3.2.0
 3.1.0
 1.7.30
 5.3.9