Code Review / ccsdk / parent.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: bed9588)
Revert "Use preinstalled version of mariadb" 58/94858/1
authorTimoney, Dan (dt5972) <dtimoney@att.com>
Tue, 3 Sep 2019 17:37:39 +0000 (13:37 -0400)
committerTimoney, Dan (dt5972) <dtimoney@att.com>
Tue, 3 Sep 2019 17:38:55 +0000 (13:38 -0400)
Preinstalled version of mariadb (1.5.9) does not seem to work
with embedded tomcat connection pools.  Or rather, using this version
forces the very ClassNotFoundException we were trying to fix.

Change-Id: I42ea6620888dd2c0aba896f141bb309ac207d095
Issue-ID: CCSDK-1445
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
dependencies-odl-bom/pom.xml patch | blob | history
odlparent/binding-parent/pom.xml patch | blob | history
odlparent/bundle-parent/pom.xml patch | blob | history
odlparent/feature-repo-parent/pom.xml patch | blob | history
odlparent/mdsal-it-parent/pom.xml patch | blob | history
odlparent/odlparent-lite/pom.xml patch | blob | history
odlparent/odlparent/pom.xml patch | blob | history
odlparent/setup/src/main/resources/pom-template.xml patch | blob | history
odlparent/single-feature-parent/pom.xml patch | blob | history

diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
index a4c0681..b5eef1a 100644 (file)
--- a/dependencies-odl-bom/pom.xml
+++ b/dependencies-odl-bom/pom.xml
@@ -444,7 +444,7 @@
             <dependency>
                 <groupId>org.mariadb.jdbc</groupId>
                 <artifactId>mariadb-java-client</artifactId>
-                <version>1.5.9</version>
+                <version>2.1.1</version>
             </dependency>
             <dependency>
                 <groupId>org.powermock</groupId>
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index c9296a6..70a077f 100644 (file)
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -182,7 +182,7 @@
                <derby.version>10.14.2.0</derby.version>
                <eelf.version>1.0.0</eelf.version>
                <grpc.version>1.17.1</grpc.version>
-               <mariadb.connector.version>1.5.9</mariadb.connector.version>
+               <mariadb.connector.version>2.1.1</mariadb.connector.version>
                <mariadb4j.version>2.2.3</mariadb4j.version>
                <testng.version>6.11</testng.version>
                <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index df850e2..4ea1c6b 100644 (file)
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -182,7 +182,7 @@
                <derby.version>10.14.2.0</derby.version>
                <eelf.version>1.0.0</eelf.version>
                <grpc.version>1.17.1</grpc.version>
-               <mariadb.connector.version>1.5.9</mariadb.connector.version>
+               <mariadb.connector.version>2.1.1</mariadb.connector.version>
                <mariadb4j.version>2.2.3</mariadb4j.version>
                <testng.version>6.11</testng.version>
                <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index a7e6e2c..d9b3dd5 100644 (file)
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -182,7 +182,7 @@
                <derby.version>10.14.2.0</derby.version>
                <eelf.version>1.0.0</eelf.version>
                <grpc.version>1.17.1</grpc.version>
-               <mariadb.connector.version>1.5.9</mariadb.connector.version>
+               <mariadb.connector.version>2.1.1</mariadb.connector.version>
                <mariadb4j.version>2.2.3</mariadb4j.version>
                <testng.version>6.11</testng.version>
                <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index 6e7684b..55d95cb 100644 (file)
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -182,7 +182,7 @@
                <derby.version>10.14.2.0</derby.version>
                <eelf.version>1.0.0</eelf.version>
                <grpc.version>1.17.1</grpc.version>
-               <mariadb.connector.version>1.5.9</mariadb.connector.version>
+               <mariadb.connector.version>2.1.1</mariadb.connector.version>
                <mariadb4j.version>2.2.3</mariadb4j.version>
                <testng.version>6.11</testng.version>
                <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index f1a2d2a..a501bb5 100644 (file)
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -182,7 +182,7 @@
                <derby.version>10.14.2.0</derby.version>
                <eelf.version>1.0.0</eelf.version>
                <grpc.version>1.17.1</grpc.version>
-               <mariadb.connector.version>1.5.9</mariadb.connector.version>
+               <mariadb.connector.version>2.1.1</mariadb.connector.version>
                <mariadb4j.version>2.2.3</mariadb4j.version>
                <testng.version>6.11</testng.version>
                <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 4d1725b..95ba2c2 100644 (file)
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -182,7 +182,7 @@
                <derby.version>10.14.2.0</derby.version>
                <eelf.version>1.0.0</eelf.version>
                <grpc.version>1.17.1</grpc.version>
-               <mariadb.connector.version>1.5.9</mariadb.connector.version>
+               <mariadb.connector.version>2.1.1</mariadb.connector.version>
                <mariadb4j.version>2.2.3</mariadb4j.version>
                <testng.version>6.11</testng.version>
                <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index 0296e9e..942b1f1 100755 (executable)
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -182,7 +182,7 @@
                <derby.version>10.14.2.0</derby.version>
                <eelf.version>1.0.0</eelf.version>
                <grpc.version>1.17.1</grpc.version>
-               <mariadb.connector.version>1.5.9</mariadb.connector.version>
+               <mariadb.connector.version>2.1.1</mariadb.connector.version>
                <mariadb4j.version>2.2.3</mariadb4j.version>
                <testng.version>6.11</testng.version>
                <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 389bfd8..2df5745 100644 (file)
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -182,7 +182,7 @@
                <derby.version>10.14.2.0</derby.version>
                <eelf.version>1.0.0</eelf.version>
                <grpc.version>1.17.1</grpc.version>
-               <mariadb.connector.version>1.5.9</mariadb.connector.version>
+               <mariadb.connector.version>2.1.1</mariadb.connector.version>
                <mariadb4j.version>2.2.3</mariadb4j.version>
                <testng.version>6.11</testng.version>
                <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
Parent POMs to be used by CCSDK clients