From a14b63b0f0dc1597c1829f116eb4a0750cd27e63 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 20 Nov 2019 16:03:27 +0100
Subject: [PATCH] Attesto vers sviluppo MTC su NUOVA MAJOR release...

---
 IOB-WIN/Resources/ChangeLog.html | 7 +++++++
 Jenkinsfile                      | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/IOB-WIN/Resources/ChangeLog.html b/IOB-WIN/Resources/ChangeLog.html
index 194016ed..471121c3 100644
--- a/IOB-WIN/Resources/ChangeLog.html
+++ b/IOB-WIN/Resources/ChangeLog.html
@@ -6,6 +6,13 @@
   <br />
   Note di rilascio:
   <ul>
+    <li>
+      <b>v.2.4.* &rarr; v.2.5.*</b>
+      <ul>
+        <li>Aggiunto adapter MTConnect</li>
+        <li>Ottimizzazione gestione SIEMENS</li>
+      </ul>
+    </li>
     <li>
       <b>v.2.3.* &rarr; v.2.4.*</b>
       <ul>
diff --git a/Jenkinsfile b/Jenkinsfile
index 0df565a8..bfc330ef 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,9 +16,9 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=533']) {
-          // env.versionNumber = VersionNumber(versionNumberString : '2.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
-          env.versionNumber = VersionNumber(versionNumberString : '2.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
+        withEnv(['NEXT_BUILD_NUMBER=534']) {
+          // env.versionNumber = VersionNumber(versionNumberString : '2.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
+          env.versionNumber = VersionNumber(versionNumberString : '2.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'
         }
       }