Bump checkstyle from 10.6.0 to 10.8.0 (#2020)

* possible updates * set version * speed up the build * skip further processing * protobuf.version 3.21.12 * no external dependencies * ignore spring 3 + protobuf * pin protobuf.version 3.21.9 * 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](checkstyle/checkstyle@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] <[email protected]> * sha256:135cf054951c23d8d78b3a7d8c8438f22ca1c15830901d976cb9bf728717334c --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Hilmar Falkenberg <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
corona-warn-app · Feb 27, 2023 · 3caf7ae · 3caf7ae
1 parent a852dac
commit 3caf7ae
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 14 deletions.
diff --git a/.mvn/maven-version-rules.xml b/.mvn/maven-version-rules.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ruleset xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  comparisonMethod="maven"
-  xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 http://mojo.codehaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
+<ruleset comparisonMethod="maven">
   <ignoreVersions>
     <!-- Ignore Alpha's, Beta's, release candidates and milestones -->
     <ignoreVersion type="regex">(?i).*Alpha(?:-?\d+)?</ignoreVersion>
@@ -32,5 +30,39 @@
         <ignoreVersion type="regex">(?i).*jre.*</ignoreVersion>
       </ignoreVersions>
     </rule>
+
+    <rule groupId="com.google.protobuf" comparisonMethod="maven">
+      <ignoreVersions>
+        <ignoreVersion type="regex">3\.22\.0</ignoreVersion>
+      </ignoreVersions>
+    </rule>
+
+    <!-- spring 3 -->
+    <rule groupId="org.springframework.boot" comparisonMethod="maven">
+      <ignoreVersions>
+        <ignoreVersion type="regex">3\..*</ignoreVersion>
+      </ignoreVersions>
+    </rule>
+    <rule groupId="org.springframework.cloud" comparisonMethod="maven">
+      <ignoreVersions>
+        <ignoreVersion type="regex">2022\..*</ignoreVersion>
+      </ignoreVersions>
+    </rule>
+    <rule groupId="org.springframework.vault" comparisonMethod="maven">
+      <ignoreVersions>
+        <ignoreVersion type="regex">3\..*</ignoreVersion>
+      </ignoreVersions>
+    </rule>
+    <rule groupId="org.springframework.security" comparisonMethod="maven">
+      <ignoreVersions>
+        <ignoreVersion type="regex">6\..*</ignoreVersion>
+      </ignoreVersions>
+    </rule>
+    <rule groupId="org.springframework.retry" comparisonMethod="maven">
+      <ignoreVersions>
+        <ignoreVersion type="regex">6\..*</ignoreVersion>
+      </ignoreVersions>
+    </rule>
+
   </rules>
 </ruleset>
diff --git 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
diff --git a/pom.xml b/pom.xml
@@ -55,18 +55,19 @@
     <spring-vault-core.version>2.3.2</spring-vault-core.version>
     <spring-retry.version>1.3.4</spring-retry.version>
     <spring-security.version>5.8.2</spring-security.version>
-    <protobuf.version>3.21.9</protobuf.version>
+    <protobuf.version>3.21.9</protobuf.version><!-- DO NOT UPGRADE, later versions made it impossible to merge yaml configs -->
     <json-simple.version>1.1.1</json-simple.version>
     <everit-json-schema.version>1.14.1</everit-json-schema.version>
     <commons-beanutils.version>1.9.4</commons-beanutils.version>
     <commons-io.version>2.11.0</commons-io.version>
     <log4j.version>2.20.0</log4j.version>
-    <slf4j.version>1.7.36</slf4j.version>
+    <slf4j.version>2.0.6</slf4j.version>
     <feign.version>12.1</feign.version>
     <commons-math3.version>3.6.1</commons-math3.version>
+    <commons-fileupload.version>1.5</commons-fileupload.version>
     <bouncycastle.version>1.72</bouncycastle.version>
-    <awssdk-s3.version>2.19.0</awssdk-s3.version>
-    <io-netty.version>4.1.87.Final</io-netty.version>
+    <awssdk-s3.version>2.20.10</awssdk-s3.version>
+    <io-netty.version>4.1.89.Final</io-netty.version>
     <guava.version>31.1-jre</guava.version>
     <jackson.version>2.14.2</jackson.version>
     <test-containers.version>1.17.6</test-containers.version>
@@ -77,7 +78,7 @@
     <jupiter.version>5.9.2</jupiter.version>
     <tomcat.version>9.0.71</tomcat.version>
     <findify-s3mock.version>0.2.6</findify-s3mock.version>
-    <checkstyle.version>10.6.0</checkstyle.version>
+    <checkstyle.version>10.8.0</checkstyle.version>
     <semver4j.version>3.1.0</semver4j.version>
     <upokecenter-cbor.version>4.5.2</upokecenter-cbor.version>
     <snakeyaml.version>1.33</snakeyaml.version>
@@ -242,6 +243,11 @@
         <artifactId>commons-math3</artifactId>
         <version>${commons-math3.version}</version>
       </dependency>
+      <dependency>
+        <groupId>commons-fileupload</groupId>
+        <artifactId>commons-fileupload</artifactId>
+        <version>${commons-fileupload.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcpkix-jdk18on</artifactId>

diff --git 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
@@ -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
@@ -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/pom.xml b/services/pom.xml
@@ -16,9 +16,11 @@
   <modules>
     <module>distribution</module>
     <module>submission</module>
+    <!-- EFGS modules aren't needed anymore
     <module>callback</module>
     <module>download</module>
     <module>upload</module>
+    -->
   </modules>
 
   <dependencies>

diff --git 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/.../main/java/app/coronawarn/server/services/submission/controller/SubmissionController.java b/.../main/java/app/coronawarn/server/services/submission/controller/SubmissionController.java
@@ -250,11 +250,13 @@ private DeferredResult<ResponseEntity<Void>> 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);
 

diff --git 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