diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-09-03 10:45:46 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-09-03 10:45:46 -0400 |
| commit | bed9588ef11d6b212d3501d1b81ce3a10051a155 (patch) | |
| tree | 38d9f0d01b7067ad31c6b67817408e29194c5e29 | |
| parent | db8b3631a90764f9eb7b30ffa47605163b56f113 (diff) | |
Use preinstalled version of mariadb
ODL pre-installs version 1.5.9 of mariadb jdbc client. We should
not install a different version to avoid possible version
conflict.
Change-Id: Ib113639c2e3bf03e2e69112d01d078bf9b922fd3
Issue-ID: CCSDK-1445
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
| -rw-r--r-- | dependencies-odl-bom/pom.xml | 2 | ||||
| -rw-r--r-- | odlparent/binding-parent/pom.xml | 2 | ||||
| -rw-r--r-- | odlparent/bundle-parent/pom.xml | 2 | ||||
| -rw-r--r-- | odlparent/feature-repo-parent/pom.xml | 2 | ||||
| -rw-r--r-- | odlparent/mdsal-it-parent/pom.xml | 2 | ||||
| -rw-r--r-- | odlparent/odlparent-lite/pom.xml | 2 | ||||
| -rw-r--r-- | odlparent/odlparent/pom.xml | 2 | ||||
| -rwxr-xr-x | odlparent/setup/src/main/resources/pom-template.xml | 2 | ||||
| -rw-r--r-- | odlparent/single-feature-parent/pom.xml | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index b5eef1a5..a4c06819 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>2.1.1</version> + <version>1.5.9</version> </dependency> <dependency> <groupId>org.powermock</groupId> diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 70a077fd..c9296a6b 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>2.1.1</mariadb.connector.version> + <mariadb.connector.version>1.5.9</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 4ea1c6b9..df850e27 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>2.1.1</mariadb.connector.version> + <mariadb.connector.version>1.5.9</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 d9b3dd57..a7e6e2c2 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>2.1.1</mariadb.connector.version> + <mariadb.connector.version>1.5.9</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 55d95cba..6e7684b9 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>2.1.1</mariadb.connector.version> + <mariadb.connector.version>1.5.9</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 a501bb5d..f1a2d2a9 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>2.1.1</mariadb.connector.version> + <mariadb.connector.version>1.5.9</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 95ba2c26..4d1725bc 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>2.1.1</mariadb.connector.version> + <mariadb.connector.version>1.5.9</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 942b1f10..0296e9e7 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>2.1.1</mariadb.connector.version> + <mariadb.connector.version>1.5.9</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 2df57452..389bfd8e 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>2.1.1</mariadb.connector.version> + <mariadb.connector.version>1.5.9</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> |