Skip to content

Commit 2143603

Browse files
pelliccmpelliccm
committed
Merge remote-tracking branch 'origin/develop' into P4ADEV-2047-file-share-api-per-download-file-elaborato
2 parents 9431aa9 + f9e3a30 commit 2143603

File tree

4 files changed

+55
-55
lines changed

4 files changed

+55
-55
lines changed

‎.github/workflows/security-scan.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
sarif_file: 'results.sarif'
5050
- name: CVE Description escaped extraction and print
5151
run: |
52-
SCAN_RESULTS=$(jq -r 'try .runs[0].tool.driver.rules | map(.help.text) | join("\\n")' results.sarif)
52+
SCAN_RESULTS=$(jq -r 'try .runs[0].tool.driver.rules | try map(.shortDescription.text) | join("\\n")' results.sarif)
5353
echo "CVE_CRITICAL=$(echo $SCAN_RESULTS | grep -o CRITICAL | wc -l)" >> $GITHUB_ENV
5454
echo "CVE_HIGH=$(echo $SCAN_RESULTS | grep -o HIGH | wc -l)" >> $GITHUB_ENV
5555
echo "CVE_MEDIUM=$(echo $SCAN_RESULTS | grep -o MEDIUM | wc -l)" >> $GITHUB_ENV
@@ -67,4 +67,4 @@ jobs:
6767
CVE_CRITICAL: ${{needs.BuildAndScan.outputs.CVE_CRITICAL}}
6868
CVE_HIGH: ${{needs.BuildAndScan.outputs.CVE_HIGH}}
6969
CVE_MEDIUM: ${{needs.BuildAndScan.outputs.CVE_MEDIUM}}
70-
secrets: inherit
70+
secrets: inherit

‎Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
#
44
# 🎯 Version Management
55
#
6-
ARG CORRETTO_VERSION="21-alpine3.20"
7-
ARG CORRETTO_SHA="8b16834e7fabfc62d4c8faa22de5df97f99627f148058d52718054aaa4ea3674"
6+
ARG CORRETTO_VERSION="21-alpine3.21"
7+
ARG CORRETTO_SHA="1b53a05c5693b5452a0c41a39b1fa3b8e7d77aa37f325acc378b7928bc1d8253"
88
ARG GRADLE_VERSION="8.10.2"
99
ARG GRADLE_DOWNLOAD_SHA256="31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26"
10-
ARG APPINSIGHTS_VERSION="3.6.2"
10+
ARG APPINSIGHTS_VERSION="3.7.0"
1111

1212
# 🌍 Timezone Configuration
1313
ARG TZ="Europe/Rome"

‎build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
java
3-
id("org.springframework.boot") version "3.4.1"
3+
id("org.springframework.boot") version "3.4.3"
44
id("io.spring.dependency-management") version "1.1.7"
55
jacoco
66
id("org.sonarqube") version "6.0.1.5171"
@@ -29,9 +29,9 @@ repositories {
2929
mavenCentral()
3030
}
3131

32-
val springDocOpenApiVersion = "2.7.0"
32+
val springDocOpenApiVersion = "2.8.5"
3333
val openApiToolsVersion = "0.2.6"
34-
val micrometerVersion = "1.4.1"
34+
val micrometerVersion = "1.4.3"
3535

3636
dependencies {
3737
implementation("org.springframework.boot:spring-boot-starter")

‎gradle.lockfile

+47-47
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
aopalliance:aopalliance:1.0=compileClasspath
5-
ch.qos.logback:logback-classic:1.5.12=compileClasspath
6-
ch.qos.logback:logback-core:1.5.12=compileClasspath
5+
ch.qos.logback:logback-classic:1.5.16=compileClasspath
6+
ch.qos.logback:logback-core:1.5.16=compileClasspath
77
com.fasterxml.jackson.core:jackson-annotations:2.18.2=compileClasspath
88
com.fasterxml.jackson.core:jackson-core:2.18.2=compileClasspath
99
com.fasterxml.jackson.core:jackson-databind:2.18.2=compileClasspath
@@ -14,13 +14,13 @@ com.fasterxml.jackson.module:jackson-module-parameter-names:2.18.2=compileClassp
1414
com.fasterxml.jackson:jackson-bom:2.18.2=compileClasspath
1515
com.fasterxml:classmate:1.7.0=compileClasspath
1616
io.micrometer:context-propagation:1.1.2=compileClasspath
17-
io.micrometer:micrometer-commons:1.14.2=compileClasspath
18-
io.micrometer:micrometer-core:1.14.2=compileClasspath
19-
io.micrometer:micrometer-jakarta9:1.14.2=compileClasspath
20-
io.micrometer:micrometer-observation:1.14.2=compileClasspath
21-
io.micrometer:micrometer-registry-prometheus:1.14.2=compileClasspath
22-
io.micrometer:micrometer-tracing-bridge-otel:1.4.1=compileClasspath
23-
io.micrometer:micrometer-tracing:1.4.1=compileClasspath
17+
io.micrometer:micrometer-commons:1.14.4=compileClasspath
18+
io.micrometer:micrometer-core:1.14.4=compileClasspath
19+
io.micrometer:micrometer-jakarta9:1.14.4=compileClasspath
20+
io.micrometer:micrometer-observation:1.14.4=compileClasspath
21+
io.micrometer:micrometer-registry-prometheus:1.14.4=compileClasspath
22+
io.micrometer:micrometer-tracing-bridge-otel:1.4.3=compileClasspath
23+
io.micrometer:micrometer-tracing:1.4.3=compileClasspath
2424
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.9.0-alpha=compileClasspath
2525
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.9.0=compileClasspath
2626
io.opentelemetry.semconv:opentelemetry-semconv:1.25.0-alpha=compileClasspath
@@ -32,58 +32,58 @@ io.opentelemetry:opentelemetry-sdk-logs:1.43.0=compileClasspath
3232
io.opentelemetry:opentelemetry-sdk-metrics:1.43.0=compileClasspath
3333
io.opentelemetry:opentelemetry-sdk-trace:1.43.0=compileClasspath
3434
io.opentelemetry:opentelemetry-sdk:1.43.0=compileClasspath
35-
io.prometheus:prometheus-metrics-config:1.3.5=compileClasspath
36-
io.prometheus:prometheus-metrics-core:1.3.5=compileClasspath
37-
io.prometheus:prometheus-metrics-model:1.3.5=compileClasspath
38-
io.prometheus:prometheus-metrics-tracer-common:1.3.5=compileClasspath
39-
io.swagger.core.v3:swagger-annotations-jakarta:2.2.25=compileClasspath
40-
io.swagger.core.v3:swagger-core-jakarta:2.2.25=compileClasspath
41-
io.swagger.core.v3:swagger-models-jakarta:2.2.25=compileClasspath
35+
io.prometheus:prometheus-metrics-config:1.3.6=compileClasspath
36+
io.prometheus:prometheus-metrics-core:1.3.6=compileClasspath
37+
io.prometheus:prometheus-metrics-model:1.3.6=compileClasspath
38+
io.prometheus:prometheus-metrics-tracer-common:1.3.6=compileClasspath
39+
io.swagger.core.v3:swagger-annotations-jakarta:2.2.28=compileClasspath
40+
io.swagger.core.v3:swagger-core-jakarta:2.2.28=compileClasspath
41+
io.swagger.core.v3:swagger-models-jakarta:2.2.28=compileClasspath
4242
jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath
4343
jakarta.annotation:jakarta.annotation-api:2.1.1=compileClasspath
4444
jakarta.validation:jakarta.validation-api:3.0.2=compileClasspath
4545
jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=compileClasspath
4646
org.apache.commons:commons-lang3:3.17.0=compileClasspath
4747
org.apache.logging.log4j:log4j-api:2.24.3=compileClasspath
4848
org.apache.logging.log4j:log4j-to-slf4j:2.24.3=compileClasspath
49-
org.apache.tomcat.embed:tomcat-embed-core:10.1.34=compileClasspath
50-
org.apache.tomcat.embed:tomcat-embed-el:10.1.34=compileClasspath
51-
org.apache.tomcat.embed:tomcat-embed-websocket:10.1.34=compileClasspath
49+
org.apache.tomcat.embed:tomcat-embed-core:10.1.36=compileClasspath
50+
org.apache.tomcat.embed:tomcat-embed-el:10.1.36=compileClasspath
51+
org.apache.tomcat.embed:tomcat-embed-websocket:10.1.36=compileClasspath
5252
org.hibernate.validator:hibernate-validator:8.0.2.Final=compileClasspath
5353
org.jboss.logging:jboss-logging:3.6.1.Final=compileClasspath
5454
org.jspecify:jspecify:1.0.0=compileClasspath
5555
org.openapitools:jackson-databind-nullable:0.2.6=compileClasspath
5656
org.projectlombok:lombok:1.18.36=compileClasspath
5757
org.slf4j:jul-to-slf4j:2.0.16=compileClasspath
5858
org.slf4j:slf4j-api:2.0.16=compileClasspath
59-
org.springdoc:springdoc-openapi-starter-common:2.7.0=compileClasspath
60-
org.springdoc:springdoc-openapi-starter-webmvc-api:2.7.0=compileClasspath
61-
org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0=compileClasspath
62-
org.springframework.boot:spring-boot-actuator-autoconfigure:3.4.1=compileClasspath
63-
org.springframework.boot:spring-boot-actuator:3.4.1=compileClasspath
64-
org.springframework.boot:spring-boot-autoconfigure:3.4.1=compileClasspath
65-
org.springframework.boot:spring-boot-starter-actuator:3.4.1=compileClasspath
66-
org.springframework.boot:spring-boot-starter-json:3.4.1=compileClasspath
67-
org.springframework.boot:spring-boot-starter-logging:3.4.1=compileClasspath
68-
org.springframework.boot:spring-boot-starter-security:3.4.1=compileClasspath
69-
org.springframework.boot:spring-boot-starter-tomcat:3.4.1=compileClasspath
70-
org.springframework.boot:spring-boot-starter-validation:3.4.1=compileClasspath
71-
org.springframework.boot:spring-boot-starter-web:3.4.1=compileClasspath
72-
org.springframework.boot:spring-boot-starter:3.4.1=compileClasspath
73-
org.springframework.boot:spring-boot:3.4.1=compileClasspath
74-
org.springframework.security:spring-security-config:6.4.2=compileClasspath
75-
org.springframework.security:spring-security-core:6.4.2=compileClasspath
76-
org.springframework.security:spring-security-crypto:6.4.2=compileClasspath
77-
org.springframework.security:spring-security-web:6.4.2=compileClasspath
78-
org.springframework:spring-aop:6.2.1=compileClasspath
79-
org.springframework:spring-beans:6.2.1=compileClasspath
80-
org.springframework:spring-context:6.2.1=compileClasspath
81-
org.springframework:spring-core:6.2.1=compileClasspath
82-
org.springframework:spring-expression:6.2.1=compileClasspath
83-
org.springframework:spring-jcl:6.2.1=compileClasspath
84-
org.springframework:spring-web:6.2.1=compileClasspath
85-
org.springframework:spring-webmvc:6.2.1=compileClasspath
86-
org.webjars:swagger-ui:5.18.2=compileClasspath
59+
org.springdoc:springdoc-openapi-starter-common:2.8.5=compileClasspath
60+
org.springdoc:springdoc-openapi-starter-webmvc-api:2.8.5=compileClasspath
61+
org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.5=compileClasspath
62+
org.springframework.boot:spring-boot-actuator-autoconfigure:3.4.3=compileClasspath
63+
org.springframework.boot:spring-boot-actuator:3.4.3=compileClasspath
64+
org.springframework.boot:spring-boot-autoconfigure:3.4.3=compileClasspath
65+
org.springframework.boot:spring-boot-starter-actuator:3.4.3=compileClasspath
66+
org.springframework.boot:spring-boot-starter-json:3.4.3=compileClasspath
67+
org.springframework.boot:spring-boot-starter-logging:3.4.3=compileClasspath
68+
org.springframework.boot:spring-boot-starter-security:3.4.3=compileClasspath
69+
org.springframework.boot:spring-boot-starter-tomcat:3.4.3=compileClasspath
70+
org.springframework.boot:spring-boot-starter-validation:3.4.3=compileClasspath
71+
org.springframework.boot:spring-boot-starter-web:3.4.3=compileClasspath
72+
org.springframework.boot:spring-boot-starter:3.4.3=compileClasspath
73+
org.springframework.boot:spring-boot:3.4.3=compileClasspath
74+
org.springframework.security:spring-security-config:6.4.3=compileClasspath
75+
org.springframework.security:spring-security-core:6.4.3=compileClasspath
76+
org.springframework.security:spring-security-crypto:6.4.3=compileClasspath
77+
org.springframework.security:spring-security-web:6.4.3=compileClasspath
78+
org.springframework:spring-aop:6.2.3=compileClasspath
79+
org.springframework:spring-beans:6.2.3=compileClasspath
80+
org.springframework:spring-context:6.2.3=compileClasspath
81+
org.springframework:spring-core:6.2.3=compileClasspath
82+
org.springframework:spring-expression:6.2.3=compileClasspath
83+
org.springframework:spring-jcl:6.2.3=compileClasspath
84+
org.springframework:spring-web:6.2.3=compileClasspath
85+
org.springframework:spring-webmvc:6.2.3=compileClasspath
86+
org.webjars:swagger-ui:5.18.3=compileClasspath
8787
org.webjars:webjars-locator-lite:1.0.1=compileClasspath
8888
org.yaml:snakeyaml:2.3=compileClasspath
8989
empty=

0 commit comments

Comments
 (0)