Skip to content

Commit

Permalink
Development: Update mysql and postgres to latest version
Browse files Browse the repository at this point in the history
  • Loading branch information
krusche committed Sep 28, 2024
1 parent 8cfa013 commit 9c6643f
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 12 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ dependencies {

dependencyManagement {
imports {
mavenBom "io.zonky.test.postgres:embedded-postgres-binaries-bom:16.4.0"
mavenBom "io.zonky.test.postgres:embedded-postgres-binaries-bom:17.0.0"
}
}

Expand Down
2 changes: 1 addition & 1 deletion docker/postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
services:
postgres:
container_name: artemis-postgres
image: docker.io/library/postgres:16.4-alpine
image: docker.io/library/postgres:17.0-alpine
pull_policy: if_not_present
user: postgres
command: ["postgres", "-c", "max_connections=10000"]
Expand Down
2 changes: 1 addition & 1 deletion docs/admin/database.rst
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Migrating MySQL Data to PostgreSQL
- db-migration
postgres:
image: docker.io/library/postgres:16.4
image: docker.io/library/postgres:17.0
environment:
- POSTGRES_USER=root
- POSTGRES_DB=Artemis
Expand Down
2 changes: 1 addition & 1 deletion docs/dev/setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ following dependencies/tools on your machine:
We use Java (JDK 21) to develop and run the Artemis application
server, which is based on `Spring
Boot <http://projects.spring.io/spring-boot>`__.
2. `MySQL Database Server 8 <https://dev.mysql.com/downloads/mysql>`__, or `PostgreSQL <https://www.postgresql.org/>`_:
2. `MySQL Database Server 9 <https://dev.mysql.com/downloads/mysql>`__, or `PostgreSQL 17 <https://www.postgresql.org/>`_:
Artemis uses Hibernate to store entities in an SQL database and Liquibase to
automatically apply schema transformations when updating Artemis.
3. `Node.js <https://nodejs.org/en/download>`__: We use Node LTS (>=20.16.0 < 21) to compile
Expand Down
4 changes: 2 additions & 2 deletions docs/dev/setup/database.rst
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ Users for MySQL
``application-local.yml`` *(spring > datasource > password)* and in ``liquibase.gradle``
*(within the 'liquibaseCommand' as argument password)*).
Set empty root password for MySQL 8
Set empty root password for MySQL 9
"""""""""""""""""""""""""""""""""""
If you have problems connecting to the MySQL 8 database using an empty root password, you can try the following command
If you have problems connecting to the MySQL 9 database using an empty root password, you can try the following command
to reset the root password to an empty password:

.. code::
Expand Down
2 changes: 1 addition & 1 deletion docs/dev/setup/docker-compose.rst
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ The ``docker-compose.yml`` file could look like this for an Artemis, Jenkins and
- "traefik.http.services.artemis.loadbalancer.server.port=8080"
artemis-db:
image: mysql:8
image: mysql:9
container_name: "mysql"
restart: unless-stopped
volumes:
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/de/tum/cit/aet/artemis/core/domain/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -172,10 +172,6 @@ public class User extends AbstractAuditingEntity implements Participant {
@Column(name = "ssh_public_key_hash")
private final String sshPublicKeyHash = null;

/**
* Word "GROUPS" is being added as a restricted word starting in MySQL 8.0.2
* Workaround: Annotation @Column(name = "`groups`") escapes this word using backticks.
*/
@ElementCollection(fetch = FetchType.LAZY)
@CollectionTable(name = "user_groups", joinColumns = @JoinColumn(name = "user_id"))
@Column(name = "user_groups")
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/config/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ zonky:
type: H2 # Alternatives: H2 / MYSQL / POSTGRES
postgres:
docker:
image: "postgres:16.4-alpine"
image: "postgres:17.0-alpine"
tmpfs:
enabled: true
server:
Expand Down

0 comments on commit 9c6643f

Please sign in to comment.