Predisposta documentazione per versione 3.1.1

link-it · Aug 6, 2019 · 15c2dca · 15c2dca
1 parent 73a0ad0
commit 15c2dca
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 9 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2019-08-06  Andrea Poli <[email protected]>
+
+	* Rilasciata versione 3.1.1
+
 2019-07-02  Andrea Poli <[email protected]>
 
 	* [GovWayMonitor, GovWayConsole]

diff --git a/ant/setup/antinstall-config.xml b/ant/setup/antinstall-config.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE installer PUBLIC "-//tp23 //DTD Ant Installer Config//EN" "http://antinstaller.sf.net/dtd/antinstall-config-0.8.dtd">
-<installer name="GovWay Installer v3.1.1.rc1" defaultImageResource="/logoSetup.png"
+<installer name="GovWay Installer v3.1.1" defaultImageResource="/logoSetup.png"
     ui="swing,text"
 	verbose="false"
     windowIcon="/iconaSetup.png" wide="550:275" loadDefaults="true">
 
     <!-- Se si caricano i loadDefaults non funzionano piu' i cambi di stato per il db -->
     <!-- loadDefaults="true" > -->
 
-    <page type="input" name="intro" displayText="Installer GovWay v3.1.1.rc1">
+    <page type="input" name="intro" displayText="Installer GovWay v3.1.1">
         <comment explanatoryText=""/>
         <comment explanatoryText="Il software GovWay e' distribuito con licenza GPL v3"/>
         <comment explanatoryText=""/>

diff --git a/distrib/distrib.sh b/distrib/distrib.sh
@@ -10,8 +10,8 @@ TRUNK_VERSION=3.1
 TAG_PDD_VERSION_PRODUCT="3"
 TAG_PDD_VERSION_MAJOR="1"
 TAG_PDD_MAJOR_VERSION="${TAG_PDD_VERSION_PRODUCT}.${TAG_PDD_VERSION_MAJOR}"
-TAG_PDD_MINOR_VERSION=0
-TAG_PDD_PATCHLEVEL=rc1
+TAG_PDD_MINOR_VERSION=1
+TAG_PDD_PATCHLEVEL=
 ramo=tags # tags / branches
 GIT_URL=https://github.com/link-it/govway.git
 SVN_SEDE="svn://svn.link.it/branches/products"

diff --git a/distrib/tag.README b/distrib/tag.README
@@ -9,7 +9,8 @@ Per creare una tag version:
 5. Inserire la versione major e minor corretta in ant/commons/sql-build.xml
 6. Inserire la corretta versione (con suffisso rc o beta se serve) nei files doc resources/doc/src/manuali/conf.py e resources/doc/src/releaseNotes/conf.py
 7. Eseguire i test di verifica JavaDoc, GPL e XSD.
-8. Creazione versione tag
+8. Sistemare file distrib/distrib.sh indicando la corretta versione compresa di suffissi 'rc' o 'beta'
+9. Creazione versione tag
 
 NOTA: prima di generare la versione, sistemare la documentazione e soprattutto il documento di ReleaseNotes
       Inoltre aggiungere la corretta versione. 
diff --git a/resources/doc/pdf/GovWay-ManualeInstallazione.pdf b/resources/doc/pdf/GovWay-ManualeInstallazione.pdf
diff --git a/resources/doc/pdf/GovWay-ManualeMonitoraggio.pdf b/resources/doc/pdf/GovWay-ManualeMonitoraggio.pdf
diff --git a/resources/doc/pdf/GovWay-ManualeUtente.pdf b/resources/doc/pdf/GovWay-ManualeUtente.pdf
diff --git a/resources/doc/pdf/GovWay-ReleaseNotes.pdf b/resources/doc/pdf/GovWay-ReleaseNotes.pdf
diff --git a/resources/doc/pdf/GovWay-ScenariApplicativi.pdf b/resources/doc/pdf/GovWay-ScenariApplicativi.pdf
diff --git a/resources/doc/src/manuali/conf.py b/resources/doc/src/manuali/conf.py
@@ -15,7 +15,7 @@
 # The short X.Y version
 version = '3.1.1'
 # The full version, including alpha/beta/rc tags
-release = '3.1.1.rc1'
+release = '3.1.1'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/resources/doc/src/manuali/installazione/installer/nuovaInstallazione.rst b/resources/doc/src/manuali/installazione/installer/nuovaInstallazione.rst
@@ -34,7 +34,7 @@ come si sviluppa il processo di installazione:
       PostgreSQL, MySQL, Oracle, HyperSQL, SQLServer, IBM DB2.
 
    -  *Application Server*: Application server utilizzato selezionato
-      tra: WildFly (10.x, 11.x, 12.x, 13.x o 14.x) e Apache Tomcat (9.x,
+      tra: WildFly (17.x, 16.x, 15.x, 14.x, 13.x, 12.x, 11.x, 10.x) e Apache Tomcat (9.x,
       8.x, 7.x).
 
 #. Al passo successivo si dovranno inserire tutti i dati per l'accesso

diff --git a/resources/doc/src/releaseNotes/conf.py b/resources/doc/src/releaseNotes/conf.py
@@ -26,7 +26,7 @@
 # The short X.Y version
 version = u'3.1.1'
 # The full version, including alpha/beta/rc tags
-release = u'3.1.1.rc1'
+release = u'3.1.1'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/tools/utils/src/org/openspcoop2/utils/Costanti.java b/tools/utils/src/org/openspcoop2/utils/Costanti.java
@@ -36,7 +36,7 @@ public class Costanti {
 	 public final static String OPENSPCOOP2_LOOKUP = "GOVWAY_LOOKUP";
 
     /** Versione beta, es: "b1" */
-    public static final String OPENSPCOOP2_BETA = ".1.rc1"; //".0.rc1";
+    public static final String OPENSPCOOP2_BETA = ".1"; //".0.rc1";
     /** Versione di OpenSPCoop */
     public static final String OPENSPCOOP2_VERSION = "3.1"+Costanti.OPENSPCOOP2_BETA;
     /** Versione di OpenSPCoop */