From ab6a016e0406473f25a6eff7312257ab395208d2 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Tue, 3 Sep 2019 13:37:39 -0400 Subject: 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) --- odlparent/binding-parent/pom.xml | 2 +- odlparent/bundle-parent/pom.xml | 2 +- odlparent/feature-repo-parent/pom.xml | 2 +- odlparent/mdsal-it-parent/pom.xml | 2 +- odlparent/odlparent-lite/pom.xml | 2 +- odlparent/odlparent/pom.xml | 2 +- odlparent/setup/src/main/resources/pom-template.xml | 2 +- odlparent/single-feature-parent/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'odlparent') 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 @@ 10.14.2.0 1.0.0 1.17.1 - 1.5.9 + 2.1.1 2.2.3 6.11 8.5.14 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 @@ 10.14.2.0 1.0.0 1.17.1 - 1.5.9 + 2.1.1 2.2.3 6.11 8.5.14 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 @@ 10.14.2.0 1.0.0 1.17.1 - 1.5.9 + 2.1.1 2.2.3 6.11 8.5.14 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 @@ 10.14.2.0 1.0.0 1.17.1 - 1.5.9 + 2.1.1 2.2.3 6.11 8.5.14 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 @@ 10.14.2.0 1.0.0 1.17.1 - 1.5.9 + 2.1.1 2.2.3 6.11 8.5.14 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 @@ 10.14.2.0 1.0.0 1.17.1 - 1.5.9 + 2.1.1 2.2.3 6.11 8.5.14 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 @@ 10.14.2.0 1.0.0 1.17.1 - 1.5.9 + 2.1.1 2.2.3 6.11 8.5.14 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 @@ 10.14.2.0 1.0.0 1.17.1 - 1.5.9 + 2.1.1 2.2.3 6.11 8.5.14 -- cgit 1.2.3-korg