From b75952c283b8d54f47f4b68ed45bb8472acdff7d Mon Sep 17 00:00:00 2001
From: "YM-RD-AP01\\ymadmin" <johnes0714@hotmail.com>
Date: Tue, 9 Jul 2019 10:39:00 +0800
Subject: [PATCH] scott: Job [Deploy_DHP_Form_Prod] configuration updated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change performed by ·¨¼y°ó
---
 jobs/Deploy_DHP_Form_Prod/config.xml | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/jobs/Deploy_DHP_Form_Prod/config.xml b/jobs/Deploy_DHP_Form_Prod/config.xml
index 81a1c90c..48aca7a5 100644
--- a/jobs/Deploy_DHP_Form_Prod/config.xml
+++ b/jobs/Deploy_DHP_Form_Prod/config.xml
@@ -1,10 +1,10 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<maven2-moduleset plugin="maven-plugin@3.2">
+<maven2-moduleset plugin="maven-plugin@3.3">
   <actions/>
   <description>打包完會將 war 檔放到 3.16.159.120 :/home/ymadmin 下</description>
   <keepDependencies>false</keepDependencies>
   <properties>
-    <com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty plugin="gitlab-plugin@1.5.11">
+    <com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty plugin="gitlab-plugin@1.5.12">
       <gitLabConnection>ylhealth</gitLabConnection>
     </com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty>
     <hudson.model.ParametersDefinitionProperty>
@@ -15,7 +15,7 @@
 master
 release/1.15GA
 hotfix/1.15.1GA</description>
-          <defaultValue>feature/I18N</defaultValue>
+          <defaultValue>DHP/master</defaultValue>
           <trim>false</trim>
         </hudson.plugins.global__variable__string__parameter.GlobalVariableStringParameterDefinition>
         <hudson.plugins.global__variable__string__parameter.GlobalVariableStringParameterDefinition plugin="global-variable-string-parameter@1.2">
@@ -35,7 +35,7 @@ hotfix/1.15.1GA</description>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
   </properties>
-  <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.1">
+  <scm class="hudson.plugins.git.GitSCM" plugin="git@3.10.0">
     <configVersion>2</configVersion>
     <userRemoteConfigs>
       <hudson.plugins.git.UserRemoteConfig>
@@ -81,11 +81,16 @@ hotfix/1.15.1GA</description>
   <globalSettings class="jenkins.mvn.DefaultGlobalSettingsProvider"/>
   <reporters/>
   <publishers>
-    <jenkins.plugins.slack.SlackNotifier plugin="slack@2.12">
+    <jenkins.plugins.slack.SlackNotifier plugin="slack@2.27">
+      <baseUrl></baseUrl>
       <teamDomain></teamDomain>
+      <authToken></authToken>
       <tokenCredentialId></tokenCredentialId>
       <botUser>false</botUser>
       <room></room>
+      <sendAsText>false</sendAsText>
+      <iconEmoji></iconEmoji>
+      <username></username>
       <startNotification>false</startNotification>
       <notifySuccess>false</notifySuccess>
       <notifyAborted>true</notifyAborted>
@@ -93,12 +98,13 @@ hotfix/1.15.1GA</description>
       <notifyUnstable>true</notifyUnstable>
       <notifyRegression>false</notifyRegression>
       <notifyFailure>true</notifyFailure>
+      <notifyEveryFailure>false</notifyEveryFailure>
       <notifyBackToNormal>true</notifyBackToNormal>
       <notifyRepeatedFailure>false</notifyRepeatedFailure>
       <includeTestSummary>false</includeTestSummary>
       <includeFailedTests>false</includeFailedTests>
       <commitInfoChoice>NONE</commitInfoChoice>
-      <includeCustomMessage>true</includeCustomMessage>
+      <includeCustomMessage>false</includeCustomMessage>
       <customMessage></customMessage>
       <customMessageSuccess></customMessageSuccess>
       <customMessageAborted></customMessageAborted>
@@ -114,15 +120,16 @@ hotfix/1.15.1GA</description>
       <externalDelete></externalDelete>
       <disableDeferredWipeout>false</disableDeferredWipeout>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.6.0">
+    <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.6.2">
       <colorMapName>xterm</colorMapName>
     </hudson.plugins.ansicolor.AnsiColorBuildWrapper>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.10"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.9"/>
   </buildWrappers>
   <prebuilders>
     <hudson.tasks.Shell>
       <command>VAR=$(git rev-parse --short HEAD)_$(date +&quot;%Y%m%d_%H%M&quot;)
-version=${GIT_BRANCH##*/}
+# version=${GIT_BRANCH##*/}
+version=$(git describe --tags)
 sed -i &quot;&quot; &quot;s/&lt;title.*/&lt;title&gt;Form v${version}_${VAR}&lt;\/title\/&gt;/&quot; src/main/webapp/WEB-INF/jsp/home.jsp</command>
     </hudson.tasks.Shell>
   </prebuilders>
-- 
2.26.2