Release 6.14.0 (#8)

* [skip ci] Update project to latest tag spagofat-6.14.0 * Update pom.xml * Update pom.xml version/s * Update CI * [maven-release-plugin] prepare release spagofat-6.14.0 * [maven-release-plugin] prepare for next development iteration --------- Co-authored-by: parerworker <[email protected]> Co-authored-by: GitHub Actions <[email protected]>
RegioneER · Aug 14, 2024 · 84b2f6c · 84b2f6c
1 parent e862753
commit 84b2f6c
Show file tree

Hide file tree

Showing 26 changed files with 165 additions and 82 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/pdfdocs/RELEASE-NOTES.pdf b/pdfdocs/RELEASE-NOTES.pdf
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>5.14.1-SNAPSHOT</version>
+    <version>6.14.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>5.2.1</version>
+        <version>6.3.0</version>
     </parent>
 
     <scm>
@@ -41,10 +41,10 @@
         <hibernate-core-version>5.3.20.Final-redhat-00001</hibernate-core-version>
         <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.3.redhat-00001</dom4j.version>
+        <dom4j.version>2.1.4</dom4j.version>
         <keycloak-filter.version>21.1.1</keycloak-filter.version>
         <xml-apis.version>1.4.01</xml-apis.version>
-        <xmlbeans.version>3.1.0</xmlbeans.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>
@@ -302,15 +302,30 @@
                 <artifactId>httpclient</artifactId>
                 <version>${httpclient.version}</version>
             </dependency>
-
+            <!--JDK 11 -->
+            <dependency>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>${jaxb.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.xml.ws</groupId>
+                <artifactId>jaxws-api</artifactId>
+                <version>${jaxws-api.version}</version>
+            </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>
                 <artifactId>javax.servlet-api</artifactId>
                 <version>${javax.servlet-api.version}</version>
             </dependency>
 
-            <!-- JBoss -->
+			<!-- JBoss -->
             <dependency>
                 <groupId>org.jboss.spec</groupId>
                 <artifactId>jboss-jakartaee-8.0</artifactId>
@@ -324,7 +339,7 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <!-- Apache commons -->
+			<!-- Apache commons -->
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
@@ -341,7 +356,7 @@
                 <version>${commons-net.version}</version>
             </dependency>
 
-            <!-- Hibernate -->
+			<!-- Hibernate -->
 			<dependency>
 				<groupId>org.hibernate</groupId>
 				<artifactId>hibernate-core</artifactId>
@@ -366,8 +381,8 @@
 				<version>${hibernate-jpamodelgen-version}</version>
                 <scope>provided</scope>
 			</dependency>
-			
-            <!-- Altro -->
+
+			<!-- Altro -->
             <dependency>
                 <groupId>org.codehaus.jettison</groupId>
                 <artifactId>jettison</artifactId>
@@ -397,7 +412,7 @@
                 <version>${poi.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.xmlbeans</groupId>
+                 <groupId>org.apache.xmlbeans</groupId>
                 <artifactId>xmlbeans</artifactId>
                 <version>${xmlbeans.version}</version>
                 <exclusions>
@@ -433,22 +448,22 @@
                 <artifactId>commons-text</artifactId>
                 <version>${commons-text.version}</version>
             </dependency>
-            <!-- OWASP -->
+			<!-- OWASP -->
             <dependency>
                 <groupId>org.owasp.esapi</groupId>
                 <artifactId>esapi</artifactId>
                 <version>${owasp.version}</version>
             </dependency>
 
-            <!-- Junit -->
+			<!-- Junit -->
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
 
-            <!-- WEBJARS -->
+			<!-- WEBJARS -->
             <dependency>
                 <groupId>org.webjars</groupId>
                 <artifactId>jquery</artifactId>
@@ -494,12 +509,12 @@
                 <artifactId>highlightjs-badgejs</artifactId>
                 <version>${highlightjs-badgejs.version}</version>
             </dependency>
-            <!-- UTILS -->
+			<!-- UTILS -->
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-servlet-filter-adapter</artifactId>
                 <version>${keycloak-filter.version}</version>
-            </dependency>            
+            </dependency>          
         </dependencies>
     </dependencyManagement>
     <dependencies />

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>5.14.1-SNAPSHOT</version>
+        <version>6.14.1-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>
@@ -48,6 +48,10 @@
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-servlet-filter-adapter</artifactId>
-        </dependency>
-    </dependencies>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.ws</groupId>
+			<artifactId>jaxws-api</artifactId>
+		</dependency>
+	</dependencies>
 </project>
diff --git a/spagolite-middle/pom.xml b/spagolite-middle/pom.xml
@@ -8,24 +8,54 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>5.14.1-SNAPSHOT</version>
+        <version>6.14.1-SNAPSHOT</version>
     </parent>
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>xmlbeans-maven-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
+                        <id>createXmlBeansDir</id>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <target>
+                                <mkdir dir="${project.build.directory}/generated-sources/xmlbeans" />
+                            </target>
+                        </configuration>
                         <goals>
-                            <goal>xmlbeans</goal>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.xmlbeans</groupId>
+                <artifactId>xmlbeans</artifactId>
+                <version>5.1.1</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>compile</goal>
                         </goals>
                     </execution>
                 </executions>
-                <inherited>true</inherited>
                 <configuration>
-                    <schemaDirectory>src/main/resources/xmlbeans-xsd</schemaDirectory>
+                    <!-- Directory contenente i file XSD -->
+                    <sourceDir>${project.basedir}/src/main/resources/xmlbeans-xsd</sourceDir>
+                    <!-- Directory di destinazione per le classi generate -->
+                    <javaTargetDir>${project.build.directory}/generated-sources/xmlbeans</javaTargetDir>
+                    <repackage>it.eng.parer.spagolite.metadata</repackage>
+                    <name>middle</name>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.logging.log4j</groupId>
+                        <artifactId>log4j-core</artifactId>
+                        <version>2.18.0</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
@@ -116,7 +146,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

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
@@ -28,14 +28,16 @@
  * 
  * @author Enrico Grillini
  * 
+ * @param <T>
+ * 
  */
 public class ProfileElement<T extends ProfileElement<?>> extends FrameElement implements Iterable<T> {
 
     private static final long serialVersionUID = 1L;
     private String name;
     private String description;
 
-    private Map<String, T> childs;
+    private final Map<String, T> 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<T> 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
@@ -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
@@ -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
@@ -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,17 +171,16 @@ public void run() {
             constantWriter.write(writer);
             writer.close();
 
-        } catch (Exception e) {
+        } catch (IOException | XmlException e) {
             e.printStackTrace();
-            return;
         }
 
     }
 
     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
@@ -6,7 +6,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>5.14.1-SNAPSHOT</version>
+        <version>6.14.1-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>5.14.1-SNAPSHOT</version>
+        <version>6.14.1-SNAPSHOT</version>
     </parent>
 
     <dependencyManagement>
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ @@
      *
      *
      */
+    @Deprecated
     public class ListNavBackTag extends AbstractListNavBarTag {
         private static final long serialVersionUID = 1L;
@@ Expand Down @@