diff --git a/authentication/pom.xml b/authentication/pom.xml index 7420fc8d3..943e0cd9d 100644 --- a/authentication/pom.xml +++ b/authentication/pom.xml @@ -1,8 +1,8 @@ org.apache.maven.plugins maven-assembly-plugin - 3.3.0 + 3.7.1 @@ -98,7 +98,14 @@ SPDX-License-Identifier: Apache-2.0 io.javalin javalin - 5.6.3 + 6.1.3 + + + + + org.jetbrains + annotations + 24.1.0 diff --git a/authentication/src/main/java/nl/esciencecenter/rsd/authentication/Main.java b/authentication/src/main/java/nl/esciencecenter/rsd/authentication/Main.java index 173af3038..5862b094d 100644 --- a/authentication/src/main/java/nl/esciencecenter/rsd/authentication/Main.java +++ b/authentication/src/main/java/nl/esciencecenter/rsd/authentication/Main.java @@ -14,7 +14,6 @@ import com.auth0.jwt.interfaces.DecodedJWT; import io.javalin.Javalin; import io.javalin.http.Context; -import io.javalin.util.ConcurrencyUtil; import java.util.Base64; import java.util.UUID; @@ -86,8 +85,7 @@ public static boolean idUserIsAllowed(OpenIdInfo helmholtzInfo) { } public static void main(String[] args) { - ConcurrencyUtil.INSTANCE.setUseLoom(false); - Javalin app = Javalin.create().start(7000); + Javalin app = Javalin.create(c -> c.useVirtualThreads = false).start(7000); app.get("/", ctx -> ctx.json("{\"Module\": \"rsd/auth\", \"Status\": \"live\"}")); if (Config.isLocalLoginEnabled()) { diff --git a/backend-postgrest/Dockerfile b/backend-postgrest/Dockerfile index a5cc5d8cc..0590f5e62 100644 --- a/backend-postgrest/Dockerfile +++ b/backend-postgrest/Dockerfile @@ -1,7 +1,7 @@ -# SPDX-FileCopyrightText: 2021 - 2023 Ewan Cahen (Netherlands eScience Center) -# SPDX-FileCopyrightText: 2021 - 2023 Netherlands eScience Center +# SPDX-FileCopyrightText: 2021 - 2024 Ewan Cahen (Netherlands eScience Center) +# SPDX-FileCopyrightText: 2021 - 2024 Netherlands eScience Center # SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center) # # SPDX-License-Identifier: Apache-2.0 -FROM postgrest/postgrest:v11.2.2 +FROM postgrest/postgrest:v12.0.2 diff --git a/database/002-create-image-table.sql b/database/002-create-image-table.sql index 3c01c5bf0..21aacbb1e 100644 --- a/database/002-create-image-table.sql +++ b/database/002-create-image-table.sql @@ -1,6 +1,6 @@ --- SPDX-FileCopyrightText: 2022 - 2023 Netherlands eScience Center +-- SPDX-FileCopyrightText: 2022 - 2024 Ewan Cahen (Netherlands eScience Center) +-- SPDX-FileCopyrightText: 2022 - 2024 Netherlands eScience Center -- SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all) --- SPDX-FileCopyrightText: 2022 Ewan Cahen (Netherlands eScience Center) -- SPDX-FileCopyrightText: 2022 dv4all -- SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center) -- @@ -45,7 +45,9 @@ CREATE TRIGGER sanitise_update_image BEFORE UPDATE ON image FOR EACH ROW EXECUTE -- cache incrased to 1 year based on lighthouse audit -- ---------------------------------------- -CREATE FUNCTION get_image(uid VARCHAR(40)) RETURNS BYTEA STABLE LANGUAGE plpgsql AS +CREATE DOMAIN "application/octet-stream" AS BYTEA; + +CREATE FUNCTION get_image(uid VARCHAR(40)) RETURNS "application/octet-stream" STABLE LANGUAGE plpgsql AS $$ DECLARE headers TEXT; DECLARE blob BYTEA; diff --git a/database/Dockerfile b/database/Dockerfile index ae581d1bb..30013bb99 100644 --- a/database/Dockerfile +++ b/database/Dockerfile @@ -1,9 +1,9 @@ -# SPDX-FileCopyrightText: 2021 - 2023 Ewan Cahen (Netherlands eScience Center) -# SPDX-FileCopyrightText: 2021 - 2023 Netherlands eScience Center +# SPDX-FileCopyrightText: 2021 - 2024 Ewan Cahen (Netherlands eScience Center) +# SPDX-FileCopyrightText: 2021 - 2024 Netherlands eScience Center # # SPDX-License-Identifier: Apache-2.0 -FROM postgres:15.4 +FROM postgres:15.6 RUN chmod a+rwx /docker-entrypoint-initdb.d COPY --chown=postgres:postgres *.sh /docker-entrypoint-initdb.d/ COPY --chown=postgres:postgres *.sql /docker-entrypoint-initdb.d/ diff --git a/docker-compose.yml b/docker-compose.yml index 68ae9104f..29aac3d00 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ version: "3.0" services: database: build: ./database - image: rsd/database:2.4.0 + image: rsd/database:2.4.1 ports: # enable connection from outside (development mode) - "5432:5432" @@ -36,7 +36,7 @@ services: backend: build: ./backend-postgrest - image: rsd/backend-postgrest:1.12.2 + image: rsd/backend-postgrest:1.13.0 expose: - 3500 environment: @@ -53,7 +53,7 @@ services: auth: build: ./authentication - image: rsd/auth:1.4.1 + image: rsd/auth:1.5.0 ports: - 5005:5005 expose: @@ -157,7 +157,7 @@ services: scrapers: build: ./scrapers - image: rsd/scrapers:1.8.0 + image: rsd/scrapers:1.8.1 environment: # it uses values from .env file - POSTGREST_URL @@ -212,7 +212,7 @@ services: nginx: build: context: ./nginx - image: rsd/nginx:1.1.3 + image: rsd/nginx:1.1.4 ports: - "80:80" - "443:443" diff --git a/nginx/Dockerfile b/nginx/Dockerfile index e1e22c692..eaa2df609 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,8 +1,8 @@ -# SPDX-FileCopyrightText: 2022 - 2023 Ewan Cahen (Netherlands eScience Center) -# SPDX-FileCopyrightText: 2022 - 2023 Netherlands eScience Center +# SPDX-FileCopyrightText: 2022 - 2024 Ewan Cahen (Netherlands eScience Center) +# SPDX-FileCopyrightText: 2022 - 2024 Netherlands eScience Center # # SPDX-License-Identifier: Apache-2.0 -FROM nginx:1.25.2 +FROM nginx:1.25.4 RUN apt-get update && apt-get install --yes certbot python3-certbot-nginx COPY nginx.conf /etc/nginx/conf.d/default.conf diff --git a/scrapers/pom.xml b/scrapers/pom.xml index 7687cf1f2..90262d263 100644 --- a/scrapers/pom.xml +++ b/scrapers/pom.xml @@ -34,14 +34,14 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-dependency-plugin - 3.3.0 + 3.6.1 org.apache.maven.plugins maven-assembly-plugin - 3.3.0 + 3.7.1