From 8eb17b0e5a5bae5e6d96f485cb449ab29cbc07dc Mon Sep 17 00:00:00 2001 From: Ronny Fray Date: Thu, 23 Mar 2023 20:55:59 -0400 Subject: [PATCH 1/2] Upgrade MariaDB to v10.6 Update MariaDB Connector/J Update MySQL Connector/J Refactor for MariaDB 10.6 --- .github/workflows/README.md | 2 +- .github/workflows/camunda.yml | 4 ++-- .github/workflows/ldap.yml | 2 +- README.md | 12 ++++++------ .../console-db-es-ls-kibana/docker-compose.yml | 2 +- pom.xml | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/README.md b/.github/workflows/README.md index f17e864e..2e957556 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -22,7 +22,7 @@ The `publish-cws-image` job is the CD component of the workflow, triggered upon - [**Services**](https://docs.github.com/en/actions/using-containerized-services/about-service-containers): - MariaDB - - Image: mariadb:10.3 + - Image: mariadb:10.6 - Ports: 3306:3306 - [**checkout**](https://github.com/marketplace/actions/checkout): This action checks out the repository under `$GITHUB_WORKSPACE`, so the workflow can access it. - Set up JDK 8: diff --git a/.github/workflows/camunda.yml b/.github/workflows/camunda.yml index 31ab490a..cf4946b6 100644 --- a/.github/workflows/camunda.yml +++ b/.github/workflows/camunda.yml @@ -21,7 +21,7 @@ jobs: services: mdb103: - image: mariadb:10.3 + image: mariadb:10.6 ports: - 3306:3306 env: @@ -144,7 +144,7 @@ jobs: services: mdb103: - image: mariadb:10.3 + image: mariadb:10.6 ports: - 3306:3306 env: diff --git a/.github/workflows/ldap.yml b/.github/workflows/ldap.yml index b20d6f7e..19027f90 100644 --- a/.github/workflows/ldap.yml +++ b/.github/workflows/ldap.yml @@ -21,7 +21,7 @@ jobs: services: mdb103: - image: mariadb:10.3 + image: mariadb:10.6 ports: - 3306:3306 env: diff --git a/README.md b/README.md index f2eeeb9f..c414e139 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ See the [wiki](https://github.com/NASA-AMMOS/common-workflow-service/wiki) for m - For Home-brew users: - Install Maven using: `brew install maven` - Verify installation using: `mvn -v` -- [**Docker**](https://docs.docker.com/get-docker/): Used to run external Elasticsearch, and create and configure mariaDB database container +- [**Docker**](https://docs.docker.com/get-docker/): Used to run external Elasticsearch, and create and configure MariaDB database container - Recommended minimum system requirements from Docker Resources window: - CPUs: 4 - Memory: 5.00 GB @@ -49,9 +49,9 @@ See the [wiki](https://github.com/NASA-AMMOS/common-workflow-service/wiki) for m ### _MariaDB Setup_ -Generate mariaDB Docker Container and Create Database Instance for CWS: +Generate MariaDB Docker Container and Create Database Instance for CWS: ``` -docker run -d -p 3306:3306 -e MYSQL_DATABASE=__DB_NAME__ -e MYSQL_ROOT_PASSWORD=__ROOT_PW__ -e TZ=America/Los_Angeles --name mdb103 mariadb:10.3 +docker run -d -p 3306:3306 -e MYSQL_DATABASE=__DB_NAME__ -e MYSQL_ROOT_PASSWORD=__ROOT_PW__ -e TZ=America/Los_Angeles --name mdb106 mariadb:10.6 ``` Replace `__DB_NAME__` with your desired database name.
@@ -59,17 +59,17 @@ Replace `__ROOT_PW__` with your desired password. `__DB_NAME__` and `__ROOT_PW__` must match parameters set in script file: `.sh` -Directly access mariaDB with: +Directly access MariaDB with: ``` mysql -h 127.0.0.1 -u root -p ``` Enter the password above when prompted. -_CWS must have been built, in this case using a build script, in order to directly access mariaDB with the MySQL monitor, as the build +_CWS must have been built, in this case using a build script, in order to directly access MariaDB with the MySQL monitor, as the build script contains required information to access the database. See the **Building CWS** section for an example build script._ -_Make sure `cws_dev` database in created mariaDB instance before moving forward to build CWS_ +_Make sure `cws_dev` database in created MariaDB instance before moving forward to build CWS_ ### _Elasticsearch Setup_ Open new Shell terminal designated for running ElasticSearch. diff --git a/install/docker/console-db-es-ls-kibana/docker-compose.yml b/install/docker/console-db-es-ls-kibana/docker-compose.yml index 3a405b7b..e6a93e06 100644 --- a/install/docker/console-db-es-ls-kibana/docker-compose.yml +++ b/install/docker/console-db-es-ls-kibana/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.2' services: db: restart: always - image: mariadb:10.3 + image: mariadb:10.6 container_name: cws-db ports: - "3306:3306" diff --git a/pom.xml b/pom.xml index f176e901..89686f92 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 2.1 4.13.1 2.7.1b3 - 2.7.2 + 3.1.3 3.6.1 3.0.1 @@ -67,7 +67,7 @@ 2.22.2 4.3.1 3.5.3 - 8.0.16 + 8.0.32 4.0.3 1.0.4 UTF-8 From a4436a8a049013570726eb1294852f0768d1e870 Mon Sep 17 00:00:00 2001 From: Ronny Fray Date: Thu, 23 Mar 2023 22:14:49 -0400 Subject: [PATCH 2/2] Update MariaDB Connector/J Update MySQL Connector/J --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 89686f92..f176e901 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 2.1 4.13.1 2.7.1b3 - 3.1.3 + 2.7.2 3.6.1 3.0.1 @@ -67,7 +67,7 @@ 2.22.2 4.3.1 3.5.3 - 8.0.32 + 8.0.16 4.0.3 1.0.4 UTF-8