Release 6.15.0 (#10)

* [skip ci] Update project to latest tag spagofat-6.15.0 * Update pom.xml * Update SNAPSHOT version * [maven-release-plugin] prepare release spagofat-6.15.0 * [maven-release-plugin] prepare for next development iteration --------- Co-authored-by: parerworker <[email protected]> Co-authored-by: GitHub Actions <[email protected]>
RegioneER · Sep 10, 2024 · 9f28bfe · 9f28bfe
1 parent 5d581ca
commit 9f28bfe
Show file tree

Hide file tree

Showing 97 changed files with 967 additions and 1,109 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
 
+## 6.15.0 (19-08-2024)
+
+### Novità: 1
+- [#33050](https://parermine.regione.emilia-romagna.it/issues/33050) Aggiornamento librerie obsolete 2024
+
 ## 6.14.1 (13-08-2024)
 
 ### Bugfix: 1
@@ -12,7 +17,7 @@
 ## 5.14.0 (30-04-2024)
 
 ### Novità: 1
-- [#29991](https://parermine.regione.emilia-romagna.it/issues/29991) Aggiornamento a Java 11
+- [#31873](https://parermine.regione.emilia-romagna.it/issues/31873) Allineamento alla versione 4.14.0
 
 ## 5.13.0 (20-12-2023)
 

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,4 +1,4 @@
-## 6.14.1 (13-08-2024)
+## 6.15.0 (19-08-2024)
 
-### Bugfix: 1
-- [#33323](https://parermine.regione.emilia-romagna.it/issues/33323) Fix configurazione dipendenze Java 11
+### Novità: 1
+- [#33050](https://parermine.regione.emilia-romagna.it/issues/33050) Aggiornamento librerie obsolete 2024
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.2-SNAPSHOT</version>
+    <version>6.15.1-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.1</version>
+        <version>6.4.0</version>
     </parent>
 
     <scm>
@@ -42,20 +42,24 @@
         <hibernate-validator-version>6.0.22.Final-redhat-00002</hibernate-validator-version>	
         <hibernate-jpamodelgen-version>5.6.14.Final-redhat-00001</hibernate-jpamodelgen-version>
         <dom4j.version>2.1.4</dom4j.version>
-        <keycloak-filter.version>21.1.1</keycloak-filter.version>
+        <keycloak-filter.version>24.0.5</keycloak-filter.version>
         <xml-apis.version>1.4.01</xml-apis.version>
         <xmlbeans.version>5.1.1</xmlbeans.version>
         <!-- webjars (framework spago) -->
-        <jquery.version>3.6.4</jquery.version>
-        <jquery-ui.version>1.13.2</jquery-ui.version>
+        <jquery.version>3.7.1</jquery.version>
+        <jquery-ui.version>1.13.3</jquery-ui.version>
         <jstree.version>3.3.8</jstree.version>
         <chosen.version>1.8.7</chosen.version>
         <select2.version>4.0.13</select2.version>
         <font-awesome.version>6.4.0</font-awesome.version>
         <highlightjs.version>11.5.0</highlightjs.version>
-        <highlightjs-line-numbers.js.version>2.7.0</highlightjs-line-numbers.js.version>
+        <highlightjs-line-numbers.js.version>2.8.0</highlightjs-line-numbers.js.version>
         <!-- MIT project forked from original: https://github.com/sinattieng/highlightjs-badgejs -->
         <highlightjs-badgejs.version>0.0.5</highlightjs-badgejs.version>
+        <commons-beanutils.version>1.9.4</commons-beanutils.version>
+        <velocity-engine-core.version>2.3</velocity-engine-core.version>
+        <javax.activation.version>1.2.0</javax.activation.version>
+        <junit-jupiter.version>5.10.3</junit-jupiter.version>      
     </properties>
 
     <dependencyManagement>
@@ -262,6 +266,11 @@
                 </exclusions>
             </dependency>
             <!-- Altro -->
+			<dependency>
+			    <groupId>org.apache.velocity</groupId>
+			    <artifactId>velocity-engine-core</artifactId>
+			    <version>${velocity-engine-core.version}</version>
+			</dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
@@ -287,11 +296,6 @@
                 <artifactId>commons-logging</artifactId>
                 <version>${commons-logging.version}</version>
             </dependency>
-            <dependency>
-                <groupId>commons-beanutils</groupId>
-                <artifactId>commons-beanutils</artifactId>
-                <version>${commons-beanutils.version}</version>
-            </dependency>
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
@@ -301,25 +305,35 @@
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
                 <version>${httpclient.version}</version>
-            </dependency>
-
-            <!--JDK 11 -->
-            <!-- JAXB -->
+            </dependency>            
+            <!-- XML -->
+			<dependency>
+				<groupId>org.apache.santuario</groupId>
+				<artifactId>xmlsec</artifactId>
+				<version>${xmlsec.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 -->
+			<!-- JAX-WS -->
             <dependency>
                 <groupId>javax.xml.ws</groupId>
                 <artifactId>jaxws-api</artifactId>
                 <version>${jaxws-api.version}</version>
-                <scope>compile</scope>
             </dependency>
-
-            <!-- Servlet API -->
+			<!-- Activation -->
+			<dependency>
+				<groupId>com.sun.activation</groupId>
+				<artifactId>javax.activation</artifactId>
+				<version>${javax.activation.version}</version>
+			</dependency>
+
+			<!-- Servlet API -->
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>javax.servlet-api</artifactId>
@@ -356,7 +370,11 @@
                 <artifactId>commons-net</artifactId>
                 <version>${commons-net.version}</version>
             </dependency>
-
+			<dependency>
+				<groupId>commons-beanutils</groupId>
+				<artifactId>commons-beanutils</artifactId>
+				<version>${commons-beanutils.version}</version>
+			</dependency>
 			<!-- Hibernate -->
 			<dependency>
 				<groupId>org.hibernate</groupId>
@@ -423,10 +441,12 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+			<!-- javax.xml provided by JDK 11 -->
             <dependency>
                 <groupId>xml-apis</groupId>
                 <artifactId>xml-apis</artifactId>
                 <version>${xml-apis.version}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>joda-time</groupId>
@@ -495,11 +515,11 @@
                 <artifactId>highlightjs</artifactId>
                 <version>${highlightjs.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.webjars.bowergithub.wcoder</groupId>
-                <artifactId>highlightjs-line-numbers.js</artifactId>
+			<dependency>
+				<groupId>org.webjars.npm</groupId>
+				<artifactId>highlightjs-line-numbers.js</artifactId>
                 <version>${highlightjs-line-numbers.js.version}</version>
-            </dependency>
+			</dependency>
             <dependency>
                 <groupId>org.webjars</groupId>
                 <artifactId>font-awesome</artifactId>
@@ -520,6 +540,18 @@
     </dependencyManagement>
     <dependencies />
     <build>
+        <pluginManagement>
+            <plugins>
+                <!-- OWASP -->
+                <plugin>
+                    <groupId>org.owasp</groupId>
+                    <artifactId>dependency-check-maven</artifactId>
+                    <configuration>
+                        <suppressionFile>src/site/owasp/suppress.xml</suppressionFile>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</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.2-SNAPSHOT</version>
+        <version>6.15.1-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>

diff --git a/spagolite-core/src/main/java/it/eng/spagoCore/base/Constants.java b/spagolite-core/src/main/java/it/eng/spagoCore/base/Constants.java
@@ -23,8 +23,8 @@
 
 /*
 * DATE            CONTRIBUTOR/DEVELOPER    NOTE
-* 13-12-2004		  Butano	   Cambiato il valore della costante Spago		   
-* 										    
+* 13-12-2004		  Butano	   Cambiato il valore della costante Spago
+*
 **/
 public class Constants {
     public static final String NOME_MODULO = "Spago";

diff --git a/spagolite-core/src/main/java/it/eng/spagoCore/configuration/ConfigServlet.java b/spagolite-core/src/main/java/it/eng/spagoCore/configuration/ConfigServlet.java
@@ -144,7 +144,7 @@ public void init(ServletConfig config) throws ServletException {
      *            contesto dell'applicazione senza "/" per esempio <em>saceriam</em>
      * @param configName
      *            nome della proprietà  supportata dallla Servlet
-     * 
+     *
      * @return valore della configurazione.
      */
     private String getValue(ServletConfig config, String applicationPrefix, String configName, String defaultValue) {
@@ -186,14 +186,14 @@ private String getValue(ServletConfig config, String applicationPrefix, String c
     /**
      * Carica, internamente all'applicazione in fase di deploy, la risorsa esterna. Per l'applicazione la risorsa sarà,
      * a tutti gli effetti, interna.
-     * 
+     *
      * @param externalResource
      *            percorso della risorsa esterna all'applicazione.
      * @param destinationPath
      *            percorso <em>relativo</em> della risorsa all'interno dell'applicazione
      * @param defaultRelativePath
      *            percorso della risorsa predefinita
-     * 
+     *
      * @return percorso relativo dalle risorsa
      */
     private String getRelativePathFromExternalResource(String externalResource, String destinationPath,
@@ -217,13 +217,13 @@ private String getRelativePathFromExternalResource(String externalResource, Stri
      * <ul>
      * <li>file://</li></li> http(s)://</li>
      * </ul>
-     * 
+     *
      * Esempio di chiamata:
      * <ul>
      * <li>loadResource("file:///opt/jboss/logo1_snap.png", "/img/logo1.png")</li>
      * <li>loadResource("https:///my.beautiful.css/overlay.css", "/css/overlay.css")</li>
      * </ul>
-     * 
+     *
      * @param resourceURL
      *            URL della risorsa da caricare
      * @param destination

diff --git a/spagolite-core/src/main/java/it/eng/spagoCore/util/JavaScript.java b/spagolite-core/src/main/java/it/eng/spagoCore/util/JavaScript.java
@@ -38,7 +38,7 @@ private JavaScript() {
      *
      * @param input
      *            stringa da manipolare.
-     * 
+     *
      * @return Stringa manipolata
      */
     public static String escape(String input) {
@@ -58,7 +58,7 @@ public static String escape(String input) {
      *
      * @param input
      *            the string to manage.
-     * 
+     *
      * @return stringa manipolata
      */
     public static String unescape(String input) {
@@ -79,7 +79,7 @@ public static String unescape(String input) {
      *
      * @param input
      *            stringa da manipolare.
-     * 
+     *
      * @return testo manipolato
      */
     public static String escapeText(String input) {
@@ -97,7 +97,7 @@ public static String escapeText(String input) {
      *            parte di stringa da sostituire.
      * @param replaced
      *            stringa nuova.
-     * 
+     *
      * @return stringa modificata
      */
     public static String replace(String toParse, String replacing, String replaced) {

diff --git a/spagolite-core/src/main/java/it/eng/spagoCore/util/Oauth2Srvlt.java b/spagolite-core/src/main/java/it/eng/spagoCore/util/Oauth2Srvlt.java
@@ -56,9 +56,9 @@ public boolean isOauth2Request(HttpServletRequest request) {
 
     /**
      * Get keycloak session from request
-     * 
+     *
      * @param req
-     * 
+     *
      * @return
      */
     private KeycloakSecurityContext getKeycloakSession(HttpServletRequest req) {

diff --git a/spagolite-core/src/main/java/it/eng/spagoCore/util/UriEcondingFilter.java b/spagolite-core/src/main/java/it/eng/spagoCore/util/UriEcondingFilter.java
@@ -178,9 +178,9 @@ private boolean checkParam(String name) {
          *
          * @param value
          *            valore atteso
-         * 
+         *
          * @return array di string verificate
-         * 
+         *
          * @throws JsonParseException
          * @throws IOException
          */

diff --git a/spagolite-core/src/main/java/it/eng/spagoIFace/session/SessionCoreManager.java b/spagolite-core/src/main/java/it/eng/spagoIFace/session/SessionCoreManager.java
@@ -35,7 +35,7 @@ public abstract class SessionCoreManager {
      *
      * @param httpSession
      *            sessione http
-     * 
+     *
      * @return resituisce l'action corrente
      */
     public static String getCurrentActionUrl(HttpSession httpSession) {
@@ -67,7 +67,7 @@ public static String getLastPublisher(HttpSession httpSession) {
      *            nome operazione
      * @param additionalInfo
      *            informazioni aggiuntive
-     * 
+     *
      * @return restituisce l'URL con query parameters
      */
     public static String getOperationUrl(HttpSession httpSession, String operation, String additionalInfo) {

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.2-SNAPSHOT</version>
+        <version>6.15.1-SNAPSHOT</version>
     </parent>
     <build>
         <plugins>
@@ -89,6 +89,14 @@
                     <groupId>commons-collections</groupId>
                     <artifactId>commons-collections</artifactId>
                 </exclusion>
+                <exclusion>
+                	<groupId>xml-apis</groupId>
+                	<artifactId>xml-apis</artifactId>
+                </exclusion>
+            	<exclusion>
+            		<groupId>org.springframework</groupId>
+            		<artifactId>spring-expression</artifactId>
+            	</exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -120,6 +128,12 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
+			<exclusions>
+            	<exclusion>
+            		<groupId>org.springframework</groupId>
+            		<artifactId>spring-expression</artifactId>
+            	</exclusion>
+            </exclusions>            
         </dependency>
         <dependency>
 			<groupId>org.apache.commons</groupId>

diff --git a/spagolite-middle/src/main/java/it/eng/spagoLite/actions/RedirectAction.java b/spagolite-middle/src/main/java/it/eng/spagoLite/actions/RedirectAction.java
@@ -25,11 +25,11 @@
 import it.eng.spagoLite.security.IUser;
 
 /**
- * 
+ *
  * Action standard per governare il redirect a livello applicativo
- * 
+ *
  * @author Enrico Grillini
- * 
+ *
  */
 public class RedirectAction extends BaseController {