From 9fad13ddb1ddb2b3263d42f46cd9877557983d70 Mon Sep 17 00:00:00 2001
From: victor <victor@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 14 Oct 2020 01:01:09 +0000
Subject: [PATCH] fixesbug#0020427 dev:victor qua:victor

Alteracao do usuario e voltando alteracoes nas tags.

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/BD/FlyWay/trunk@103782 d1611594-4594-4d17-8e1d-87c2c4800839
---
 pom.xml   |  7 ++-----
 test.xml  | 15 ++++++---------
 test2.xml | 20 +++++++++-----------
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index 293a4b064..5a4419e96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,12 +46,9 @@
             <version>2.5</version>
         </dependency>
         <dependency>
-            <groupId>com.oracle.jdbc</groupId>
-			<artifactId>ojdbc6.</artifactId>
-			<version>12.1.0.2.0</version>
-			<!-- <groupId>br.com.rjconsultores</groupId>
+            <groupId>br.com.rjconsultores</groupId>
              <artifactId>ojdbc14</artifactId> 
-			 <version>1.0</version> -->            
+			 <version>1.0</version>
         </dependency>
     </dependencies>
     
diff --git a/test.xml b/test.xml
index 21a115278..efc7c58bc 100644
--- a/test.xml
+++ b/test.xml
@@ -19,7 +19,7 @@
         <flyway.version>5.2.0</flyway.version>
 		 <database.url>jdbc:oracle:thin:@//10.20.30.10:1524/ORCLCDB</database.url> 
         <!-- <database.url>jdbc:oracle:thin:@//10.20.30.11:1521/ORCL</database.url> -->
-        <database.user>c##vtateste1</database.user>
+        <database.user>c##testcdb</database.user>
         <databese.password>vtax05</databese.password>
     </properties>
 
@@ -53,8 +53,7 @@
                         </configuration>
                         <dependencies>
                             <dependency>
-                                <!-- <groupId>com.oracle.jdbc</groupId> -->
-								<groupId>oracle.jdbc.driver.OracleDriver</groupId>
+								<groupId>com.oracle.jdbc</groupId>
                                 <artifactId>ojdbc6</artifactId>
                                 <version>12.1.0.2.0</version>
                             </dependency>                
@@ -88,9 +87,8 @@
                         </configuration>
                         <dependencies>
                             <dependency>
-                                <!-- <groupId>com.oracle.jdbc</groupId> -->
-								<groupId>oracle.jdbc.driver.OracleDriver</groupId>
-                                <artifactId>ojdbc6</artifactId>
+                                <groupId>com.oracle.jdbc</groupId>
+								<artifactId>ojdbc6</artifactId>
                                 <version>12.1.0.2.0</version>
                             </dependency>                
                         </dependencies>
@@ -123,9 +121,8 @@
                         </configuration>
                         <dependencies>
                             <dependency>
-                                <!-- <groupId>com.oracle.jdbc</groupId> -->
-								<groupId>oracle.jdbc.driver.OracleDriver</groupId>
-                                <artifactId>ojdbc6</artifactId>
+                                <groupId>com.oracle.jdbc</groupId>
+								<artifactId>ojdbc6</artifactId>
                                 <version>12.1.0.2.0</version>
                             </dependency>                
                         </dependencies>
diff --git a/test2.xml b/test2.xml
index 052e7eb4d..fdfb77a18 100644
--- a/test2.xml
+++ b/test2.xml
@@ -18,9 +18,10 @@
     <properties>
         <flyway.version>5.2.0</flyway.version>
        <database.url>jdbc:oracle:thin:@//10.20.30.10:1524/ORCLCDB</database.url> 
-        <!-- <database.url>jdbc:oracle:thin:@//10.20.30.11:1521/ORCL</database.url> -->
-        <database.user>c##vtateste1</database.user>
-        <databese.password>dev_rj_20</databese.password>
+        <!-- <database.url>jdbc:oracle:thin:@//10.20.30.11:1521/ORCL</database.url> 
+        <database.user>c##vtateste1</database.user> -->
+		<database.user>c##testcdb</database.user>
+        <databese.password>vtax05</databese.password>
     </properties>
 
     <dependencies>
@@ -53,9 +54,8 @@
                         </configuration>
                         <dependencies>
                             <dependency>
-                                <!-- <groupId>com.oracle.jdbc</groupId> -->
-								<groupId>oracle.jdbc.driver.OracleDriver</groupId>
-                                <artifactId>ojdbc6</artifactId>
+								<groupId>com.oracle.jdbc</groupId>
+								<artifactId>ojdbc6</artifactId>
                                 <version>12.1.0.2.0</version>
                             </dependency>                
                         </dependencies>
@@ -88,9 +88,8 @@
                         </configuration>
                         <dependencies>
                             <dependency>
-                                <!-- <groupId>com.oracle.jdbc</groupId> -->
-								<groupId>oracle.jdbc.driver.OracleDriver</groupId>
-                                <artifactId>ojdbc6</artifactId>
+                                <groupId>com.oracle.jdbc</groupId>
+								<artifactId>ojdbc6</artifactId>
                                 <version>12.1.0.2.0</version>
                             </dependency>                
                         </dependencies>
@@ -123,8 +122,7 @@
                         </configuration>
                         <dependencies>
                             <dependency>
-                                <!-- <groupId>com.oracle.jdbc</groupId> -->
-								<groupId>oracle.jdbc.driver.OracleDriver</groupId>
+                                <<groupId>com.oracle.jdbc</groupId> 
                                 <artifactId>ojdbc6</artifactId>
                                 <version>12.1.0.2.0</version>
                             </dependency>