From 39ce60fa483aca3250899b8d7d6171ec34fe5e97 Mon Sep 17 00:00:00 2001
From: Fabio Faria <fabio.fbarreto@totvs.com.br>
Date: Mon, 16 Jan 2023 19:06:44 -0300
Subject: [PATCH 1/3] fixes bug#AL-2027

---
 pom.xml | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 740ad7e99..b726676f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,9 +3,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>br.com.rjconsultores</groupId>
-    <artifactId>Flyway</artifactId>
+    <artifactId>Flyway</artifactId>
     
-	<version>1.0.14</version>
+	<version>1.0.15</version> 
     
 	<distributionManagement>
         <repository>
@@ -16,6 +16,16 @@
 
     <build>
         <sourceDirectory>src</sourceDirectory>
+
+		<resources>        
+			<resource>
+			   <directory>${basedir}/src</directory>
+			   <includes>
+				 <include>*.*</include>
+				 <include>db/**</include>
+			   </includes>
+			</resource>
+		</resources>
         
         <plugins>
             <plugin>
@@ -45,10 +55,10 @@
         </dependency>
 
         <dependency>
-		    <groupId>javax.servlet</groupId>
-		    <artifactId>javax.servlet-api</artifactId>
-		    <version>4.0.0</version>
-		    <scope>provided</scope>
+            <groupId>javax.servlet</groupId>
+     	    <artifactId>javax.servlet-api</artifactId>
+	        <version>4.0.0</version>
+            <scope>provided</scope>
 		</dependency>
 
 		<dependency>

From 5d556e87739eb3e36919edc06371f733bd86e551 Mon Sep 17 00:00:00 2001
From: Fabio Faria <fabio.fbarreto@totvs.com.br>
Date: Tue, 17 Jan 2023 09:01:12 -0300
Subject: [PATCH 2/3] fixes bug#AL-2027

---
 pom.xml | 64 ---------------------------------------------------------
 1 file changed, 64 deletions(-)

diff --git a/pom.xml b/pom.xml
index daf49d0e2..3d539f0cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -69,68 +68,5 @@
 		</dependency>
 
     </dependencies>
-    
-=======
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>br.com.rjconsultores</groupId>
-    <artifactId>Flyway</artifactId>
     
-	<version>1.0.14</version>
-    
-	<distributionManagement>
-        <repository>
-            <id>rj-releases</id>
-            <url>http://52.5.53.15:8081/nexus/content/repositories/releases/</url>
-        </repository>
-    </distributionManagement>
-
-    <build>
-        <sourceDirectory>src</sourceDirectory>
-        
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <encoding>ISO-8859-1</encoding>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>${project.artifactId}</finalName>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.12</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-core</artifactId>
-            <version>4.2.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-     	    <artifactId>javax.servlet-api</artifactId>
-	        <version>4.0.0</version>
-            <scope>provided</scope>
-		</dependency>
-
-		<dependency>
-		    <groupId>com.oracle.database.jdbc</groupId>
-		    <artifactId>ojdbc8</artifactId>
-		    <version>21.7.0.0</version>
-		</dependency>
-
-    </dependencies>
-    
->>>>>>> 0227c90bf3907b4e6e7eb75916aaea43fe814397
 </project>
\ No newline at end of file

From 31a746b86e136072df10d6dc24aec941f48aa93d Mon Sep 17 00:00:00 2001
From: Fabio Faria <fabio.fbarreto@totvs.com.br>
Date: Tue, 17 Jan 2023 16:57:56 -0300
Subject: [PATCH 3/3] fixes bug#AL-2027

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

diff --git a/pom.xml b/pom.xml
index 3d539f0cb..7f4bec88b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,8 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>br.com.rjconsultores</groupId>
-    <artifactId>Flyway</artifactId>
-    
+    <artifactId>Flyway</artifactId>    
 	<version>1.0.15</version> 
     
 	<distributionManagement>