This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 075629a Upgrading CXF + bump deps to Jakarta EE
075629a is described below
commit 075629a11440ef07746337a6f430130df2b0a317
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Wed Aug 26 10:16:15 2020 +0200
Upgrading CXF + bump deps to Jakarta EE
---
client/am/console/pom.xml | 4 +-
client/idm/console/pom.xml | 4 +-
client/idrepo/console/pom.xml | 4 +-
client/idrepo/enduser/pom.xml | 4 +-
common/idrepo/rest-api/pom.xml | 4 +-
core/am/rest-cxf/pom.xml | 4 +-
core/idm/rest-cxf/pom.xml | 4 +-
core/idrepo/rest-cxf/pom.xml | 8 +--
core/persistence-api/pom.xml | 4 +-
core/persistence-jpa-json/pom.xml | 4 +-
core/persistence-jpa/pom.xml | 8 +--
core/provisioning-java/pom.xml | 4 +-
core/spring/pom.xml | 4 +-
core/starter/pom.xml | 4 +-
ext/flowable/client-console/pom.xml | 4 +-
ext/flowable/client-enduser/pom.xml | 4 +-
ext/flowable/flowable-bpmn/pom.xml | 4 --
ext/oidcc4ui/client-common-ui/pom.xml | 4 +-
ext/oidcc4ui/client-console/pom.xml | 4 +-
ext/oidcc4ui/client-enduser/pom.xml | 4 +-
ext/saml2sp4ui/client-common-ui/pom.xml | 4 +-
ext/saml2sp4ui/client-console/pom.xml | 4 +-
ext/saml2sp4ui/client-enduser/pom.xml | 4 +-
ext/saml2sp4ui/logic/pom.xml | 4 +-
ext/saml2sp4ui/rest-cxf/pom.xml | 4 +-
ext/scimv2/client-console/pom.xml | 4 +-
ext/scimv2/scim-rest-api/pom.xml | 4 +-
ext/scimv2/scim-rest-cxf/pom.xml | 4 +-
fit/build-tools/pom.xml | 4 +-
fit/core-reference/pom.xml | 4 +-
ide/netbeans/pom.xml | 4 --
.../view/ResourceExplorerTopComponent.java | 48 +++++++-----------
pom.xml | 58 +++++++++-------------
33 files changed, 105 insertions(+), 133 deletions(-)
diff --git a/client/am/console/pom.xml b/client/am/console/pom.xml
index f79ac21..a853803 100644
--- a/client/am/console/pom.xml
+++ b/client/am/console/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/client/idm/console/pom.xml b/client/idm/console/pom.xml
index 028d8c7..f24d381 100644
--- a/client/idm/console/pom.xml
+++ b/client/idm/console/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/client/idrepo/console/pom.xml b/client/idrepo/console/pom.xml
index 9ae8cfb..562aa89 100644
--- a/client/idrepo/console/pom.xml
+++ b/client/idrepo/console/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/client/idrepo/enduser/pom.xml b/client/idrepo/enduser/pom.xml
index d34a91f..f7ed9fa 100644
--- a/client/idrepo/enduser/pom.xml
+++ b/client/idrepo/enduser/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/common/idrepo/rest-api/pom.xml b/common/idrepo/rest-api/pom.xml
index 2d50c2d..99fc04c 100644
--- a/common/idrepo/rest-api/pom.xml
+++ b/common/idrepo/rest-api/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
diff --git a/core/am/rest-cxf/pom.xml b/core/am/rest-cxf/pom.xml
index 80de056..f2990d2 100644
--- a/core/am/rest-cxf/pom.xml
+++ b/core/am/rest-cxf/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/core/idm/rest-cxf/pom.xml b/core/idm/rest-cxf/pom.xml
index a61222e..f371f00 100644
--- a/core/idm/rest-cxf/pom.xml
+++ b/core/idm/rest-cxf/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/core/idrepo/rest-cxf/pom.xml b/core/idrepo/rest-cxf/pom.xml
index 227b836..ddb6baf 100644
--- a/core/idrepo/rest-cxf/pom.xml
+++ b/core/idrepo/rest-cxf/pom.xml
@@ -39,14 +39,14 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
diff --git a/core/persistence-api/pom.xml b/core/persistence-api/pom.xml
index fbfdcfb..9e16df3 100644
--- a/core/persistence-api/pom.xml
+++ b/core/persistence-api/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
diff --git a/core/persistence-jpa-json/pom.xml
b/core/persistence-jpa-json/pom.xml
index 83db64d..0565105 100644
--- a/core/persistence-jpa-json/pom.xml
+++ b/core/persistence-jpa-json/pom.xml
@@ -56,8 +56,8 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/core/persistence-jpa/pom.xml b/core/persistence-jpa/pom.xml
index 0d6b810..6536c21 100644
--- a/core/persistence-jpa/pom.xml
+++ b/core/persistence-jpa/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
@@ -98,8 +98,8 @@ under the License.
<!-- TEST -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/core/provisioning-java/pom.xml b/core/provisioning-java/pom.xml
index 5a2211e..84c8695 100644
--- a/core/provisioning-java/pom.xml
+++ b/core/provisioning-java/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/core/spring/pom.xml b/core/spring/pom.xml
index 80dcd6b..44cefd1 100644
--- a/core/spring/pom.xml
+++ b/core/spring/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/core/starter/pom.xml b/core/starter/pom.xml
index a01d659..18eb797 100644
--- a/core/starter/pom.xml
+++ b/core/starter/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/ext/flowable/client-console/pom.xml
b/ext/flowable/client-console/pom.xml
index 874beea..73d3ee1 100644
--- a/ext/flowable/client-console/pom.xml
+++ b/ext/flowable/client-console/pom.xml
@@ -40,8 +40,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/ext/flowable/client-enduser/pom.xml
b/ext/flowable/client-enduser/pom.xml
index 0c203e5..9ba3bcf 100644
--- a/ext/flowable/client-enduser/pom.xml
+++ b/ext/flowable/client-enduser/pom.xml
@@ -55,8 +55,8 @@ under the License.
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
</dependencies>
diff --git a/ext/flowable/flowable-bpmn/pom.xml
b/ext/flowable/flowable-bpmn/pom.xml
index 6dbf83f..0db9dcb 100644
--- a/ext/flowable/flowable-bpmn/pom.xml
+++ b/ext/flowable/flowable-bpmn/pom.xml
@@ -39,10 +39,6 @@ under the License.
<dependencies>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
</dependency>
diff --git a/ext/oidcc4ui/client-common-ui/pom.xml
b/ext/oidcc4ui/client-common-ui/pom.xml
index dfb13d6..30f781c 100644
--- a/ext/oidcc4ui/client-common-ui/pom.xml
+++ b/ext/oidcc4ui/client-common-ui/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/ext/oidcc4ui/client-console/pom.xml
b/ext/oidcc4ui/client-console/pom.xml
index 160f247..7c24ff9 100644
--- a/ext/oidcc4ui/client-console/pom.xml
+++ b/ext/oidcc4ui/client-console/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
diff --git a/ext/oidcc4ui/client-enduser/pom.xml
b/ext/oidcc4ui/client-enduser/pom.xml
index 61334fe..ba27681 100644
--- a/ext/oidcc4ui/client-enduser/pom.xml
+++ b/ext/oidcc4ui/client-enduser/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
diff --git a/ext/saml2sp4ui/client-common-ui/pom.xml
b/ext/saml2sp4ui/client-common-ui/pom.xml
index 4c246b2..35767d5 100644
--- a/ext/saml2sp4ui/client-common-ui/pom.xml
+++ b/ext/saml2sp4ui/client-common-ui/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
diff --git a/ext/saml2sp4ui/client-console/pom.xml
b/ext/saml2sp4ui/client-console/pom.xml
index 6408f32..698a0cd 100644
--- a/ext/saml2sp4ui/client-console/pom.xml
+++ b/ext/saml2sp4ui/client-console/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
diff --git a/ext/saml2sp4ui/client-enduser/pom.xml
b/ext/saml2sp4ui/client-enduser/pom.xml
index 2a03b1a..8921fc3 100644
--- a/ext/saml2sp4ui/client-enduser/pom.xml
+++ b/ext/saml2sp4ui/client-enduser/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
diff --git a/ext/saml2sp4ui/logic/pom.xml b/ext/saml2sp4ui/logic/pom.xml
index a86a89c..8b46d25 100644
--- a/ext/saml2sp4ui/logic/pom.xml
+++ b/ext/saml2sp4ui/logic/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/ext/saml2sp4ui/rest-cxf/pom.xml b/ext/saml2sp4ui/rest-cxf/pom.xml
index fd173ac..5d4fbc9 100644
--- a/ext/saml2sp4ui/rest-cxf/pom.xml
+++ b/ext/saml2sp4ui/rest-cxf/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/ext/scimv2/client-console/pom.xml
b/ext/scimv2/client-console/pom.xml
index e4050b8..c7309a8 100644
--- a/ext/scimv2/client-console/pom.xml
+++ b/ext/scimv2/client-console/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
diff --git a/ext/scimv2/scim-rest-api/pom.xml b/ext/scimv2/scim-rest-api/pom.xml
index c99cc7e..3185a49 100644
--- a/ext/scimv2/scim-rest-api/pom.xml
+++ b/ext/scimv2/scim-rest-api/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
diff --git a/ext/scimv2/scim-rest-cxf/pom.xml b/ext/scimv2/scim-rest-cxf/pom.xml
index 4b744b0..e42a8e3 100644
--- a/ext/scimv2/scim-rest-cxf/pom.xml
+++ b/ext/scimv2/scim-rest-cxf/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/fit/build-tools/pom.xml b/fit/build-tools/pom.xml
index bf3e431..b6aa430 100644
--- a/fit/build-tools/pom.xml
+++ b/fit/build-tools/pom.xml
@@ -39,8 +39,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml
index cf71c55..95a6fef 100644
--- a/fit/core-reference/pom.xml
+++ b/fit/core-reference/pom.xml
@@ -46,8 +46,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/ide/netbeans/pom.xml b/ide/netbeans/pom.xml
index 70889de..2ed5406 100644
--- a/ide/netbeans/pom.xml
+++ b/ide/netbeans/pom.xml
@@ -90,10 +90,6 @@ under the License.
<artifactId>org-openide-loaders</artifactId>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-core-multiview</artifactId>
<type>jar</type>
diff --git
a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/view/ResourceExplorerTopComponent.java
b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/view/ResourceExplorerTopComponent.java
index dc9c7cf..a6ca319 100644
---
a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/view/ResourceExplorerTopComponent.java
+++
b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/view/ResourceExplorerTopComponent.java
@@ -21,6 +21,7 @@ package org.apache.syncope.ide.netbeans.view;
import java.awt.Image;
import java.awt.event.ActionEvent;
import java.awt.event.MouseEvent;
+import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
@@ -38,11 +39,10 @@ import javax.swing.JOptionPane;
import javax.swing.JPopupMenu;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
-import javax.swing.text.JTextComponent;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.cxf.helpers.IOUtils;
import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.to.MailTemplateTO;
import org.apache.syncope.common.lib.to.ReportTemplateTO;
@@ -378,9 +378,9 @@ public final class ResourceExplorerTopComponent extends
TopComponent {
mailTemplate.setKey(name1);
added =
mailTemplateManagerService.create(mailTemplate);
mailTemplateManagerService.setFormat(name1,
MailTemplateFormat.HTML,
- IOUtils.toInputStream("//Enter Content here",
encodingPattern));
+ new ByteArrayInputStream("//Enter content
here".getBytes(encodingPattern)));
mailTemplateManagerService.setFormat(name1,
MailTemplateFormat.TEXT,
- IOUtils.toInputStream("//Enter Content here",
encodingPattern));
+ new ByteArrayInputStream("//Enter content
here".getBytes(encodingPattern)));
openMailEditor(name1);
} else if
(PluginConstants.GROOVY_SCRIPTS.equals(parent1.getUserObject())) {
ImplementationTO newNode = new ImplementationTO();
@@ -454,7 +454,7 @@ public final class ResourceExplorerTopComponent extends
TopComponent {
}
newNode.setBody(IOUtils.toString(getClass().getResourceAsStream(
"/org/apache/syncope/ide/netbeans/implementations/" + templateClassName +
".groovy"),
- StandardCharsets.UTF_8));
+ StandardCharsets.UTF_8.name()));
added = implementationManagerService.create(newNode);
openScriptEditor(name1, (String) node.getUserObject());
} else {
@@ -462,11 +462,11 @@ public final class ResourceExplorerTopComponent extends
TopComponent {
reportTemplate.setKey(name1);
added =
reportTemplateManagerService.create(reportTemplate);
reportTemplateManagerService.setFormat(name1,
ReportTemplateFormat.FO,
- IOUtils.toInputStream("//Enter content here",
encodingPattern));
+ new ByteArrayInputStream("//Enter content
here".getBytes(encodingPattern)));
reportTemplateManagerService.setFormat(name1,
ReportTemplateFormat.CSV,
- IOUtils.toInputStream("//Enter content here",
encodingPattern));
+ new ByteArrayInputStream("//Enter content
here".getBytes(encodingPattern)));
reportTemplateManagerService.setFormat(name1,
ReportTemplateFormat.HTML,
- IOUtils.toInputStream("//Enter content here",
encodingPattern));
+ new ByteArrayInputStream("//Enter content
here".getBytes(encodingPattern)));
openReportEditor(name1);
}
if (added) {
@@ -553,7 +553,7 @@ public final class ResourceExplorerTopComponent extends
TopComponent {
LOG.log(Level.SEVERE, String.format("Format [%s] not
supported", format));
break;
}
- String content = is == null ? StringUtils.EMPTY :
IOUtils.toString(is, encodingPattern);
+ String content = is == null ? StringUtils.EMPTY :
IOUtils.toString(is, encodingPattern.name());
String mailTemplatesDirName = System.getProperty("java.io.tmpdir")
+ "/Templates/Mail/";
File mailTemplatesDir = new File(mailTemplatesDirName);
@@ -623,7 +623,7 @@ public final class ResourceExplorerTopComponent extends
TopComponent {
LOG.log(Level.SEVERE, String.format("Format [%s] not
supported", format));
break;
}
- String content = is == null ? StringUtils.EMPTY :
IOUtils.toString(is, encodingPattern);
+ String content = is == null ? StringUtils.EMPTY :
IOUtils.toString(is, encodingPattern.name());
String reportTemplatesDirName =
System.getProperty("java.io.tmpdir") + "/Templates/Report/";
File reportTemplatesDir = new File(reportTemplatesDirName);
@@ -650,9 +650,9 @@ public final class ResourceExplorerTopComponent extends
TopComponent {
private void saveContent() {
try {
- JTextComponent ed = EditorRegistry.lastFocusedComponent();
- Document document = ed.getDocument();
- String content = document.getText(0, document.getLength());
+ Document document =
EditorRegistry.lastFocusedComponent().getDocument();
+ String textContent = document.getText(0, document.getLength());
+ InputStream isContent = new
ByteArrayInputStream(textContent.getBytes(encodingPattern));
String path = (String)
document.getProperty(Document.TitleProperty);
String[] temp = path.split(File.separator.replace("\\", "\\\\"));
String name = temp[temp.length - 1];
@@ -664,29 +664,19 @@ public final class ResourceExplorerTopComponent extends
TopComponent {
if ("Mail".equals(templateType)) {
if ("txt".equals(format)) {
- mailTemplateManagerService.setFormat(key,
- MailTemplateFormat.TEXT,
- IOUtils.toInputStream(content, encodingPattern));
+ mailTemplateManagerService.setFormat(key,
MailTemplateFormat.TEXT, isContent);
} else {
- mailTemplateManagerService.setFormat(key,
- MailTemplateFormat.HTML,
- IOUtils.toInputStream(content, encodingPattern));
+ mailTemplateManagerService.setFormat(key,
MailTemplateFormat.HTML, isContent);
}
} else if ("html".equals(format)) {
- reportTemplateManagerService.setFormat(key,
- ReportTemplateFormat.HTML,
- IOUtils.toInputStream(content, encodingPattern));
+ reportTemplateManagerService.setFormat(key,
ReportTemplateFormat.HTML, isContent);
} else if ("fo".equals(format)) {
- reportTemplateManagerService.setFormat(key,
- ReportTemplateFormat.FO,
- IOUtils.toInputStream(content, encodingPattern));
+ reportTemplateManagerService.setFormat(key,
ReportTemplateFormat.FO, isContent);
} else if ("csv".equals(format)) {
- reportTemplateManagerService.setFormat(key,
- ReportTemplateFormat.CSV,
- IOUtils.toInputStream(content, encodingPattern));
+ reportTemplateManagerService.setFormat(key,
ReportTemplateFormat.CSV, isContent);
} else if ("Groovy".equals(fileName)) {
ImplementationTO node =
implementationManagerService.read(templateType, key);
- node.setBody(content);
+ node.setBody(textContent);
implementationManagerService.update(node);
}
} catch (BadLocationException e) {
diff --git a/pom.xml b/pom.xml
index 9b6d98a..aadddc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -404,7 +404,7 @@ under the License.
<connid.scimv11.version>1.0.1</connid.scimv11.version>
<connid.servicenow.version>1.0.0</connid.servicenow.version>
- <cxf.version>3.3.7</cxf.version>
+ <cxf.version>3.4.0</cxf.version>
<bouncycastle.version>1.66</bouncycastle.version>
<jackson.version>2.11.2</jackson.version>
@@ -562,25 +562,14 @@ under the License.
<dependencies>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.jakarta.validation-api</artifactId>
+ <version>2.0.2</version>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>2.0.1.Final</version>
- </dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
- <version>3.0.0</version>
- <scope>provided</scope>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ <version>2.2.3</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
@@ -588,22 +577,11 @@ under the License.
<version>1.8.4</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>4.0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
- <version>2.3.3</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>4.0.4</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.taglibs</groupId>
- <artifactId>taglibs-standard-impl</artifactId>
- <version>1.2.5</version>
- </dependency>
<!-- CXF -->
<dependency>
@@ -787,7 +765,7 @@ under the License.
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.1_spec</artifactId>
+ <artifactId>geronimo-jpa_2.2_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -911,6 +889,10 @@ under the License.
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.hibernate.validator</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -949,6 +931,10 @@ under the License.
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.hibernate.validator</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1278,7 +1264,7 @@ under the License.
<artifactId>xalan</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.servlet</groupId>
+ <groupId>jakarta.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
@@ -1354,6 +1340,10 @@ under the License.
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
