Repository: syncope Updated Branches: refs/heads/2_1_X e7854f1c6 -> ee34e7fcb refs/heads/master 271a2e77c -> 7edc502e5
Upgrading CXF and Swagger Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ee34e7fc Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ee34e7fc Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ee34e7fc Branch: refs/heads/2_1_X Commit: ee34e7fcba0e1e5f9338be5e13cda6dc8015a5d7 Parents: e7854f1 Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Mon Aug 13 09:08:58 2018 +0200 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Mon Aug 13 09:08:58 2018 +0200 ---------------------------------------------------------------------- .../client/lib/batch/BatchClientFactoryBean.java | 14 -------------- pom.xml | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/ee34e7fc/client/lib/src/main/java/org/apache/syncope/client/lib/batch/BatchClientFactoryBean.java ---------------------------------------------------------------------- diff --git a/client/lib/src/main/java/org/apache/syncope/client/lib/batch/BatchClientFactoryBean.java b/client/lib/src/main/java/org/apache/syncope/client/lib/batch/BatchClientFactoryBean.java index a8858dc..32732e9 100644 --- a/client/lib/src/main/java/org/apache/syncope/client/lib/batch/BatchClientFactoryBean.java +++ b/client/lib/src/main/java/org/apache/syncope/client/lib/batch/BatchClientFactoryBean.java @@ -35,20 +35,6 @@ public class BatchClientFactoryBean extends JAXRSClientFactoryBean { private final List<BatchRequestItem> batchRequestItems = new ArrayList<>(); - private ClassLoader proxyLoader; - - private boolean inheritHeaders; - - @Override - public void setClassLoader(final ClassLoader loader) { - this.proxyLoader = loader; - } - - @Override - public void setInheritHeaders(final boolean inheritHeaders) { - this.inheritHeaders = inheritHeaders; - } - @Override protected ConduitSelector getConduitSelector(final Endpoint ep) { ConduitSelector cs = getConduitSelector(); http://git-wip-us.apache.org/repos/asf/syncope/blob/ee34e7fc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 02188ab..5aa6d05 100644 --- a/pom.xml +++ b/pom.xml @@ -389,7 +389,7 @@ under the License. <connid.scimv11.version>1.0.1</connid.scimv11.version> <connid.servicenow.version>1.0.0</connid.servicenow.version> - <cxf.version>3.2.5</cxf.version> + <cxf.version>3.2.6</cxf.version> <jackson.version>2.9.6</jackson.version> @@ -441,7 +441,7 @@ under the License. <log.directory>${project.build.directory}/log</log.directory> <flowable-modeler.directory>${project.build.directory}/flowable-modeler</flowable-modeler.directory> - <swagger-core.version>2.0.2</swagger-core.version> + <swagger-core.version>2.0.3</swagger-core.version> <swagger-ui.version>3.17.6</swagger-ui.version> <guava.version>20.0</guava.version>
