From 37dac836af190e6d75f71b1103d2ae7626618c5f Mon Sep 17 00:00:00 2001
From: "gleison.cruz" <gleison.cruz@totvs.com.br>
Date: Tue, 3 Jan 2023 14:00:27 -0300
Subject: [PATCH 1/3] AL-1904 - Atualizando o arquivo pom para resolver o
 conflito

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 984146936..5f4d1e52d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.0.18</version>
+	<version>1.0.30</version>
 	<packaging>war</packaging>
 
 	<distributionManagement>

From 8c5fb83828508f6939bd7300a861f382c932dfb0 Mon Sep 17 00:00:00 2001
From: "gleison.cruz" <gleison.cruz@totvs.com.br>
Date: Tue, 3 Jan 2023 15:39:21 -0300
Subject: [PATCH 2/3] Conflito POM

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c06db566c..dc8838e06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
 		<dependency>
 			<groupId>br.com.rjconsultores</groupId>
 			<artifactId>ModelWeb</artifactId>
-			<version>1.0.12</version>			
+			<version>${modelWeb.version}</version>
 		</dependency>
 		
 		<dependency>

From 396522b2624810af2e2e171396aa48a898685e84 Mon Sep 17 00:00:00 2001
From: "lucas.taia" <lucas.taia@BHN330100005.bh01.local>
Date: Tue, 3 Jan 2023 16:48:37 -0300
Subject: [PATCH 3/3] =?UTF-8?q?correc=C3=A7=C3=A3o=20AL-1627?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index dc8838e06..2ae6e4190 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.0.30</version>
+	<version>1.0.31</version>
 	<packaging>war</packaging>
  
 	<properties>
 		<modelWeb.version>1.0.20</modelWeb.version>
-		<flyway.version>1.0.11</flyway.version>
+		<flyway.version>1.0.12</flyway.version>
 	</properties>
 
 	<distributionManagement>