RegioneER · sinattieng · Aug 14, 2024 · Aug 13, 2024 · Aug 14, 2024 · Aug 14, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,19 @@
 
+## 6.14.1 (13-08-2024)
+
+### Bugfix: 1
+- [#33323](https://parermine.regione.emilia-romagna.it/issues/33323) Fix configurazione dipendenze Java 11
+
 ## 6.14.0 (07-06-2024)
 
 ### Novità: 1
 - [#29991](https://parermine.regione.emilia-romagna.it/issues/29991) Aggiornamento a Java 11
 
+## 5.14.0 (30-04-2024)
+
+### Novità: 1
+- [#29991](https://parermine.regione.emilia-romagna.it/issues/29991) Aggiornamento a Java 11
+
 ## 5.13.0 (20-12-2023)
 
 ### Novità: 1

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,4 +1,4 @@
-## 6.14.0 (07-06-2024)
+## 6.14.1 (13-08-2024)
 
-### Novità: 1
-- [#29991](https://parermine.regione.emilia-romagna.it/issues/29991) Aggiornamento a Java 11
+### Bugfix: 1
+- [#33323](https://parermine.regione.emilia-romagna.it/issues/33323) Fix configurazione dipendenze Java 11
diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spagofat</artifactId>
-    <version>6.14.1-SNAPSHOT</version>
+    <version>6.14.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Spagolite</name>
     <description>Framework utilizzato dalle applicazioni web, si tratta di uno strato software comune contenente anche le dipendenze di terze parti ed ereditato come bom.</description>
@@ -10,7 +10,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>parer-pom</artifactId>
-        <version>6.3.0</version>
+        <version>6.3.1</version>
     </parent>
 
     <scm>
@@ -302,22 +302,23 @@
                 <artifactId>httpclient</artifactId>
                 <version>${httpclient.version}</version>
             </dependency>
+
             <!--JDK 11 -->
+            <!-- JAXB -->
             <dependency>
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>
                 <version>${jaxb.version}</version>
+                <scope>compile</scope>
             </dependency>
+            <!-- JAX-WS -->
             <dependency>
                 <groupId>javax.xml.ws</groupId>
                 <artifactId>jaxws-api</artifactId>
                 <version>${jaxws-api.version}</version>
+                <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>com.sun.xml.ws</groupId>
-                <artifactId>jaxws-tools</artifactId>
-                <version>${jaxws-tools.version}</version>
-            </dependency>
+
             <!-- Servlet API -->
             <dependency>
                 <groupId>javax.servlet</groupId>

diff --git a/spagolite-core/pom.xml b/spagolite-core/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.14.1-SNAPSHOT</version>
+        <version>6.14.2-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>

diff --git a/spagolite-middle/pom.xml b/spagolite-middle/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.14.1-SNAPSHOT</version>
+        <version>6.14.2-SNAPSHOT</version>
     </parent>
     <build>
         <plugins>

diff --git a/spagolite-middle/src/main/java/it/eng/spagoLite/security/saml/SliteSAMLEntryPoint.java b/spagolite-middle/src/main/java/it/eng/spagoLite/security/saml/SliteSAMLEntryPoint.java
@@ -1,3 +1,20 @@
+/*
+ * Engineering Ingegneria Informatica S.p.A.
+ *
+ * Copyright (C) 2023 Regione Emilia-Romagna
+ * <p/>
+ * This program is free software: you can redistribute it and/or modify it under the terms of
+ * the GNU Affero General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ * <p/>
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ * <p/>
+ * You should have received a copy of the GNU Affero General Public License along with this program.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package it.eng.spagoLite.security.saml;
 
 import java.io.IOException;

diff --git a/spagolite-paginator-ejb/pom.xml b/spagolite-paginator-ejb/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.14.1-SNAPSHOT</version>
+        <version>6.14.2-SNAPSHOT</version>
     </parent>
 
      <dependencyManagement>

diff --git a/spagolite-paginator-gf/pom.xml b/spagolite-paginator-gf/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.14.1-SNAPSHOT</version>
+        <version>6.14.2-SNAPSHOT</version>
     </parent>
 
     <dependencyManagement>

diff --git a/spagolite-si-client/pom.xml b/spagolite-si-client/pom.xml
@@ -7,17 +7,39 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.14.1-SNAPSHOT</version>
+        <version>6.14.2-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- JDK 11 -->
+        <!-- JAXB -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <!-- JAX-WS -->
+        <dependency>
+            <groupId>javax.xml.ws</groupId>
+            <artifactId>jaxws-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-tools</artifactId>
+            <artifactId>jaxws-rt</artifactId>
+            <version>2.3.5</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 	<build>
@@ -30,16 +52,19 @@
                             <groupId>javax.xml.bind</groupId>
                             <artifactId>jaxb-api</artifactId>
                             <version>2.3.0</version>
+                            <scope>compile</scope>
                         </dependency>
                         <dependency>
                             <groupId>javax.activation</groupId>
                             <artifactId>activation</artifactId>
                             <version>1.1.1</version>
+                            <scope>compile</scope>
                         </dependency>
                         <dependency>
                             <groupId>javax.xml.ws</groupId>
                             <artifactId>jaxws-api</artifactId>
                             <version>2.3.1</version>
+                            <scope>compile</scope>
                         </dependency>
                         <dependency>
                             <groupId>com.sun.xml.ws</groupId>
@@ -51,6 +76,7 @@
                             <groupId>org.apache.logging.log4j</groupId>
                             <artifactId>log4j-slf4j-impl</artifactId>
                             <version>2.18.0</version>
+                            <scope>compile</scope>
                         </dependency>
                     </dependencies>
                     <executions>
@@ -84,7 +110,8 @@
                                 <wsdlOption>
                                     <wsdl>./src/main/resources/wsdl/ReplicaUtente.wsdl</wsdl>
                                     <wsdlLocation>classpath:wsdl/ReplicaUtente.wsdl</wsdlLocation>
-                                    <packagenames>
+                                    <serviceName>ReplicaUtente</serviceName>
+                                     <packagenames>
                                         <packagename>it.eng.integriam.client.ws.reputente</packagename>
                                     </packagenames>
                                 </wsdlOption>
@@ -110,6 +137,7 @@
                     </execution>
                 </executions>
             </plugin>
-        </plugins>
+
+            </plugins>
     </build>
 </project>
diff --git a/spagolite-si-client/src/main/resources/wsdl/ReplicaUtente.wsdl b/spagolite-si-client/src/main/resources/wsdl/ReplicaUtente.wsdl
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is Metro/2.2.0-1 (tags/2.2.0u1-7139; 2012-06-02T10:55:19+0000) JAXWS-RI/2.2.6-2 JAXWS/2.2 svn-revision#unknown. --><!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is Metro/2.2.0-1 (tags/2.2.0u1-7139; 2012-06-02T10:55:19+0000) JAXWS-RI/2.2.6-2 JAXWS/2.2 svn-revision#unknown. --><definitions xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsp1_2="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ws.server.integriam.eng.it/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://ws.server.integriam.eng.it/" name="ReplicaUtente">
+<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is Metro/2.2.0-1 (tags/2.2.0u1-7139; 2012-06-02T10:55:19+0000) JAXWS-RI/2.2.6-2 JAXWS/2.2 svn-revision#unknown. --><!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is Metro/2.2.0-1 (tags/2.2.0u1-7139; 2012-06-02T10:55:19+0000) JAXWS-RI/2.2.6-2 JAXWS/2.2 svn-revision#unknown. --><definitions xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsp1_2="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ws.saceriam.eng.it/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://ws.saceriam.eng.it/" name="ReplicaUtente">
 <types>
 <xsd:schema>
-<xsd:import namespace="http://ws.server.integriam.eng.it/" schemaLocation="../xsd/ReplicaUtente.xsd"/>
+<xsd:import namespace="http://ws.saceriam.eng.it/" schemaLocation="../xsd/ReplicaUtente.xsd"/>
 </xsd:schema>
 </types>
 <message name="modificaUtente">
@@ -24,16 +24,16 @@
 </message>
 <portType name="ReplicaUtente">
 <operation name="modificaUtente">
-<input wsam:Action="http://ws.server.integriam.eng.it/ReplicaUtente/modificaUtenteRequest" message="tns:modificaUtente"/>
-<output wsam:Action="http://ws.server.integriam.eng.it/ReplicaUtente/modificaUtenteResponse" message="tns:modificaUtenteResponse"/>
+<input wsam:Action="http://ws.saceriam.eng.it/ReplicaUtente/modificaUtenteRequest" message="tns:modificaUtente"/>
+<output wsam:Action="http://ws.saceriam.eng.it/ReplicaUtente/modificaUtenteResponse" message="tns:modificaUtenteResponse"/>
 </operation>
 <operation name="inserimentoUtente">
-<input wsam:Action="http://ws.server.integriam.eng.it/ReplicaUtente/inserimentoUtenteRequest" message="tns:inserimentoUtente"/>
-<output wsam:Action="http://ws.server.integriam.eng.it/ReplicaUtente/inserimentoUtenteResponse" message="tns:inserimentoUtenteResponse"/>
+<input wsam:Action="http://ws.saceriam.eng.it/ReplicaUtente/inserimentoUtenteRequest" message="tns:inserimentoUtente"/>
+<output wsam:Action="http://ws.saceriam.eng.it/ReplicaUtente/inserimentoUtenteResponse" message="tns:inserimentoUtenteResponse"/>
 </operation>
 <operation name="cancellaUtente">
-<input wsam:Action="http://ws.server.integriam.eng.it/ReplicaUtente/cancellaUtenteRequest" message="tns:cancellaUtente"/>
-<output wsam:Action="http://ws.server.integriam.eng.it/ReplicaUtente/cancellaUtenteResponse" message="tns:cancellaUtenteResponse"/>
+<input wsam:Action="http://ws.saceriam.eng.it/ReplicaUtente/cancellaUtenteRequest" message="tns:cancellaUtente"/>
+<output wsam:Action="http://ws.saceriam.eng.it/ReplicaUtente/cancellaUtenteResponse" message="tns:cancellaUtenteResponse"/>
 </operation>
 </portType>
 <binding name="ReplicaUtentePortBinding" type="tns:ReplicaUtente">

diff --git a/spagolite-si-client/src/main/resources/xsd/ReplicaUtente.xsd b/spagolite-si-client/src/main/resources/xsd/ReplicaUtente.xsd
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is Metro/2.2.0-1 (tags/2.2.0u1-7139; 2012-06-02T10:55:19+0000) JAXWS-RI/2.2.6-2 JAXWS/2.2 svn-revision#unknown. --><xs:schema xmlns:tns="http://ws.server.integriam.eng.it/" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://ws.server.integriam.eng.it/">
+<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is Metro/2.2.0-1 (tags/2.2.0u1-7139; 2012-06-02T10:55:19+0000) JAXWS-RI/2.2.6-2 JAXWS/2.2 svn-revision#unknown. --><xs:schema xmlns:tns="http://ws.saceriam.eng.it/" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://ws.saceriam.eng.it/">
 
 <xs:element name="cancellaUtente" type="tns:cancellaUtente"/>
 

diff --git a/spagolite-si-server/pom.xml b/spagolite-si-server/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.14.1-SNAPSHOT</version>
+        <version>6.14.2-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
     <dependencies>

diff --git a/spagolite-si-server/src/main/java/it/eng/integriam/server/ws/ReplicaUtente.java b/spagolite-si-server/src/main/java/it/eng/integriam/server/ws/ReplicaUtente.java
@@ -29,7 +29,7 @@
 import it.eng.integriam.server.ws.reputente.ReplicaUtenteInterface;
 import it.eng.integriam.server.ws.reputente.Utente;
 
-@WebService(serviceName = "ReplicaUtente")
+@WebService(serviceName = "ReplicaUtente", targetNamespace = "http://ws.saceriam.eng.it/")
 @HandlerChain(file = "/ws_handler.xml")
 public class ReplicaUtente {
 

diff --git a/spagolite-si-util/pom.xml b/spagolite-si-util/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.14.1-SNAPSHOT</version>
+        <version>6.14.2-SNAPSHOT</version>
     </parent>
     <build>
         <plugins>

diff --git a/spagolite-sl-ejb/pom.xml b/spagolite-sl-ejb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.14.1-SNAPSHOT</version>
+        <version>6.14.2-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/spagolite-sl-jpa/pom.xml b/spagolite-sl-jpa/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.14.1-SNAPSHOT</version>
+        <version>6.14.2-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>

diff --git a/spagolite-sl-slg/pom.xml b/spagolite-sl-slg/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.14.1-SNAPSHOT</version>
+        <version>6.14.2-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>

diff --git a/spagolite-sl-slg/src/main/java/it/eng/parer/sacerlog/slite/gen/util/ParerTool.java b/spagolite-sl-slg/src/main/java/it/eng/parer/sacerlog/slite/gen/util/ParerTool.java
@@ -45,9 +45,9 @@ public static void main(String[] args)
         }
         System.out.println("Percorso corrente : " + new File(".").getAbsolutePath());
         System.setProperty("file.encoding", "UTF-8");
-        // java.lang.reflect.Field charset = Charset.class.getDeclaredField("defaultCharset");
-        // charset.setAccessible(true);
-        // charset.set(null, null);
+        java.lang.reflect.Field charset = Charset.class.getDeclaredField("defaultCharset");
+        charset.setAccessible(true);
+        charset.set(null, null);
         String actionPath = basedir.replaceAll("\\\\", "/")
                 + "/../spagolite-sl-web/src/main/java/it/eng/parer/sacerlog/web/action";
         ParerTool myParerTool = new ParerTool(actionPath, null, GEN_PACKAGE, ACTION_PACKAGE, FORM_PACKAGE);

diff --git a/spagolite-sl-web/pom.xml b/spagolite-sl-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.14.1-SNAPSHOT</version>
+        <version>6.14.2-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>

diff --git a/spagolite-timer-wrapper-common/pom.xml b/spagolite-timer-wrapper-common/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.14.1-SNAPSHOT</version>
+        <version>6.14.2-SNAPSHOT</version>
     </parent>
     <artifactId>spagofat-timer-wrapper-common</artifactId>
     <name>Spagolite Timer wrapper - common</name>

diff --git a/spagolite-timer-wrapper-ejb/pom.xml b/spagolite-timer-wrapper-ejb/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.14.1-SNAPSHOT</version>
+        <version>6.14.2-SNAPSHOT</version>
     </parent>
     <artifactId>spagofat-timer-wrapper-ejb</artifactId>
     <name>Spagolite Timer wrapper - ejb</name>

diff --git a/spagolite-webresources/pom.xml b/spagolite-webresources/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.14.1-SNAPSHOT</version>
+        <version>6.14.2-SNAPSHOT</version>
     </parent>
     <build>
         <plugins>