Merge pull request #1263 from research-software-directory/1262-backen…

…d-upgrades

Backend dependency upgrades

authentication/Dockerfile

@@ -1,13 +1,13 @@
-# SPDX-FileCopyrightText: 2021 - 2023 Ewan Cahen (Netherlands eScience Center) <[email protected]>
-# SPDX-FileCopyrightText: 2021 - 2023 Netherlands eScience Center
+# SPDX-FileCopyrightText: 2021 - 2024 Ewan Cahen (Netherlands eScience Center) <[email protected]>
+# 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) <[email protected]>
 # SPDX-FileCopyrightText: 2022 dv4all
 #
 # 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 .

authentication/pom.xml

@@ -32,7 +32,7 @@ SPDX-License-Identifier: Apache-2.0
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>3.6.1</version>
+				<version>3.7.1</version>
 			</plugin>
 
 			<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-assembly-plugin -->
@@ -61,14 +61,15 @@ SPDX-License-Identifier: Apache-2.0
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M6</version>
+				<version>3.2.5</version>
 			</plugin>
 
 			<!-- https://docs.sonarcloud.io/enriching/test-coverage/java-test-coverage/ -->
+			<!-- https://mvnrepository.com/artifact/org.jacoco/jacoco-maven-plugin -->
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.10</version>
+				<version>0.8.12</version>
 				<executions>
 					<execution>
 						<id>prepare-agent</id>
@@ -98,7 +99,7 @@ SPDX-License-Identifier: Apache-2.0
 		<dependency>
 			<groupId>io.javalin</groupId>
 			<artifactId>javalin</artifactId>
-			<version>6.1.3</version>
+			<version>6.2.0</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.jetbrains/annotations -->
@@ -112,7 +113,7 @@ SPDX-License-Identifier: Apache-2.0
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
-			<version>2.0.9</version>
+			<version>2.0.13</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/com.auth0/java-jwt -->
@@ -126,7 +127,7 @@ SPDX-License-Identifier: Apache-2.0
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.10.1</version>
+			<version>2.11.0</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/com.nimbusds/oauth2-oidc-sdk -->
@@ -140,23 +141,21 @@ SPDX-License-Identifier: Apache-2.0
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.8.2</version>
 			<scope>test</scope>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.junit.platform/junit-platform-launcher -->
 		<dependency>
 			<groupId>org.junit.platform</groupId>
 			<artifactId>junit-platform-launcher</artifactId>
-			<version>1.8.2</version>
 			<scope>test</scope>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.apache.maven.surefire/surefire-junit-platform -->
 		<dependency>
 			<groupId>org.apache.maven.surefire</groupId>
 			<artifactId>surefire-junit-platform</artifactId>
-			<version>3.0.0-M6</version>
+			<version>3.2.5</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -172,25 +171,26 @@ SPDX-License-Identifier: Apache-2.0
 		<dependency>
 			<groupId>net.bytebuddy</groupId>
 			<artifactId>byte-buddy</artifactId>
-			<version>1.14.9</version>
+			<version>1.14.18</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/net.bytebuddy/byte-buddy-agent -->
 		<dependency>
 			<groupId>net.bytebuddy</groupId>
 			<artifactId>byte-buddy-agent</artifactId>
-			<version>1.14.9</version>
+			<version>1.14.18</version>
 			<scope>test</scope>
 		</dependency>
 
 	</dependencies>
 
 	<dependencyManagement>
 		<dependencies>
+			<!-- https://mvnrepository.com/artifact/org.junit/junit-bom -->
 			<dependency>
 				<groupId>org.junit</groupId>
 				<artifactId>junit-bom</artifactId>
-				<version>5.8.2</version>
+				<version>5.10.3</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

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

backend-tests/Dockerfile

@@ -1,9 +1,9 @@
-# SPDX-FileCopyrightText: 2023 Ewan Cahen (Netherlands eScience Center) <[email protected]>
-# SPDX-FileCopyrightText: 2023 Netherlands eScience Center
+# SPDX-FileCopyrightText: 2023 - 2024 Ewan Cahen (Netherlands eScience Center) <[email protected]>
+# 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 .

backend-tests/pom.xml

@@ -28,7 +28,7 @@ SPDX-License-Identifier: Apache-2.0
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>3.6.1</version>
+				<version>3.7.1</version>
 			</plugin>
 
 			<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-surefire-plugin -->
@@ -50,14 +50,14 @@ SPDX-License-Identifier: Apache-2.0
 			<plugin>
 				<groupId>org.junit.jupiter</groupId>
 				<artifactId>junit-jupiter-engine</artifactId>
-				<version>5.10.1</version>
+				<version>5.10.3</version>
 			</plugin>
 
 			<!-- https://mvnrepository.com/artifact/org.junit.platform/junit-platform-launcher -->
 			<plugin>
 				<groupId>org.junit.platform</groupId>
 				<artifactId>junit-platform-launcher</artifactId>
-				<version>1.10.1</version>
+				<version>1.10.3</version>
 			</plugin>
 		</plugins>
 	</build>
@@ -68,7 +68,7 @@ SPDX-License-Identifier: Apache-2.0
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.10.1</version>
+			<version>2.11.0</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -83,15 +83,15 @@ SPDX-License-Identifier: Apache-2.0
 		<dependency>
 			<groupId>io.rest-assured</groupId>
 			<artifactId>rest-assured</artifactId>
-			<version>5.4.0</version>
+			<version>5.5.0</version>
 			<scope>test</scope>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.10.1</version>
+			<version>5.10.3</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

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<Void> 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));

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 .

codemeta/template/overview.gohtml

@@ -3,7 +3,9 @@
 <head>
 	<meta charset="UTF-8">
 	<title>CodeMeta overview</title>
-	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/[email protected]/css/pico.min.css">
+	<link rel="stylesheet" crossorigin="anonymous"
+		  integrity="sha256-UX1QXFbL3Q8J8D+FaNSZ66h7MsTUB5/2ZgX49wjIX7Y="
+		  href="https://cdn.jsdelivr.net/npm/@picocss/[email protected]/css/pico.css">
 </head>
 <body class="container">
 <h1>

data-generation/Dockerfile

@@ -1,9 +1,9 @@
-# SPDX-FileCopyrightText: 2022 - 2023 Ewan Cahen (Netherlands eScience Center) <[email protected]>
-# SPDX-FileCopyrightText: 2022 - 2023 Netherlands eScience Center
+# SPDX-FileCopyrightText: 2022 - 2024 Ewan Cahen (Netherlands eScience Center) <[email protected]>
+# 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

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];

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"
 	}
 }

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/

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

scrapers/Dockerfile

@@ -1,11 +1,11 @@
-# SPDX-FileCopyrightText: 2022 - 2023 Ewan Cahen (Netherlands eScience Center) <[email protected]>
-# SPDX-FileCopyrightText: 2022 - 2023 Netherlands eScience Center
+# SPDX-FileCopyrightText: 2022 - 2024 Ewan Cahen (Netherlands eScience Center) <[email protected]>
+# 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) <[email protected]>
 #
 # 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 .