diff --git a/pom.xml b/pom.xml index b726676f4..daf49d0e2 100644 --- a/pom.xml +++ b/pom.xml @@ -1,3 +1,4 @@ +<<<<<<< HEAD @@ -69,4 +70,67 @@ +======= + + 4.0.0 + br.com.rjconsultores + Flyway + + 1.0.14 + + + + rj-releases + http://52.5.53.15:8081/nexus/content/repositories/releases/ + + + + + src + + + + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + ISO-8859-1 + + + + ${project.artifactId} + + + + + log4j + log4j + 1.2.12 + + + + org.flywaydb + flyway-core + 4.2.0 + + + + javax.servlet + javax.servlet-api + 4.0.0 + provided + + + + com.oracle.database.jdbc + ojdbc8 + 21.7.0.0 + + + + +>>>>>>> 0227c90bf3907b4e6e7eb75916aaea43fe814397 \ No newline at end of file