From beab8e4e0313e8f90a1687784f9b0d96ccf93e57 Mon Sep 17 00:00:00 2001 From: fabio Date: Mon, 13 Mar 2023 11:56:42 +0000 Subject: [PATCH 01/16] =?UTF-8?q?corre=C3=A7ao=20do=20build=20fixes=20bug#?= =?UTF-8?q?AL-2072?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bbfccca3f..31dc30941 100644 --- a/README.md +++ b/README.md @@ -58,5 +58,5 @@ ou usar o + + + + + + + From 157634d5b7660f8fac50f9e6a87c9598f9736b2a Mon Sep 17 00:00:00 2001 From: "valdir.cordeiro" Date: Mon, 13 Mar 2023 17:27:49 -0300 Subject: [PATCH 03/16] bug#al-2213 Ouro e Prata - Espec_-_Bloquear-Desbloquear_desconto_via_API dev: qua: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gerando nova versão --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a69eda421..abce0c301 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.0.70 + 1.0.71 war From 8fc0506b57289d7586fb5ea5bf6f980181968bc0 Mon Sep 17 00:00:00 2001 From: "lucas.taia" Date: Tue, 14 Mar 2023 20:16:23 -0300 Subject: [PATCH 04/16] fixes bug#AL-1627 --- pom.xml | 2 +- .../render/RenderTarjetaCredito.java | 19 +++++++++++++++++++ .../busquedaTarjetaCredito.zul | 6 ++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index abce0c301..f22ded4da 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.0.71 + 1.0.72 war diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTarjetaCredito.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTarjetaCredito.java index adb9d3d6a..9a09dcd30 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTarjetaCredito.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderTarjetaCredito.java @@ -2,6 +2,7 @@ package com.rjconsultores.ventaboletos.web.utilerias.render; import java.math.BigDecimal; +import org.zkoss.zul.Checkbox; import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; @@ -45,6 +46,24 @@ public class RenderTarjetaCredito implements ListitemRenderer { lc = new Listcell(""); } lc.setParent(lstm); + + BigDecimal tarifaMinima = tarjetaCredito.getTarifaMinima(); + if (tarifaMinima != null) { + lc = new Listcell(tarifaMinima.setScale(2).toString()); + } else { + lc = new Listcell(""); + } + lc.setParent(lstm); + + lc = new Listcell(); + + boolean indAplicaVenda = tarjetaCredito.getIndAplicaVenda() != null ? tarjetaCredito.getIndAplicaVenda() : false; + Checkbox chkAplicaVenda = new Checkbox(); + chkAplicaVenda.setDisabled(Boolean.TRUE); + chkAplicaVenda.setChecked(indAplicaVenda); + + lc.appendChild(chkAplicaVenda); + lc.setParent(lstm); lstm.setAttribute("data", tarjetaCredito); } diff --git a/web/gui/configuraciones_comerciales/busquedaTarjetaCredito.zul b/web/gui/configuraciones_comerciales/busquedaTarjetaCredito.zul index 24e250538..adbf43ab3 100644 --- a/web/gui/configuraciones_comerciales/busquedaTarjetaCredito.zul +++ b/web/gui/configuraciones_comerciales/busquedaTarjetaCredito.zul @@ -67,6 +67,12 @@ + + From c7368a5ce915dcec468dff4e14f2fb1ad8edaf97 Mon Sep 17 00:00:00 2001 From: celio Date: Wed, 15 Mar 2023 15:35:08 -0300 Subject: [PATCH 05/16] fixes bug#AL-2355 --- pom.xml | 2 +- .../controladores/catalogos/EditarPuntoVentaController.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f22ded4da..952e99b52 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.0.72 + 1.0.73 war diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java index 25b0b1ed6..1e03a85bf 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java @@ -2417,7 +2417,8 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer { } private void validarDiversos() { - if (!txtResponEnergia.getValue().isEmpty() + if (puntoVenta.getDiversosId() != null || + !txtResponEnergia.getValue().isEmpty() || cmbPosicao.getSelectedItem() != null || checkInformatizada.isChecked() || checkBilheteInfo.isChecked() From 46458f4fe94980885f361cb63b94044290ee7a15 Mon Sep 17 00:00:00 2001 From: valdevir Date: Thu, 16 Mar 2023 09:35:52 -0300 Subject: [PATCH 06/16] fixes bug #AL-2143 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 952e99b52..16f795044 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.0.73 + 1.0.74 war - 1.0.39 - 1.0.25 + 1.0.40 + 1.0.26 From 6cff42836ff5074f43d3ac273be4bcbbeaa0f438 Mon Sep 17 00:00:00 2001 From: valdevir Date: Thu, 16 Mar 2023 10:25:22 -0300 Subject: [PATCH 07/16] fixes bug #AL-2143 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 16f795044..36fd752df 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.0.74 + 1.0.75 war 1.0.40 - 1.0.26 + 1.0.27 From 70dbbc20702234a6e46c267c7ee4e66b8a917464 Mon Sep 17 00:00:00 2001 From: valdevir Date: Thu, 16 Mar 2023 10:47:15 -0300 Subject: [PATCH 08/16] fixes bug #AL-2143 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 36fd752df..cbb41bda6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.0.75 + 1.0.76 war 1.0.40 - 1.0.27 + 1.0.28 From fae53da06e64aea9a4ad9bef1763827d92243fb5 Mon Sep 17 00:00:00 2001 From: valdevir Date: Thu, 16 Mar 2023 11:15:55 -0300 Subject: [PATCH 09/16] fixes bug #AL-2143 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cbb41bda6..cbb67b5a8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,11 +4,11 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.0.76 + 1.0.77 war - 1.0.40 + 1.0.41 1.0.28 From 405e6528e9144628eb00a282fa2537cab2531153 Mon Sep 17 00:00:00 2001 From: valdevir Date: Thu, 16 Mar 2023 15:46:22 -0300 Subject: [PATCH 10/16] fixes bug #AL-2364 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cbb67b5a8..332e03df6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,11 +4,11 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.0.77 + 1.0.78 war - 1.0.41 + 1.0.42 1.0.28 From b7466cfcb6b74116651a4fb88d253bfca459e1cd Mon Sep 17 00:00:00 2001 From: celio Date: Fri, 17 Mar 2023 11:05:02 -0300 Subject: [PATCH 11/16] fixes bug#AL-2326 --- .../impl/RelatorioLinhasHorarioSimplificado.java | 2 +- .../RelatorioLinhasHorarioController.java | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java index b9d7a7d5b..f01805ace 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java @@ -56,7 +56,7 @@ public class RelatorioLinhasHorarioSimplificado extends Relatorio { String corridaIds = "", rutaIds = ""; GrupoRuta grupoRuta = (GrupoRuta) parametros.get("GRUPORUTA"); Integer tipoServico = (Integer) parametros.get("TIPOSERVICIO_ID"); - Boolean isPorData = parametros.get("ISPORDATA") == null ? false : true; + Boolean isPorData = parametros.get("ISPORDATA") == null ? false : (Boolean) parametros.get("ISPORDATA"); if (lsNumServico != null && !lsNumServico.isEmpty()) { corridaIds = retornaFiltro(lsNumServico, null); } diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java index 24a9d6388..cb237ff43 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java @@ -122,7 +122,7 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer { parametros.put("DATA_FINAL", DateUtil.fimFecha(this.datFinal.getValue())); parametros.put("ISSIMPLIFICADO", chkSimplificado.isChecked()); - parametros.put("ISSIMPLIFICADO", chkSimplificadoPorData.isChecked()); + parametros.put("ISPORDATA", chkSimplificadoPorData.isChecked()); parametros.put("USUARIO_ID", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString()); parametros.put("NOME_USUARIO", UsuarioLogado.getUsuarioLogado().getNombusuario().toString()); @@ -162,7 +162,7 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer { parametros.put("lsNumServico", lsNumServico); Relatorio relatorio = null; String tituloRelatorio = ""; - if(!chkSimplificado.isChecked()) { + if(!chkSimplificado.isChecked() && !chkSimplificadoPorData.isChecked()) { relatorio = new RelatorioLinhasHorario(parametros, dataSourceRead.getConnection()); tituloRelatorio = "relatorioLinhasHorarioController.window.title"; }else { @@ -267,10 +267,10 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer { public void onEvent(Event event) { boolean isChecked = chkSimplificado.isChecked(); - if (!isChecked) { + if (isChecked) { chkSimplificadoPorData.setChecked(false); chkSimplificadoPorData.setDisabled(true); - } else { + } else if (!isChecked) { chkSimplificadoPorData.setDisabled(false); } } @@ -280,8 +280,11 @@ public class RelatorioLinhasHorarioController extends MyGenericForwardComposer { public void onEvent(Event event) { boolean isChecked = chkSimplificadoPorData.isChecked(); - if (isChecked && !chkSimplificado.isChecked()) { - chkSimplificado.setChecked(true); + if (isChecked ) { + chkSimplificado.setChecked(false); + chkSimplificado.setDisabled(true); + } else if (!isChecked) { + chkSimplificado.setDisabled(false); } } }); From 86c3da3ad671acbe640f8b2941057b0f6d1187b0 Mon Sep 17 00:00:00 2001 From: celio Date: Fri, 17 Mar 2023 11:08:15 -0300 Subject: [PATCH 12/16] =?UTF-8?q?ALtera=C3=A7=C3=A3o=20pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 332e03df6..6bfb8c1ed 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.0.78 + 1.0.79 war From 11d6578d74d094217b444299686020ccaedcbd71 Mon Sep 17 00:00:00 2001 From: valdevir Date: Fri, 17 Mar 2023 11:59:16 -0300 Subject: [PATCH 13/16] fixes bug #AL-2364 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 332e03df6..74c2f7d92 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.0.78 + 1.0.79 war 1.0.42 - 1.0.28 + 1.0.29 From 0d4db5317ef3da0bb344ed6c6e951f03e9493cd3 Mon Sep 17 00:00:00 2001 From: Fabio Faria Date: Tue, 21 Mar 2023 09:54:47 -0300 Subject: [PATCH 14/16] =?UTF-8?q?modifica=C3=A7ao=20de=20caminho=20do=20ar?= =?UTF-8?q?quivo=20do=20jenkins?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile-Adm | 299 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 299 insertions(+) create mode 100644 Jenkinsfile-Adm diff --git a/Jenkinsfile-Adm b/Jenkinsfile-Adm new file mode 100644 index 000000000..71f3c100e --- /dev/null +++ b/Jenkinsfile-Adm @@ -0,0 +1,299 @@ +def SETTINGS = "/var/jenkins_home/tools/apache-maven-3.6.0/settings.xml" +def ENCODE = "ISO-8859-1" +def MODULO = "adm" +def TAG_SELECTOR = "UNINTIALIZED" + +//====================================================================================================== +def build(SETTINGS, ENCODE, jdk) { + if (jdk == 'JDK8.202') { + withEnv(["JAVA_HOME=/var/jenkins_home/tools/hudson.model.JDK/JDK8.202"]) { + sh "mvn -B -f pom.xml -s ${SETTINGS} clean deploy -DskipTests -Dfile.encoding=${ENCODE} -Dproject.build.sourceEncoding=${ENCODE}" + } + } else { + sh "mvn -B -f pom.xml -s ${SETTINGS} clean deploy -DskipTests -Dfile.encoding=${ENCODE} -Dproject.build.sourceEncoding=${ENCODE}" + } +} + +//====================================================================================================== +def deployNexus(projeto, SETTINGS, ENCODE) { + echo "Realizando deploy para o nexus: ${projeto}" + sh "mvn -B -s ${SETTINGS} deploy -DskipTests --file=pom.xml -Dfile.encoding=${ENCODE}" +} + +//====================================================================================================== +def geraVersao() { + TAG_SELECTOR = readMavenPom file: 'pom.xml' + VERSAO = TAG_SELECTOR.getVersion() + VERSAO_TEXTO = "Versao: ${VERSAO}@${env.BUILD_TIMESTAMP_VERSAO}" + + currentBuild.displayName = "${VERSAO}" + currentBuild.description = ""+ + ""+ + "Download Link ventaboletosadm-${VERSAO}.war" + + println(VERSAO_TEXTO) + writeFile file: "src/java/versionADM.info", text: VERSAO_TEXTO +} + +//====================================================================================================== +def gitCheckout(branch_name, url_name) { + if (branch_name == null || branch_name.isEmpty()) { + branch_name = "master" + } + + SCM = checkout([ + $class: 'GitSCM', + branches: [[name: "*/${branch_name}"]], + doGenerateSubmoduleConfigurations: false, + extensions: [[$class: 'AuthorInChangelog']], + submoduleCfg: [], + userRemoteConfigs: [[credentialsId: 'admin-gitea', url: url_name]] + ]) +} + +//====================================================================================================== +@NonCPS +def verificaTicket(mensagem) { + def M = mensagem =~ /#\D{2}-\d{4}/ + if(M){ + return M[0].substring(1) + } +} + +//====================================================================================================== +@NonCPS +String getChangedFilesList() { + changedFiles = "" + for (changeLogSet in currentBuild.changeSets) { + for (entry in changeLogSet.getItems()) { + for (file in entry.getAffectedFiles()) { + changedFiles += "${file.editType.name} - ${file.path}\n" + } + } + } + return changedFiles +} + +//====================================================================================================== +@NonCPS +String getChangedLog() { + changedLog = "" + for (changeLogSet in currentBuild.changeSets) { + for (entries in changeLogSet.getItems()) { + for (entry in entries) { + changedLog += "*Commit: ${entry.commitId}\n" + changedLog += "Message: ${entry.msg}\n" + for (file in entry.getAffectedFiles()) { + changedLog += "${file.editType.name} - ${file.path}\n" + } + changedLog += "Author: ${entry.author} \n" + } + } + } + return changedLog +} + +//====================================================================================================== +def archiveFile(arquivo) { + try { + archiveArtifacts artifacts: arquivo + } catch (err) { + echo err.getMessage() + } +} + +//====================================================================================================== +pipeline { + agent any + tools { + maven 'mvn_3.6.0' + jdk 'JDK8.202' + } + stages { + stage('Info') { + steps { + sh ''' + echo "PATH = ${PATH}" + echo "M2_HOME = ${M2_HOME}" + ''' + echo "VERSÃO: @${env.BUILD_TIMESTAMP_VERSAO}#${env.BUILD_NUMBER}" + echo "parametro ${GIT} " + } + } + + stage('Checkout Git') { + steps { + script { + try { + gitCheckout('master', 'http://18.235.188.113:3000/rjconsultores/ventaBoletosAdm.git') + } catch (err) { + echo err.getMessage() + } + } + } + } + + stage('Deps') { + steps { + script { + if(! getChangedFilesList()) { + echo 'Não foram encontradas mudanças desde o ultimo build' + currentBuild.result = 'ABORTED' + return + } + + Auditador = build(job: "Adm/Lib-Auditador-Build", parameters: [ + [$class: 'StringParameterValue', name: 'GIT', value: "master"]], propagate: false).result + + if(Auditador == 'FAILURE') { + currentBuild.result = 'FAILURE' + error('Lib-Auditador-Build FAILURE') + } + + if(Auditador == 'UNSTABLE') { + currentBuild.result = 'UNSTABLE' + } + + Integracao = build(job: "Adm/Lib-IntegracaoReceitaDespesa-Build", parameters: [ + [$class: 'StringParameterValue', name: 'GIT', value: "master"]], propagate: false).result + + if(Integracao == 'FAILURE') { + currentBuild.result = 'FAILURE' + error('Lib-IntegracaoReceitaDespesa-Build FAILURE') + } + + if(Integracao == 'UNSTABLE') { + currentBuild.result = 'UNSTABLE' + } + + BoletoCnab = build(job: "Adm/Lib-GeneradorBoletosCNAB-Build", parameters: [ + [$class: 'StringParameterValue', name: 'GIT', value: "master"]], propagate: false).result + + if(BoletoCnab == 'FAILURE') { + currentBuild.result = 'FAILURE' + error('Lib-GeneradorBoletosCNAB-Build FAILURE') + } + + if(BoletoCnab == 'UNSTABLE') { + currentBuild.result = 'UNSTABLE' + } + + ModelWeb = build(job: "Adm/Lib-ModelWeb-Build", parameters: [ + [$class: 'StringParameterValue', name: 'GIT', value: "master"]], propagate: false).result + + if(ModelWeb == 'FAILURE') { + currentBuild.result = 'FAILURE' + error('ModelWeb FAILURE') + } + + if(ModelWeb == 'UNSTABLE') { + currentBuild.result = 'UNSTABLE' + } + + Flyway = build(job: "Adm/Lib-Flyway-Build", parameters: [ + [$class: 'StringParameterValue', name: 'GIT', value: "master"]], propagate: false).result + + if(Flyway == 'FAILURE') { + currentBuild.result = 'FAILURE' + error('Flyway FAILURE') + } + + if(Flyway == 'UNSTABLE') { + currentBuild.result = 'UNSTABLE' + } + } + } + } + + stage('Build') { + steps { + script { + geraVersao() + build(SETTINGS, ENCODE, 'JDK8.202') + } + } + } + stage('Test') { + steps { + echo "Em construção" + } + } + } + + post { + success { + script { + if( getChangedFilesList()) { + //gravando e publicando as mudanças + def publisher = LastChanges.getLastChangesPublisher "PREVIOUS_REVISION", "LINE", "LINE", true, true, "", "", "", "", "" + publisher.publishLastChanges() + def changes = publisher.getLastChanges() + + def textoJira = "Build SUCCESS: Versao ${VERSAO_TEXTO}\n" + + "(acesse http://18.235.188.113:1313/job/Adm/job/Adm-Project-Build/${env.BUILD_NUMBER}/)\n\n" + + "Download de versão ${VERSAO}\n" + + "(http://52.5.53.15:8081/nexus/content/repositories/releases/br/com/rjconsultores/ventaboletosadm/${VERSAO}/ventaboletosadm-${VERSAO}.war)\n\n" + + "Alterações do projeto VentaBoletosAdm\n" + + "${getChangedFilesList()}\n\n" + + def textoTag = "TAG: **${VERSAO_TEXTO}** \n" + + def changedLog = getChangedLog() + def TICKET = verificaTicket(changedLog) + + for (commit in changes.getCommits()) { + def commitInfo = commit.getCommitInfo() + textoJira += "${commitInfo}\n\n" + + textoTag += "- Commit: ${commitInfo.commitId} \n"+ + "- Autor: ${commitInfo.committerEmail} \n"+ + "- Data: ${commitInfo.commitDate} \n"+ + "- Message: ${commitInfo.commitMessage} \n\n" + } + + + //geração automatica de versão + try { + def giteaversion = httpRequest contentType: 'APPLICATION_JSON', httpMode: 'POST', requestBody: '''{ + "body": "'''+textoTag+'''", + "draft": false, + "name": "'''+VERSAO+'''", + "prerelease": false, + "tag_name": "'''+VERSAO+'''", + "target_commitish": "master" + }''', responseHandle: 'NONE', url: 'http://18.235.188.113:3000/api/v1/repos/adm/VentaBoletosAdm/releases?access_token=6231bd083b69e47f5ad34329891ed6b3128a154e', wrapAsMultipart: false + } catch (err) { + echo err.getMessage() + } + + + if( TICKET ){ + //integrando ao jira + jiraComment body: textoJira, issueKey: TICKET + + + //resolvendo o card + if( textoJira.contains('fixes bug') ){ + step([$class: 'JiraIssueUpdateBuilder', comment: '', jqlSearch: "issue = ${TICKET}", workflowActionName: 'RESOLVIDO']) + } + } else { + echo 'Ticket não encontrado' + } + + archiveFile("target/ventaboletosadm.war") + cleanWs( + cleanWhenAborted:true, + cleanWhenFailure: false, + cleanWhenNotBuilt: false, + cleanWhenSuccess: true, + cleanWhenUnstable: true, + deleteDirs: true, + notFailBuild: true, + disableDeferredWipeout: true, + patterns: [[ pattern: '.war' , type: 'EXCLUDE' ]] + ) + } + } + } + } +} \ No newline at end of file From e49f201fafba6b736fcc6762a0648f5e7bfb6350 Mon Sep 17 00:00:00 2001 From: pinheiro Date: Tue, 21 Mar 2023 13:58:41 +0000 Subject: [PATCH 15/16] Atualizar 'Jenkinsfile-Adm' --- Jenkinsfile-Adm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-Adm b/Jenkinsfile-Adm index 71f3c100e..eab7fbd0a 100644 --- a/Jenkinsfile-Adm +++ b/Jenkinsfile-Adm @@ -43,7 +43,7 @@ def gitCheckout(branch_name, url_name) { SCM = checkout([ $class: 'GitSCM', - branches: [[name: "*/${branch_name}"]], + branches: [[name: "*/${refs/tags/1.0.61-2}"]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'AuthorInChangelog']], submoduleCfg: [], From 31376cd0a13058263af51dadb9bb2d743934b606 Mon Sep 17 00:00:00 2001 From: pinheiro Date: Tue, 21 Mar 2023 17:02:56 +0000 Subject: [PATCH 16/16] Atualizar 'Jenkinsfile-Adm' --- Jenkinsfile-Adm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-Adm b/Jenkinsfile-Adm index eab7fbd0a..e1b7bbe4c 100644 --- a/Jenkinsfile-Adm +++ b/Jenkinsfile-Adm @@ -43,7 +43,7 @@ def gitCheckout(branch_name, url_name) { SCM = checkout([ $class: 'GitSCM', - branches: [[name: "*/${refs/tags/1.0.61-2}"]], + branches: [[name: "*/${branch_name}"]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'AuthorInChangelog']], submoduleCfg: [],