Update project to latest tag verso-jboss-3.1.0

RegioneER · Dec 10, 2024 · 0f31556 · 0f31556
1 parent d14a672
commit 0f31556
Show file tree

Hide file tree

Showing 186 changed files with 3,590 additions and 3,580 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,10 @@
 
+## 3.1.0 (10-12-2024)
+
+### Novità: 2
+- [#33952](https://parermine.regione.emilia-romagna.it/issues/33952) Aggiornamento librerie obsolete 2024
+- [#33129](https://parermine.regione.emilia-romagna.it/issues/33129) Aggiornamento alle ultimi versioni librerie jakarata-ee8 per jboss 7.4
+
 ## 3.0.0 (19-08-2024)
 
 ### Novità: 1

diff --git a/README.md b/README.md
@@ -88,6 +88,13 @@ Requisiti minimi per installazione:
 |com.manydesigns|elements|4.1.beta6|
 |com.narupley|not-going-to-be-commons-ssl|0.3.20|
 |com.sun.activation|jakarta.activation|1.2.2.redhat-00001|
+|com.sun.mail|jakarta.mail|1.6.7.redhat-00001|
+|com.sun.xml.bind|jaxb-impl|2.3.5|
+|com.sun.xml.fastinfoset|FastInfoset|1.2.18|
+|com.sun.xml.messaging.saaj|saaj-impl|1.5.3|
+|com.sun.xml.stream.buffer|streambuffer|1.5.10|
+|com.sun.xml.ws|jaxws-rt|2.3.5|
+|com.sun.xml.ws|policy|2.7.10|
 |com.zaxxer|SparseBitSet|1.2|
 |commons-codec|commons-codec|1.15|
 |commons-collections|commons-collections|3.2.2|
@@ -99,15 +106,25 @@ Requisiti minimi per installazione:
 |commons-lang|commons-lang|2.5|
 |commons-logging|commons-logging|1.2|
 |commons-net|commons-net|3.9.0|
-|it.eng.parer|spagofat-core|5.12.0|
-|it.eng.parer|spagofat-middle|5.12.0|
-|it.eng.parer|spagofat-si-client|5.12.0|
-|it.eng.parer|spagofat-si-util|5.12.0|
-|it.eng.parer|spagofat-webresources|5.12.0|
+|it.eng.parer|spagofat-core|6.14.1|
+|it.eng.parer|spagofat-middle|6.14.1|
+|it.eng.parer|spagofat-si-client|6.14.1|
+|it.eng.parer|spagofat-si-util|6.14.1|
+|it.eng.parer|spagofat-webresources|6.14.1|
+|jakarta.annotation|jakarta.annotation-api|1.3.5|
+|jakarta.jws|jakarta.jws-api|2.1.0|
+|jakarta.xml.bind|jakarta.xml.bind-api|2.3.3|
+|jakarta.xml.soap|jakarta.xml.soap-api|1.4.2|
+|jakarta.xml.ws|jakarta.xml.ws-api|2.3.3|
 |javassist|javassist|3.8.0.GA|
+|javax.activation|activation|1.1.1|
+|javax.annotation|javax.annotation-api|1.3.2|
 |javax.servlet.jsp.jstl|jstl-api|1.2|
 |javax.servlet.jsp|jsp-api|2.1|
 |javax.servlet|servlet-api|2.5|
+|javax.xml.bind|jaxb-api|2.3.0|
+|javax.xml.soap|javax.xml.soap-api|1.4.0|
+|javax.xml.ws|jaxws-api|2.3.1|
 |jaxen|jaxen|1.2.0|
 |joda-time|joda-time|2.12.5|
 |junit|junit|4.13.2|
@@ -121,20 +138,26 @@ Requisiti minimi per installazione:
 |org.apache.httpcomponents|httpclient|4.5.14|
 |org.apache.httpcomponents|httpcore|4.4.14.redhat-00001|
 |org.apache.httpcomponents|httpmime|4.5.14|
-|org.apache.poi|poi|4.1.2|
+|org.apache.logging.log4j|log4j-api|2.18.0|
+|org.apache.poi|poi|5.2.3|
 |org.apache.santuario|xmlsec|2.2.3.redhat-00001|
 |org.apache.velocity|velocity-engine-core|2.0|
-|org.apache.xmlbeans|xmlbeans|3.1.0|
+|org.apache.xmlbeans|xmlbeans|5.1.1|
 |org.bouncycastle|bcpkix-jdk15on|1.70|
 |org.bouncycastle|bcprov-jdk15on|1.70|
 |org.bouncycastle|bcutil-jdk15on|1.70|
 |org.codehaus.jettison|jettison|1.5.4|
 |org.codehaus.woodstox|stax2-api|4.2.1.redhat-00001|
+|org.glassfish.external|management-api|3.2.3|
+|org.glassfish.gmbal|gmbal-api-only|4.0.3|
+|org.glassfish.ha|ha-api|3.1.13|
 |org.hamcrest|hamcrest-core|1.3|
 |org.javassist|javassist|3.27.0.GA-redhat-00001|
 |org.jboss.logging|jboss-logging|3.4.1.Final-redhat-00001|
 |org.jdom|jdom2|2.0.6.1|
 |org.json|json|20090211|
+|org.jvnet.mimepull|mimepull|1.9.15|
+|org.jvnet.staxex|stax-ex|1.8.3|
 |org.keycloak|keycloak-adapter-core|21.1.1|
 |org.keycloak|keycloak-adapter-spi|21.1.1|
 |org.keycloak|keycloak-authz-client|21.1.1|

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,4 +1,5 @@
-## 3.0.0 (19-08-2024)
+## 3.1.0 (10-12-2024)
 
-### Novità: 1
-- [#30803](https://parermine.regione.emilia-romagna.it/issues/30803) Aggiornamento a Java 11
+### Novità: 2
+- [#33952](https://parermine.regione.emilia-romagna.it/issues/33952) Aggiornamento librerie obsolete 2024
+- [#33129](https://parermine.regione.emilia-romagna.it/issues/33129) Aggiornamento alle ultimi versioni librerie jakarata-ee8 per jboss 7.4
diff --git a/pom.xml b/pom.xml
@@ -2,16 +2,15 @@
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>verso-jboss</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.1.0</version>
     <packaging>war</packaging>
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>parer-pom</artifactId>
-        <version>6.3.1</version>
+        <version>6.5.0</version>
     </parent>
     <name>verso</name>
     <description>Progetto VERSO</description>
-    <url>https://nexus.ente.regione.emr.it/repository/parer-site/verso/${project.version}/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -21,7 +20,7 @@
         <!-- Skiptests by default : esecuzione su CI -->
         <skipTests>true</skipTests>
         <!-- spagofat bom -->
-        <spagofat.version>6.14.1</spagofat.version>
+        <spagofat.version>6.16.0</spagofat.version>
         <!-- third party lib -->
         <xml-resolver.version>1.2.0.redhat-10</xml-resolver.version>
         <cglib-nodep.version>3.3.0</cglib-nodep.version>
@@ -31,19 +30,21 @@
         <jdom2.version>2.0.6.1</jdom2.version>
         <jstl-api.version>1.2</jstl-api.version>
         <jaxen.version>1.2.0</jaxen.version>
+        <jaxws-rt.version>2.3.5</jaxws-rt.version>
+        <json.verion>20240303</json.verion>          
         <!-- resource filter -->
         <web.session-config.cookie-config.http-only>true</web.session-config.cookie-config.http-only>
 		<web.session-config.cookie-config.secure>true</web.session-config.cookie-config.secure>
     </properties>
 
-    <distributionManagement>
+<distributionManagement>
         <repository>
           <id>github</id>
           <url>https://maven.pkg.github.com/RegioneER/parer-verso</url>
         </repository>      
     </distributionManagement>
 
-    <repositories>
+<repositories>
         <repository>
             <id>github</id>
             <url>https://maven.pkg.github.com/RegioneER/parer-framework-parerpom</url>           
@@ -65,21 +66,52 @@
                 <artifactId>taglibs-standard-impl</artifactId>
                 <version>${taglibs-standard-jstlel.version}</version>
             </dependency>
-			<dependency>
-				<groupId>xml-resolver</groupId>
-				<artifactId>xml-resolver</artifactId>
-				<version>${xml-resolver.version}</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-	            <groupId>commons-logging</groupId>
-	            <artifactId>commons-logging</artifactId>
-	            <version>${commons-logging.version}</version>
-	        </dependency>      
+            <dependency>
+                <groupId>xml-resolver</groupId>
+                <artifactId>xml-resolver</artifactId>
+                <version>${xml-resolver.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>${commons-logging.version}</version>
+            </dependency>                  
+            <dependency>
+                <groupId>xml-apis</groupId>
+                <artifactId>xml-apis</artifactId>
+                <version>${xml-apis.version}</version>
+                <scope>provided</scope>               
+            </dependency>
+            <dependency>
+                <groupId>org.json</groupId>
+                <artifactId>json</artifactId>
+                <version>${json.verion}</version>
+            </dependency>       	              
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
+          <!-- BOM per JBoss EAP 7.4 (jboss-eap-jakartaee8) dependencies -->
+            <!-- jboss-ejb-api_3.2_spec -->
+            <!-- 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-jaxb-api_2.3_spec -->
+            <dependency>
+                <groupId>org.jboss.spec.javax.xml.bind</groupId>
+                <artifactId>jboss-jaxb-api_2.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>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
@@ -142,6 +174,10 @@
                     <groupId>commons-beanutils</groupId>
                     <artifactId>commons-beanutils</artifactId>
                 </exclusion>
+                <exclusion>
+                	<groupId>xml-apis</groupId>
+                	<artifactId>xml-apis</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>		
         <dependency>
@@ -214,6 +250,12 @@
             <groupId>com.manydesigns</groupId>
             <artifactId>elements</artifactId>
             <version>4.1.beta6</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-collections</groupId>
+                    <artifactId>commons-collections</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 		<!-- non presente su maven central, probabilmente nella versione stabile 4.1 -->
 		<!-- sarà tutto confluito nella libreria principale manydesigns TOGLIERLA DOOPO L'AGGIORNAMENTO! -->
@@ -239,11 +281,6 @@
             <artifactId>httpmime</artifactId>
             <version>${httpmime.version}</version>
         </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>${commons-collections.version}</version>
-        </dependency>
         <dependency>
             <groupId>javax.servlet.jsp.jstl</groupId>
             <artifactId>jstl-api</artifactId>
@@ -255,33 +292,35 @@
             <artifactId>jaxen</artifactId>
             <version>${jaxen.version}</version>
         </dependency>
-		<!-- Xalan & co -->
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>${xerces.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-            <version>${xalan.version}</version>
-        </dependency>
+		<!-- Xerces & co -->
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>${xerces.version}</version>
+			<scope>runtime</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>xml-apis</groupId>
+					<artifactId>xml-apis</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>xalan</groupId>
+			<artifactId>xalan</artifactId>
+			<version>${xalan.version}</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>xalan</groupId>
+			<artifactId>serializer</artifactId>
+			<version>${xalan.version}</version>
+			<scope>runtime</scope>
+		</dependency>
         <dependency>
             <groupId>org.reactivestreams</groupId>
             <artifactId>reactive-streams</artifactId>
-        </dependency>
-
-         <!--JDK 11 -->
-            <dependency>
-                <groupId>javax.xml.bind</groupId>
-                <artifactId>jaxb-api</artifactId>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>javax.xml.ws</groupId>
-                <artifactId>jaxws-api</artifactId>
-                <scope>provided</scope>
-            </dependency>           
+        </dependency>    
     </dependencies>
 
     <build>
@@ -310,6 +349,14 @@
 						</overlays>
                     </configuration>
                 </plugin>
+                <!-- OWASP -->
+                <plugin>
+                    <groupId>org.owasp</groupId>
+                    <artifactId>dependency-check-maven</artifactId>
+                    <configuration>
+                        <suppressionFile>src/site/owasp/suppress.xml</suppressionFile>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -349,7 +396,7 @@
 		</profile>
      </profiles>
 
-    <scm>
+<scm>
         <developerConnection>scm:git:https://github.com/RegioneER/parer-verso.git</developerConnection>
         <tag>HEAD</tag>
     </scm>

diff --git a/src/main/java/it/eng/elements/fields/LabelField.java b/src/main/java/it/eng/elements/fields/LabelField.java
@@ -96,27 +96,33 @@ public LabelField(PropertyAccessor accessor, Mode mode, String prefix) {
     // **************************************************************************
     // Implementazione/override di AbstractLabelField
     // **************************************************************************
+    @Override
     public void readFromRequest(HttpServletRequest req) {
-
+        // not used
     }
 
+    @Override
     public void readFromObject(Object obj) {
-
+        // not used
     }
 
     public void writeToObject(Object obj) {
+        // not used
     }
 
+    @Override
     protected void valueToXhtmlEdit(XhtmlBuffer xb) {
         valueToXhtmlView(xb);
 
     }
 
+    @Override
     protected void valueToXhtmlPreview(XhtmlBuffer xb) {
         valueToXhtmlView(xb);
 
     }
 
+    @Override
     protected void valueToXhtmlView(XhtmlBuffer xb) {
         xb.openElement("div");
         String cssClass = "value";
@@ -145,6 +151,7 @@ protected void valueToXhtmlView(XhtmlBuffer xb) {
         xb.closeElement("div");
     }
 
+    @Override
     public String getDisplayValue() {
         String escapedText;
         if (richText) {
@@ -162,12 +169,12 @@ public String getValue() {
     // **************************************************************************
     // Other methods
     // **************************************************************************
-
+    @Deprecated(forRemoval = true)
     private int numRowTextArea(String stringValue, int cols) {
         if (stringValue == null)
             return textAreaMinRows;
 
-        String dim[] = stringValue.split("\n");
+        String[] dim = stringValue.split("\n");
         int rows = 0;
         for (String aDim : dim) {
             if (aDim.length() >= cols)

diff --git a/src/main/java/it/eng/exceptions/VersoException.java b/src/main/java/it/eng/exceptions/VersoException.java
@@ -26,7 +26,7 @@
 public class VersoException extends Exception {
 
     /**
-     * 
+     *
      */
     private static final long serialVersionUID = -9173356878746119329L;
     private final VersoErrorCategory category;
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ @@
     public class VersoException extends Exception {
         /**
-         *
+         *
          */
         private static final long serialVersionUID = -9173356878746119329L;
         private final VersoErrorCategory category;
@@ Expand Down @@