Merge remote-tracking branch 'origin/master' into 163253_spagofat-6.14.1

Conflicts: CHANGELOG.md RELEASE-NOTES.md pom.xml spagolite-core/pom.xml spagolite-middle/pom.xml spagolite-paginator-ejb/pom.xml spagolite-paginator-gf/pom.xml spagolite-si-client/pom.xml spagolite-si-server/pom.xml spagolite-si-util/pom.xml spagolite-sl-ejb/pom.xml spagolite-sl-jpa/pom.xml spagolite-sl-slg/pom.xml spagolite-sl-web/pom.xml spagolite-timer-wrapper-common/pom.xml spagolite-timer-wrapper-ejb/pom.xml spagolite-webresources/pom.xml
RegioneER · Aug 14, 2024 · 660189f · 660189f
2 parents 6bb5372 + 84b2f6c
commit 660189f
Show file tree

Hide file tree

Showing 22 changed files with 38 additions and 577 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,19 +1,9 @@
 
-## 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
-- [#31873](https://parermine.regione.emilia-romagna.it/issues/31873) Allineamento alla versione 4.14.0
-
 ## 5.13.0 (20-12-2023)
 
 ### Novità: 1

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,4 +1,4 @@
-## 6.14.1 (13-08-2024)
+## 6.14.0 (07-06-2024)
 
-### Bugfix: 1
-- [#33323](https://parermine.regione.emilia-romagna.it/issues/33323) Fix configurazione dipendenze Java 11
+### Novità: 1
+- [#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,18 +1,11 @@
 <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</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>
-    <url>https://nexus.ente.regione.emr.it/repository/parer-site/spago/${project.version}/</url>
 
-    <distributionManagement>
-        <site>
-            <id>site</id>
-            <url>dav:https://nexus.ente.regione.emr.it/repository/parer-site/spago/${project.version}</url>
-        </site>
-    </distributionManagement>
 
     <parent>
         <groupId>it.eng.parer</groupId>
@@ -21,9 +14,24 @@
     </parent>
 
     <scm>
-        <developerConnection>scm:git:git@gitlab.ente.regione.emr.it:parer/framework-spagolite.git</developerConnection>
-        <tag>spagofat-6.14.1</tag>
+        <developerConnection>scm:git:https://github.com/RegioneER/parer-framework-spagolite.git</developerConnection>
+        <tag>HEAD</tag>
     </scm>
+
+    <distributionManagement>
+        <repository>
+               <id>github</id>
+               <url>https://maven.pkg.github.com/RegioneER/parer-framework-spagolite</url>
+           </repository>      
+    </distributionManagement>
+
+    <repositories>
+        <repository>
+            <id>github</id>
+            <url>https://maven.pkg.github.com/RegioneER/parer-framework-parerpom</url>            
+       </repository>     
+	</repositories>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- Javadoc skipped by default (temporaneo) -->
@@ -294,7 +302,7 @@
                 <artifactId>httpclient</artifactId>
                 <version>${httpclient.version}</version>
             </dependency>
-            
+
             <!--JDK 11 -->
             <!-- JAXB -->
             <dependency>