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 2017/11/27 10:15:13 UTC
[2/2] syncope git commit: Bulk upgrade: jackson, elasticsearch,
commons-io, commons-codec, swagger-jaxrs, bootstrap-fileinput, pdfbox,
greenmail
Bulk upgrade: jackson, elasticsearch, commons-io, commons-codec, swagger-jaxrs, bootstrap-fileinput, pdfbox, greenmail
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/96219bed
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/96219bed
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/96219bed
Branch: refs/heads/2_0_X
Commit: 96219beddba40c8cf33a009d24cfea5ef13d7aca
Parents: e7daf95
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Nov 27 10:17:15 2017 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Nov 27 11:15:01 2017 +0100
----------------------------------------------------------------------
.../client/cli/commands/MigrateTest.java | 13 ++------
.../console/resources/FilesystemResource.java | 6 +---
.../html/form/preview/BinaryCertPreviewer.java | 13 +++-----
.../html/form/preview/BinaryPDFPreviewer.java | 10 +++---
.../apache/syncope/core/logic/ReportLogic.java | 9 ++----
.../jpa/content/XMLContentLoader.java | 7 +---
.../java/job/report/ReportJobDelegate.java | 5 ++-
.../syncope/core/rest/cxf/WADLServlet.java | 9 ++----
.../activiti/ActivitiDefinitionLoader.java | 6 +---
.../workflow/activiti/ActivitiDeployUtils.java | 13 +++-----
.../activiti/ActivitiUserWorkflowAdapter.java | 6 +---
.../flowable/FlowableDefinitionLoader.java | 6 +---
.../workflow/flowable/FlowableDeployUtils.java | 13 +++-----
.../flowable/FlowableUserWorkflowAdapter.java | 6 +---
.../provisioning/camel/SyncopeCamelContext.java | 6 +---
fit/build-tools/pom.xml | 5 ---
.../fit/buildtools/LdifInputStreamLoader.java | 3 +-
.../org/apache/syncope/fit/AbstractITCase.java | 7 +---
.../org/apache/syncope/fit/cli/CLIITCase.java | 5 +--
.../core/AbstractNotificationTaskITCase.java | 7 +---
.../syncope/fit/core/ConnectorITCase.java | 7 +---
.../syncope/fit/core/ExceptionMapperITCase.java | 7 +---
.../apache/syncope/fit/core/LoggerITCase.java | 7 +---
.../syncope/fit/core/MigrationITCase.java | 10 +++---
.../apache/syncope/fit/core/PullTaskITCase.java | 12 +++++--
.../installer/processes/BaseProcess.java | 7 +---
.../installer/utilities/FileSystemUtils.java | 26 +++++++--------
pom.xml | 34 ++++++++++----------
28 files changed, 82 insertions(+), 183 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/client/cli/src/test/java/org/apache/syncope/client/cli/commands/MigrateTest.java
----------------------------------------------------------------------
diff --git a/client/cli/src/test/java/org/apache/syncope/client/cli/commands/MigrateTest.java b/client/cli/src/test/java/org/apache/syncope/client/cli/commands/MigrateTest.java
index e782744..8ceadce 100644
--- a/client/cli/src/test/java/org/apache/syncope/client/cli/commands/MigrateTest.java
+++ b/client/cli/src/test/java/org/apache/syncope/client/cli/commands/MigrateTest.java
@@ -29,7 +29,6 @@ import java.util.Properties;
import javax.sql.DataSource;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.commons.io.IOUtils;
import org.apache.syncope.client.cli.Input;
import org.apache.syncope.client.cli.commands.migrate.MigrateCommand;
import org.apache.syncope.core.persistence.jpa.content.ContentLoaderHandler;
@@ -48,16 +47,12 @@ public class MigrateTest {
@BeforeClass
public static void before() {
Properties props = new Properties();
- InputStream propStream = null;
- try {
- propStream = MigrateTest.class.getResourceAsStream("/test.properties");
+ try (InputStream propStream = MigrateTest.class.getResourceAsStream("/test.properties")) {
props.load(propStream);
BASE_PATH = props.getProperty("testClasses");
} catch (IOException e) {
fail(e.getMessage());
- } finally {
- IOUtils.closeQuietly(propStream);
}
assertNotNull(BASE_PATH);
}
@@ -80,14 +75,10 @@ public class MigrateTest {
// 3. attempt to set initial content from the migrated MasterContent.xml
SAXParserFactory factory = SAXParserFactory.newInstance();
- InputStream in = null;
- try {
- in = new FileInputStream(args[3]);
+ try (InputStream in = new FileInputStream(args[3])) {
SAXParser parser = factory.newSAXParser();
parser.parse(in, new ContentLoaderHandler(dataSource, ROOT_ELEMENT, false));
- } finally {
- IOUtils.closeQuietly(in);
}
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/client/console/src/main/java/org/apache/syncope/client/console/resources/FilesystemResource.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/resources/FilesystemResource.java b/client/console/src/main/java/org/apache/syncope/client/console/resources/FilesystemResource.java
index dad9917..f8dc13d 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/resources/FilesystemResource.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/resources/FilesystemResource.java
@@ -62,14 +62,10 @@ public class FilesystemResource extends AbstractResource {
@Override
public void writeData(final Attributes attributes) throws IOException {
- InputStream resourceIS = null;
- try {
- resourceIS = Files.newInputStream(new File(baseDir, subPath).toPath());
+ try (InputStream resourceIS = Files.newInputStream(new File(baseDir, subPath).toPath())) {
IOUtils.copy(resourceIS, attributes.getResponse().getOutputStream());
} catch (IOException e) {
LOG.error("Could not read from {}", baseDir.getAbsolutePath() + subPath, e);
- } finally {
- IOUtils.closeQuietly(resourceIS);
}
}
});
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryCertPreviewer.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryCertPreviewer.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryCertPreviewer.java
index 778c16b..90e49ae 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryCertPreviewer.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryCertPreviewer.java
@@ -19,10 +19,8 @@
package org.apache.syncope.client.console.wicket.markup.html.form.preview;
import java.io.ByteArrayInputStream;
-import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
-import javax.naming.InvalidNameException;
import javax.naming.ldap.LdapName;
import javax.naming.ldap.Rdn;
import org.apache.commons.lang3.StringUtils;
@@ -31,7 +29,6 @@ import org.apache.syncope.client.console.commons.Constants;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.Model;
-import org.apache.wicket.util.io.IOUtils;
@BinaryPreview(mimeTypes = { "application/x-x509-ca-cert", "application/x-x509-user-cert", "application/pkix-cert" })
public class BinaryCertPreviewer extends AbstractBinaryPreviewer {
@@ -44,14 +41,13 @@ public class BinaryCertPreviewer extends AbstractBinaryPreviewer {
@Override
public Component preview(final byte[] uploadedBytes) {
- Label commonNameLabel = new Label("certCommonName", new Model<String>());
+ Label commonNameLabel = new Label("certCommonName", new Model<>());
if (uploadedBytes.length == 0) {
LOG.info("Enpty certificate");
return commonNameLabel;
}
- ByteArrayInputStream certificateStream = new ByteArrayInputStream(uploadedBytes);
- try {
+ try (ByteArrayInputStream certificateStream = new ByteArrayInputStream(uploadedBytes)) {
X509Certificate certificate = (X509Certificate) CertificateFactory.getInstance("X.509").
generateCertificate(certificateStream);
@@ -67,12 +63,11 @@ public class BinaryCertPreviewer extends AbstractBinaryPreviewer {
}
}
commonNameLabel.setDefaultModelObject(commonNameBuilder.toString());
- } catch (CertificateException | InvalidNameException e) {
+ } catch (Exception e) {
LOG.error("Error evaluating certificate file", e);
commonNameLabel.setDefaultModelObject(getString(Constants.ERROR));
- } finally {
- IOUtils.closeQuietly(certificateStream);
}
+
return this.addOrReplace(commonNameLabel);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.java
index da00856..23aa4ef 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/preview/BinaryPDFPreviewer.java
@@ -23,6 +23,7 @@ import java.awt.RenderingHints;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.Serializable;
import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.io.MemoryUsageSetting;
@@ -38,7 +39,6 @@ import org.apache.wicket.markup.html.image.NonCachingImage;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.request.resource.DynamicImageResource;
import org.apache.wicket.request.resource.IResource;
-import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.time.Time;
@BinaryPreview(mimeTypes = { "application/pdf" })
@@ -62,9 +62,9 @@ public class BinaryPDFPreviewer extends AbstractBinaryPreviewer {
public Component preview(final byte[] uploadedBytes) {
firstPage = null;
- PDDocument document = null;
- try {
- document = PDDocument.load(new ByteArrayInputStream(uploadedBytes), MemoryUsageSetting.setupTempFileOnly());
+ try (InputStream bais = new ByteArrayInputStream(uploadedBytes);
+ PDDocument document = PDDocument.load(bais, MemoryUsageSetting.setupTempFileOnly())) {
+
document.setResourceCache(new DefaultResourceCache() {
@Override
@@ -79,8 +79,6 @@ public class BinaryPDFPreviewer extends AbstractBinaryPreviewer {
}
} catch (IOException e) {
LOG.error("While generating thumbnail from first page", e);
- } finally {
- IOUtils.closeQuietly(document);
}
Fragment fragment;
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/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 fd9ce26..9505303 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
@@ -217,9 +217,9 @@ public class ReportLogic extends AbstractExecutableLogic<ReportTO> {
final ReportExecExportFormat format) {
// streaming SAX handler from a compressed byte array stream
- ByteArrayInputStream bais = new ByteArrayInputStream(reportExec.getExecResult());
- ZipInputStream zis = new ZipInputStream(bais);
- try {
+ try (ByteArrayInputStream bais = new ByteArrayInputStream(reportExec.getExecResult());
+ ZipInputStream zis = new ZipInputStream(bais)) {
+
// a single ZipEntry in the ZipInputStream (see ReportJob)
zis.getNextEntry();
@@ -280,9 +280,6 @@ public class ReportLogic extends AbstractExecutableLogic<ReportTO> {
LOG.debug("Result of {} successfully exported as {}", reportExec, format);
} catch (Exception e) {
LOG.error("While exporting content", e);
- } finally {
- IOUtils.closeQuietly(zis);
- IOUtils.closeQuietly(bais);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentLoader.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentLoader.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentLoader.java
index 8ebea1d..4059033 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentLoader.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentLoader.java
@@ -26,7 +26,6 @@ import javax.annotation.Resource;
import javax.sql.DataSource;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.commons.io.IOUtils;
import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.spring.ResourceWithFallbackLoader;
import org.apache.syncope.core.persistence.api.content.ContentLoader;
@@ -97,15 +96,11 @@ public class XMLContentLoader extends AbstractContentDealer implements ContentLo
throws Exception {
SAXParserFactory factory = SAXParserFactory.newInstance();
- InputStream in = null;
- try {
- in = contentXML.getResource().getInputStream();
+ try (InputStream in = contentXML.getResource().getInputStream()) {
SAXParser parser = factory.newSAXParser();
parser.parse(in, new ContentLoaderHandler(dataSource, ROOT_ELEMENT, true));
LOG.debug("[{}] Default content successfully loaded", domain);
- } finally {
- IOUtils.closeQuietly(in);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/ReportJobDelegate.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/ReportJobDelegate.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/ReportJobDelegate.java
index 28f4894..40d9250 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/ReportJobDelegate.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/ReportJobDelegate.java
@@ -30,7 +30,6 @@ import javax.xml.transform.Transformer;
import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
-import org.apache.commons.io.IOUtils;
import org.apache.syncope.common.lib.report.ReportletConf;
import org.apache.syncope.common.lib.types.ReportExecStatus;
import org.apache.syncope.core.provisioning.api.utils.ExceptionUtils2;
@@ -183,8 +182,8 @@ public class ReportJobDelegate {
} finally {
try {
zos.closeEntry();
- IOUtils.closeQuietly(zos);
- IOUtils.closeQuietly(baos);
+ zos.close();
+ baos.close();
} catch (IOException e) {
LOG.error("While closing StreamResult's backend", e);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/WADLServlet.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/WADLServlet.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/WADLServlet.java
index e421909..c7191da 100644
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/WADLServlet.java
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/WADLServlet.java
@@ -103,13 +103,10 @@ public class WADLServlet extends HttpServlet {
} else if ("/syncope.wadl".equals(request.getServletPath())) {
response.setContentType(MediaType.APPLICATION_XML);
- InputStream in = new ByteArrayInputStream(wadl.getBytes());
- OutputStream out = response.getOutputStream();
- try {
+ try (InputStream in = new ByteArrayInputStream(wadl.getBytes());
+ OutputStream out = response.getOutputStream()) {
+
IOUtils.copy(in, out);
- } finally {
- IOUtils.closeQuietly(in);
- IOUtils.closeQuietly(out);
}
} else {
throw new ServerException("URL not supported: " + request.getRequestURI());
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiDefinitionLoader.java
----------------------------------------------------------------------
diff --git a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiDefinitionLoader.java b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiDefinitionLoader.java
index 9521213..9cbde8d 100644
--- a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiDefinitionLoader.java
+++ b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiDefinitionLoader.java
@@ -56,14 +56,10 @@ public class ActivitiDefinitionLoader implements SyncopeLoader {
public void load() {
byte[] wfDef = new byte[0];
- InputStream wfIn = null;
- try {
- wfIn = userWorkflowDef.getResource().getInputStream();
+ try (InputStream wfIn = userWorkflowDef.getResource().getInputStream()) {
wfDef = IOUtils.toByteArray(wfIn);
} catch (IOException e) {
LOG.error("While loading " + userWorkflowDef.getResource().getFilename(), e);
- } finally {
- IOUtils.closeQuietly(wfIn);
}
for (Map.Entry<String, ProcessEngine> entry : dpEngine.getEngines().entrySet()) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiDeployUtils.java
----------------------------------------------------------------------
diff --git a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiDeployUtils.java b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiDeployUtils.java
index 965e03c..6022f85 100644
--- a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiDeployUtils.java
+++ b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiDeployUtils.java
@@ -35,7 +35,6 @@ import org.activiti.engine.ProcessEngine;
import org.activiti.engine.repository.Deployment;
import org.activiti.engine.repository.Model;
import org.activiti.engine.repository.ProcessDefinition;
-import org.apache.commons.io.IOUtils;
import org.apache.syncope.core.workflow.api.WorkflowException;
public final class ActivitiDeployUtils {
@@ -54,13 +53,11 @@ public final class ActivitiDeployUtils {
}
public static void deployModel(final ProcessEngine engine, final ProcessDefinition procDef) {
- InputStream bpmnStream = null;
- InputStreamReader isr = null;
XMLStreamReader xtr = null;
- try {
- bpmnStream = engine.getRepositoryService().getResourceAsStream(
- procDef.getDeploymentId(), procDef.getResourceName());
- isr = new InputStreamReader(bpmnStream);
+ try (InputStream bpmnStream = engine.getRepositoryService().
+ getResourceAsStream(procDef.getDeploymentId(), procDef.getResourceName());
+ InputStreamReader isr = new InputStreamReader(bpmnStream)) {
+
xtr = XMLInputFactory.newInstance().createXMLStreamReader(isr);
BpmnModel bpmnModel = new BpmnXMLConverter().convertToBpmnModel(xtr);
@@ -86,8 +83,6 @@ public final class ActivitiDeployUtils {
// ignore
}
}
- IOUtils.closeQuietly(isr);
- IOUtils.closeQuietly(bpmnStream);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
index e327a15..f7aed6c 100644
--- a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
+++ b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
@@ -881,14 +881,10 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
}
protected void exportProcessResource(final String deploymentId, final String resourceName, final OutputStream os) {
- InputStream procDefIS = engine.getRepositoryService().
- getResourceAsStream(deploymentId, resourceName);
- try {
+ try (InputStream procDefIS = engine.getRepositoryService().getResourceAsStream(deploymentId, resourceName)) {
IOUtils.copy(procDefIS, os);
} catch (IOException e) {
LOG.error("While exporting {}", resourceName, e);
- } finally {
- IOUtils.closeQuietly(procDefIS);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableDefinitionLoader.java
----------------------------------------------------------------------
diff --git a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableDefinitionLoader.java b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableDefinitionLoader.java
index d918ecc..c4232ff 100644
--- a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableDefinitionLoader.java
+++ b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableDefinitionLoader.java
@@ -56,14 +56,10 @@ public class FlowableDefinitionLoader implements SyncopeLoader {
public void load() {
byte[] wfDef = new byte[0];
- InputStream wfIn = null;
- try {
- wfIn = userWorkflowDef.getResource().getInputStream();
+ try (InputStream wfIn = userWorkflowDef.getResource().getInputStream()) {
wfDef = IOUtils.toByteArray(wfIn);
} catch (IOException e) {
LOG.error("While loading " + userWorkflowDef.getResource().getFilename(), e);
- } finally {
- IOUtils.closeQuietly(wfIn);
}
for (Map.Entry<String, ProcessEngine> entry : dpEngine.getEngines().entrySet()) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableDeployUtils.java
----------------------------------------------------------------------
diff --git a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableDeployUtils.java b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableDeployUtils.java
index 4d28cd2..080332e 100644
--- a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableDeployUtils.java
+++ b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableDeployUtils.java
@@ -35,7 +35,6 @@ import org.activiti.engine.ProcessEngine;
import org.activiti.engine.repository.Deployment;
import org.activiti.engine.repository.Model;
import org.activiti.engine.repository.ProcessDefinition;
-import org.apache.commons.io.IOUtils;
import org.apache.syncope.core.workflow.api.WorkflowException;
public final class FlowableDeployUtils {
@@ -54,13 +53,11 @@ public final class FlowableDeployUtils {
}
public static void deployModel(final ProcessEngine engine, final ProcessDefinition procDef) {
- InputStream bpmnStream = null;
- InputStreamReader isr = null;
XMLStreamReader xtr = null;
- try {
- bpmnStream = engine.getRepositoryService().getResourceAsStream(
- procDef.getDeploymentId(), procDef.getResourceName());
- isr = new InputStreamReader(bpmnStream);
+ try (InputStream bpmnStream = engine.getRepositoryService().
+ getResourceAsStream(procDef.getDeploymentId(), procDef.getResourceName());
+ InputStreamReader isr = new InputStreamReader(bpmnStream)) {
+
xtr = XMLInputFactory.newInstance().createXMLStreamReader(isr);
BpmnModel bpmnModel = new BpmnXMLConverter().convertToBpmnModel(xtr);
@@ -86,8 +83,6 @@ public final class FlowableDeployUtils {
// ignore
}
}
- IOUtils.closeQuietly(isr);
- IOUtils.closeQuietly(bpmnStream);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java
index 7307bd0..686c86e 100644
--- a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java
+++ b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java
@@ -881,14 +881,10 @@ public class FlowableUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
}
protected void exportProcessResource(final String deploymentId, final String resourceName, final OutputStream os) {
- InputStream procDefIS = engine.getRepositoryService().
- getResourceAsStream(deploymentId, resourceName);
- try {
+ try (InputStream procDefIS = engine.getRepositoryService().getResourceAsStream(deploymentId, resourceName)) {
IOUtils.copy(procDefIS, os);
} catch (IOException e) {
LOG.error("While exporting {}", resourceName, e);
- } finally {
- IOUtils.closeQuietly(procDefIS);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/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 ca09718..95c65a6 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
@@ -99,16 +99,12 @@ public class SyncopeCamelContext {
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
List<RouteDefinition> routeDefs = new ArrayList<>();
for (String route : routes) {
- InputStream input = null;
- try {
- input = IOUtils.toInputStream(route, StandardCharsets.UTF_8);
+ try (InputStream input = IOUtils.toInputStream(route, StandardCharsets.UTF_8)) {
LSInput lsinput = domImpl.createLSInput();
lsinput.setByteStream(input);
Node routeElement = parser.parse(lsinput).getDocumentElement();
routeDefs.add(unmarshaller.unmarshal(routeElement, RouteDefinition.class).getValue());
- } finally {
- IOUtils.closeQuietly(input);
}
}
camelContext.addRouteDefinitions(routeDefs);
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/fit/build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/fit/build-tools/pom.xml b/fit/build-tools/pom.xml
index 8e7a2b1..2e53017 100644
--- a/fit/build-tools/pom.xml
+++ b/fit/build-tools/pom.xml
@@ -109,11 +109,6 @@ under the License.
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
-
- <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>provided</scope>
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/LdifInputStreamLoader.java
----------------------------------------------------------------------
diff --git a/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/LdifInputStreamLoader.java b/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/LdifInputStreamLoader.java
index 135c341..460b23f 100644
--- a/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/LdifInputStreamLoader.java
+++ b/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/LdifInputStreamLoader.java
@@ -20,7 +20,6 @@ package org.apache.syncope.fit.buildtools;
import java.io.InputStream;
import java.util.List;
-import org.apache.commons.io.IOUtils;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.entry.Modification;
@@ -120,7 +119,7 @@ public class LdifInputStreamLoader {
}
}
} finally {
- IOUtils.closeQuietly(ldif);
+ ldif.close();
}
} catch (Exception ioe) {
LOG.error(I18n.err(I18n.ERR_174), ioe);
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
index 938de9c..49b4cb2 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
@@ -38,7 +38,6 @@ import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.cxf.jaxrs.client.WebClient;
@@ -248,9 +247,7 @@ public abstract class AbstractITCase {
@BeforeClass
public static void securitySetup() {
- InputStream propStream = null;
- try {
- propStream = Encryptor.class.getResourceAsStream("/security.properties");
+ try (InputStream propStream = Encryptor.class.getResourceAsStream("/security.properties")) {
Properties props = new Properties();
props.load(propStream);
@@ -260,8 +257,6 @@ public abstract class AbstractITCase {
JWT_ISSUER = props.getProperty("jwtIssuer");
} catch (Exception e) {
LOG.error("Could not read secretKey", e);
- } finally {
- IOUtils.closeQuietly(propStream);
}
assertNotNull(ANONYMOUS_UNAME);
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/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 7355a1c..a18982d 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
@@ -57,10 +57,8 @@ public class CLIITCase extends AbstractITCase {
@BeforeClass
public static void install() {
Properties props = new Properties();
- InputStream propStream = null;
Process process = null;
- try {
- propStream = CLIITCase.class.getResourceAsStream("/cli-test.properties");
+ try (InputStream propStream = CLIITCase.class.getResourceAsStream("/cli-test.properties")) {
props.load(propStream);
File workDir = new File(props.getProperty("cli-work.dir"));
@@ -77,7 +75,6 @@ public class CLIITCase extends AbstractITCase {
} catch (IOException | InterruptedException e) {
fail(e.getMessage());
} finally {
- IOUtils.closeQuietly(propStream);
if (process != null) {
process.destroy();
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AbstractNotificationTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AbstractNotificationTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AbstractNotificationTaskITCase.java
index 41c7844..eb405bd 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AbstractNotificationTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AbstractNotificationTaskITCase.java
@@ -29,7 +29,6 @@ import javax.mail.Folder;
import javax.mail.Message;
import javax.mail.Session;
import javax.mail.Store;
-import org.apache.commons.io.IOUtils;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -48,14 +47,10 @@ public abstract class AbstractNotificationTaskITCase extends AbstractTaskITCase
@BeforeClass
public static void startGreenMail() {
Properties props = new Properties();
- InputStream propStream = null;
- try {
- propStream = ExceptionMapperITCase.class.getResourceAsStream("/mail.properties");
+ try (InputStream propStream = ExceptionMapperITCase.class.getResourceAsStream("/mail.properties")) {
props.load(propStream);
} catch (Exception e) {
LOG.error("Could not load /mail.properties", e);
- } finally {
- IOUtils.closeQuietly(propStream);
}
SMTP_HOST = props.getProperty("smtpHost");
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ConnectorITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ConnectorITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ConnectorITCase.java
index 09a2653..f609fc2 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ConnectorITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ConnectorITCase.java
@@ -41,7 +41,6 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.collections4.Predicate;
import org.apache.commons.collections4.Transformer;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.syncope.client.lib.SyncopeClient;
@@ -81,10 +80,8 @@ public class ConnectorITCase extends AbstractITCase {
@BeforeClass
public static void setUpConnIdBundles() throws IOException {
- InputStream propStream = null;
- try {
+ try (InputStream propStream = ConnectorITCase.class.getResourceAsStream("/connid.properties")) {
Properties props = new Properties();
- propStream = ConnectorITCase.class.getResourceAsStream("/connid.properties");
props.load(propStream);
for (String location : props.getProperty("connid.locations").split(",")) {
@@ -99,8 +96,6 @@ public class ConnectorITCase extends AbstractITCase {
testJDBCURL = props.getProperty("testdb.url");
} catch (Exception e) {
LOG.error("Could not load /connid.properties", e);
- } finally {
- IOUtils.closeQuietly(propStream);
}
assertNotNull(connectorServerLocation);
assertNotNull(connIdSoapVersion);
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ExceptionMapperITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ExceptionMapperITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ExceptionMapperITCase.java
index 0e6357f..a188e28 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ExceptionMapperITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ExceptionMapperITCase.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.fail;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
-import org.apache.commons.io.IOUtils;
import org.apache.syncope.common.lib.SyncopeClientCompositeException;
import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.AnyTypeClassTO;
@@ -43,14 +42,10 @@ public class ExceptionMapperITCase extends AbstractITCase {
@BeforeClass
public static void setUpErrorMessages() throws IOException {
- InputStream propStream = null;
- try {
- propStream = ExceptionMapperITCase.class.getResourceAsStream("/errorMessages.properties");
+ try (InputStream propStream = ExceptionMapperITCase.class.getResourceAsStream("/errorMessages.properties")) {
ERROR_MESSAGES.load(propStream);
} catch (Exception e) {
LOG.error("Could not load /errorMessages.properties", e);
- } finally {
- IOUtils.closeQuietly(propStream);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/fit/core-reference/src/test/java/org/apache/syncope/fit/core/LoggerITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/LoggerITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/LoggerITCase.java
index 94e85dc..7739b34 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/LoggerITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/LoggerITCase.java
@@ -36,7 +36,6 @@ import javax.xml.ws.WebServiceException;
import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.collections4.Predicate;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.log.EventCategoryTO;
@@ -257,10 +256,8 @@ public class LoggerITCase extends AbstractITCase {
@Test
public void customAuditAppender() throws IOException, InterruptedException {
- InputStream propStream = null;
- try {
+ try (InputStream propStream = getClass().getResourceAsStream("/core-test.properties")) {
Properties props = new Properties();
- propStream = getClass().getResourceAsStream("/core-test.properties");
props.load(propStream);
String auditFilePath = props.getProperty("test.log.dir")
@@ -332,8 +329,6 @@ public class LoggerITCase extends AbstractITCase {
assertTrue(StringUtils.isEmpty(FileUtils.readFileToString(auditTempFile, Charset.defaultCharset())));
} catch (IOException e) {
fail("Unable to read/write log files" + e.getMessage());
- } finally {
- IOUtils.closeQuietly(propStream);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MigrationITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MigrationITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MigrationITCase.java
index 7600340..fdb4865 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MigrationITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MigrationITCase.java
@@ -29,7 +29,6 @@ import java.util.Properties;
import javax.ws.rs.core.Response;
import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.collections4.Predicate;
-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.AbstractTaskTO;
@@ -100,14 +99,15 @@ public class MigrationITCase extends AbstractTaskITCase {
@BeforeClass
public static void setup() throws IOException {
- InputStream propStream = null;
try {
Properties props = new Properties();
- propStream = MigrationITCase.class.getResourceAsStream("/test.properties");
+ InputStream propStream = MigrationITCase.class.getResourceAsStream("/test.properties");
props.load(propStream);
- IOUtils.closeQuietly(propStream);
+ propStream.close();
+
propStream = MigrationITCase.class.getResourceAsStream("/connid.properties");
props.load(propStream);
+ propStream.close();
basedir = props.getProperty("basedir");
@@ -120,8 +120,6 @@ public class MigrationITCase extends AbstractTaskITCase {
connIdDbVersion = props.getProperty("connid.database.version");
} catch (Exception e) {
LOG.error("Could not load /connid.properties", e);
- } finally {
- IOUtils.closeQuietly(propStream);
}
assertNotNull(basedir);
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
index 6436f54..7872506 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
@@ -179,9 +179,15 @@ public class PullTaskITCase extends AbstractTaskITCase {
} catch (IOException e) {
fail(e.getMessage());
} finally {
- IOUtils.closeQuietly(propStream);
- IOUtils.closeQuietly(srcStream);
- IOUtils.closeQuietly(dstStream);
+ if (propStream != null) {
+ propStream.close();
+ }
+ if (srcStream != null) {
+ srcStream.close();
+ }
+ if (dstStream != null) {
+ dstStream.close();
+ }
}
// -----------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/installer/src/main/java/org/apache/syncope/installer/processes/BaseProcess.java
----------------------------------------------------------------------
diff --git a/installer/src/main/java/org/apache/syncope/installer/processes/BaseProcess.java b/installer/src/main/java/org/apache/syncope/installer/processes/BaseProcess.java
index 6c691cc..07e33e3 100644
--- a/installer/src/main/java/org/apache/syncope/installer/processes/BaseProcess.java
+++ b/installer/src/main/java/org/apache/syncope/installer/processes/BaseProcess.java
@@ -22,7 +22,6 @@ import com.izforge.izpack.panels.process.AbstractUIProcessHandler;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
-import org.apache.commons.io.IOUtils;
public abstract class BaseProcess {
@@ -31,14 +30,10 @@ public abstract class BaseProcess {
protected String syncopeInstallDir;
static {
- InputStream input = null;
- try {
- input = BaseProcess.class.getResourceAsStream("/installer.properties");
+ try (InputStream input = BaseProcess.class.getResourceAsStream("/installer.properties")) {
PROPERTIES.load(input);
} catch (IOException e) {
// ignore
- } finally {
- IOUtils.closeQuietly(input);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/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 c8b70e1..f84538b 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
@@ -37,7 +37,6 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
import org.w3c.dom.Document;
public class FileSystemUtils {
@@ -135,20 +134,17 @@ public class FileSystemUtils {
}
public static void writeXML(final Document doc, final OutputStream out) throws IOException, TransformerException {
- try {
- final TransformerFactory factory = TransformerFactory.newInstance();
- factory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true);
- final Transformer transformer = factory.newTransformer();
- transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "no");
- transformer.setOutputProperty(OutputKeys.METHOD, "xml");
- transformer.setOutputProperty(OutputKeys.INDENT, "yes");
- transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
- transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
- transformer.transform(new DOMSource(doc),
- new StreamResult(new OutputStreamWriter(out, Charset.forName("UTF-8"))));
- } finally {
- IOUtils.closeQuietly(out);
- }
+ final TransformerFactory factory = TransformerFactory.newInstance();
+ factory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true);
+ final Transformer transformer = factory.newTransformer();
+ transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "no");
+ transformer.setOutputProperty(OutputKeys.METHOD, "xml");
+ transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+ transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+ transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
+ transformer.transform(new DOMSource(doc),
+ new StreamResult(new OutputStreamWriter(out, Charset.forName("UTF-8"))));
+ out.close();
}
public static void delete(final File file) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/96219bed/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dd2c41c..7f91349 100644
--- a/pom.xml
+++ b/pom.xml
@@ -367,7 +367,7 @@ under the License.
<cxf.version>3.1.14</cxf.version>
- <jackson.version>2.9.1</jackson.version>
+ <jackson.version>2.9.2</jackson.version>
<spring.version>4.3.12.RELEASE</spring.version>
<spring-security.version>4.2.3.RELEASE</spring-security.version>
@@ -392,14 +392,14 @@ under the License.
<slf4j.version>1.7.25</slf4j.version>
<opensaml.version>3.3.0</opensaml.version>
- <elasticsearch.version>5.6.2</elasticsearch.version>
+ <elasticsearch.version>5.6.4</elasticsearch.version>
<log4j.version>2.10.0</log4j.version>
<disruptor.version>3.3.7</disruptor.version>
- <commons-io.version>2.5</commons-io.version>
+ <commons-io.version>2.6</commons-io.version>
<commons-email.version>1.5</commons-email.version>
- <commons-codec.version>1.10</commons-codec.version>
+ <commons-codec.version>1.11</commons-codec.version>
<commons-jexl.version>3.1</commons-jexl.version>
<commons-lang.version>3.7</commons-lang.version>
<commons-text.version>1.1</commons-text.version>
@@ -419,7 +419,7 @@ under the License.
<activiti-modeler.directory>${project.build.directory}/activiti-modeler</activiti-modeler.directory>
<flowable-modeler.directory>${project.build.directory}/flowable-modeler</flowable-modeler.directory>
- <swagger-core.version>1.5.16</swagger-core.version>
+ <swagger-core.version>1.5.17</swagger-core.version>
<swagger-ui.version>2.2.10</swagger-ui.version>
<guava.version>20.0</guava.version>
@@ -430,7 +430,7 @@ under the License.
<bootstrap.version>3.3.7</bootstrap.version>
<bootstrap-select.version>1.12.2</bootstrap-select.version>
- <bootstrap-fileinput.version>4.4.2</bootstrap-fileinput.version>
+ <bootstrap-fileinput.version>4.4.6</bootstrap-fileinput.version>
<bootbox.version>4.4.0</bootbox.version>
<font-awesome.version>4.7.0</font-awesome.version>
<ionicons.version>2.0.1</ionicons.version>
@@ -1327,7 +1327,7 @@ under the License.
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
- <version>2.0.7</version>
+ <version>2.0.8</version>
</dependency>
<dependency>
@@ -1674,7 +1674,7 @@ under the License.
<dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail</artifactId>
- <version>1.5.5</version>
+ <version>1.5.6</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -2267,17 +2267,17 @@ under the License.
<link>http://www.slf4j.org/api/</link>
<link>http://connid.tirasa.net/apidocs/1.4/</link>
<link>http://cxf.apache.org/javadoc/latest-3.1.x/</link>
- <link>http://fasterxml.github.io/jackson-core/javadoc/2.8/</link>
- <link>http://fasterxml.github.io/jackson-databind/javadoc/2.8/</link>
- <link>http://fasterxml.github.io/jackson-annotations/javadoc/2.8/</link>
- <link>http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.8/</link>
- <link>http://fasterxml.github.io/jackson-dataformat-yaml/javadoc/2.8/</link>
- <link>http://fasterxml.github.io/jackson-datatype-joda/javadoc/2.8/</link>
- <link>http://www.javadoc.io/doc/org.apache.camel/camel-core/2.17.6/</link>
+ <link>http://fasterxml.github.io/jackson-core/javadoc/2.9/</link>
+ <link>http://fasterxml.github.io/jackson-databind/javadoc/2.9/</link>
+ <link>http://fasterxml.github.io/jackson-annotations/javadoc/2.9/</link>
+ <link>http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.9/</link>
+ <link>http://fasterxml.github.io/jackson-dataformat-yaml/javadoc/2.9/</link>
+ <link>http://fasterxml.github.io/jackson-datatype-joda/javadoc/2.9/</link>
+ <link>http://www.javadoc.io/doc/org.apache.camel/camel-core/2.17.7/</link>
<link>http://www.javadoc.io/doc/org.apache.camel/camel-spring/2.17.6/</link>
<link>https://ci.apache.org/projects/wicket/apidocs/7.x/</link>
<link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
- <link>https://commons.apache.org/proper/commons-io/javadocs/api-2.5/</link>
+ <link>https://commons.apache.org/proper/commons-io/javadocs/api-2.6/</link>
<link>https://commons.apache.org/proper/commons-jexl/apidocs/</link>
<link>https://commons.apache.org/proper/commons-collections/javadocs/api-release/</link>
<link>http://docs.spring.io/spring/docs/4.3.x/javadoc-api/</link>
@@ -2286,7 +2286,7 @@ under the License.
<link>http://www.flowable.org/docs/javadocs/</link>
<link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml-saml-api/3.3.0/opensaml-saml-api-3.3.0-javadoc.jar/!/index.html</link>
<link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml-core/3.3.0/opensaml-core-3.3.0-javadoc.jar/!/index.html</link>
- <link>https://www.javadoc.io/doc/org.elasticsearch/elasticsearch/5.6.2</link>
+ <link>https://www.javadoc.io/doc/org.elasticsearch/elasticsearch/5.6.4</link>
</links>
</configuration>
<reportSets>