From 0eaa7df6da4f5dd2413bc46c5fc72308726f0291 Mon Sep 17 00:00:00 2001 From: Ewan Cahen Date: Mon, 29 Jul 2024 16:57:35 +0200 Subject: [PATCH] chore: upgrade backend dependencies --- authentication/Dockerfile | 6 ++--- authentication/pom.xml | 24 ++++++++--------- backend-postgrest/Dockerfile | 2 +- backend-tests/Dockerfile | 6 ++--- backend-tests/pom.xml | 12 ++++----- .../java/nl/esciencecenter/SetupAllTests.java | 14 +++++++--- codemeta/Dockerfile | 2 +- codemeta/template/overview.gohtml | 4 ++- data-generation/Dockerfile | 6 ++--- data-generation/main.js | 2 +- data-generation/package-lock.json | 16 +++++------ data-generation/package.json | 8 +++--- database/Dockerfile | 2 +- nginx/Dockerfile | 2 +- scrapers/Dockerfile | 6 ++--- scrapers/pom.xml | 27 +++++++++---------- 16 files changed, 72 insertions(+), 67 deletions(-) diff --git a/authentication/Dockerfile b/authentication/Dockerfile index 6fa8a08f4..9e3286d83 100644 --- a/authentication/Dockerfile +++ b/authentication/Dockerfile @@ -1,5 +1,5 @@ -# 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: 2022 Dusan Mijatovic (dv4all) # SPDX-FileCopyrightText: 2022 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences # SPDX-FileCopyrightText: 2022 Matthias Rüster (GFZ) @@ -7,7 +7,7 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM maven:3.9.5-eclipse-temurin-21 AS builder +FROM maven:3.9.8-eclipse-temurin-21 AS builder WORKDIR /usr/mymaven RUN mkdir src COPY pom.xml . diff --git a/authentication/pom.xml b/authentication/pom.xml index 943e0cd9d..fd0c72ee8 100644 --- a/authentication/pom.xml +++ b/authentication/pom.xml @@ -32,7 +32,7 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-dependency-plugin - 3.6.1 + 3.7.1 @@ -61,14 +61,15 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M6 + 3.2.5 + org.jacoco jacoco-maven-plugin - 0.8.10 + 0.8.12 prepare-agent @@ -98,7 +99,7 @@ SPDX-License-Identifier: Apache-2.0 io.javalin javalin - 6.1.3 + 6.2.0 @@ -112,7 +113,7 @@ SPDX-License-Identifier: Apache-2.0 org.slf4j slf4j-simple - 2.0.9 + 2.0.13 @@ -126,7 +127,7 @@ SPDX-License-Identifier: Apache-2.0 com.google.code.gson gson - 2.10.1 + 2.11.0 @@ -140,7 +141,6 @@ SPDX-License-Identifier: Apache-2.0 org.junit.jupiter junit-jupiter - 5.8.2 test @@ -148,7 +148,6 @@ SPDX-License-Identifier: Apache-2.0 org.junit.platform junit-platform-launcher - 1.8.2 test @@ -156,7 +155,7 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.surefire surefire-junit-platform - 3.0.0-M6 + 3.2.5 test @@ -172,14 +171,14 @@ SPDX-License-Identifier: Apache-2.0 net.bytebuddy byte-buddy - 1.14.9 + 1.14.18 net.bytebuddy byte-buddy-agent - 1.14.9 + 1.14.18 test @@ -187,10 +186,11 @@ SPDX-License-Identifier: Apache-2.0 + org.junit junit-bom - 5.8.2 + 5.10.3 pom import diff --git a/backend-postgrest/Dockerfile b/backend-postgrest/Dockerfile index 0590f5e62..871278358 100644 --- a/backend-postgrest/Dockerfile +++ b/backend-postgrest/Dockerfile @@ -4,4 +4,4 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM postgrest/postgrest:v12.0.2 +FROM postgrest/postgrest:v12.2.2 diff --git a/backend-tests/Dockerfile b/backend-tests/Dockerfile index 4b301aa6a..2d40fbf21 100644 --- a/backend-tests/Dockerfile +++ b/backend-tests/Dockerfile @@ -1,9 +1,9 @@ -# SPDX-FileCopyrightText: 2023 Ewan Cahen (Netherlands eScience Center) -# SPDX-FileCopyrightText: 2023 Netherlands eScience Center +# SPDX-FileCopyrightText: 2023 - 2024 Ewan Cahen (Netherlands eScience Center) +# SPDX-FileCopyrightText: 2023 - 2024 Netherlands eScience Center # # SPDX-License-Identifier: Apache-2.0 -FROM maven:3.9.5-eclipse-temurin-21 +FROM maven:3.9.8-eclipse-temurin-21 WORKDIR /usr/mymaven RUN mkdir src COPY pom.xml . diff --git a/backend-tests/pom.xml b/backend-tests/pom.xml index 465745154..7152b11c7 100644 --- a/backend-tests/pom.xml +++ b/backend-tests/pom.xml @@ -28,7 +28,7 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-dependency-plugin - 3.6.1 + 3.7.1 @@ -50,14 +50,14 @@ SPDX-License-Identifier: Apache-2.0 org.junit.jupiter junit-jupiter-engine - 5.10.1 + 5.10.3 org.junit.platform junit-platform-launcher - 1.10.1 + 1.10.3 @@ -68,7 +68,7 @@ SPDX-License-Identifier: Apache-2.0 com.google.code.gson gson - 2.10.1 + 2.11.0 test @@ -83,7 +83,7 @@ SPDX-License-Identifier: Apache-2.0 io.rest-assured rest-assured - 5.4.0 + 5.5.0 test @@ -91,7 +91,7 @@ SPDX-License-Identifier: Apache-2.0 org.junit.jupiter junit-jupiter-api - 5.10.1 + 5.10.3 test diff --git a/backend-tests/src/test/java/nl/esciencecenter/SetupAllTests.java b/backend-tests/src/test/java/nl/esciencecenter/SetupAllTests.java index 8844089ad..20cf07d8c 100644 --- a/backend-tests/src/test/java/nl/esciencecenter/SetupAllTests.java +++ b/backend-tests/src/test/java/nl/esciencecenter/SetupAllTests.java @@ -31,15 +31,21 @@ public void beforeAll(ExtensionContext extensionContext) throws Exception { public static void checkBackendAvailable() throws InterruptedException { URI backendUri = URI.create(System.getenv("POSTGREST_URL")); - HttpClient client = HttpClient.newHttpClient(); + HttpClient client = HttpClient.newBuilder().followRedirects(HttpClient.Redirect.NORMAL).build(); HttpRequest request = HttpRequest.newBuilder(backendUri).build(); int maxTries = 30; for (int i = 1; i <= maxTries; i++) { try { - client.send(request, HttpResponse.BodyHandlers.discarding()); - System.out.println("Attempt %d/%d to connect to the backend on %s succeeded, continuing with the tests" + HttpResponse response = client.send(request, HttpResponse.BodyHandlers.discarding()); + if (response.statusCode() == 200) { + System.out.println("Attempt %d/%d to connect to the backend on %s succeeded, continuing with the tests" + .formatted(i, maxTries, backendUri)); + client.close(); + return; + } + System.out.println("Attempt %d/%d to connect to the backend on %s failed, trying again in 1 second" .formatted(i, maxTries, backendUri)); - return; + Thread.sleep(1000); } catch (IOException e) { System.out.println("Attempt %d/%d to connect to the backend on %s failed, trying again in 1 second" .formatted(i, maxTries, backendUri)); diff --git a/codemeta/Dockerfile b/codemeta/Dockerfile index c1bf1695a..08c9d8e5a 100644 --- a/codemeta/Dockerfile +++ b/codemeta/Dockerfile @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM golang:1.22.2-bookworm AS builder +FROM golang:1.22.5-bookworm AS builder WORKDIR /usr/src/app COPY go.mod . diff --git a/codemeta/template/overview.gohtml b/codemeta/template/overview.gohtml index 9b881cd6a..f39c71301 100644 --- a/codemeta/template/overview.gohtml +++ b/codemeta/template/overview.gohtml @@ -3,7 +3,9 @@ CodeMeta overview - +

diff --git a/data-generation/Dockerfile b/data-generation/Dockerfile index e1575639c..e54e618fe 100644 --- a/data-generation/Dockerfile +++ b/data-generation/Dockerfile @@ -1,9 +1,9 @@ -# 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 node:21.4.0-bullseye-slim +FROM node:22.5.1-bullseye-slim WORKDIR /usr/app COPY ./package.json /usr/app RUN npm install diff --git a/data-generation/main.js b/data-generation/main.js index 72af94f91..590d81f24 100644 --- a/data-generation/main.js +++ b/data-generation/main.js @@ -455,7 +455,7 @@ function generateOrcids(amount = 50) { const orcids = new Set(); while (orcids.size < amount) { - orcids.add(faker.helpers.replaceSymbolWithNumber('0000-000#-####-####')); + orcids.add(faker.helpers.replaceSymbols('0000-000#-####-####')); } return [...orcids]; diff --git a/data-generation/package-lock.json b/data-generation/package-lock.json index b5f90e919..757a6829c 100644 --- a/data-generation/package-lock.json +++ b/data-generation/package-lock.json @@ -9,18 +9,18 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@faker-js/faker": "8.3.1", + "@faker-js/faker": "8.4.1", "jsonwebtoken": "9.0.2", "wait-on": "7.2.0" }, "devDependencies": { - "prettier": "3.2.5" + "prettier": "3.3.3" } }, "node_modules/@faker-js/faker": { - "version": "8.3.1", - "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-8.3.1.tgz", - "integrity": "sha512-FdgpFxY6V6rLZE9mmIBb9hM0xpfvQOSNOLnzolzKwsE1DH+gC7lEKV1p1IbR0lAYyvYd5a4u3qWJzowUkw1bIw==", + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-8.4.1.tgz", + "integrity": "sha512-XQ3cU+Q8Uqmrbf2e0cIC/QN43sTBSC8KF12u29Mb47tWrt2hAgBXSgpZMj4Ao8Uk0iJcU99QsOCaIL8934obCg==", "funding": [ { "type": "opencollective", @@ -267,9 +267,9 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" diff --git a/data-generation/package.json b/data-generation/package.json index 8fd7ac5dc..ecba17073 100644 --- a/data-generation/package.json +++ b/data-generation/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "@faker-js/faker": "8.3.1", + "@faker-js/faker": "8.4.1", "jsonwebtoken": "9.0.2", "wait-on": "7.2.0" }, @@ -12,11 +12,9 @@ "format:check": "prettier --check .", "format:fix": "prettier --write ." }, - "author": "", - "license": "ISC", - "description": "", + "description": "This module generates and stores fake data for the RSD for testing purposes", "type": "module", "devDependencies": { - "prettier": "3.2.5" + "prettier": "3.3.3" } } diff --git a/database/Dockerfile b/database/Dockerfile index 30013bb99..9ab9bf32d 100644 --- a/database/Dockerfile +++ b/database/Dockerfile @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM postgres:15.6 +FROM postgres:15.7 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/nginx/Dockerfile b/nginx/Dockerfile index eaa2df609..f85a1206f 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -3,6 +3,6 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM nginx:1.25.4 +FROM nginx:1.26.1 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/Dockerfile b/scrapers/Dockerfile index 95b33aa97..293db72eb 100644 --- a/scrapers/Dockerfile +++ b/scrapers/Dockerfile @@ -1,11 +1,11 @@ -# 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-FileCopyrightText: 2022 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences # SPDX-FileCopyrightText: 2022 Matthias Rüster (GFZ) # # SPDX-License-Identifier: Apache-2.0 -FROM maven:3.9.5-eclipse-temurin-21 AS builder +FROM maven:3.9.8-eclipse-temurin-21 AS builder WORKDIR /usr/mymaven RUN mkdir ./src COPY pom.xml . diff --git a/scrapers/pom.xml b/scrapers/pom.xml index 90262d263..575261309 100644 --- a/scrapers/pom.xml +++ b/scrapers/pom.xml @@ -34,7 +34,7 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-dependency-plugin - 3.6.1 + 3.7.1 @@ -63,14 +63,15 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M6 + 3.2.5 + org.jacoco jacoco-maven-plugin - 0.8.10 + 0.8.12 prepare-agent @@ -99,7 +100,7 @@ SPDX-License-Identifier: Apache-2.0 org.junit junit-bom - 5.8.2 + 5.10.3 pom import @@ -107,18 +108,18 @@ SPDX-License-Identifier: Apache-2.0 - + org.slf4j - slf4j-api - 2.0.11 + slf4j-api + 2.0.13 ch.qos.logback logback-classic - 1.4.14 + 1.5.6 @@ -132,14 +133,13 @@ SPDX-License-Identifier: Apache-2.0 com.google.code.gson gson - 2.10.1 + 2.11.0 org.junit.jupiter junit-jupiter - 5.8.2 test @@ -147,7 +147,6 @@ SPDX-License-Identifier: Apache-2.0 org.junit.platform junit-platform-launcher - 1.8.2 test @@ -155,7 +154,7 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.surefire surefire-junit-platform - 3.0.0-M6 + 3.2.5 test @@ -170,13 +169,13 @@ SPDX-License-Identifier: Apache-2.0 com.fasterxml.jackson.core jackson-databind - 2.16.1 + 2.17.2 com.fasterxml.jackson.dataformat jackson-dataformat-yaml - 2.16.1 + 2.17.2