You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/04/26 09:35:24 UTC
[1/2] syncope git commit: Reviewing LICENSE / NOTICE after last
additions
Repository: syncope
Updated Branches:
refs/heads/master daecdbbc0 -> f14320e05
Reviewing LICENSE / NOTICE after last additions
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d2404b90
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d2404b90
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d2404b90
Branch: refs/heads/master
Commit: d2404b9073b0e54f1efc9554d4d54b7fc44408a1
Parents: daecdbb
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Apr 22 10:39:59 2016 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Apr 22 11:22:10 2016 +0200
----------------------------------------------------------------------
deb/console/LICENSE | 5 ++++
deb/console/NOTICE | 5 ++++
deb/core/LICENSE | 5 ++++
deb/core/NOTICE | 4 +++
installer/LICENSE | 65 +++++++++++++-----------------------------------
installer/NOTICE | 11 +++-----
pom.xml | 10 ++++++++
standalone/LICENSE | 10 ++++++++
standalone/NOTICE | 10 +++++++-
9 files changed, 68 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/d2404b90/deb/console/LICENSE
----------------------------------------------------------------------
diff --git a/deb/console/LICENSE b/deb/console/LICENSE
index 2118cbd..1d53870 100644
--- a/deb/console/LICENSE
+++ b/deb/console/LICENSE
@@ -668,6 +668,11 @@ This is licensed under the MIT license, see above.
==
+For slimScroll (http://rocha.la/jQuery-slimScroll):
+This is licensed under the MIT license, see above.
+
+==
+
For javax.annotation-api (https://jcp.org/en/jsr/detail?id=250):
This is licensed under the CDDL 1.0, see above.
http://git-wip-us.apache.org/repos/asf/syncope/blob/d2404b90/deb/console/NOTICE
----------------------------------------------------------------------
diff --git a/deb/console/NOTICE b/deb/console/NOTICE
index e3791b1..0fda330 100644
--- a/deb/console/NOTICE
+++ b/deb/console/NOTICE
@@ -57,6 +57,11 @@ Copyright (c) 2016 Drifty (http://drifty.com/)
==
+This product includes software developed by the slimScroll project.
+Copyright (c) 2011 Piotr Rochala (http://rocha.la)
+
+==
+
This product includs software developed by Oracle.
Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
http://git-wip-us.apache.org/repos/asf/syncope/blob/d2404b90/deb/core/LICENSE
----------------------------------------------------------------------
diff --git a/deb/core/LICENSE b/deb/core/LICENSE
index 2c0ac26..6ce8c66 100644
--- a/deb/core/LICENSE
+++ b/deb/core/LICENSE
@@ -213,6 +213,11 @@ This is licensed under the AL 2.0, see above.
==
+For Java Uuid Generator (JUG) (http://wiki.fasterxml.com/JugHome):
+This is licensed under the AL 2.0, see above.
+
+==
+
For Guava (https://github.com/google/guava):
This is licensed under the AL 2.0, see above.
http://git-wip-us.apache.org/repos/asf/syncope/blob/d2404b90/deb/core/NOTICE
----------------------------------------------------------------------
diff --git a/deb/core/NOTICE b/deb/core/NOTICE
index 853b27b..138ea15 100644
--- a/deb/core/NOTICE
+++ b/deb/core/NOTICE
@@ -17,6 +17,10 @@ This product includes software developed by the Jackson project.
==
+This product includes software developed by the Java Uuid Generator (JUG) project.
+
+==
+
This product includes software developed by the Google Guava project.
Copyright (c) 2016 The Guava Authors.
http://git-wip-us.apache.org/repos/asf/syncope/blob/d2404b90/installer/LICENSE
----------------------------------------------------------------------
diff --git a/installer/LICENSE b/installer/LICENSE
index 13d76cc..2468d8b 100644
--- a/installer/LICENSE
+++ b/installer/LICENSE
@@ -203,7 +203,17 @@
==
-For ASM (http://asm.ow2.org/):
+For Plexus Classworlds (https://codehaus-plexus.github.io/plexus-classworlds/):
+This is licensed under the AL 2.0, see above.
+
+==
+
+For Jackson (http://wiki.fasterxml.com/JacksonHome):
+This is licensed under the AL 2.0, see above.
+
+==
+
+For Laf-plugin (https://java.net/projects/laf-plugin):
This is licensed under the BSD license:
Redistribution and use in source and binary forms, with or without
@@ -233,53 +243,27 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
==
-For NanoXML lite (http://nanoxml.sourceforge.net/orig/):
-This is licensed under the zlib/libpng license:
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgement in the product documentation would be
- appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-
-==
-
-For Plexus Classworlds (https://codehaus-plexus.github.io/plexus-classworlds/):
-This is licensed under the AL 2.0, see above.
-
-==
-
-For Jackson (http://wiki.fasterxml.com/JacksonHome):
-This is licensed under the AL 2.0, see above.
+For Laf-widget (https://java.net/projects/laf-widget):
+This is licensed under the BSD license, see above.
==
-For JGoodies Looks (https://java.net/projects/looks):
+For Substance (https://java.net/projects/substance):
This is licensed under the BSD license, see above.
==
-For Jline v2 (http://jline.github.io/jline2/):
+For Trident (https://kenai.com/projects/trident/):
This is licensed under the BSD license, see above.
==
-For Laf-plugin (https://java.net/projects/laf-plugin):
+For JGoodies Looks (https://java.net/projects/looks):
This is licensed under the BSD license, see above.
==
-For Laf-widget (https://java.net/projects/laf-widget):
+For Jline v2 (http://jline.github.io/jline2/):
This is licensed under the BSD license, see above.
==
@@ -294,21 +278,11 @@ This is licensed under the AL 2.0, see above.
==
-For Eclipse SWT (https://www.eclipse.org/swt/):
-This is licensed under the AL 2.0, see above.
-
-==
-
For Hamcrest (http://hamcrest.org/):
This is licensed under the BSD license, see above.
==
-For Substance (https://java.net/projects/substance):
-This is licensed under the BSD license, see above.
-
-==
-
For JDOM (http://www.jdom.org/):
This is licensed under the BSD license, see above.
@@ -319,11 +293,6 @@ This is licensed under the BSD license, see above.
==
-For Trident (https://kenai.com/projects/trident/):
-This is licensed under the BSD license, see above.
-
-==
-
For MXP1: Xml Pull Parser 3rd Edition (http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/):
This is licensed under the Indiana University Extreme! Lab Software License, version 1.1.1:
http://git-wip-us.apache.org/repos/asf/syncope/blob/d2404b90/installer/NOTICE
----------------------------------------------------------------------
diff --git a/installer/NOTICE b/installer/NOTICE
index cb2c606..61d5145 100644
--- a/installer/NOTICE
+++ b/installer/NOTICE
@@ -9,12 +9,12 @@ with which this file is now or was at one time distributed.
==
-This product includes software developed by the NanoXML project.
-Copyright (c) 2000-2002 Marc De Scheemaecker, All Rights Reserved.
+This product includes software developed by the Jackson project.
==
-This product includes software developed by the Jackson project.
+This product includes software developed by the Trident project.
+ Copyright (c) 2005-2010 Trident Kirill Grouchnikov. All Rights Reserved.
==
@@ -38,8 +38,3 @@ This product includes software developed by the JDOM project.
This product includes software developed by the PicoContainer project.
Copyright (C) 2003-2011 PicoContainer Committers. All rights reserved.
-
-==
-
-This product includes software developed by the Trident project.
- Copyright (c) 2005-2010 Trident Kirill Grouchnikov. All Rights Reserved.
http://git-wip-us.apache.org/repos/asf/syncope/blob/d2404b90/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3598102..ff39755 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1243,6 +1243,16 @@ under the License.
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-panel</artifactId>
<version>${izpack.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.icepdf.os</groupId>
+ <artifactId>icepdf-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.icepdf.os</groupId>
+ <artifactId>icepdf-viewer</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/syncope/blob/d2404b90/standalone/LICENSE
----------------------------------------------------------------------
diff --git a/standalone/LICENSE b/standalone/LICENSE
index f204452..a143104 100644
--- a/standalone/LICENSE
+++ b/standalone/LICENSE
@@ -272,6 +272,11 @@ This is licensed under the AL 2.0, see above.
==
+For Java Uuid Generator (JUG) (http://wiki.fasterxml.com/JugHome):
+This is licensed under the AL 2.0, see above.
+
+==
+
For Guava (https://github.com/google/guava):
This is licensed under the AL 2.0, see above.
@@ -937,6 +942,11 @@ This is licensed under the MIT license, see above.
==
+For slimScroll (http://rocha.la/jQuery-slimScroll):
+This is licensed under the MIT license, see above.
+
+==
+
For javax.annotation-api (https://jcp.org/en/jsr/detail?id=250):
This is licensed under the CDDL 1.0, see above.
http://git-wip-us.apache.org/repos/asf/syncope/blob/d2404b90/standalone/NOTICE
----------------------------------------------------------------------
diff --git a/standalone/NOTICE b/standalone/NOTICE
index 68941b3..03762ef 100644
--- a/standalone/NOTICE
+++ b/standalone/NOTICE
@@ -57,6 +57,10 @@ This product includes software developed by the Jackson project.
==
+This product includes software developed by the Java Uuid Generator (JUG) project.
+
+==
+
This product includes software developed by the Google Guava project.
Copyright (c) 2016 The Guava Authors.
@@ -92,6 +96,11 @@ Copyright (c) 2016 Drifty (http://drifty.com/)
==
+This product includes software developed by the slimScroll project.
+Copyright (c) 2011 Piotr Rochala (http://rocha.la)
+
+==
+
This product includs software developed by Oracle.
Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
@@ -265,4 +274,3 @@ All Rights Reserved.
This product includes software developed by the X-editable project.
Copyright (c) 2012 Vitaliy Potapov
-
[2/2] syncope git commit: Upgrading Commons IO
Posted by il...@apache.org.
Upgrading Commons IO
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f14320e0
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f14320e0
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f14320e0
Branch: refs/heads/master
Commit: f14320e0503b2656269c57f1ab34c622ae71441a
Parents: d2404b9
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Apr 26 09:35:13 2016 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Apr 26 09:35:13 2016 +0200
----------------------------------------------------------------------
.../console/rest/NotificationRestClient.java | 10 +++---
.../apache/syncope/core/logic/ReportLogic.java | 13 ++++---
.../cxf/service/MailTemplateServiceImpl.java | 3 +-
.../cxf/service/ReportTemplateServiceImpl.java | 3 +-
.../provisioning/camel/SyncopeCamelContext.java | 3 +-
.../org/apache/syncope/fit/cli/CLIITCase.java | 22 +++++++-----
.../syncope/fit/core/MailTemplateITCase.java | 17 ++++++---
.../org/apache/syncope/fit/core/RESTITCase.java | 14 ++++++--
.../syncope/fit/core/ReportTemplateITCase.java | 17 ++++++---
.../apache/syncope/fit/core/WorkflowITCase.java | 5 +--
.../installer/utilities/FileSystemUtils.java | 2 +-
.../syncope/installer/utilities/HttpUtils.java | 37 ++++++++++----------
installer/src/main/resources/izpack/install.xml | 2 +-
pom.xml | 2 +-
14 files changed, 93 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/f14320e0/client/console/src/main/java/org/apache/syncope/client/console/rest/NotificationRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/NotificationRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/NotificationRestClient.java
index f5b2e30..ebf581e 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/NotificationRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/NotificationRestClient.java
@@ -22,19 +22,17 @@ import java.io.InputStream;
import java.util.List;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.MailTemplateTO;
import org.apache.syncope.common.lib.to.NotificationTO;
import org.apache.syncope.common.lib.types.MailTemplateFormat;
import org.apache.syncope.common.rest.api.service.MailTemplateService;
import org.apache.syncope.common.rest.api.service.NotificationService;
-import org.slf4j.LoggerFactory;
public class NotificationRestClient extends BaseRestClient {
private static final long serialVersionUID = 6328933265096511690L;
- protected static final org.slf4j.Logger LOG = LoggerFactory.getLogger(NotificationRestClient.class);
-
public List<NotificationTO> getAllNotifications() {
return getService(NotificationService.class).list();
}
@@ -74,7 +72,8 @@ public class NotificationRestClient extends BaseRestClient {
public String readTemplateFormat(final String key, final MailTemplateFormat format) {
try {
return IOUtils.toString(InputStream.class.cast(
- getService(MailTemplateService.class).getFormat(key, format).getEntity()));
+ getService(MailTemplateService.class).getFormat(key, format).getEntity()),
+ SyncopeConstants.DEFAULT_CHARSET);
} catch (Exception e) {
LOG.info("Error retrieving mail tenplate content");
return StringUtils.EMPTY;
@@ -82,6 +81,7 @@ public class NotificationRestClient extends BaseRestClient {
}
public void updateTemplateFormat(final String key, final String str, final MailTemplateFormat format) {
- getService(MailTemplateService.class).setFormat(key, format, IOUtils.toInputStream(str));
+ getService(MailTemplateService.class).setFormat(
+ key, format, IOUtils.toInputStream(str, SyncopeConstants.DEFAULT_CHARSET));
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f14320e0/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
index 9a57a59..8b2eb1d 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
@@ -40,6 +40,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.tuple.Triple;
import org.apache.syncope.common.lib.SyncopeClientException;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.ExecTO;
import org.apache.syncope.common.lib.to.ReportTO;
import org.apache.syncope.common.lib.types.ClientExceptionType;
@@ -232,7 +233,8 @@ public class ReportLogic extends AbstractJobLogic<ReportTO> {
switch (format) {
case HTML:
XSLTTransformer xsl2html = new XSLTTransformer(new StreamSource(
- IOUtils.toInputStream(reportExec.getReport().getTemplate().getHTMLTemplate())));
+ IOUtils.toInputStream(reportExec.getReport().getTemplate().getHTMLTemplate(),
+ SyncopeConstants.DEFAULT_CHARSET)));
xsl2html.setParameters(parameters);
pipeline.addComponent(xsl2html);
pipeline.addComponent(XMLSerializer.createXHTMLSerializer());
@@ -240,7 +242,8 @@ public class ReportLogic extends AbstractJobLogic<ReportTO> {
case PDF:
XSLTTransformer xsl2pdf = new XSLTTransformer(new StreamSource(
- IOUtils.toInputStream(reportExec.getReport().getTemplate().getFOTemplate())));
+ IOUtils.toInputStream(reportExec.getReport().getTemplate().getFOTemplate(),
+ SyncopeConstants.DEFAULT_CHARSET)));
xsl2pdf.setParameters(parameters);
pipeline.addComponent(xsl2pdf);
pipeline.addComponent(new FopSerializer(MimeConstants.MIME_PDF));
@@ -248,7 +251,8 @@ public class ReportLogic extends AbstractJobLogic<ReportTO> {
case RTF:
XSLTTransformer xsl2rtf = new XSLTTransformer(new StreamSource(
- IOUtils.toInputStream(reportExec.getReport().getTemplate().getFOTemplate())));
+ IOUtils.toInputStream(reportExec.getReport().getTemplate().getFOTemplate(),
+ SyncopeConstants.DEFAULT_CHARSET)));
xsl2rtf.setParameters(parameters);
pipeline.addComponent(xsl2rtf);
pipeline.addComponent(new FopSerializer(MimeConstants.MIME_RTF));
@@ -256,7 +260,8 @@ public class ReportLogic extends AbstractJobLogic<ReportTO> {
case CSV:
XSLTTransformer xsl2csv = new XSLTTransformer(new StreamSource(
- IOUtils.toInputStream(reportExec.getReport().getTemplate().getCSVTemplate())));
+ IOUtils.toInputStream(reportExec.getReport().getTemplate().getCSVTemplate(),
+ SyncopeConstants.DEFAULT_CHARSET)));
xsl2csv.setParameters(parameters);
pipeline.addComponent(xsl2csv);
pipeline.addComponent(new TextSerializer());
http://git-wip-us.apache.org/repos/asf/syncope/blob/f14320e0/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/MailTemplateServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/MailTemplateServiceImpl.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/MailTemplateServiceImpl.java
index 967b2f0..8a6ede5 100644
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/MailTemplateServiceImpl.java
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/MailTemplateServiceImpl.java
@@ -27,6 +27,7 @@ import javax.ws.rs.InternalServerErrorException;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.StreamingOutput;
import org.apache.commons.io.IOUtils;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.MailTemplateTO;
import org.apache.syncope.common.lib.types.MailTemplateFormat;
import org.apache.syncope.common.rest.api.RESTHeaders;
@@ -83,7 +84,7 @@ public class MailTemplateServiceImpl extends AbstractServiceImpl implements Mail
@Override
public void setFormat(final String key, final MailTemplateFormat format, final InputStream templateIn) {
try {
- logic.setFormat(key, format, IOUtils.toString(templateIn));
+ logic.setFormat(key, format, IOUtils.toString(templateIn, SyncopeConstants.DEFAULT_CHARSET));
} catch (final IOException e) {
LOG.error("While setting format {} for mail template {}", format, key, e);
throw new InternalServerErrorException("Could not read entity", e);
http://git-wip-us.apache.org/repos/asf/syncope/blob/f14320e0/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ReportTemplateServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ReportTemplateServiceImpl.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ReportTemplateServiceImpl.java
index 820b53e..4a1b504 100644
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ReportTemplateServiceImpl.java
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ReportTemplateServiceImpl.java
@@ -28,6 +28,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.StreamingOutput;
import org.apache.commons.io.IOUtils;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.ReportTemplateTO;
import org.apache.syncope.common.lib.types.ReportTemplateFormat;
import org.apache.syncope.common.rest.api.RESTHeaders;
@@ -84,7 +85,7 @@ public class ReportTemplateServiceImpl extends AbstractServiceImpl implements Re
@Override
public void setFormat(final String key, final ReportTemplateFormat format, final InputStream templateIn) {
try {
- logic.setFormat(key, format, IOUtils.toString(templateIn));
+ logic.setFormat(key, format, IOUtils.toString(templateIn, SyncopeConstants.DEFAULT_CHARSET));
} catch (final IOException e) {
LOG.error("While setting format {} for report template {}", format, key, e);
throw new InternalServerErrorException("Could not read entity", e);
http://git-wip-us.apache.org/repos/asf/syncope/blob/f14320e0/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java
index d86e42b..d034f08 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/SyncopeCamelContext.java
@@ -29,6 +29,7 @@ import org.apache.camel.model.Constants;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.spring.SpringCamelContext;
import org.apache.commons.io.IOUtils;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.persistence.api.dao.CamelRouteDAO;
import org.apache.syncope.core.persistence.api.entity.CamelRoute;
@@ -86,7 +87,7 @@ public class SyncopeCamelContext {
for (CamelRoute route : routes) {
InputStream input = null;
try {
- input = IOUtils.toInputStream(route.getContent());
+ input = IOUtils.toInputStream(route.getContent(), SyncopeConstants.DEFAULT_CHARSET);
LSInput lsinput = domImpl.createLSInput();
lsinput.setByteStream(input);
http://git-wip-us.apache.org/repos/asf/syncope/blob/f14320e0/fit/core-reference/src/test/java/org/apache/syncope/fit/cli/CLIITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/cli/CLIITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/cli/CLIITCase.java
index d2148e1..3840f7c 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/cli/CLIITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/cli/CLIITCase.java
@@ -42,6 +42,7 @@ import org.apache.syncope.client.cli.commands.policy.PolicyCommand;
import org.apache.syncope.client.cli.commands.report.ReportCommand;
import org.apache.syncope.client.cli.commands.role.RoleCommand;
import org.apache.syncope.client.cli.commands.user.UserCommand;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.fit.AbstractITCase;
import org.junit.BeforeClass;
import org.junit.FixMethodOrder;
@@ -104,7 +105,7 @@ public class CLIITCase extends AbstractITCase {
PROCESS_BUILDER.command(getCommand());
Process process = PROCESS_BUILDER.start();
- String result = IOUtils.toString(process.getInputStream());
+ String result = IOUtils.toString(process.getInputStream(), SyncopeConstants.DEFAULT_CHARSET);
assertTrue(result.startsWith("\nUsage: Main [options]"));
assertTrue(result.contains(
new EntitlementCommand().getClass().getAnnotation(Command.class).name()
@@ -128,7 +129,8 @@ public class CLIITCase extends AbstractITCase {
EntitlementCommand.EntitlementOptions.LIST.getOptionName()));
Process process = PROCESS_BUILDER.start();
- long entitlements = IterableUtils.countMatches(IOUtils.readLines(process.getInputStream()),
+ long entitlements = IterableUtils.countMatches(
+ IOUtils.readLines(process.getInputStream(), SyncopeConstants.DEFAULT_CHARSET),
new Predicate<String>() {
@Override
@@ -152,7 +154,8 @@ public class CLIITCase extends AbstractITCase {
ConnectorCommand.ConnectorOptions.LIST_BUNDLES.getOptionName()));
Process process = PROCESS_BUILDER.start();
- long bundles = IterableUtils.countMatches(IOUtils.readLines(process.getInputStream()),
+ long bundles = IterableUtils.countMatches(
+ IOUtils.readLines(process.getInputStream(), SyncopeConstants.DEFAULT_CHARSET),
new Predicate<String>() {
@Override
@@ -181,7 +184,7 @@ public class CLIITCase extends AbstractITCase {
UserCommand.UserOptions.READ_BY_ID.getOptionName(),
String.valueOf(userKey1)));
Process process = PROCESS_BUILDER.start();
- String result = IOUtils.toString(process.getInputStream());
+ String result = IOUtils.toString(process.getInputStream(), SyncopeConstants.DEFAULT_CHARSET);
assertTrue(result.contains("username: " + userService.read(userKey1).getUsername()));
process.destroy();
@@ -191,7 +194,8 @@ public class CLIITCase extends AbstractITCase {
String.valueOf(userKey1), String.valueOf(userKey2),
String.valueOf(userKey3), String.valueOf(userKey4), String.valueOf(userKey5)));
Process process2 = PROCESS_BUILDER.start();
- long users = IterableUtils.countMatches(IOUtils.readLines(process2.getInputStream()),
+ long users = IterableUtils.countMatches(
+ IOUtils.readLines(process2.getInputStream(), SyncopeConstants.DEFAULT_CHARSET),
new Predicate<String>() {
@Override
@@ -209,7 +213,7 @@ public class CLIITCase extends AbstractITCase {
String.valueOf(userKey1), String.valueOf(userKey2),
String.valueOf(userKey3), String.valueOf(userKey4), String.valueOf(userKey5)));
Process process3 = PROCESS_BUILDER.start();
- String result3 = IOUtils.toString(process3.getInputStream());
+ String result3 = IOUtils.toString(process3.getInputStream(), SyncopeConstants.DEFAULT_CHARSET);
assertTrue(
result3.contains("username: " + userService.read(userKey1).getUsername())
&& result3.contains("username: " + userService.read(userKey2).getUsername())
@@ -231,7 +235,7 @@ public class CLIITCase extends AbstractITCase {
RoleCommand.RoleOptions.READ.getOptionName(),
roleId));
final Process process = PROCESS_BUILDER.start();
- final String result = IOUtils.toString(process.getInputStream());
+ final String result = IOUtils.toString(process.getInputStream(), SyncopeConstants.DEFAULT_CHARSET);
assertTrue(result.contains(roleService.read(roleId).getEntitlements().iterator().next()));
process.destroy();
@@ -248,7 +252,7 @@ public class CLIITCase extends AbstractITCase {
ReportCommand.ReportOptions.READ.getOptionName(),
"72"));
final Process process = PROCESS_BUILDER.start();
- final String result = IOUtils.toString(process.getInputStream());
+ final String result = IOUtils.toString(process.getInputStream(), SyncopeConstants.DEFAULT_CHARSET);
assertTrue(result.contains("- Report 72 doesn't exist"));
process.destroy();
@@ -265,7 +269,7 @@ public class CLIITCase extends AbstractITCase {
PolicyCommand.PolicyOptions.READ.getOptionName(),
"wrong"));
final Process process = PROCESS_BUILDER.start();
- final String result = IOUtils.toString(process.getInputStream());
+ final String result = IOUtils.toString(process.getInputStream(), SyncopeConstants.DEFAULT_CHARSET);
assertTrue(result.contains("- Policy wrong doesn't exist"));
process.destroy();
http://git-wip-us.apache.org/repos/asf/syncope/blob/f14320e0/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MailTemplateITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MailTemplateITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MailTemplateITCase.java
index 9a7f511..fdf3a2a 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MailTemplateITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MailTemplateITCase.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.commons.io.IOUtils;
import org.apache.syncope.common.lib.SyncopeClientException;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.MailTemplateTO;
import org.apache.syncope.common.lib.types.ClientExceptionType;
import org.apache.syncope.common.lib.types.MailTemplateFormat;
@@ -86,24 +87,28 @@ public class MailTemplateITCase extends AbstractITCase {
// 3. set TEXT
String textTemplate = "Hi there, I am ${username}.";
mailTemplateService.setFormat(
- key, MailTemplateFormat.TEXT, IOUtils.toInputStream(textTemplate));
+ key, MailTemplateFormat.TEXT, IOUtils.toInputStream(textTemplate, SyncopeConstants.DEFAULT_CHARSET));
response = mailTemplateService.getFormat(key, MailTemplateFormat.TEXT);
assertEquals(200, response.getStatus());
assertTrue(response.getMediaType().toString().startsWith(MediaType.TEXT_PLAIN));
assertTrue(response.getEntity() instanceof InputStream);
- assertEquals(textTemplate, IOUtils.toString((InputStream) response.getEntity()));
+ assertEquals(
+ textTemplate,
+ IOUtils.toString((InputStream) response.getEntity(), SyncopeConstants.DEFAULT_CHARSET));
// 3. set HTML
String htmlTemplate = "<html><body>Hi there, I am ${username}.</body></html>";
mailTemplateService.setFormat(
- key, MailTemplateFormat.HTML, IOUtils.toInputStream(htmlTemplate));
+ key, MailTemplateFormat.HTML, IOUtils.toInputStream(htmlTemplate, SyncopeConstants.DEFAULT_CHARSET));
response = mailTemplateService.getFormat(key, MailTemplateFormat.HTML);
assertEquals(200, response.getStatus());
assertTrue(response.getMediaType().toString().startsWith(MediaType.TEXT_HTML));
assertTrue(response.getEntity() instanceof InputStream);
- assertEquals(htmlTemplate, IOUtils.toString((InputStream) response.getEntity()));
+ assertEquals(
+ htmlTemplate,
+ IOUtils.toString((InputStream) response.getEntity(), SyncopeConstants.DEFAULT_CHARSET));
// 4. remove HTML
mailTemplateService.removeFormat(key, MailTemplateFormat.HTML);
@@ -119,7 +124,9 @@ public class MailTemplateITCase extends AbstractITCase {
assertEquals(200, response.getStatus());
assertTrue(response.getMediaType().toString().startsWith(MediaType.TEXT_PLAIN));
assertTrue(response.getEntity() instanceof InputStream);
- assertEquals(textTemplate, IOUtils.toString((InputStream) response.getEntity()));
+ assertEquals(
+ textTemplate,
+ IOUtils.toString((InputStream) response.getEntity(), SyncopeConstants.DEFAULT_CHARSET));
// 5. remove mail template
mailTemplateService.delete(key);
http://git-wip-us.apache.org/repos/asf/syncope/blob/f14320e0/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RESTITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RESTITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RESTITCase.java
index 30183fd..97caca3 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RESTITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RESTITCase.java
@@ -32,11 +32,13 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.syncope.client.lib.SyncopeClient;
import org.apache.syncope.client.lib.SyncopeClientFactoryBean;
import org.apache.syncope.common.lib.SyncopeClientException;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.patch.GroupPatch;
import org.apache.syncope.common.lib.patch.StringReplacePatchItem;
import org.apache.syncope.common.lib.patch.UserPatch;
@@ -67,7 +69,9 @@ public class RESTITCase extends AbstractITCase {
Response response = noContentService.create(group);
assertEquals(Response.Status.CREATED.getStatusCode(), response.getStatus());
assertEquals(Preference.RETURN_NO_CONTENT.toString(), response.getHeaderString(RESTHeaders.PREFERENCE_APPLIED));
- assertEquals(StringUtils.EMPTY, org.apache.commons.io.IOUtils.toString((InputStream) response.getEntity()));
+ assertEquals(
+ StringUtils.EMPTY,
+ IOUtils.toString((InputStream) response.getEntity(), SyncopeConstants.DEFAULT_CHARSET));
group = getObject(response.getLocation(), GroupService.class, GroupTO.class);
assertNotNull(group);
@@ -79,12 +83,16 @@ public class RESTITCase extends AbstractITCase {
response = noContentService.update(groupPatch);
assertEquals(Response.Status.NO_CONTENT.getStatusCode(), response.getStatus());
assertEquals(Preference.RETURN_NO_CONTENT.toString(), response.getHeaderString(RESTHeaders.PREFERENCE_APPLIED));
- assertEquals(StringUtils.EMPTY, org.apache.commons.io.IOUtils.toString((InputStream) response.getEntity()));
+ assertEquals(
+ StringUtils.EMPTY,
+ IOUtils.toString((InputStream) response.getEntity(), SyncopeConstants.DEFAULT_CHARSET));
response = noContentService.delete(group.getKey());
assertEquals(Response.Status.NO_CONTENT.getStatusCode(), response.getStatus());
assertEquals(Preference.RETURN_NO_CONTENT.toString(), response.getHeaderString(RESTHeaders.PREFERENCE_APPLIED));
- assertEquals(StringUtils.EMPTY, org.apache.commons.io.IOUtils.toString((InputStream) response.getEntity()));
+ assertEquals(
+ StringUtils.EMPTY,
+ IOUtils.toString((InputStream) response.getEntity(), SyncopeConstants.DEFAULT_CHARSET));
}
@Test
http://git-wip-us.apache.org/repos/asf/syncope/blob/f14320e0/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReportTemplateITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReportTemplateITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReportTemplateITCase.java
index 56d8ec3..638f7d6 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReportTemplateITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReportTemplateITCase.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.commons.io.IOUtils;
import org.apache.syncope.common.lib.SyncopeClientException;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.ReportTemplateTO;
import org.apache.syncope.common.lib.types.ClientExceptionType;
import org.apache.syncope.common.lib.types.ReportTemplateFormat;
@@ -87,25 +88,29 @@ public class ReportTemplateITCase extends AbstractITCase {
String csvTemplate =
"<xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'></xsl:stylesheet>";
reportTemplateService.setFormat(
- key, ReportTemplateFormat.CSV, IOUtils.toInputStream(csvTemplate));
+ key, ReportTemplateFormat.CSV, IOUtils.toInputStream(csvTemplate, SyncopeConstants.DEFAULT_CHARSET));
response = reportTemplateService.getFormat(key, ReportTemplateFormat.CSV);
assertEquals(200, response.getStatus());
assertTrue(response.getMediaType().toString().startsWith(MediaType.APPLICATION_XML));
assertTrue(response.getEntity() instanceof InputStream);
- assertEquals(csvTemplate, IOUtils.toString((InputStream) response.getEntity()));
+ assertEquals(
+ csvTemplate,
+ IOUtils.toString((InputStream) response.getEntity(), SyncopeConstants.DEFAULT_CHARSET));
// 3. set HTML
String htmlTemplate =
"<xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'></xsl:stylesheet>";
reportTemplateService.setFormat(
- key, ReportTemplateFormat.HTML, IOUtils.toInputStream(htmlTemplate));
+ key, ReportTemplateFormat.HTML, IOUtils.toInputStream(htmlTemplate, SyncopeConstants.DEFAULT_CHARSET));
response = reportTemplateService.getFormat(key, ReportTemplateFormat.HTML);
assertEquals(200, response.getStatus());
assertTrue(response.getMediaType().toString().startsWith(MediaType.APPLICATION_XML));
assertTrue(response.getEntity() instanceof InputStream);
- assertEquals(htmlTemplate, IOUtils.toString((InputStream) response.getEntity()));
+ assertEquals(
+ htmlTemplate,
+ IOUtils.toString((InputStream) response.getEntity(), SyncopeConstants.DEFAULT_CHARSET));
// 4. remove HTML
reportTemplateService.removeFormat(key, ReportTemplateFormat.HTML);
@@ -121,7 +126,9 @@ public class ReportTemplateITCase extends AbstractITCase {
assertEquals(200, response.getStatus());
assertTrue(response.getMediaType().toString().startsWith(MediaType.APPLICATION_XML));
assertTrue(response.getEntity() instanceof InputStream);
- assertEquals(csvTemplate, IOUtils.toString((InputStream) response.getEntity()));
+ assertEquals(
+ csvTemplate,
+ IOUtils.toString((InputStream) response.getEntity(), SyncopeConstants.DEFAULT_CHARSET));
// 5. remove report template
reportTemplateService.delete(key);
http://git-wip-us.apache.org/repos/asf/syncope/blob/f14320e0/fit/core-reference/src/test/java/org/apache/syncope/fit/core/WorkflowITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/WorkflowITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/WorkflowITCase.java
index d111782..db05c73 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/WorkflowITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/WorkflowITCase.java
@@ -28,6 +28,7 @@ import java.io.IOException;
import java.io.InputStream;
import javax.ws.rs.core.Response;
import org.apache.commons.io.IOUtils;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.fit.AbstractITCase;
import org.junit.Assume;
@@ -40,7 +41,7 @@ public class WorkflowITCase extends AbstractITCase {
assertTrue(response.getMediaType().toString().
startsWith(clientFactory.getContentType().getMediaType().toString()));
assertTrue(response.getEntity() instanceof InputStream);
- String definition = IOUtils.toString((InputStream) response.getEntity());
+ String definition = IOUtils.toString((InputStream) response.getEntity(), SyncopeConstants.DEFAULT_CHARSET);
assertNotNull(definition);
assertFalse(definition.isEmpty());
}
@@ -59,7 +60,7 @@ public class WorkflowITCase extends AbstractITCase {
private void importDefinition(final AnyTypeKind type) throws IOException {
Response response = workflowService.exportDefinition(type);
- String definition = IOUtils.toString((InputStream) response.getEntity());
+ String definition = IOUtils.toString((InputStream) response.getEntity(), SyncopeConstants.DEFAULT_CHARSET);
workflowService.importDefinition(type, definition);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f14320e0/installer/src/main/java/org/apache/syncope/installer/utilities/FileSystemUtils.java
----------------------------------------------------------------------
diff --git a/installer/src/main/java/org/apache/syncope/installer/utilities/FileSystemUtils.java b/installer/src/main/java/org/apache/syncope/installer/utilities/FileSystemUtils.java
index a822a2b..b3ea05f 100644
--- a/installer/src/main/java/org/apache/syncope/installer/utilities/FileSystemUtils.java
+++ b/installer/src/main/java/org/apache/syncope/installer/utilities/FileSystemUtils.java
@@ -111,7 +111,7 @@ public class FileSystemUtils {
public String readFile(final File file) {
String content = "";
try {
- content = FileUtils.readFileToString(file);
+ content = FileUtils.readFileToString(file, Charset.forName("UTF-8"));
} catch (IOException ex) {
final String errorMessage = "Error reading file " + file.getAbsolutePath() + ": " + ex.getMessage();
handler.emitError(errorMessage, errorMessage);
http://git-wip-us.apache.org/repos/asf/syncope/blob/f14320e0/installer/src/main/java/org/apache/syncope/installer/utilities/HttpUtils.java
----------------------------------------------------------------------
diff --git a/installer/src/main/java/org/apache/syncope/installer/utilities/HttpUtils.java b/installer/src/main/java/org/apache/syncope/installer/utilities/HttpUtils.java
index 023ce7a..fbd18e9 100644
--- a/installer/src/main/java/org/apache/syncope/installer/utilities/HttpUtils.java
+++ b/installer/src/main/java/org/apache/syncope/installer/utilities/HttpUtils.java
@@ -21,6 +21,7 @@ package org.apache.syncope.installer.utilities;
import com.izforge.izpack.panels.process.AbstractUIProcessHandler;
import java.io.File;
import java.io.IOException;
+import java.nio.charset.Charset;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpHost;
@@ -98,17 +99,18 @@ public class HttpUtils {
httpGet = new HttpGet(String.format(HTTP_URL_TEMPLATE, host, port) + path);
}
int status = 0;
+ handler.logOutput("Calling " + httpGet.getURI(), true);
+ InstallLog.getInstance().info("Calling " + httpGet.getURI());
try {
- handler.logOutput("Calling " + httpGet.getURI(), true);
- InstallLog.getInstance().info("Calling " + httpGet.getURI());
- final CloseableHttpResponse response = httpClient.execute(
- targetHost, httpGet, setAuth(targetHost, new BasicScheme()));
- status = response.getStatusLine().getStatusCode();
- handler.logOutput("Calling status " + status, true);
- InstallLog.getInstance().info("Calling status " + status);
- response.close();
- } catch (final IOException ex) {
- final String messageError = "Error in " + path + ": " + ex.getMessage();
+ try (CloseableHttpResponse response = httpClient.execute(
+ targetHost, httpGet, setAuth(targetHost, new BasicScheme()))) {
+
+ status = response.getStatusLine().getStatusCode();
+ handler.logOutput("Calling status " + status, true);
+ InstallLog.getInstance().info("Calling status " + status);
+ }
+ } catch (IOException e) {
+ String messageError = "Error in " + path + ": " + e.getMessage();
handler.emitError(messageError, messageError);
InstallLog.getInstance().error(messageError);
}
@@ -117,16 +119,15 @@ public class HttpUtils {
public String postWithDigestAuth(final String url, final String file) {
String responseBodyAsString = "";
- try {
- final CloseableHttpResponse response = httpClient.execute(targetHost,
- httpPost(url, MultipartEntityBuilder.create().addPart("bin", new FileBody(new File(file))).build()),
- setAuth(targetHost, new DigestScheme()));
- responseBodyAsString = IOUtils.toString(response.getEntity().getContent());
+ try (CloseableHttpResponse response =
+ httpClient.execute(targetHost, httpPost(url, MultipartEntityBuilder.create().
+ addPart("bin", new FileBody(new File(file))).build()),
+ setAuth(targetHost, new DigestScheme()))) {
+ responseBodyAsString = IOUtils.toString(response.getEntity().getContent(), Charset.forName("UTF-8"));
handler.logOutput("Http status: " + response.getStatusLine().getStatusCode(), true);
InstallLog.getInstance().info("Http status: " + response.getStatusLine().getStatusCode());
- response.close();
- } catch (final IOException ex) {
- final String messageError = "Error calling " + url + ": " + ex.getMessage();
+ } catch (IOException e) {
+ final String messageError = "Error calling " + url + ": " + e.getMessage();
handler.emitError(messageError, messageError);
InstallLog.getInstance().error(messageError);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f14320e0/installer/src/main/resources/izpack/install.xml
----------------------------------------------------------------------
diff --git a/installer/src/main/resources/izpack/install.xml b/installer/src/main/resources/izpack/install.xml
index ac762a0..c9335db 100644
--- a/installer/src/main/resources/izpack/install.xml
+++ b/installer/src/main/resources/izpack/install.xml
@@ -132,7 +132,7 @@ under the License.
<jar src="../syncope-installer-@{syncope.version}.jar" stage="install"/>
<jar src="lib/commons-logging-@{commons-logging.version}.jar"/>
<jar src="lib/commons-codec-@{commons-codec.version}.jar"/>
- <jar src="lib/commons-io-2.4.jar"/>
+ <jar src="lib/commons-io-@{commons-io.version}.jar"/>
<jar src="lib/httpclient-@{httpclient.version}.jar"/>
<jar src="lib/httpmime-@{httpclient.version}.jar"/>
<jar src="lib/httpcore-4.3.3.jar"/>
http://git-wip-us.apache.org/repos/asf/syncope/blob/f14320e0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ff39755..78725f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -359,7 +359,7 @@ under the License.
<log4j.version>2.5</log4j.version>
<disruptor.version>3.3.4</disruptor.version>
- <commons-io.version>2.4</commons-io.version>
+ <commons-io.version>2.5</commons-io.version>
<commons-email.version>1.4</commons-email.version>
<commons-codec.version>1.10</commons-codec.version>
<commons-jexl.version>3.0</commons-jexl.version>