diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
index bde4606..eede620 100644
--- a/.github/workflows/compile.yml
+++ b/.github/workflows/compile.yml
@@ -4,4 +4,4 @@ jobs:
compile:
uses: RegioneER/parer-github-template/.github/workflows/compile.yml@v1
with:
- java: '8'
+ java: '11'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5b0c6f9..1b47b45 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,4 +11,4 @@ jobs:
uses: RegioneER/parer-github-template/.github/workflows/release.yml@v1
with:
version: ${{ inputs.version }}
- java: '8'
+ java: '11'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce8d2bb..1e35f7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
-## 5.14.0 (30-04-2024)
+## 6.14.0 (07-06-2024)
### Novità : 1
-- [#31873](https://parermine.regione.emilia-romagna.it/issues/31873) Allineamento alla versione 4.14.0
+- [#29991](https://parermine.regione.emilia-romagna.it/issues/29991) Aggiornamento a Java 11
## 5.13.0 (20-12-2023)
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index ac8a0b2..a803e59 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,4 +1,4 @@
-## 5.14.0 (30-04-2024)
+## 6.14.0 (07-06-2024)
### Novità : 1
-- [#31873](https://parermine.regione.emilia-romagna.it/issues/31873) Allineamento alla versione 4.14.0
+- [#29991](https://parermine.regione.emilia-romagna.it/issues/29991) Aggiornamento a Java 11
diff --git a/pdfdocs/CHANGELOG.pdf b/pdfdocs/CHANGELOG.pdf
index 24f8e06..2626abf 100644
Binary files a/pdfdocs/CHANGELOG.pdf and b/pdfdocs/CHANGELOG.pdf differ
diff --git a/pdfdocs/RELEASE-NOTES.pdf b/pdfdocs/RELEASE-NOTES.pdf
index 3930b29..1ce69fa 100644
Binary files a/pdfdocs/RELEASE-NOTES.pdf and b/pdfdocs/RELEASE-NOTES.pdf differ
diff --git a/pom.xml b/pom.xml
index b30f86d..4f10deb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
4.0.0
spagofat
- 5.14.1-SNAPSHOT
+ 6.14.1-SNAPSHOT
pom
Spagolite
Framework utilizzato dalle applicazioni web, si tratta di uno strato software comune contenente anche le dipendenze di terze parti ed ereditato come bom.
@@ -10,7 +10,7 @@
it.eng.parer
parer-pom
- 5.2.1
+ 6.3.0
@@ -41,10 +41,10 @@
5.3.20.Final-redhat-00001
6.0.22.Final-redhat-00002
5.6.14.Final-redhat-00001
- 2.1.3.redhat-00001
+ 2.1.4
21.1.1
1.4.01
- 3.1.0
+ 5.1.1
3.6.4
1.13.2
@@ -302,7 +302,22 @@
httpclient
${httpclient.version}
-
+
+
+ javax.xml.bind
+ jaxb-api
+ ${jaxb.version}
+
+
+ javax.xml.ws
+ jaxws-api
+ ${jaxws-api.version}
+
+
+ com.sun.xml.ws
+ jaxws-tools
+ ${jaxws-tools.version}
+
javax.servlet
@@ -310,7 +325,7 @@
${javax.servlet-api.version}
-
+
org.jboss.spec
jboss-jakartaee-8.0
@@ -324,7 +339,7 @@
pom
import
-
+
org.apache.commons
commons-lang3
@@ -341,7 +356,7 @@
${commons-net.version}
-
+
org.hibernate
hibernate-core
@@ -366,8 +381,8 @@
${hibernate-jpamodelgen-version}
provided
-
-
+
+
org.codehaus.jettison
jettison
@@ -397,7 +412,7 @@
${poi.version}
- org.apache.xmlbeans
+ org.apache.xmlbeans
xmlbeans
${xmlbeans.version}
@@ -433,14 +448,14 @@
commons-text
${commons-text.version}
-
+
org.owasp.esapi
esapi
${owasp.version}
-
+
junit
junit
@@ -448,7 +463,7 @@
test
-
+
org.webjars
jquery
@@ -494,12 +509,12 @@
highlightjs-badgejs
${highlightjs-badgejs.version}
-
+
org.keycloak
keycloak-servlet-filter-adapter
${keycloak-filter.version}
-
+
diff --git a/spagolite-core/pom.xml b/spagolite-core/pom.xml
index 9037635..54fe147 100644
--- a/spagolite-core/pom.xml
+++ b/spagolite-core/pom.xml
@@ -8,7 +8,7 @@
it.eng.parer
spagofat
- 5.14.1-SNAPSHOT
+ 6.14.1-SNAPSHOT
@@ -48,6 +48,10 @@
org.keycloak
keycloak-servlet-filter-adapter
-
-
+
+
+ javax.xml.ws
+ jaxws-api
+
+
diff --git a/spagolite-middle/pom.xml b/spagolite-middle/pom.xml
index 50154b1..44ad5b2 100644
--- a/spagolite-middle/pom.xml
+++ b/spagolite-middle/pom.xml
@@ -8,24 +8,54 @@
it.eng.parer
spagofat
- 5.14.1-SNAPSHOT
+ 6.14.1-SNAPSHOT
- org.codehaus.mojo
- xmlbeans-maven-plugin
+ org.apache.maven.plugins
+ maven-antrun-plugin
+ createXmlBeansDir
+ generate-sources
+
+
+
+
+
- xmlbeans
+ run
+
+
+
+
+
+ org.apache.xmlbeans
+ xmlbeans
+ 5.1.1
+
+
+
+ compile
- true
- src/main/resources/xmlbeans-xsd
+
+ ${project.basedir}/src/main/resources/xmlbeans-xsd
+
+ ${project.build.directory}/generated-sources/xmlbeans
+ it.eng.parer.spagolite.metadata
+ middle
+
+
+ org.apache.logging.log4j
+ log4j-core
+ 2.18.0
+
+
@@ -116,7 +146,6 @@
org.slf4j
slf4j-simple
- ${slf4j.version}
test
diff --git a/spagolite-middle/src/main/java/it/eng/spagoLite/security/profile/ProfileElement.java b/spagolite-middle/src/main/java/it/eng/spagoLite/security/profile/ProfileElement.java
index cc32166..01e2498 100644
--- a/spagolite-middle/src/main/java/it/eng/spagoLite/security/profile/ProfileElement.java
+++ b/spagolite-middle/src/main/java/it/eng/spagoLite/security/profile/ProfileElement.java
@@ -28,6 +28,8 @@
*
* @author Enrico Grillini
*
+ * @param
+ *
*/
public class ProfileElement> extends FrameElement implements Iterable {
@@ -35,7 +37,7 @@ public class ProfileElement> extends FrameElement im
private String name;
private String description;
- private Map childs;
+ private final Map childs;
public ProfileElement(String name, String description) {
this.name = name;
@@ -60,6 +62,7 @@ public void setDescription(String description) {
this.description = description;
}
+ @Override
public Iterator iterator() {
return childs.values().iterator();
}
diff --git a/spagolite-middle/src/main/java/it/eng/spagoLite/tag/form/list/ListNavBackTag.java b/spagolite-middle/src/main/java/it/eng/spagoLite/tag/form/list/ListNavBackTag.java
index 1e00410..5e1f527 100644
--- a/spagolite-middle/src/main/java/it/eng/spagoLite/tag/form/list/ListNavBackTag.java
+++ b/spagolite-middle/src/main/java/it/eng/spagoLite/tag/form/list/ListNavBackTag.java
@@ -26,6 +26,7 @@
*
*
*/
+@Deprecated
public class ListNavBackTag extends AbstractListNavBarTag {
private static final long serialVersionUID = 1L;
diff --git a/spagolite-middle/src/main/java/it/eng/spagoLite/tag/form/wizard/AbstractWizardTag.java b/spagolite-middle/src/main/java/it/eng/spagoLite/tag/form/wizard/AbstractWizardTag.java
index 30013ad..bbc5ab8 100644
--- a/spagolite-middle/src/main/java/it/eng/spagoLite/tag/form/wizard/AbstractWizardTag.java
+++ b/spagolite-middle/src/main/java/it/eng/spagoLite/tag/form/wizard/AbstractWizardTag.java
@@ -123,6 +123,7 @@ protected void writeNext() throws JspException {
* @throws JspException
* eccezione generica
*/
+ @Deprecated
protected String getLink(String navigationEvent, String linkClass, String title, String step, String textInnerLink)
throws JspException {
String submitName = "operation" + Values.OPERATION_SEPARATOR + "wizardNavigationOnClick"
diff --git a/spagolite-middle/src/main/java/it/eng/util/SpagoLiteTool.java b/spagolite-middle/src/main/java/it/eng/util/SpagoLiteTool.java
index 6daaf48..ff12d62 100644
--- a/spagolite-middle/src/main/java/it/eng/util/SpagoLiteTool.java
+++ b/spagolite-middle/src/main/java/it/eng/util/SpagoLiteTool.java
@@ -26,6 +26,7 @@
import it.eng.util.actionWriter.ActionWriter;
import it.eng.util.constantWriter.ConstantWriter;
import it.eng.util.formWriter.FormWriter;
+import org.apache.xmlbeans.XmlException;
public class SpagoLiteTool {
@@ -170,9 +171,8 @@ public void run() {
constantWriter.write(writer);
writer.close();
- } catch (Exception e) {
+ } catch (IOException | XmlException e) {
e.printStackTrace();
- return;
}
}
@@ -180,7 +180,7 @@ public void run() {
public static String getGeneratedAnnotation(String className) {
StringBuilder writer = new StringBuilder();
writer.append(" @Generated(\n");
- writer.append(" value = \"" + className + "\",\n");
+ writer.append(" value = \"").append(className).append("\",\n");
writer.append(" comments = \"Questa classe e' stata generata dal SipsTool\"\n");
writer.append(" )\n");
return writer.toString();
diff --git a/spagolite-paginator-ejb/pom.xml b/spagolite-paginator-ejb/pom.xml
index f0e5470..4c481f8 100644
--- a/spagolite-paginator-ejb/pom.xml
+++ b/spagolite-paginator-ejb/pom.xml
@@ -6,7 +6,7 @@
it.eng.parer
spagofat
- 5.14.1-SNAPSHOT
+ 6.14.1-SNAPSHOT
diff --git a/spagolite-paginator-gf/pom.xml b/spagolite-paginator-gf/pom.xml
index 20c8aec..b67af19 100644
--- a/spagolite-paginator-gf/pom.xml
+++ b/spagolite-paginator-gf/pom.xml
@@ -5,7 +5,7 @@
it.eng.parer
spagofat
- 5.14.1-SNAPSHOT
+ 6.14.1-SNAPSHOT
diff --git a/spagolite-si-client/pom.xml b/spagolite-si-client/pom.xml
index 50b098f..c6a5e84 100644
--- a/spagolite-si-client/pom.xml
+++ b/spagolite-si-client/pom.xml
@@ -7,7 +7,7 @@
it.eng.parer
spagofat
- 5.14.1-SNAPSHOT
+ 6.14.1-SNAPSHOT
@@ -15,17 +15,49 @@
junit
test
+
+ com.sun.xml.ws
+ jaxws-tools
+
-
-
-
- org.apache.cxf
- cxf-codegen-plugin
-
-
- generate-cxf-sources
- generate-sources
-
+
+
+
+ org.apache.cxf
+ cxf-codegen-plugin
+
+
+ javax.xml.bind
+ jaxb-api
+ 2.3.0
+
+
+ javax.activation
+ activation
+ 1.1.1
+
+
+ javax.xml.ws
+ jaxws-api
+ 2.3.1
+
+
+ com.sun.xml.ws
+ jaxws-rt
+ 2.3.5
+ compile
+
+
+ org.apache.logging.log4j
+ log4j-slf4j-impl
+ 2.18.0
+
+
+
+
+ generate-cxf-sources
+ generate-sources
+
${project.build.directory}/generated-sources/ws
diff --git a/spagolite-si-server/pom.xml b/spagolite-si-server/pom.xml
index 67abd34..64410a0 100644
--- a/spagolite-si-server/pom.xml
+++ b/spagolite-si-server/pom.xml
@@ -6,7 +6,7 @@
it.eng.parer
spagofat
- 5.14.1-SNAPSHOT
+ 6.14.1-SNAPSHOT
war
diff --git a/spagolite-si-util/pom.xml b/spagolite-si-util/pom.xml
index 06235f4..a69cc63 100644
--- a/spagolite-si-util/pom.xml
+++ b/spagolite-si-util/pom.xml
@@ -14,7 +14,7 @@
it.eng.parer
spagofat
- 5.14.1-SNAPSHOT
+ 6.14.1-SNAPSHOT
@@ -49,6 +49,11 @@
org.dom4j
dom4j
+
+ javax.xml.ws
+ jaxws-api
+
+
org.junit.jupiter
junit-jupiter-api
diff --git a/spagolite-sl-ejb/pom.xml b/spagolite-sl-ejb/pom.xml
index 8411980..078e770 100644
--- a/spagolite-sl-ejb/pom.xml
+++ b/spagolite-sl-ejb/pom.xml
@@ -7,7 +7,7 @@
it.eng.parer
spagofat
- 5.14.1-SNAPSHOT
+ 6.14.1-SNAPSHOT
diff --git a/spagolite-sl-jpa/pom.xml b/spagolite-sl-jpa/pom.xml
index 8f79492..855fe58 100644
--- a/spagolite-sl-jpa/pom.xml
+++ b/spagolite-sl-jpa/pom.xml
@@ -7,7 +7,7 @@
it.eng.parer
spagofat
- 5.14.1-SNAPSHOT
+ 6.14.1-SNAPSHOT
diff --git a/spagolite-sl-slg/pom.xml b/spagolite-sl-slg/pom.xml
index 338f3e7..e2371bf 100644
--- a/spagolite-sl-slg/pom.xml
+++ b/spagolite-sl-slg/pom.xml
@@ -7,7 +7,7 @@
it.eng.parer
spagofat
- 5.14.1-SNAPSHOT
+ 6.14.1-SNAPSHOT
@@ -27,10 +27,15 @@
org.apache.commons
commons-collections4
-
- org.dom4j
- dom4j
-
+
+ org.dom4j
+ dom4j
+
+
+ org.apache.logging.log4j
+ log4j-core
+ 2.18.0
+
@@ -42,9 +47,6 @@
parer-tool-compilation
generate-sources
- 1.8
- 1.8
- 1.8
it/eng/parer/sacerlog/slite/gen/util/*.java
diff --git a/spagolite-sl-web/pom.xml b/spagolite-sl-web/pom.xml
index 3b01bbe..230ea98 100644
--- a/spagolite-sl-web/pom.xml
+++ b/spagolite-sl-web/pom.xml
@@ -7,7 +7,7 @@
it.eng.parer
spagofat
- 5.14.1-SNAPSHOT
+ 6.14.1-SNAPSHOT
@@ -32,24 +32,24 @@
spagofat-sl-slg
provided
-
- org.apache.commons
- commons-collections4
-
-
+
+ org.apache.commons
+ commons-collections4
+
+
org.apache.maven.plugins
maven-compiler-plugin
-
-
+
+
org.apache.maven.plugins
maven-war-plugin
false
-
diff --git a/spagolite-sl-web/src/main/java/it/eng/parer/sacerlog/web/action/GestioneLogEventiAction.java b/spagolite-sl-web/src/main/java/it/eng/parer/sacerlog/web/action/GestioneLogEventiAction.java
index f71cb1c..a3ec14f 100644
--- a/spagolite-sl-web/src/main/java/it/eng/parer/sacerlog/web/action/GestioneLogEventiAction.java
+++ b/spagolite-sl-web/src/main/java/it/eng/parer/sacerlog/web/action/GestioneLogEventiAction.java
@@ -53,18 +53,9 @@
import it.eng.spagoLite.db.base.table.BaseTable;
import it.eng.spagoLite.db.oracle.decode.DecodeMap;
import it.eng.spagoLite.form.list.List;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import java.util.Date;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-import javax.annotation.Resource;
-import javax.ejb.SessionContext;
-import jdk.nashorn.internal.objects.Global;
-import org.apache.commons.lang3.exception.ExceptionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
diff --git a/spagolite-timer-wrapper-common/pom.xml b/spagolite-timer-wrapper-common/pom.xml
index 2d90f26..a24c1d4 100644
--- a/spagolite-timer-wrapper-common/pom.xml
+++ b/spagolite-timer-wrapper-common/pom.xml
@@ -4,7 +4,7 @@
it.eng.parer
spagofat
- 5.14.1-SNAPSHOT
+ 6.14.1-SNAPSHOT
spagofat-timer-wrapper-common
Spagolite Timer wrapper - common
diff --git a/spagolite-timer-wrapper-ejb/pom.xml b/spagolite-timer-wrapper-ejb/pom.xml
index 2390311..c3e268a 100644
--- a/spagolite-timer-wrapper-ejb/pom.xml
+++ b/spagolite-timer-wrapper-ejb/pom.xml
@@ -4,7 +4,7 @@
it.eng.parer
spagofat
- 5.14.1-SNAPSHOT
+ 6.14.1-SNAPSHOT
spagofat-timer-wrapper-ejb
Spagolite Timer wrapper - ejb
diff --git a/spagolite-webresources/pom.xml b/spagolite-webresources/pom.xml
index d5d48f9..fa6f2d8 100644
--- a/spagolite-webresources/pom.xml
+++ b/spagolite-webresources/pom.xml
@@ -6,7 +6,7 @@
it.eng.parer
spagofat
- 5.14.1-SNAPSHOT
+ 6.14.1-SNAPSHOT