Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update all patch versions (master) (patch) #3041

Merged
merged 1 commit into from
Sep 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repos:
args:
- --autofix
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.0
rev: v3.0.3
hooks:
- id: prettier
additional_dependencies:
Expand Down
2 changes: 1 addition & 1 deletion core/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM mapfish_print_builder AS builder

FROM tomcat:9.0.78-jdk11-temurin-jammy AS runner
FROM tomcat:9.0.80-jdk11-temurin-jammy AS runner
LABEL maintainer="Camptocamp <[email protected]>"

RUN --mount=type=cache,target=/var/cache,sharing=locked \
Expand Down
14 changes: 7 additions & 7 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ dependencies {
"org.springframework:spring-context:5.3.29",
"org.springframework:spring-web:5.3.29",
"org.springframework:spring-webmvc:5.3.29",
"org.springframework.security:spring-security-config:5.8.5",
"org.springframework.security:spring-security-web:5.8.5",
"org.springframework.security:spring-security-config:5.8.6",
"org.springframework.security:spring-security-web:5.8.6",
'com.thetransactioncompany:cors-filter:2.10',
// Hibernate & Postgres
'org.hibernate:hibernate-core:5.6.15.Final',
Expand Down Expand Up @@ -165,8 +165,8 @@ dependencies {
)
jasper(
"net.sf.jasperreports:jasperreports:6.20.5",
"org.codehaus.groovy:groovy-all:3.0.18",
'ar.com.fdvs:DynamicJasper:5.3.8',
"org.codehaus.groovy:groovy-all:3.0.19",
'ar.com.fdvs:DynamicJasper:5.3.9',
"net.sf.jasperreports:jasperreports-fonts:6.20.5",
"net.sf.jasperreports:jasperreports-functions:6.20.5",
'joda-time:joda-time:2.12.5'
Expand All @@ -176,14 +176,14 @@ dependencies {
"org.slf4j:slf4j-api:2.0.7",
"org.slf4j:jcl-over-slf4j:2.0.7",
"org.slf4j:jul-to-slf4j:2.0.7",
"ch.qos.logback:logback-classic:1.4.8",
"ch.qos.logback:logback-access:1.4.8",
"ch.qos.logback:logback-classic:1.4.11",
"ch.qos.logback:logback-access:1.4.11",
'org.json:json:20230618',
'org.yaml:snakeyaml:2.0',
'com.github.spullara.cli-parser:cli-parser:1.1.6',
'org.apache.httpcomponents:httpclient:4.5.14',
'com.sun.mail:javax.mail:1.6.2',
'com.amazonaws:aws-java-sdk-s3:1.12.520',
'com.amazonaws:aws-java-sdk-s3:1.12.542',
'com.adobe.xmp:xmpcore:6.1.11',
'io.sentry:sentry-logback:6.27.0',
'net.logstash.logback:logstash-logback-encoder:7.4',
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<link href="favicon.ico" rel="shortcut icon" />
<script
type="text/javascript"
src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.0/jquery.min.js"
integrity="sha512-3gJwYpMe3QewGELv8k/BX9vcqhryRdzRMxVfq6ngyWXwo03GFEzjsUm8Q7RZcHPHksttq7/GFoxjCVUjkjvPdw=="
src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js"
integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g=="
crossorigin="anonymous"
referrerpolicy="no-referrer"
></script>
Expand Down
2 changes: 1 addition & 1 deletion docs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ repositories {

dependencies {
implementation project(':core')
implementation ("org.codehaus.groovy:groovy-all:3.0.18",
implementation ("org.codehaus.groovy:groovy-all:3.0.19",
"org.springframework:spring-test:5.3.29",
'org.ccil.cowan.tagsoup:tagsoup:1.2.1',
'com.samskivert:jmustache:1.15',
Expand Down
4 changes: 2 additions & 2 deletions docs/src/main/resources/templates/_main.html
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ <h1>{{pageTitle}}</h1>

<script
type="text/javascript"
src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.0/jquery.min.js"
integrity="sha512-3gJwYpMe3QewGELv8k/BX9vcqhryRdzRMxVfq6ngyWXwo03GFEzjsUm8Q7RZcHPHksttq7/GFoxjCVUjkjvPdw=="
src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js"
integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g=="
crossorigin="anonymous"
referrerpolicy="no-referrer"
></script>
Expand Down