summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-09-03 13:37:39 -0400
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-09-03 13:38:55 -0400
commitab6a016e0406473f25a6eff7312257ab395208d2 (patch)
tree745ac00614204262abdb94e26e9854504d9acab8
parentbed9588ef11d6b212d3501d1b81ce3a10051a155 (diff)
Revert "Use preinstalled version of mariadb"
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>
-rw-r--r--dependencies-odl-bom/pom.xml2
-rw-r--r--odlparent/binding-parent/pom.xml2
-rw-r--r--odlparent/bundle-parent/pom.xml2
-rw-r--r--odlparent/feature-repo-parent/pom.xml2
-rw-r--r--odlparent/mdsal-it-parent/pom.xml2
-rw-r--r--odlparent/odlparent-lite/pom.xml2
-rw-r--r--odlparent/odlparent/pom.xml2
-rwxr-xr-xodlparent/setup/src/main/resources/pom-template.xml2
-rw-r--r--odlparent/single-feature-parent/pom.xml2
9 files changed, 9 insertions, 9 deletions
diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
index a4c06819..b5eef1a5 100644
--- 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 c9296a6b..70a077fd 100644
--- 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 df850e27..4ea1c6b9 100644
--- 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 a7e6e2c2..d9b3dd57 100644
--- 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 6e7684b9..55d95cba 100644
--- 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 f1a2d2a9..a501bb5d 100644
--- 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 4d1725bc..95ba2c26 100644
--- 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 0296e9e7..942b1f10 100755
--- 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 389bfd8e..2df57452 100644
--- 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>