RegioneER · ScardigliA · Dec 13, 2024 · Dec 13, 2024 · Dec 13, 2024 · Dec 13, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,14 @@
 
+## 6.3.0 (09-12-2024)
+
+### Bugfix: 1
+- [#34056](https://parermine.regione.emilia-romagna.it/issues/34056) Visualizzazione corretta dei decimali nel Dettaglio di un servizio erogato
+
+### Novità: 3
+- [#34738](https://parermine.regione.emilia-romagna.it/issues/34738) Aggiornamento CSV per rilascio microservizi censiti in SIAM
+- [#33125](https://parermine.regione.emilia-romagna.it/issues/33125) Aggiornamento alle ultimi versioni librerie jakarata-ee8 per jboss 7.4
+- [#32826](https://parermine.regione.emilia-romagna.it/issues/32826) Modifiche alla conservazione dei log dei job
+
 ## 6.2.0 (19-09-2024)
 
 ### Bugfix: 1

diff --git a/README.md b/README.md
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,10 +1,9 @@
-## 6.2.0 (19-09-2024)
+## 6.3.0 (09-12-2024)
 
 ### Bugfix: 1
-- [#34035](https://parermine.regione.emilia-romagna.it/issues/34035) Errore critico di funzionalità utilizzando "Estrai righe fatture da ricerca"
+- [#34056](https://parermine.regione.emilia-romagna.it/issues/34056) Visualizzazione corretta dei decimali nel Dettaglio di un servizio erogato
 
-### Novità: 4
-- [#32999](https://parermine.regione.emilia-romagna.it/issues/32999) Enti/Gestione accordi: introduzione campo di ricerca "Stato accordo"
-- [#32651](https://parermine.regione.emilia-romagna.it/issues/32651) Associazione tra parametri e versione dell'applicazione
-- [#31350](https://parermine.regione.emilia-romagna.it/issues/31350) Modifiche alla pagina Lista degli accessi per la gestione dell'ora di accesso
-- [#31276](https://parermine.regione.emilia-romagna.it/issues/31276) Richiesta modifica di disciplinare tecnico
+### Novità: 3
+- [#34738](https://parermine.regione.emilia-romagna.it/issues/34738) Aggiornamento CSV per rilascio microservizi censiti in SIAM
+- [#33125](https://parermine.regione.emilia-romagna.it/issues/33125) Aggiornamento alle ultimi versioni librerie jakarata-ee8 per jboss 7.4
+- [#32826](https://parermine.regione.emilia-romagna.it/issues/32826) Modifiche alla conservazione dei log dei job
diff --git a/SacerIam-ear/pom.xml b/SacerIam-ear/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>saceriam-jboss</artifactId>
         <groupId>it.eng.parer</groupId>
-        <version>6.2.1-SNAPSHOT</version>
+        <version>6.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>saceriam-jboss-ear</artifactId>
@@ -103,7 +103,13 @@
         </dependency>
         <dependency>
             <groupId>it.eng.parer</groupId>
-            <artifactId>spagofat-middle</artifactId> 
+            <artifactId>spagofat-middle</artifactId>
+            <exclusions>
+            	<exclusion>
+            		<groupId>org.apache.logging.log4j</groupId>
+            		<artifactId>log4j-api</artifactId>
+            	</exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.security.extensions</groupId>
@@ -129,6 +135,10 @@
                     <groupId>xml-apis</groupId>
                     <artifactId>xml-apis</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>commons-collections</groupId>
+                    <artifactId>commons-collections</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -173,6 +183,10 @@
                     <groupId>xml-apis</groupId>
                     <artifactId>xml-apis</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>commons-collections</groupId>
+                    <artifactId>commons-collections</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

diff --git a/SacerIam-ejb/pom.xml b/SacerIam-ejb/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>saceriam-jboss</artifactId>
         <groupId>it.eng.parer</groupId>
-        <version>6.2.1-SNAPSHOT</version>
+        <version>6.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>saceriam-jboss-ejb</artifactId>
@@ -33,11 +33,30 @@
             <groupId>net.sourceforge.javacsv</groupId>
             <artifactId>javacsv</artifactId>            
         </dependency>
-		<!-- JBOSS -->
+        <!-- BOM per JBoss EAP 7.4 (jboss-eap-jakartaee8) dependencies -->
+        <!-- jboss-ejb-api_3.2_spec -->
         <dependency>
-            <groupId>org.jboss.spec</groupId>
-            <artifactId>jboss-jakartaee-8.0</artifactId>
-            <type>pom</type>
+            <groupId>org.jboss.spec.javax.ejb</groupId>
+            <artifactId>jboss-ejb-api_3.2_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- jboss-annotations-api_1.3_spec -->
+        <dependency>
+            <groupId>org.jboss.spec.javax.annotation</groupId>
+            <artifactId>jboss-annotations-api_1.3_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- jboss-jaxws-api_2.3_spec -->
+        <dependency>
+            <groupId>org.jboss.spec.javax.xml.ws</groupId>
+            <artifactId>jboss-jaxws-api_2.3_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- jboss-interceptors-api_1.2_spec -->
+        <dependency>
+            <groupId>org.jboss.spec.javax.interceptor</groupId>
+            <artifactId>jboss-interceptors-api_1.2_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>        
             <groupId>it.eng.parer</groupId>
@@ -50,7 +69,13 @@
         </dependency>
         <dependency>        
             <groupId>it.eng.parer</groupId>
-            <artifactId>spagofat-middle</artifactId>            
+            <artifactId>spagofat-middle</artifactId>
+            <exclusions>
+            	<exclusion>
+            		<groupId>org.apache.logging.log4j</groupId>
+            		<artifactId>log4j-api</artifactId>
+            	</exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>it.eng.parer</groupId>

diff --git a/SacerIam-ejb/src/main/java/it/eng/saceriam/ws/rest/ejb/ControlliRestWS.java b/SacerIam-ejb/src/main/java/it/eng/saceriam/ws/rest/ejb/ControlliRestWS.java
@@ -72,7 +72,7 @@ public RispostaControlli checkCredenzialiEAuth(String loginName, String password
 
         try {
             WSLoginHandler.loginAndCheckAuthzIAM(loginName, password, descrizione.getNomeWs(), indirizzoIP,
-                    entityManager);
+                    entityManager, false);
             // se l'autenticazione riesce, non va in eccezione.
             // passo quindi a leggere i dati dell'utente dal db
             UsrUser iamUser;

diff --git a/SacerIam-ejb/src/main/java/it/eng/saceriam/ws/rest/ejb/RecuperoHelpEjb.java b/SacerIam-ejb/src/main/java/it/eng/saceriam/ws/rest/ejb/RecuperoHelpEjb.java
@@ -148,8 +148,9 @@ public void cancellaHelp(BigDecimal idHelp) {
         recuperoHelpHelper.cancellaHelp(idHelp);
     }
 
-    public boolean loginAndAuth(String utente, String password, String servizioWeb) throws AuthWSException {
-        return WSLoginHandler.loginAndCheckAuthzIAM(utente, password, servizioWeb, null, em);
+    public boolean loginAndAuth(String utente, String password, String servizioWeb, boolean isOAuth2)
+            throws AuthWSException {
+        return WSLoginHandler.loginAndCheckAuthzIAM(utente, password, servizioWeb, null, em, isOAuth2);
     }
 
     public boolean appExists(String nomeApplicazione) throws AuthWSException {

diff --git a/SacerIam-ejb/src/main/java/it/eng/saceriam/ws/rest/helper/RecuperoHelpHelper.java b/SacerIam-ejb/src/main/java/it/eng/saceriam/ws/rest/helper/RecuperoHelpHelper.java
@@ -137,8 +137,9 @@ public List<AplVVisHelpOnLine> getHelpBetweenDate(BigDecimal idApplic, String ti
         return l;
     }
 
-    public boolean loginAndAuth(String utente, String password, String servizioWeb) throws AuthWSException {
-        return WSLoginHandler.loginAndCheckAuthzIAM(utente, password, servizioWeb, null, em);
+    public boolean loginAndAuth(String utente, String password, String servizioWeb, boolean isOAuth2)
+            throws AuthWSException {
+        return WSLoginHandler.loginAndCheckAuthzIAM(utente, password, servizioWeb, null, em, isOAuth2);
     }
 
     public boolean appExists(String nomeApplicazione) throws AuthWSException {

diff --git a/SacerIam-jpa/pom.xml b/SacerIam-jpa/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>saceriam-jboss</artifactId>
-        <version>6.2.1-SNAPSHOT</version>
+        <version>6.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>saceriam-jboss-jpa</artifactId>
@@ -40,13 +40,6 @@
             <version>${jboss-vfs.version}</version>
             <scope>provided</scope>
         </dependency>
-        <!-- Annotazioni entity -->
-        <dependency>
-            <groupId>org.jboss.spec</groupId>
-            <artifactId>jboss-jakartaee-8.0</artifactId>
-            <type>pom</type>
-            <scope>provided</scope>
-        </dependency> 
         <dependency>
             <groupId>it.eng.parer</groupId>
             <artifactId>spagofat-timer-wrapper-common</artifactId>

diff --git a/SacerIam-slg/pom.xml b/SacerIam-slg/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>saceriam-jboss</artifactId>
-        <version>6.2.1-SNAPSHOT</version>
+        <version>6.3.1-SNAPSHOT</version>
     </parent>
     <artifactId>saceriam-jboss-slg</artifactId>
     <name>SacerIam-slg</name>
@@ -56,6 +56,13 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
+                <dependencies>
+					<dependency>
+						<groupId>org.apache.logging.log4j</groupId>
+						<artifactId>log4j-api</artifactId>
+						<version>2.23.1</version>
+					</dependency>					
+				</dependencies>
                 <executions>
                     <execution>
                         <id>generate-slite-sources</id>
@@ -77,10 +84,11 @@
         </plugins>
     </build>
     <dependencies>
-		<dependency>
-            <groupId>org.jboss.spec</groupId>
-            <artifactId>jboss-jakartaee-8.0</artifactId>
-            <type>pom</type>
+        <!-- BOM per JBoss EAP 7.4 (jboss-eap-jakartaee8) dependencies -->
+        <!-- jboss-annotations-api_1.3_spec -->
+        <dependency>
+            <groupId>org.jboss.spec.javax.annotation</groupId>
+            <artifactId>jboss-annotations-api_1.3_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -97,9 +105,9 @@
             <artifactId>spagofat-sl-jpa</artifactId>
         </dependency>
         <dependency>
-			<groupId>org.dom4j</groupId>
-			<artifactId>dom4j</artifactId>
-		</dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/SacerIam-slg/src/main/resources/forms/AmministrazioneEntiConvenzionati.xml b/SacerIam-slg/src/main/resources/forms/AmministrazioneEntiConvenzionati.xml
@@ -957,9 +957,9 @@
         <Input Name="ni_unita_doc_vers" Description="Numero unità documentarie versate" Type="INTEGER" />
         <Input Name="ni_byte_vers" Description="Storage occupato (in bytes)" Type="INTEGER" />
         <Input Name="ni_abitanti" Description="Numero di abitanti" Type="INTEGER" />        
-        <Input Name="im_netto" Description="Importo netto" Type="INTEGER" />        
+        <Input Name="im_netto" Description="Importo netto" Type="DECIMAL" Format="#.######" GroupingDecimal="true" />        
         <Input Name="cd_iva" Description="Codice IVA" Type="STRING" />
-        <Input Name="im_iva" Description="Importo IVA" Type="INTEGER" />        
+        <Input Name="im_iva" Description="Importo IVA" Type="DECIMAL" Format="#.######" GroupingDecimal="true" />        
     </List>
 
     <!-- Lista dei disciplinari tecnici -->

diff --git a/SacerIam-web/pom.xml b/SacerIam-web/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>saceriam-jboss</artifactId>
         <groupId>it.eng.parer</groupId>
-        <version>6.2.1-SNAPSHOT</version>
+        <version>6.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>saceriam-jboss-web</artifactId>
@@ -21,12 +21,32 @@
     </properties>
 
     <dependencies>
-		<dependency>
-			<groupId>org.jboss.spec</groupId>
-			<artifactId>jboss-jakartaee-8.0</artifactId>
-			<type>pom</type>
-		</dependency>
-
+       <!-- BOM per JBoss EAP 7.4 (jboss-eap-jakartaee8) dependencies -->
+        <!-- jboss-ejb-api_3.2_spec -->
+        <dependency>
+            <groupId>org.jboss.spec.javax.ejb</groupId>
+            <artifactId>jboss-ejb-api_3.2_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- jboss-servlet-api_4.0_spec -->
+        <dependency>
+            <groupId>org.jboss.spec.javax.servlet</groupId>
+            <artifactId>jboss-servlet-api_4.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- jboss-jaxws-api_2.3_spec -->
+        <dependency>
+            <groupId>org.jboss.spec.javax.xml.ws</groupId>
+            <artifactId>jboss-jaxws-api_2.3_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- org.dom4j/dom4j -->
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>it.eng.parer</groupId>
             <artifactId>spagofat-core</artifactId>
@@ -36,6 +56,12 @@
             <groupId>it.eng.parer</groupId>
             <artifactId>spagofat-middle</artifactId>
             <scope>provided</scope>
+            <exclusions>
+            	<exclusion>
+            		<groupId>org.apache.logging.log4j</groupId>
+            		<artifactId>log4j-api</artifactId>
+            	</exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>it.eng.parer</groupId>

diff --git a/SacerIam-web/src/main/java/it/eng/saceriam/web/rest/controller/RecuperoHelpController.java b/SacerIam-web/src/main/java/it/eng/saceriam/web/rest/controller/RecuperoHelpController.java
@@ -68,7 +68,7 @@ public ResponseEntity<RecuperoHelpRisposta> getHelpInJSON(@RequestParam String n
 
             if (recuperoHelpEjb.appExists(nmApplic)) {
                 try {
-                    recuperoHelpEjb.loginAndAuth(nmUserId, cdPwd, "RecuperoHelp");
+                    recuperoHelpEjb.loginAndAuth(nmUserId, cdPwd, "RecuperoHelp", false);
                     AplVVisHelpOnLine help = recuperoHelpEjb.recuperoHelp(nmApplic, tiHelpOnLine, nmPaginaWeb,
                             nmEntryMenu);
                     if (help == null) {

diff --git a/pom.xml b/pom.xml
@@ -2,21 +2,21 @@
 <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>saceriam-jboss</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.3.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>SacerIam</name>
     <description>Progetto SACERIAM</description>
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>parer-pom</artifactId>
-        <version>6.4.0</version>
+        <version>6.5.0</version>
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- Skiptests by default : esecuzione su CI 
         <skipTests>true</skipTests>-->
         <!-- spagofat bom -->
-        <spagofat.version>6.15.0</spagofat.version>
+        <spagofat.version>6.16.0</spagofat.version>
         <idp-jaas-rdbms.version>0.0.9</idp-jaas-rdbms.version>
         <!-- third party libraries -->
         <naming-java.version>0.8</naming-java.version>
@@ -111,7 +111,7 @@
                 <artifactId>javacsv</artifactId>
                 <version>${javacsv.version}</version>
             </dependency>
-			<!-- Xalan & co -->
+            <!-- Xalan & co -->
             <dependency>
                 <groupId>xalan</groupId>
                 <artifactId>xalan</artifactId>
@@ -134,20 +134,7 @@
                 <artifactId>xml-resolver</artifactId>
                 <version>${xml-resolver.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.jboss.bom</groupId>
-                <artifactId>jboss-eap-jakartaee8-with-tools</artifactId>
-                <version>${jboss-eap-jakartaee8-with-tools.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.spec</groupId>
-                <artifactId>jboss-jakartaee-8.0</artifactId>
-                <type>pom</type>
-                <version>${jboss-jakartaee-8.0.version}</version>
-            </dependency>
-			<!-- Questo è il modulo di login dell'IDP, usato come libreria per le funzioni di logging -->
+            <!-- Questo è il modulo di login dell'IDP, usato come libreria per le funzioni di logging -->
             <dependency>
                 <groupId>it.eng.parer</groupId>
                 <artifactId>idp-jaas-rdbms</artifactId>