diff --git a/core/plugins/org.activitymgr.core.dao.h2fragment/META-INF/MANIFEST.MF b/core/plugins/org.activitymgr.core.dao.h2fragment/META-INF/MANIFEST.MF index 651d0120..112fa2e2 100644 --- a/core/plugins/org.activitymgr.core.dao.h2fragment/META-INF/MANIFEST.MF +++ b/core/plugins/org.activitymgr.core.dao.h2fragment/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Activity Manager H2 JDBC Driver Fragment Bundle-SymbolicName: org.activitymgr.core.dao.h2fragment -Bundle-Version: 1.4.1.qualifier +Bundle-Version: 1.4.4.qualifier Fragment-Host: org.apache.commons.dbcp Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ClassPath: h2-1.3.172.jar diff --git a/core/plugins/org.activitymgr.core.dao.h2fragment/pom.xml b/core/plugins/org.activitymgr.core.dao.h2fragment/pom.xml index 07b40efa..4ac3a098 100644 --- a/core/plugins/org.activitymgr.core.dao.h2fragment/pom.xml +++ b/core/plugins/org.activitymgr.core.dao.h2fragment/pom.xml @@ -37,7 +37,7 @@ org.activitymgr parent - 1.4.1-SNAPSHOT + 1.4.4-SNAPSHOT ../../../parent diff --git a/core/plugins/org.activitymgr.core.dao.hsqldbfragment/META-INF/MANIFEST.MF b/core/plugins/org.activitymgr.core.dao.hsqldbfragment/META-INF/MANIFEST.MF index 06813dbc..69cf423b 100644 --- a/core/plugins/org.activitymgr.core.dao.hsqldbfragment/META-INF/MANIFEST.MF +++ b/core/plugins/org.activitymgr.core.dao.hsqldbfragment/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Activity Manager Hsqldb JDBC Driver Fragment Bundle-SymbolicName: org.activitymgr.core.dao.hsqldbfragment -Bundle-Version: 1.4.1.qualifier +Bundle-Version: 1.4.4.qualifier Fragment-Host: org.apache.commons.dbcp Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ClassPath: hsqldb-2.3.4.jar diff --git a/core/plugins/org.activitymgr.core.dao.hsqldbfragment/pom.xml b/core/plugins/org.activitymgr.core.dao.hsqldbfragment/pom.xml index 7fdbdfb9..7c8e09ae 100644 --- a/core/plugins/org.activitymgr.core.dao.hsqldbfragment/pom.xml +++ b/core/plugins/org.activitymgr.core.dao.hsqldbfragment/pom.xml @@ -37,7 +37,7 @@ org.activitymgr parent - 1.4.1-SNAPSHOT + 1.4.4-SNAPSHOT ../../../parent diff --git a/core/plugins/org.activitymgr.core.dao.mysqlfragment/META-INF/MANIFEST.MF b/core/plugins/org.activitymgr.core.dao.mysqlfragment/META-INF/MANIFEST.MF index afba6ddb..42b77ca3 100644 --- a/core/plugins/org.activitymgr.core.dao.mysqlfragment/META-INF/MANIFEST.MF +++ b/core/plugins/org.activitymgr.core.dao.mysqlfragment/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Activity Manager Mysql Driver Fragment Bundle-SymbolicName: org.activitymgr.core.dao.mysqlfragment -Bundle-Version: 1.4.1.qualifier +Bundle-Version: 1.4.4.qualifier Fragment-Host: org.apache.commons.dbcp Bundle-RequiredExecutionEnvironment: JavaSE-11 -Bundle-ClassPath: mysql-connector-java-5.1.26-bin.jar +Bundle-ClassPath: mariadb-java-client-3.4.1.jar diff --git a/core/plugins/org.activitymgr.core.dao.mysqlfragment/build.properties b/core/plugins/org.activitymgr.core.dao.mysqlfragment/build.properties index e2d5f00c..32a56ec3 100644 --- a/core/plugins/org.activitymgr.core.dao.mysqlfragment/build.properties +++ b/core/plugins/org.activitymgr.core.dao.mysqlfragment/build.properties @@ -1,2 +1,2 @@ bin.includes = META-INF/,\ - mysql-connector-java-5.1.26-bin.jar + mariadb-java-client-3.4.1.jar diff --git a/core/plugins/org.activitymgr.core.dao.mysqlfragment/mariadb-java-client-3.4.1.jar b/core/plugins/org.activitymgr.core.dao.mysqlfragment/mariadb-java-client-3.4.1.jar new file mode 100644 index 00000000..40028c47 Binary files /dev/null and b/core/plugins/org.activitymgr.core.dao.mysqlfragment/mariadb-java-client-3.4.1.jar differ diff --git a/core/plugins/org.activitymgr.core.dao.mysqlfragment/mysql-connector-java-5.1.26-bin.jar b/core/plugins/org.activitymgr.core.dao.mysqlfragment/mysql-connector-java-5.1.26-bin.jar deleted file mode 100644 index bf1e9339..00000000 Binary files a/core/plugins/org.activitymgr.core.dao.mysqlfragment/mysql-connector-java-5.1.26-bin.jar and /dev/null differ diff --git a/core/plugins/org.activitymgr.core.dao.mysqlfragment/pom.xml b/core/plugins/org.activitymgr.core.dao.mysqlfragment/pom.xml index 66b908a4..5d9fb696 100644 --- a/core/plugins/org.activitymgr.core.dao.mysqlfragment/pom.xml +++ b/core/plugins/org.activitymgr.core.dao.mysqlfragment/pom.xml @@ -37,7 +37,7 @@ org.activitymgr parent - 1.4.1-SNAPSHOT + 1.4.4-SNAPSHOT ../../../parent diff --git a/core/plugins/org.activitymgr.core.dao/META-INF/MANIFEST.MF b/core/plugins/org.activitymgr.core.dao/META-INF/MANIFEST.MF index 243b97f2..46be5dfe 100644 --- a/core/plugins/org.activitymgr.core.dao/META-INF/MANIFEST.MF +++ b/core/plugins/org.activitymgr.core.dao/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Activity Manager DAO Layer Bundle-SymbolicName: org.activitymgr.core.dao Automatic-Module-Name: org.activitymgr.core.dao -Bundle-Version: 1.4.1.qualifier +Bundle-Version: 1.4.4.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.activitymgr.core.dto;bundle-version="1.0.0", org.activitymgr.core.util;bundle-version="1.0.0", diff --git a/core/plugins/org.activitymgr.core.dao/pom.xml b/core/plugins/org.activitymgr.core.dao/pom.xml index d82b5491..e4427c88 100644 --- a/core/plugins/org.activitymgr.core.dao/pom.xml +++ b/core/plugins/org.activitymgr.core.dao/pom.xml @@ -37,7 +37,7 @@ org.activitymgr parent - 1.4.1-SNAPSHOT + 1.4.4-SNAPSHOT ../../../parent diff --git a/core/plugins/org.activitymgr.core.dto/META-INF/MANIFEST.MF b/core/plugins/org.activitymgr.core.dto/META-INF/MANIFEST.MF index c1a63465..00c6f4a6 100644 --- a/core/plugins/org.activitymgr.core.dto/META-INF/MANIFEST.MF +++ b/core/plugins/org.activitymgr.core.dto/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Activity Manager Data Transfer Objects Bundle-SymbolicName: org.activitymgr.core.dto -Bundle-Version: 1.4.1.qualifier +Bundle-Version: 1.4.4.qualifier Bundle-Vendor: Jean-Francois Brazeau Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.activitymgr.core.dto, diff --git a/core/plugins/org.activitymgr.core.dto/pom.xml b/core/plugins/org.activitymgr.core.dto/pom.xml index 16076997..00844d58 100644 --- a/core/plugins/org.activitymgr.core.dto/pom.xml +++ b/core/plugins/org.activitymgr.core.dto/pom.xml @@ -37,7 +37,7 @@ org.activitymgr parent - 1.4.1-SNAPSHOT + 1.4.4-SNAPSHOT ../../../parent diff --git a/core/plugins/org.activitymgr.core.model/META-INF/MANIFEST.MF b/core/plugins/org.activitymgr.core.model/META-INF/MANIFEST.MF index b5d4dada..8a9b9b51 100644 --- a/core/plugins/org.activitymgr.core.model/META-INF/MANIFEST.MF +++ b/core/plugins/org.activitymgr.core.model/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Activity Manager Core Bundle-SymbolicName: org.activitymgr.core.model;singleton:=true -Bundle-Version: 1.4.1.qualifier +Bundle-Version: 1.4.4.qualifier Bundle-Vendor: Jean-Francois Brazeau Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.activitymgr.core.util, diff --git a/core/plugins/org.activitymgr.core.model/pom.xml b/core/plugins/org.activitymgr.core.model/pom.xml index 2a06478e..1b22ab9e 100644 --- a/core/plugins/org.activitymgr.core.model/pom.xml +++ b/core/plugins/org.activitymgr.core.model/pom.xml @@ -37,7 +37,7 @@ org.activitymgr parent - 1.4.1-SNAPSHOT + 1.4.4-SNAPSHOT ../../../parent diff --git a/core/plugins/org.activitymgr.core.orm/META-INF/MANIFEST.MF b/core/plugins/org.activitymgr.core.orm/META-INF/MANIFEST.MF index 2c4ec0cb..8022e3f5 100644 --- a/core/plugins/org.activitymgr.core.orm/META-INF/MANIFEST.MF +++ b/core/plugins/org.activitymgr.core.orm/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Lightweight ORM Bundle-SymbolicName: org.activitymgr.core.orm -Bundle-Version: 1.4.1.qualifier +Bundle-Version: 1.4.4.qualifier Bundle-Vendor: Jean-Francois Brazeau Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.apache.log4j diff --git a/core/plugins/org.activitymgr.core.orm/pom.xml b/core/plugins/org.activitymgr.core.orm/pom.xml index b52efa55..db2e6091 100644 --- a/core/plugins/org.activitymgr.core.orm/pom.xml +++ b/core/plugins/org.activitymgr.core.orm/pom.xml @@ -37,7 +37,7 @@ org.activitymgr parent - 1.4.1-SNAPSHOT + 1.4.4-SNAPSHOT ../../../parent diff --git a/core/plugins/org.activitymgr.core.util/META-INF/MANIFEST.MF b/core/plugins/org.activitymgr.core.util/META-INF/MANIFEST.MF index bb7ea061..d08ae6cb 100644 --- a/core/plugins/org.activitymgr.core.util/META-INF/MANIFEST.MF +++ b/core/plugins/org.activitymgr.core.util/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Activity Manager Utility Class Bundle-SymbolicName: org.activitymgr.core.util -Bundle-Version: 1.4.1.qualifier +Bundle-Version: 1.4.4.qualifier Bundle-Vendor: Jean-Francois Brazeau Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.activitymgr.core.util diff --git a/core/plugins/org.activitymgr.core.util/pom.xml b/core/plugins/org.activitymgr.core.util/pom.xml index ed7f1d31..a015a6e2 100644 --- a/core/plugins/org.activitymgr.core.util/pom.xml +++ b/core/plugins/org.activitymgr.core.util/pom.xml @@ -37,7 +37,7 @@ org.activitymgr parent - 1.4.1-SNAPSHOT + 1.4.4-SNAPSHOT ../../../parent diff --git a/core/plugins/org.activitymgr.core.util/src/org/activitymgr/core/util/strings.properties b/core/plugins/org.activitymgr.core.util/src/org/activitymgr/core/util/strings.properties index 7549a42c..3490057b 100644 --- a/core/plugins/org.activitymgr.core.util/src/org/activitymgr/core/util/strings.properties +++ b/core/plugins/org.activitymgr.core.util/src/org/activitymgr/core/util/strings.properties @@ -63,7 +63,7 @@ DatabaseUI.buttons.EXPORT_DATABASE=Export database DatabaseUI.buttons.IMPORT_DATABASE=Import from XML DatabaseUI.buttons.OPEN_DATABASE=Open database DatabaseUI.buttons.RESET_DATABASE=Reset database data -DatabaseUI.databasetypes.MYSQL_SERVER=MySQL Server database +DatabaseUI.databasetypes.MARIA_DB=MariaDB database DatabaseUI.databasetypes.STANDALONE_MODE=Standalone mode (embedded HSQL database) DatabaseUI.databasetypes.USER_DEFINED=User defined database DatabaseUI.errors.DATABASE_NOT_INSTALLED=Database not installed.\nConnection failed. diff --git a/core/plugins/org.activitymgr.core.util/src/org/activitymgr/core/util/strings_fr.properties b/core/plugins/org.activitymgr.core.util/src/org/activitymgr/core/util/strings_fr.properties index 56fe0744..acfaf7b0 100644 --- a/core/plugins/org.activitymgr.core.util/src/org/activitymgr/core/util/strings_fr.properties +++ b/core/plugins/org.activitymgr.core.util/src/org/activitymgr/core/util/strings_fr.properties @@ -61,9 +61,9 @@ DatabaseUI.buttons.EXPORT_DATABASE=Exporter la base DatabaseUI.buttons.IMPORT_DATABASE=Importer depuis XML DatabaseUI.buttons.OPEN_DATABASE=Ouvrir la base DatabaseUI.buttons.RESET_DATABASE=Réinitialiser les données -DatabaseUI.databasetypes.MYSQL_SERVER=Base de données MySQL Server +DatabaseUI.databasetypes.MARIA_DB=Base de données MariaDB DatabaseUI.databasetypes.STANDALONE_MODE=Mode standalone (base HSQL embarquée) -DatabaseUI.databasetypes.USER_DEFINED=Autre base de donnée +DatabaseUI.databasetypes.USER_DEFINED=Autre base de données DatabaseUI.errors.DATABASE_NOT_INSTALLED=La base de données n''est pas installée.\nLa connexion a échoué. DatabaseUI.errors.DURATIONS_CREATION_ERROR=Erreur inattendue lors de la création des durées par défaut DatabaseUI.errors.FILE_DOES_NOT_EXIST=Le fichier spécifié n'existe pas. Veuillez spécifier un nom valide. diff --git a/core/releng/org.activitymgr.core.feature/feature.xml b/core/releng/org.activitymgr.core.feature/feature.xml index d2cc3c12..4db38626 100644 --- a/core/releng/org.activitymgr.core.feature/feature.xml +++ b/core/releng/org.activitymgr.core.feature/feature.xml @@ -2,7 +2,7 @@ + version="1.4.4.qualifier"> Activity Manager Core Feature. diff --git a/core/releng/org.activitymgr.core.feature/pom.xml b/core/releng/org.activitymgr.core.feature/pom.xml index b3dfc7a3..d7e58004 100644 --- a/core/releng/org.activitymgr.core.feature/pom.xml +++ b/core/releng/org.activitymgr.core.feature/pom.xml @@ -37,7 +37,7 @@ org.activitymgr parent - 1.4.1-SNAPSHOT + 1.4.4-SNAPSHOT ../../../parent diff --git a/core/tests/org.activitymgr.core.tests/META-INF/MANIFEST.MF b/core/tests/org.activitymgr.core.tests/META-INF/MANIFEST.MF index 086ad0ea..edbf5990 100644 --- a/core/tests/org.activitymgr.core.tests/META-INF/MANIFEST.MF +++ b/core/tests/org.activitymgr.core.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Activity Manager Core Tests Bundle-SymbolicName: org.activitymgr.core.tests -Bundle-Version: 1.4.1.qualifier +Bundle-Version: 1.4.4.qualifier Bundle-Vendor: Jean-Francois Brazeau Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.activitymgr.core.model;visibility:=reexport, diff --git a/core/tests/org.activitymgr.core.tests/pom.xml b/core/tests/org.activitymgr.core.tests/pom.xml index 0fddb021..5c15f968 100644 --- a/core/tests/org.activitymgr.core.tests/pom.xml +++ b/core/tests/org.activitymgr.core.tests/pom.xml @@ -37,7 +37,7 @@ org.activitymgr parent - 1.4.1-SNAPSHOT + 1.4.4-SNAPSHOT ../../../parent diff --git a/core/tests/org.activitymgr.core.tests/src/org/activitymgr/core/tests.properties b/core/tests/org.activitymgr.core.tests/src/org/activitymgr/core/tests.properties index 5d87df9c..c67ba016 100644 --- a/core/tests/org.activitymgr.core.tests/src/org/activitymgr/core/tests.properties +++ b/core/tests/org.activitymgr.core.tests/src/org/activitymgr/core/tests.properties @@ -14,8 +14,8 @@ hsqlmem.url=jdbc:hsqldb:mem:activitymgrdb hsqlmem.user=sa hsqlmem.password= -mysql.url=jdbc:mysql://localhost/taskmgr_db -mysql.driver=com.mysql.jdbc.Driver +mysql.url=jdbc:mariadb://localhost/taskmgr_db +mysql.driver=org.mariadb.jdbc.Driver mysql.user=taskmgr_user mysql.password=secret diff --git a/misc/docker/mariadb12/Dockerfile b/misc/docker/mariadb12/Dockerfile new file mode 100644 index 00000000..3314a3e6 --- /dev/null +++ b/misc/docker/mariadb12/Dockerfile @@ -0,0 +1,22 @@ +FROM debian:12 + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + bash \ + ca-certificates \ + mariadb-client \ + mariadb-server \ + procps \ + psmisc \ + && rm -rf /var/lib/apt/lists/* + +COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh + +RUN sed -i 's/\r$//' /usr/local/bin/docker-entrypoint.sh \ + && chmod +x /usr/local/bin/docker-entrypoint.sh + +EXPOSE 3306 + +ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] diff --git a/misc/docker/mariadb12/docker-entrypoint.sh b/misc/docker/mariadb12/docker-entrypoint.sh new file mode 100644 index 00000000..1dc73746 --- /dev/null +++ b/misc/docker/mariadb12/docker-entrypoint.sh @@ -0,0 +1,75 @@ +#!/usr/bin/env bash +set -euo pipefail + +DB_BASE="${DB_BASE:-/usr}" +DB_DATADIR="${DB_DATADIR:-/var/lib/mysql}" +DB_RUNDIR="${DB_RUNDIR:-/run/mysqld}" +DB_SOCKET="${DB_SOCKET:-${DB_RUNDIR}/mysqld.sock}" +DB_PORT="${DB_PORT:-3306}" +DB_NAME="${DB_NAME:-taskmgr_db}" +DB_USER="${DB_USER:-taskmgr_user}" +DB_PASSWORD="${DB_PASSWORD:-secret}" +DB_INIT_MARKER="${DB_INIT_MARKER:-${DB_DATADIR}/.activitymgr_initialized}" + +mkdir -p "${DB_DATADIR}" "${DB_RUNDIR}" +chown -R mysql:mysql "${DB_DATADIR}" "${DB_RUNDIR}" + +MARIADB_INSTALL_DB="/usr/bin/mariadb-install-db" +MYSQLD_SAFE="/usr/bin/mysqld_safe" +MARIADB_ADMIN="/usr/bin/mariadb-admin" +MARIADB="/usr/bin/mariadb" + +if [[ ! -d "${DB_DATADIR}/mysql" ]]; then + echo "[mariadb12] Initializing MariaDB data directory" + "${MARIADB_INSTALL_DB}" \ + --basedir="${DB_BASE}" \ + --datadir="${DB_DATADIR}" \ + --user=mysql +fi + +if [[ ! -f "${DB_INIT_MARKER}" ]]; then + echo "[mariadb12] Starting temporary MariaDB instance" + "${MYSQLD_SAFE}" \ + --basedir="${DB_BASE}" \ + --datadir="${DB_DATADIR}" \ + --socket="${DB_SOCKET}" \ + --port="${DB_PORT}" \ + --user=mysql \ + --skip-networking=0 \ + --bind-address=127.0.0.1 \ + >/tmp/mariadb-init.log 2>&1 & + + for i in $(seq 1 120); do + if "${MARIADB_ADMIN}" --socket="${DB_SOCKET}" --user=root ping --silent >/dev/null 2>&1; then + break + fi + sleep 1 + done + + if ! "${MARIADB_ADMIN}" --socket="${DB_SOCKET}" --user=root ping --silent >/dev/null 2>&1; then + cat /tmp/mariadb-init.log >&2 || true + echo "[mariadb12] Temporary MariaDB instance did not become ready" >&2 + exit 1 + fi + + "${MARIADB}" --socket="${DB_SOCKET}" --user=root < /etc/apt/sources.list \ && printf 'Acquire::Check-Valid-Until "false";\n' > /etc/apt/apt.conf.d/99no-check-valid-until +ENV DEBIAN_FRONTEND=noninteractive + RUN apt-get update \ && apt-get install -y --no-install-recommends \ bash \ ca-certificates \ - curl \ - libaio1 \ - libncurses5 \ - perl \ procps \ psmisc \ - tar \ + mysql-client \ + mysql-server \ && rm -rf /var/lib/apt/lists/* -RUN groupadd -r mysql \ - && useradd -r -g mysql -s /bin/false mysql \ - && mkdir -p /opt /var/lib/mysql /var/run/mysqld \ - && curl -fsSL "${MYSQL_DOWNLOAD_URL}" -o /tmp/mysql.tar.gz \ - && tar -xzf /tmp/mysql.tar.gz -C /opt \ - && mv "/opt/mysql-${MYSQL_VERSION}-linux2.6-x86_64" /opt/mysql \ - && test -x /opt/mysql/bin/my_print_defaults \ - && test -x /opt/mysql/scripts/mysql_install_db \ - && test -x /opt/mysql/bin/mysqld_safe \ - && ln -s /opt/mysql /usr/local/mysql \ - && rm /tmp/mysql.tar.gz \ - && chown -R mysql:mysql /opt/mysql /var/lib/mysql /var/run/mysqld - COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh RUN sed -i 's/\r$//' /usr/local/bin/docker-entrypoint.sh \ diff --git a/misc/docker/mysql55/docker-entrypoint.sh b/misc/docker/mysql55/docker-entrypoint.sh index 534c0506..d4e7d353 100644 --- a/misc/docker/mysql55/docker-entrypoint.sh +++ b/misc/docker/mysql55/docker-entrypoint.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -euo pipefail -MYSQL_BASE="${MYSQL_BASE:-/opt/mysql}" +MYSQL_BASE="${MYSQL_BASE:-/usr}" MYSQL_DATADIR="${MYSQL_DATADIR:-/var/lib/mysql}" MYSQL_RUNDIR="${MYSQL_RUNDIR:-/var/run/mysqld}" MYSQL_SOCKET="${MYSQL_SOCKET:-${MYSQL_RUNDIR}/mysqld.sock}" @@ -9,23 +9,26 @@ MYSQL_PORT="${MYSQL_PORT:-3306}" MYSQL_DATABASE="${MYSQL_DATABASE:-taskmgr_db}" MYSQL_USER="${MYSQL_USER:-taskmgr_user}" MYSQL_PASSWORD="${MYSQL_PASSWORD:-secret}" +MYSQL_INIT_MARKER="${MYSQL_INIT_MARKER:-${MYSQL_DATADIR}/.activitymgr_initialized}" mkdir -p "${MYSQL_DATADIR}" "${MYSQL_RUNDIR}" chown -R mysql:mysql "${MYSQL_DATADIR}" "${MYSQL_RUNDIR}" -MYSQL_INSTALL_DB="${MYSQL_BASE}/scripts/mysql_install_db" -MYSQLD_SAFE="${MYSQL_BASE}/bin/mysqld_safe" -MYSQLADMIN="${MYSQL_BASE}/bin/mysqladmin" -MYSQL="${MYSQL_BASE}/bin/mysql" +MYSQL_INSTALL_DB="/usr/bin/mysql_install_db" +MYSQLD_SAFE="/usr/bin/mysqld_safe" +MYSQLADMIN="/usr/bin/mysqladmin" +MYSQL="/usr/bin/mysql" if [[ ! -d "${MYSQL_DATADIR}/mysql" ]]; then - echo "[mysql55] Initializing MySQL data directory" + echo "[mysql-jessie] Initializing MySQL data directory" "${MYSQL_INSTALL_DB}" \ --basedir="${MYSQL_BASE}" \ --datadir="${MYSQL_DATADIR}" \ --user=mysql +fi - echo "[mysql55] Starting temporary MySQL instance" +if [[ ! -f "${MYSQL_INIT_MARKER}" ]]; then + echo "[mysql-jessie] Starting temporary MySQL instance" "${MYSQLD_SAFE}" \ --basedir="${MYSQL_BASE}" \ --datadir="${MYSQL_DATADIR}" \ @@ -45,7 +48,7 @@ if [[ ! -d "${MYSQL_DATADIR}/mysql" ]]; then if ! "${MYSQLADMIN}" --socket="${MYSQL_SOCKET}" --user=root ping --silent >/dev/null 2>&1; then cat /tmp/mysql-init.log >&2 || true - echo "[mysql55] Temporary MySQL instance did not become ready" >&2 + echo "[mysql-jessie] Temporary MySQL instance did not become ready" >&2 exit 1 fi @@ -56,9 +59,11 @@ FLUSH PRIVILEGES; SQL "${MYSQLADMIN}" --socket="${MYSQL_SOCKET}" --user=root shutdown + touch "${MYSQL_INIT_MARKER}" + chown mysql:mysql "${MYSQL_INIT_MARKER}" fi -echo "[mysql55] Starting MySQL 5.5.47 on port ${MYSQL_PORT}" +echo "[mysql-jessie] Starting repository MySQL on port ${MYSQL_PORT}" exec "${MYSQLD_SAFE}" \ --basedir="${MYSQL_BASE}" \ --datadir="${MYSQL_DATADIR}" \ diff --git a/misc/docker/test-runner/Dockerfile.debian12 b/misc/docker/test-runner/Dockerfile.debian12 new file mode 100644 index 00000000..430ff7b7 --- /dev/null +++ b/misc/docker/test-runner/Dockerfile.debian12 @@ -0,0 +1,42 @@ +FROM debian:12 + +ARG MAVEN_VERSION=3.9.9 +ARG MAVEN_BASE_URL=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/${MAVEN_VERSION} +ARG TEMURIN_API_URL=https://api.adoptium.net/v3/binary/latest/11/ga/linux/x64/jdk/hotspot/normal/adoptium + +ENV JAVA_HOME=/opt/java/openjdk +ENV MAVEN_HOME=/opt/maven +ENV MAVEN_CONFIG=/m2 +ENV MAVEN_OPTS="-Xms256m -Xmx2g" +ENV PATH="${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${PATH}" + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + bash \ + ca-certificates \ + curl \ + fontconfig \ + fonts-dejavu-core \ + git \ + gzip \ + libfreetype6 \ + tar \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /opt/java /opt/maven \ + && curl -fsSL "${TEMURIN_API_URL}" -o /tmp/jdk11.tar.gz \ + && tar -xzf /tmp/jdk11.tar.gz -C /opt/java \ + && mv /opt/java/jdk-* "${JAVA_HOME}" \ + && rm /tmp/jdk11.tar.gz \ + && curl -fsSL "${MAVEN_BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz" -o /tmp/maven.tar.gz \ + && tar -xzf /tmp/maven.tar.gz -C /opt/maven --strip-components=1 \ + && rm /tmp/maven.tar.gz + +WORKDIR /workspace + +COPY run-core-tests.sh /usr/local/bin/run-core-tests.sh + +RUN sed -i 's/\r$//' /usr/local/bin/run-core-tests.sh \ + && chmod +x /usr/local/bin/run-core-tests.sh + +ENTRYPOINT ["/usr/local/bin/run-core-tests.sh"] diff --git a/misc/docker/test-runner/README.md b/misc/docker/test-runner/README.md index ac2baee8..927e2091 100644 --- a/misc/docker/test-runner/README.md +++ b/misc/docker/test-runner/README.md @@ -65,4 +65,39 @@ Notes for the MySQL scenario: - The `tests` service keeps using the same runner image and script. - The MySQL-specific JDBC settings are injected through environment variables, so the default H2 configuration remains unchanged outside Compose. -- The `mysql55` service runs a local image based on the official MySQL 5.5.47 generic binary tarball. +- The `mysql55` service installs MySQL from the official Debian Jessie repositories to stay close to a standard Jessie setup. + +Run the tests with a Debian 12 runner and MySQL 8: + +```bash +docker compose -f misc/docker/test-runner/compose.mysql8.yml up --build --abort-on-container-exit tests +``` + +Stop that stack: + +```bash +docker compose -f misc/docker/test-runner/compose.mysql8.yml down -v +``` + +Notes for the Debian 12 / MySQL 8 scenario: + +- The test runner uses `Dockerfile.debian12` and keeps the same Java 11 + Maven bootstrap approach. +- The MySQL service uses the official `mysql:8.0` image with `mysql_native_password` enabled to keep the test setup compatible with the current JDBC configuration. + +Run the tests with a full Debian 12 + MariaDB stack: + +```bash +docker compose -f misc/docker/test-runner/compose.mariadb12.yml up --build --abort-on-container-exit tests +``` + +Stop that stack: + +```bash +docker compose -f misc/docker/test-runner/compose.mariadb12.yml down -v +``` + +Notes for the Debian 12 / MariaDB scenario: + +- Both the runner and the database services are built from Debian 12 images. +- The database service installs `mariadb-server` from the official Debian 12 repositories. +- The MariaDB stack now uses the native MariaDB JDBC driver and a `jdbc:mariadb://...` URL. diff --git a/misc/docker/test-runner/compose.mariadb12.yml b/misc/docker/test-runner/compose.mariadb12.yml new file mode 100644 index 00000000..3826b033 --- /dev/null +++ b/misc/docker/test-runner/compose.mariadb12.yml @@ -0,0 +1,40 @@ +services: + mariadb12: + build: + context: ../mariadb12 + image: activity-manager-mariadb12:bookworm + container_name: activity-manager-mariadb12 + environment: + DB_NAME: taskmgr_db + DB_USER: taskmgr_user + DB_PASSWORD: secret + healthcheck: + test: ["CMD-SHELL", "mariadb-admin --user=root --host=127.0.0.1 --port=3306 ping --silent"] + interval: 5s + timeout: 5s + retries: 30 + ports: + - "3306:3306" + + tests: + build: + context: . + dockerfile: Dockerfile.debian12 + image: activity-manager-tests:debian12 + depends_on: + mariadb12: + condition: service_healthy + environment: + DBCONFIG: mysql + MYSQL_DRIVER: org.mariadb.jdbc.Driver + MYSQL_URL: jdbc:mariadb://mariadb12:3306/taskmgr_db?useSSL=false&serverTimezone=UTC + MYSQL_USER: taskmgr_user + MYSQL_PASSWORD: secret + DB_HOST: mariadb12 + DB_PORT: "3306" + volumes: + - ../../..:/workspace + - activity-manager-m2:/m2 + +volumes: + activity-manager-m2: diff --git a/misc/docker/test-runner/compose.mysql55.yml b/misc/docker/test-runner/compose.mysql55.yml index 2a4c7318..beaee1cc 100644 --- a/misc/docker/test-runner/compose.mysql55.yml +++ b/misc/docker/test-runner/compose.mysql55.yml @@ -2,14 +2,14 @@ services: mysql55: build: context: ../mysql55 - image: activity-manager-mysql55:5.5.47 + image: activity-manager-mysql55:jessie container_name: activity-manager-mysql55 environment: MYSQL_DATABASE: taskmgr_db MYSQL_USER: taskmgr_user MYSQL_PASSWORD: secret healthcheck: - test: ["CMD-SHELL", "/opt/mysql/bin/mysqladmin --user=root --host=127.0.0.1 --port=3306 ping --silent"] + test: ["CMD-SHELL", "mysqladmin --user=root --host=127.0.0.1 --port=3306 ping --silent"] interval: 5s timeout: 5s retries: 30 diff --git a/misc/docker/test-runner/compose.mysql8.yml b/misc/docker/test-runner/compose.mysql8.yml new file mode 100644 index 00000000..fcb38c2b --- /dev/null +++ b/misc/docker/test-runner/compose.mysql8.yml @@ -0,0 +1,41 @@ +services: + mysql8: + image: mysql:8.0 + container_name: activity-manager-mysql8 + command: + - --default-authentication-plugin=mysql_native_password + environment: + MYSQL_ROOT_PASSWORD: root + MYSQL_DATABASE: taskmgr_db + MYSQL_USER: taskmgr_user + MYSQL_PASSWORD: secret + healthcheck: + test: ["CMD-SHELL", "mysqladmin --user=root --password=root --host=127.0.0.1 --port=3306 ping --silent"] + interval: 5s + timeout: 5s + retries: 30 + ports: + - "3306:3306" + + tests: + build: + context: . + dockerfile: Dockerfile.debian12 + image: activity-manager-tests:debian12 + depends_on: + mysql8: + condition: service_healthy + environment: + DBCONFIG: mysql + MYSQL_DRIVER: com.mysql.cj.jdbc.Driver + MYSQL_URL: jdbc:mysql://mysql8:3306/taskmgr_db?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=UTC + MYSQL_USER: taskmgr_user + MYSQL_PASSWORD: secret + DB_HOST: mysql8 + DB_PORT: "3306" + volumes: + - ../../..:/workspace + - activity-manager-m2:/m2 + +volumes: + activity-manager-m2: diff --git a/parent/pom.xml b/parent/pom.xml index 5f172f0a..24e2419c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -35,7 +35,7 @@ 4.0.0 org.activitymgr parent - 1.4.1-SNAPSHOT + 1.4.4-SNAPSHOT pom POM Parent diff --git a/pom.xml b/pom.xml index 27effac2..0a33f9af 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 4.0.0 org.activitymgr container - 1.4.1-SNAPSHOT + 1.4.4-SNAPSHOT pom POM Container diff --git a/ui.rcp/plugins/org.activitymgr.ui.rcp/META-INF/MANIFEST.MF b/ui.rcp/plugins/org.activitymgr.ui.rcp/META-INF/MANIFEST.MF index b76dbe94..c6b28630 100644 --- a/ui.rcp/plugins/org.activitymgr.ui.rcp/META-INF/MANIFEST.MF +++ b/ui.rcp/plugins/org.activitymgr.ui.rcp/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Activity Manager RCP UI Bundle-SymbolicName: org.activitymgr.ui.rcp;singleton:=true Automatic-Module-Name: org.activitymgr.ui.rcp -Bundle-Version: 1.4.1.qualifier +Bundle-Version: 1.4.4.qualifier Bundle-Activator: org.activitymgr.ui.rcp.Activator Bundle-Vendor: Jean-Francois Brazeau Require-Bundle: org.eclipse.ui, diff --git a/ui.rcp/plugins/org.activitymgr.ui.rcp/pom.xml b/ui.rcp/plugins/org.activitymgr.ui.rcp/pom.xml index 06bf0aef..e47c5227 100644 --- a/ui.rcp/plugins/org.activitymgr.ui.rcp/pom.xml +++ b/ui.rcp/plugins/org.activitymgr.ui.rcp/pom.xml @@ -37,7 +37,7 @@ org.activitymgr parent - 1.4.1-SNAPSHOT + 1.4.4-SNAPSHOT ../../../parent diff --git a/ui.rcp/plugins/org.activitymgr.ui.rcp/src/org/activitymgr/ui/rcp/DatabaseUI.java b/ui.rcp/plugins/org.activitymgr.ui.rcp/src/org/activitymgr/ui/rcp/DatabaseUI.java index fcb242f4..31287bc5 100644 --- a/ui.rcp/plugins/org.activitymgr.ui.rcp/src/org/activitymgr/ui/rcp/DatabaseUI.java +++ b/ui.rcp/plugins/org.activitymgr.ui.rcp/src/org/activitymgr/ui/rcp/DatabaseUI.java @@ -102,7 +102,7 @@ public interface IDbStatusListener { /** Constantes */ public static final int STANDALONE_MODE = 0; - public static final int MYSQL_SERVER_MODE = 1; + public static final int MARIADB_MODE = 1; public static final int USER_DEFINED_MODE = 2; /** Model manager */ @@ -211,7 +211,7 @@ public DatabaseUI(Composite parentComposite, IModelMgr modelMgr, IDTOFactory fac dbTypeCombo.add(Strings .getString("DatabaseUI.databasetypes.STANDALONE_MODE")); //$NON-NLS-1$ dbTypeCombo.add(Strings - .getString("DatabaseUI.databasetypes.MYSQL_SERVER")); //$NON-NLS-1$ + .getString("DatabaseUI.databasetypes.MARIA_DB")); //$NON-NLS-1$ dbTypeCombo.add(Strings .getString("DatabaseUI.databasetypes.USER_DEFINED")); //$NON-NLS-1$ dbTypeCombo.select(STANDALONE_MODE); @@ -455,8 +455,8 @@ protected void dbTypeChanged() { enabledField(dbDataFileText, conectionPanel, "data/activitymgr", false); //$NON-NLS-1$ break; - // Cas d'une connexion MySQL - case MYSQL_SERVER_MODE: + // Cas d'une connexion MariaDB + case MARIADB_MODE: enabledField(dbHostText, "localhost", false); //$NON-NLS-1$ enabledField(dbPortText, "3306", true); //$NON-NLS-1$ enabledField(dbNameText, "taskmgr_db", false); //$NON-NLS-1$ @@ -598,12 +598,12 @@ private void entriesChanged() { jdbcUserIdText.setText("sa"); //$NON-NLS-1$ jdbcPasswordText.setText(""); //$NON-NLS-1$ break; - // Cas d'une connexion MySQL - case MYSQL_SERVER_MODE: - jdbcDriverText.setText("com.mysql.jdbc.Driver"); //$NON-NLS-1$ + // Cas d'une connexion MariaDB + case MARIADB_MODE: + jdbcDriverText.setText("org.mariadb.jdbc.Driver"); //$NON-NLS-1$ dbDataFileText.setStringValue(""); //$NON-NLS-1$ jdbcUrlText - .setText("jdbc:mysql://" + dbHostText.getText() + ":" + dbPortText.getText() + "/" + dbNameText.getText()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + .setText("jdbc:mariadb://" + dbHostText.getText() + ":" + dbPortText.getText() + "/" + dbNameText.getText()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ break; // Cas d'une connexion autre case USER_DEFINED_MODE: diff --git a/ui.rcp/releng/org.activitymgr.ui.rcp.feature/feature.xml b/ui.rcp/releng/org.activitymgr.ui.rcp.feature/feature.xml index 1f0f86bd..fa3855f3 100644 --- a/ui.rcp/releng/org.activitymgr.ui.rcp.feature/feature.xml +++ b/ui.rcp/releng/org.activitymgr.ui.rcp.feature/feature.xml @@ -2,7 +2,7 @@ + version="1.4.4.qualifier"> Activity Manager RCP UI Feature. diff --git a/ui.rcp/releng/org.activitymgr.ui.rcp.feature/pom.xml b/ui.rcp/releng/org.activitymgr.ui.rcp.feature/pom.xml index 3fde391e..5cc85b9f 100644 --- a/ui.rcp/releng/org.activitymgr.ui.rcp.feature/pom.xml +++ b/ui.rcp/releng/org.activitymgr.ui.rcp.feature/pom.xml @@ -37,7 +37,7 @@ org.activitymgr parent - 1.4.1-SNAPSHOT + 1.4.4-SNAPSHOT ../../../parent diff --git a/ui.rcp/releng/org.activitymgr.ui.rcp.repository/category.xml b/ui.rcp/releng/org.activitymgr.ui.rcp.repository/category.xml index d131411c..237a95b9 100644 --- a/ui.rcp/releng/org.activitymgr.ui.rcp.repository/category.xml +++ b/ui.rcp/releng/org.activitymgr.ui.rcp.repository/category.xml @@ -1,6 +1,6 @@ - + diff --git a/ui.rcp/releng/org.activitymgr.ui.rcp.repository/org.activitymgr.ui.rcp.product b/ui.rcp/releng/org.activitymgr.ui.rcp.repository/org.activitymgr.ui.rcp.product index 98747a64..b5708d2a 100644 --- a/ui.rcp/releng/org.activitymgr.ui.rcp.repository/org.activitymgr.ui.rcp.product +++ b/ui.rcp/releng/org.activitymgr.ui.rcp.repository/org.activitymgr.ui.rcp.product @@ -1,7 +1,7 @@ - + diff --git a/ui.rcp/releng/org.activitymgr.ui.rcp.repository/pom.xml b/ui.rcp/releng/org.activitymgr.ui.rcp.repository/pom.xml index a9442e67..712faef6 100644 --- a/ui.rcp/releng/org.activitymgr.ui.rcp.repository/pom.xml +++ b/ui.rcp/releng/org.activitymgr.ui.rcp.repository/pom.xml @@ -37,7 +37,7 @@ org.activitymgr parent - 1.4.1-SNAPSHOT + 1.4.4-SNAPSHOT ../../../parent diff --git a/ui.web/plugins/org.activitymgr.ui.web.logic/META-INF/MANIFEST.MF b/ui.web/plugins/org.activitymgr.ui.web.logic/META-INF/MANIFEST.MF index bd908e97..9cd598a8 100755 --- a/ui.web/plugins/org.activitymgr.ui.web.logic/META-INF/MANIFEST.MF +++ b/ui.web/plugins/org.activitymgr.ui.web.logic/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Activity Manager Web UI Logic Bundle-SymbolicName: org.activitymgr.ui.web.logic;singleton:=true -Bundle-Version: 1.4.1.qualifier +Bundle-Version: 1.4.4.qualifier Bundle-Vendor: Jean-Francois Brazeau Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.osgi, diff --git a/ui.web/plugins/org.activitymgr.ui.web.logic/pom.xml b/ui.web/plugins/org.activitymgr.ui.web.logic/pom.xml index de80924e..8b7bde5d 100644 --- a/ui.web/plugins/org.activitymgr.ui.web.logic/pom.xml +++ b/ui.web/plugins/org.activitymgr.ui.web.logic/pom.xml @@ -37,7 +37,7 @@ org.activitymgr parent - 1.4.1-SNAPSHOT + 1.4.4-SNAPSHOT ../../../parent diff --git a/ui.web/plugins/org.activitymgr.ui.web.logic/src/org/activitymgr/ui/web/logic/LogicModule.java b/ui.web/plugins/org.activitymgr.ui.web.logic/src/org/activitymgr/ui/web/logic/LogicModule.java index 64d8a259..c66176de 100644 --- a/ui.web/plugins/org.activitymgr.ui.web.logic/src/org/activitymgr/ui/web/logic/LogicModule.java +++ b/ui.web/plugins/org.activitymgr.ui.web.logic/src/org/activitymgr/ui/web/logic/LogicModule.java @@ -139,8 +139,8 @@ protected void configure() { private DataSource createDataSource(IConfiguration cfg) { BasicDataSource datasource = new BasicDataSource(); IConfiguration jdbcCfg = cfg.getScoped("activitymgr.jdbc", null); - datasource.setDriverClassName(jdbcCfg.get("driver", "com.mysql.jdbc.Driver")); - datasource.setUrl(jdbcCfg.get("url", "jdbc:mysql://localhost:3306/taskmgr_db")); + datasource.setDriverClassName(jdbcCfg.get("driver", "org.mariadb.jdbc.Driver")); + datasource.setUrl(jdbcCfg.get("url", "jdbc:mariadb://localhost:3306/taskmgr_db")); datasource.setUsername(jdbcCfg.get("user", "taskmgr")); datasource.setPassword(jdbcCfg.get("password", "taskmgr")); datasource.setDefaultAutoCommit(false); diff --git a/ui.web/plugins/org.activitymgr.ui.web.view/META-INF/MANIFEST.MF b/ui.web/plugins/org.activitymgr.ui.web.view/META-INF/MANIFEST.MF index 534a445a..56b0f939 100644 --- a/ui.web/plugins/org.activitymgr.ui.web.view/META-INF/MANIFEST.MF +++ b/ui.web/plugins/org.activitymgr.ui.web.view/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Activity Manager Web UI View Bundle-SymbolicName: org.activitymgr.ui.web.view;singleton:=true -Bundle-Version: 1.4.1.qualifier +Bundle-Version: 1.4.4.qualifier Bundle-Vendor: Jean-Francois Brazeau Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.activitymgr.ui.web.logic;visibility:=reexport, diff --git a/ui.web/plugins/org.activitymgr.ui.web.view/pom.xml b/ui.web/plugins/org.activitymgr.ui.web.view/pom.xml index 344f5f09..7136c422 100644 --- a/ui.web/plugins/org.activitymgr.ui.web.view/pom.xml +++ b/ui.web/plugins/org.activitymgr.ui.web.view/pom.xml @@ -37,7 +37,7 @@ org.activitymgr parent - 1.4.1-SNAPSHOT + 1.4.4-SNAPSHOT ../../../parent diff --git a/ui.web/releng/org.activitymgr.ui.web.feature/cfg-db.properties b/ui.web/releng/org.activitymgr.ui.web.feature/cfg-db.properties index bf1809d9..f6b50e05 100644 --- a/ui.web/releng/org.activitymgr.ui.web.feature/cfg-db.properties +++ b/ui.web/releng/org.activitymgr.ui.web.feature/cfg-db.properties @@ -1,5 +1,5 @@ # Database connection configuration -activitymgr.jdbc.driver=com.mysql.jdbc.Driver -activitymgr.jdbc.url=jdbc:mysql://localhost:3306/taskmgr_db +activitymgr.jdbc.driver=org.mariadb.jdbc.Driver +activitymgr.jdbc.url=jdbc:mariadb://localhost:3306/taskmgr_db activitymgr.jdbc.user=taskmgr -activitymgr.jdbc.password=taskmgr \ No newline at end of file +activitymgr.jdbc.password=taskmgr diff --git a/ui.web/releng/org.activitymgr.ui.web.feature/feature.xml b/ui.web/releng/org.activitymgr.ui.web.feature/feature.xml index a593aaae..67572820 100644 --- a/ui.web/releng/org.activitymgr.ui.web.feature/feature.xml +++ b/ui.web/releng/org.activitymgr.ui.web.feature/feature.xml @@ -2,7 +2,7 @@ + version="1.4.4.qualifier"> Activity Manager Web UI Feature. diff --git a/ui.web/releng/org.activitymgr.ui.web.feature/pom.xml b/ui.web/releng/org.activitymgr.ui.web.feature/pom.xml index c8164e42..b45e255d 100644 --- a/ui.web/releng/org.activitymgr.ui.web.feature/pom.xml +++ b/ui.web/releng/org.activitymgr.ui.web.feature/pom.xml @@ -37,7 +37,7 @@ org.activitymgr parent - 1.4.1-SNAPSHOT + 1.4.4-SNAPSHOT ../../../parent diff --git a/ui.web/releng/org.activitymgr.ui.web.repository/category.xml b/ui.web/releng/org.activitymgr.ui.web.repository/category.xml index 2f73df9d..09dfa9ed 100644 --- a/ui.web/releng/org.activitymgr.ui.web.repository/category.xml +++ b/ui.web/releng/org.activitymgr.ui.web.repository/category.xml @@ -1,6 +1,6 @@ - + diff --git a/ui.web/releng/org.activitymgr.ui.web.repository/launch/setup/cfg-db.properties b/ui.web/releng/org.activitymgr.ui.web.repository/launch/setup/cfg-db.properties index 8ab8f33b..bc919b76 100644 --- a/ui.web/releng/org.activitymgr.ui.web.repository/launch/setup/cfg-db.properties +++ b/ui.web/releng/org.activitymgr.ui.web.repository/launch/setup/cfg-db.properties @@ -2,8 +2,8 @@ # See org.activitymgr.ui.web.logic.LogicModule # Database connection configuration -activitymgr.jdbc.driver=com.mysql.jdbc.Driver -activitymgr.jdbc.url=jdbc:mysql://localhost:3306/taskmgr_db +activitymgr.jdbc.driver=org.mariadb.jdbc.Driver +activitymgr.jdbc.url=jdbc:mariadb://localhost:3306/taskmgr_db activitymgr.jdbc.user=taskmgr activitymgr.jdbc.password=taskmgr diff --git a/ui.web/releng/org.activitymgr.ui.web.repository/org.activitymgr.ui.web.view.product b/ui.web/releng/org.activitymgr.ui.web.repository/org.activitymgr.ui.web.view.product index b8f7c0c7..bca899a7 100644 --- a/ui.web/releng/org.activitymgr.ui.web.repository/org.activitymgr.ui.web.view.product +++ b/ui.web/releng/org.activitymgr.ui.web.repository/org.activitymgr.ui.web.view.product @@ -1,7 +1,7 @@ - + @@ -75,7 +75,7 @@ - + diff --git a/ui.web/releng/org.activitymgr.ui.web.repository/pom.xml b/ui.web/releng/org.activitymgr.ui.web.repository/pom.xml index 74dce347..f0a203eb 100644 --- a/ui.web/releng/org.activitymgr.ui.web.repository/pom.xml +++ b/ui.web/releng/org.activitymgr.ui.web.repository/pom.xml @@ -37,7 +37,7 @@ org.activitymgr parent - 1.4.1-SNAPSHOT + 1.4.4-SNAPSHOT ../../../parent