From 804460ae235c48503afb61bce7fec96c7baa2123 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Fri, 24 Feb 2023 15:15:34 +0100 Subject: [PATCH 01/10] possible updates --- pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index c5907387fe..e6cd6c7eb9 100644 --- a/pom.xml +++ b/pom.xml @@ -54,30 +54,30 @@ 2.3.2 1.3.4 - 5.7.6 - 3.21.9 + 5.8.2 + 3.22.0 1.1.1 1.14.1 1.9.4 2.11.0 - 2.19.0 - 1.7.36 + 2.20.0 + 2.0.6 12.1 3.6.1 1.72 - 2.19.0 - 4.1.87.Final + 2.20.10 + 4.1.89.Final 31.1-jre 2.14.2 1.17.6 - 42.5.1 + 42.5.4 2.35.0 4.5.14 4.13.2 5.9.2 9.0.71 0.2.6 - 10.6.0 + 10.7.0 3.1.0 4.5.2 1.33 From fb3f6626a58b13b29ada1b3fb57af0449f641863 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Fri, 24 Feb 2023 15:25:04 +0100 Subject: [PATCH 02/10] set version --- .mvn/maven.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/maven.config b/.mvn/maven.config index 0727a838ce..30361c456d 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -1,4 +1,4 @@ --Drevision=3.1.0-SNAPSHOT +-Drevision=3.2.0-SNAPSHOT -Dlicense.projectName=Corona-Warn-App -Dlicense.inceptionYear=2020 -Dlicense.licenseName=apache_v2 From 07e43299d2aee9a816a3d0e92cb53de1553f066a Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Fri, 24 Feb 2023 15:25:42 +0100 Subject: [PATCH 03/10] speed up the build --- services/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/pom.xml b/services/pom.xml index f6ecc57f3d..930352a191 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -16,9 +16,11 @@ distribution submission + From a2547c3186d3d6d5763f20f51152f2b8e9f47b76 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Fri, 24 Feb 2023 15:45:47 +0100 Subject: [PATCH 04/10] skip further processing --- .../services/submission/controller/SubmissionController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/submission/src/main/java/app/coronawarn/server/services/submission/controller/SubmissionController.java b/services/submission/src/main/java/app/coronawarn/server/services/submission/controller/SubmissionController.java index 80254e4fd9..93a73b6dda 100644 --- a/services/submission/src/main/java/app/coronawarn/server/services/submission/controller/SubmissionController.java +++ b/services/submission/src/main/java/app/coronawarn/server/services/submission/controller/SubmissionController.java @@ -250,11 +250,13 @@ private DeferredResult> buildRealDeferredResult(final Submi new PrintableSubmissionPayload(payload)); deferredResult .setResult(ResponseEntity.status(BAD_REQUEST).header("cwa-error-code", "KEYS_ALREADY_EXIST").build()); + return deferredResult; } if (!tanVerifier.verifyTan(tan)) { submissionMonitor.incrementInvalidTanRequestCounter(); deferredResult.setResult(ResponseEntity.status(FORBIDDEN).build()); + return deferredResult; } else { saveDiagnosisKeys(diagnosisKeys); From c3026ef0d37227257f9fdb804755ea36975e167e Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Fri, 24 Feb 2023 15:46:10 +0100 Subject: [PATCH 05/10] protobuf.version 3.21.12 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 62ab947a8e..d4b4369b89 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 2.3.2 1.3.4 5.8.2 - 3.22.0 + 3.21.12 1.1.1 1.14.1 1.9.4 @@ -64,7 +64,7 @@ 2.0.6 12.1 3.6.1 - 1.5 + 1.5 1.72 2.20.10 4.1.89.Final From 4f2b6caa33f209965f9c53105bf6bc1e937539c7 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Fri, 24 Feb 2023 15:46:37 +0100 Subject: [PATCH 06/10] no external dependencies --- .mvn/maven-version-rules.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.mvn/maven-version-rules.xml b/.mvn/maven-version-rules.xml index 10ef29728a..29226e080e 100644 --- a/.mvn/maven-version-rules.xml +++ b/.mvn/maven-version-rules.xml @@ -1,7 +1,5 @@ - + (?i).*Alpha(?:-?\d+)? From fe73e8d9ab99068cde6e9eced1a9097cdce6918d Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Fri, 24 Feb 2023 15:47:07 +0100 Subject: [PATCH 07/10] ignore spring 3 + protobuf --- .mvn/maven-version-rules.xml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/.mvn/maven-version-rules.xml b/.mvn/maven-version-rules.xml index 29226e080e..21884ee8b7 100644 --- a/.mvn/maven-version-rules.xml +++ b/.mvn/maven-version-rules.xml @@ -30,5 +30,39 @@ (?i).*jre.* + + + + 3\.22\.0 + + + + + + + 3\..* + + + + + 2022\..* + + + + + 3\..* + + + + + 6\..* + + + + + 6\..* + + + \ No newline at end of file From 95217657c83d0764f91133b485a5b892efc4c63e Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Fri, 24 Feb 2023 17:32:15 +0100 Subject: [PATCH 08/10] pin protobuf.version 3.21.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d4b4369b89..e69e49228b 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 2.3.2 1.3.4 5.8.2 - 3.21.12 + 3.21.9 1.1.1 1.14.1 1.9.4 From ef1ec787a917d688a3947bc13d1fd1d0b260b92f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Feb 2023 03:06:38 +0000 Subject: [PATCH 09/10] Bump checkstyle from 10.6.0 to 10.8.0 Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 10.6.0 to 10.8.0. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.6.0...checkstyle-10.8.0) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 845594b365..f2f8538dea 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ 5.9.2 9.0.71 0.2.6 - 10.6.0 + 10.8.0 3.1.0 4.5.2 1.33 From a426d6f8026c8e9c8244a905c6fbeca17901b245 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Mon, 27 Feb 2023 11:17:17 +0100 Subject: [PATCH 10/10] sha256:135cf054951c23d8d78b3a7d8c8438f22ca1c15830901d976cb9bf728717334c --- services/callback/Dockerfile | 2 +- services/distribution/Dockerfile | 2 +- services/download/Dockerfile | 2 +- services/submission/Dockerfile | 2 +- services/upload/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/callback/Dockerfile b/services/callback/Dockerfile index c1b6bd0efe..fa97a9e999 100644 --- a/services/callback/Dockerfile +++ b/services/callback/Dockerfile @@ -34,7 +34,7 @@ RUN ${WORK_DIR}/mvnw --batch-mode -P docker-image --file ${WORK_DIR}/pom.xml ${M RUN cp ${WORK_DIR}/services/${SERVICE}/target/*.jar /usr/sap/${SERVICE}-service/service.jar RUN cp ${WORK_DIR}/scripts/DpkgHelper.java /DpkgHelper.java -FROM gcr.io/distroless/java17-debian11@sha256:61c05080a2fbf2f6fcb2eb11b936e30ebc7eb5cad474056e5e356b5b1b94d200 +FROM gcr.io/distroless/java17-debian11@sha256:135cf054951c23d8d78b3a7d8c8438f22ca1c15830901d976cb9bf728717334c ARG SERVICE=callback diff --git a/services/distribution/Dockerfile b/services/distribution/Dockerfile index cc81ab169e..b3aa16153f 100644 --- a/services/distribution/Dockerfile +++ b/services/distribution/Dockerfile @@ -34,7 +34,7 @@ RUN ${WORK_DIR}/mvnw --batch-mode -P docker-image --file ${WORK_DIR}/pom.xml ${M RUN cp ${WORK_DIR}/services/${SERVICE}/target/*.jar /usr/sap/${SERVICE}-service/service.jar RUN cp ${WORK_DIR}/scripts/DpkgHelper.java /DpkgHelper.java -FROM gcr.io/distroless/java17-debian11@sha256:61c05080a2fbf2f6fcb2eb11b936e30ebc7eb5cad474056e5e356b5b1b94d200 +FROM gcr.io/distroless/java17-debian11@sha256:135cf054951c23d8d78b3a7d8c8438f22ca1c15830901d976cb9bf728717334c ARG SERVICE=distribution diff --git a/services/download/Dockerfile b/services/download/Dockerfile index 3ed71dfdd7..d2546b6d56 100644 --- a/services/download/Dockerfile +++ b/services/download/Dockerfile @@ -34,7 +34,7 @@ RUN ${WORK_DIR}/mvnw --batch-mode -P docker-image --file ${WORK_DIR}/pom.xml ${M RUN cp ${WORK_DIR}/services/${SERVICE}/target/*.jar /usr/sap/${SERVICE}-service/service.jar RUN cp ${WORK_DIR}/scripts/DpkgHelper.java /DpkgHelper.java -FROM gcr.io/distroless/java17-debian11@sha256:61c05080a2fbf2f6fcb2eb11b936e30ebc7eb5cad474056e5e356b5b1b94d200 +FROM gcr.io/distroless/java17-debian11@sha256:135cf054951c23d8d78b3a7d8c8438f22ca1c15830901d976cb9bf728717334c ARG SERVICE=download diff --git a/services/submission/Dockerfile b/services/submission/Dockerfile index 47303219b2..752dacd2e7 100644 --- a/services/submission/Dockerfile +++ b/services/submission/Dockerfile @@ -34,7 +34,7 @@ RUN ${WORK_DIR}/mvnw --batch-mode -P docker-image --file ${WORK_DIR}/pom.xml ${M RUN cp ${WORK_DIR}/services/${SERVICE}/target/*.jar /usr/sap/${SERVICE}-service/service.jar RUN cp ${WORK_DIR}/scripts/DpkgHelper.java /DpkgHelper.java -FROM gcr.io/distroless/java17-debian11@sha256:61c05080a2fbf2f6fcb2eb11b936e30ebc7eb5cad474056e5e356b5b1b94d200 +FROM gcr.io/distroless/java17-debian11@sha256:135cf054951c23d8d78b3a7d8c8438f22ca1c15830901d976cb9bf728717334c ARG SERVICE=submission diff --git a/services/upload/Dockerfile b/services/upload/Dockerfile index ea1fc2a168..0cb4b50a59 100644 --- a/services/upload/Dockerfile +++ b/services/upload/Dockerfile @@ -34,7 +34,7 @@ RUN ${WORK_DIR}/mvnw --batch-mode -P docker-image --file ${WORK_DIR}/pom.xml ${M RUN cp ${WORK_DIR}/services/${SERVICE}/target/*.jar /usr/sap/${SERVICE}-service/service.jar RUN cp ${WORK_DIR}/scripts/DpkgHelper.java /DpkgHelper.java -FROM gcr.io/distroless/java17-debian11@sha256:61c05080a2fbf2f6fcb2eb11b936e30ebc7eb5cad474056e5e356b5b1b94d200 +FROM gcr.io/distroless/java17-debian11@sha256:135cf054951c23d8d78b3a7d8c8438f22ca1c15830901d976cb9bf728717334c ARG SERVICE=upload