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.

Sign up for GitHub

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) #3141

Merged
merged 2 commits into from
Jan 17, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b5f020
Update all patch versions
renovate[bot] Jan 17, 2024
80e1b77
Update the dpkg packages list
sbrunner Jan 10, 2024
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 ci/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/1.6.12/c2cciutils/schema.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/1.6.14/c2cciutils/schema.json

publish:
pypi:
Expand Down
155 changes: 98 additions & 57 deletions ci/dpkg-versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ camptocamp/mapfish_print:latest:
ubuntu_22_04/apt: 2.4.11
ubuntu_22_04/base-passwd: 3.5.52build1
ubuntu_22_04/bash: 5.1-6ubuntu1
ubuntu_22_04/util-linux: 2.37.2-4ubuntu3
ubuntu_22_04/bsdutils: 1:2.37.2-4ubuntu3
ubuntu_22_04/ca-certificates: 20230311ubuntu0.22.04.1
ubuntu_22_04/coreutils: 8.32-4.1ubuntu1
ubuntu_22_04/curl: 7.81.0-1ubuntu1.14
ubuntu_22_04/curl: 7.81.0-1ubuntu1.15
ubuntu_22_04/dash: 0.5.11+git20210903+057cd650a4ed-3build1
ubuntu_22_04/debconf: 1.5.79ubuntu1
ubuntu_22_04/debianutils: 5.5-1ubuntu2
Expand All @@ -15,74 +15,115 @@ camptocamp/mapfish_print:latest:
ubuntu_22_04/e2fsprogs: 1.46.5-2ubuntu1.1
ubuntu_22_04/findutils: 4.8.0-1ubuntu3
ubuntu_22_04/fontconfig: 2.13.1-4.2ubuntu5
ubuntu_22_04/fontconfig-config: 2.13.1-4.2ubuntu5
ubuntu_22_04/fonts-dejavu: 2.37-2build1
ubuntu_22_04/fonts-dejavu-core: 2.37-2build1
ubuntu_22_04/fonts-dejavu-extra: 2.37-2build1
ubuntu_22_04/fonts-liberation: 1:1.07.4-11
ubuntu_22_04/gcc-12: 12.3.0-1ubuntu1~22.04
ubuntu_22_04/gnupg2: 2.2.27-3ubuntu2.1
ubuntu_22_04/gcc-12-base: 12.3.0-1ubuntu1~22.04
ubuntu_22_04/gpgv: 2.2.27-3ubuntu2.1
ubuntu_22_04/grep: 3.7-1build1
ubuntu_22_04/gzip: 1.10-4ubuntu4.1
ubuntu_22_04/hostname: 3.23ubuntu2
ubuntu_22_04/init-system-helpers: '1.62'
ubuntu_22_04/acl: 2.3.1-1
ubuntu_22_04/apr: 1.7.0-8ubuntu0.22.04.1
ubuntu_22_04/attr: 1:2.5.1-1build1
ubuntu_22_04/audit: 1:3.0.7-1build1
ubuntu_22_04/brotli: 1.0.9-2build6
ubuntu_22_04/bzip2: 1.0.8-5build1
ubuntu_22_04/glibc: 2.35-0ubuntu3.4
ubuntu_22_04/libcap-ng: 0.7.9-2.2build3
ubuntu_22_04/libacl1: 2.3.1-1
ubuntu_22_04/libapr1: 1.7.0-8ubuntu0.22.04.1
ubuntu_22_04/libapt-pkg6.0: 2.4.11
ubuntu_22_04/libattr1: 1:2.5.1-1build1
ubuntu_22_04/libaudit-common: 1:3.0.7-1build1
ubuntu_22_04/libaudit1: 1:3.0.7-1build1
ubuntu_22_04/libblkid1: 2.37.2-4ubuntu3
ubuntu_22_04/libbrotli1: 1.0.9-2build6
ubuntu_22_04/libbz2-1.0: 1.0.8-5build1
ubuntu_22_04/libc-bin: 2.35-0ubuntu3.5
ubuntu_22_04/libc6: 2.35-0ubuntu3.5
ubuntu_22_04/libcap-ng0: 0.7.9-2.2build3
ubuntu_22_04/libcap2: 1:2.44-1ubuntu0.22.04.1
ubuntu_22_04/libxcrypt: 1:4.4.27-1
ubuntu_22_04/db5.3: 5.3.28+dfsg1-0.8ubuntu3
ubuntu_22_04/cdebconf: 0.261ubuntu1
ubuntu_22_04/expat: 2.4.7-1ubuntu0.2
ubuntu_22_04/libffi: 3.4.2-4
ubuntu_22_04/freetype: 2.11.1+dfsg-1ubuntu0.2
ubuntu_22_04/libcom-err2: 1.46.5-2ubuntu1.1
ubuntu_22_04/libcrypt1: 1:4.4.27-1
ubuntu_22_04/libcurl4: 7.81.0-1ubuntu1.15
ubuntu_22_04/libdb5.3: 5.3.28+dfsg1-0.8ubuntu3
ubuntu_22_04/libdebconfclient0: 0.261ubuntu1
ubuntu_22_04/libexpat1: 2.4.7-1ubuntu0.2
ubuntu_22_04/libext2fs2: 1.46.5-2ubuntu1.1
ubuntu_22_04/libffi8: 3.4.2-4
ubuntu_22_04/libfontconfig1: 2.13.1-4.2ubuntu5
ubuntu_22_04/libfreetype6: 2.11.1+dfsg-1ubuntu0.2
ubuntu_22_04/libgcc-s1: 12.3.0-1ubuntu1~22.04
ubuntu_22_04/libgcrypt20: 1.9.4-3ubuntu3
ubuntu_22_04/gmp: 2:6.2.1+dfsg-3ubuntu1
ubuntu_22_04/gnutls28: 3.7.3-4ubuntu1.3
ubuntu_22_04/libgpg-error: 1.43-3
ubuntu_22_04/krb5: 1.19.2-2ubuntu0.3
ubuntu_22_04/nettle: 3.7.3-1build2
ubuntu_22_04/libidn2: 2.3.2-2build1
ubuntu_22_04/keyutils: 1.6.1-2ubuntu3
ubuntu_22_04/openldap: 2.5.16+dfsg-0ubuntu0.22.04.1
ubuntu_22_04/lz4: 1.9.3-2build2
ubuntu_22_04/xz-utils: 5.2.5-2ubuntu1
ubuntu_22_04/ncurses: 6.3-2ubuntu0.1
ubuntu_22_04/nghttp2: 1.43.0-1ubuntu0.1
ubuntu_22_04/libnsl: 1.3.0-2build2
ubuntu_22_04/p11-kit: 0.24.0-6build1
ubuntu_22_04/pam: 1.4.0-11ubuntu2.3
ubuntu_22_04/pcre2: 10.39-3ubuntu0.1
ubuntu_22_04/pcre3: 2:8.39-13ubuntu0.22.04.1
ubuntu_22_04/libpng1.6: 1.6.37-3build5
ubuntu_22_04/procps: 2:3.3.17-6ubuntu2.1
ubuntu_22_04/libpsl: 0.21.0-1.2build2
ubuntu_22_04/rtmpdump: 2.4+20151223.gitfa8646d.1-2build4
ubuntu_22_04/cyrus-sasl2: 2.1.27+dfsg2-3ubuntu1.2
ubuntu_22_04/libseccomp: 2.5.3-2ubuntu2
ubuntu_22_04/libselinux: 3.3-1build2
ubuntu_22_04/libsemanage: 3.3-1build2
ubuntu_22_04/libsepol: 3.3-1build1
ubuntu_22_04/libssh: 0.9.6-2ubuntu0.22.04.1
ubuntu_22_04/openssl: 3.0.2-0ubuntu1.12
ubuntu_22_04/systemd: 249.11-0ubuntu3.11
ubuntu_22_04/libgmp10: 2:6.2.1+dfsg-3ubuntu1
ubuntu_22_04/libgnutls30: 3.7.3-4ubuntu1.3
ubuntu_22_04/libgpg-error0: 1.43-3
ubuntu_22_04/libgssapi-krb5-2: 1.19.2-2ubuntu0.3
ubuntu_22_04/libhogweed6: 3.7.3-1build2
ubuntu_22_04/libidn2-0: 2.3.2-2build1
ubuntu_22_04/libk5crypto3: 1.19.2-2ubuntu0.3
ubuntu_22_04/libkeyutils1: 1.6.1-2ubuntu3
ubuntu_22_04/libkrb5-3: 1.19.2-2ubuntu0.3
ubuntu_22_04/libkrb5support0: 1.19.2-2ubuntu0.3
ubuntu_22_04/libldap-2.5-0: 2.5.16+dfsg-0ubuntu0.22.04.1
ubuntu_22_04/liblz4-1: 1.9.3-2build2
ubuntu_22_04/liblzma5: 5.2.5-2ubuntu1
ubuntu_22_04/libmount1: 2.37.2-4ubuntu3
ubuntu_22_04/libncurses6: 6.3-2ubuntu0.1
ubuntu_22_04/libncursesw6: 6.3-2ubuntu0.1
ubuntu_22_04/libnettle8: 3.7.3-1build2
ubuntu_22_04/libnghttp2-14: 1.43.0-1ubuntu0.1
ubuntu_22_04/libnsl2: 1.3.0-2build2
ubuntu_22_04/libp11-kit0: 0.24.0-6build1
ubuntu_22_04/libpam-modules: 1.4.0-11ubuntu2.3
ubuntu_22_04/libpam-modules-bin: 1.4.0-11ubuntu2.3
ubuntu_22_04/libpam-runtime: 1.4.0-11ubuntu2.3
ubuntu_22_04/libpam0g: 1.4.0-11ubuntu2.3
ubuntu_22_04/libpcre2-8-0: 10.39-3ubuntu0.1
ubuntu_22_04/libpcre3: 2:8.39-13ubuntu0.22.04.1
ubuntu_22_04/libpng16-16: 1.6.37-3build5
ubuntu_22_04/libprocps8: 2:3.3.17-6ubuntu2.1
ubuntu_22_04/libpsl5: 0.21.0-1.2build2
ubuntu_22_04/librtmp1: 2.4+20151223.gitfa8646d.1-2build4
ubuntu_22_04/libsasl2-2: 2.1.27+dfsg2-3ubuntu1.2
ubuntu_22_04/libsasl2-modules-db: 2.1.27+dfsg2-3ubuntu1.2
ubuntu_22_04/libseccomp2: 2.5.3-2ubuntu2
ubuntu_22_04/libselinux1: 3.3-1build2
ubuntu_22_04/libsemanage-common: 3.3-1build2
ubuntu_22_04/libsemanage2: 3.3-1build2
ubuntu_22_04/libsepol2: 3.3-1build1
ubuntu_22_04/libsmartcols1: 2.37.2-4ubuntu3
ubuntu_22_04/libss2: 1.46.5-2ubuntu1.1
ubuntu_22_04/libssh-4: 0.9.6-2ubuntu0.22.04.2
ubuntu_22_04/libssl3: 3.0.2-0ubuntu1.12
ubuntu_22_04/libstdc++6: 12.3.0-1ubuntu1~22.04
ubuntu_22_04/libsystemd0: 249.11-0ubuntu3.11
ubuntu_22_04/libtasn1-6: 4.18.0-4build1
ubuntu_22_04/libtirpc: 1.3.2-2ubuntu0.1
ubuntu_22_04/libunistring: 1.0-1
ubuntu_22_04/xxhash: 0.8.1-1
ubuntu_22_04/libzstd: 1.4.8+dfsg-3build1
ubuntu_22_04/shadow: 1:4.8.1-2ubuntu2.1
ubuntu_22_04/lsb: 11.1.0ubuntu4
ubuntu_22_04/libtinfo6: 6.3-2ubuntu0.1
ubuntu_22_04/libtirpc-common: 1.3.2-2ubuntu0.1
ubuntu_22_04/libtirpc3: 1.3.2-2ubuntu0.1
ubuntu_22_04/libudev1: 249.11-0ubuntu3.11
ubuntu_22_04/libunistring2: 1.0-1
ubuntu_22_04/libuuid1: 2.37.2-4ubuntu3
ubuntu_22_04/libxxhash0: 0.8.1-1
ubuntu_22_04/libzstd1: 1.4.8+dfsg-3build1
ubuntu_22_04/locales: 2.35-0ubuntu3.5
ubuntu_22_04/login: 1:4.8.1-2ubuntu2.1
ubuntu_22_04/logsave: 1.46.5-2ubuntu1.1
ubuntu_22_04/lsb-base: 11.1.0ubuntu4
ubuntu_22_04/mawk: 1.3.4.20200120-3
ubuntu_22_04/perl: 5.34.0-3ubuntu1.3
ubuntu_22_04/mount: 2.37.2-4ubuntu3
ubuntu_22_04/ncurses-base: 6.3-2ubuntu0.1
ubuntu_22_04/ncurses-bin: 6.3-2ubuntu0.1
ubuntu_22_04/openssl: 3.0.2-0ubuntu1.12
ubuntu_22_04/p11-kit: 0.24.0-6build1
ubuntu_22_04/p11-kit-modules: 0.24.0-6build1
ubuntu_22_04/passwd: 1:4.8.1-2ubuntu2.1
ubuntu_22_04/perl-base: 5.34.0-3ubuntu1.3
ubuntu_22_04/procps: 2:3.3.17-6ubuntu2.1
ubuntu_22_04/sed: 4.8-1ubuntu2
ubuntu_22_04/sensible-utils: 0.0.17
ubuntu_22_04/sysvinit: 3.01-1ubuntu1
ubuntu_22_04/tar: 1.34+dfsg-1ubuntu0.1.22.04.1
ubuntu_22_04/tzdata: 2023c-0ubuntu0.22.04.2
ubuntu_22_04/sysvinit-utils: 3.01-1ubuntu1
ubuntu_22_04/tar: 1.34+dfsg-1ubuntu0.1.22.04.2
ubuntu_22_04/tzdata: 2023d-0ubuntu0.22.04
ubuntu_22_04/ubuntu-keyring: 2021.03.26
ubuntu_22_04/ucf: '3.0043'
ubuntu_22_04/usrmerge: 25ubuntu2
ubuntu_22_04/util-linux: 2.37.2-4ubuntu3
ubuntu_22_04/wget: 1.21.2-2ubuntu1
2 changes: 1 addition & 1 deletion ci/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
c2cciutils[checks,publish]==1.6.12
c2cciutils[checks,publish]==1.6.14
pre-commit==3.5.0
2 changes: 1 addition & 1 deletion core/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM mapfish_print_builder AS builder

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

RUN --mount=type=cache,target=/var/cache,sharing=locked \
Expand Down
30 changes: 15 additions & 15 deletions core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ dependencies {
"org.springframework:spring-context:5.3.31",
"org.springframework:spring-web:5.3.31",
"org.springframework:spring-webmvc:5.3.31",
"org.springframework.security:spring-security-config:5.8.8",
"org.springframework.security:spring-security-web:5.8.8",
"org.springframework.security:spring-security-config:5.8.9",
"org.springframework.security:spring-security-web:5.8.9",
'com.thetransactioncompany:cors-filter:2.10',
// Hibernate & Postgres
'org.hibernate:hibernate-core:5.6.15.Final',
Expand All @@ -145,13 +145,13 @@ dependencies {
"javax.media:jai-core:1.1.3"
)
metrics(
"io.dropwizard.metrics:metrics-core:4.2.22",
"io.dropwizard.metrics:metrics-servlet:4.2.22",
"io.dropwizard.metrics:metrics-httpclient:4.2.22",
"io.dropwizard.metrics:metrics-servlets:4.2.22",
"io.dropwizard.metrics:metrics-jvm:4.2.22",
"io.dropwizard.metrics:metrics-jmx:4.2.22",
"io.dropwizard.metrics:metrics-logback:4.2.22",
"io.dropwizard.metrics:metrics-core:4.2.23",
"io.dropwizard.metrics:metrics-servlet:4.2.23",
"io.dropwizard.metrics:metrics-httpclient:4.2.23",
"io.dropwizard.metrics:metrics-servlets:4.2.23",
"io.dropwizard.metrics:metrics-jvm:4.2.23",
"io.dropwizard.metrics:metrics-jmx:4.2.23",
"io.dropwizard.metrics:metrics-logback:4.2.23",
)
geotools(
"org.geotools:gt-epsg-hsql:29.3",
Expand All @@ -165,25 +165,25 @@ dependencies {
)
jasper(
"net.sf.jasperreports:jasperreports:6.20.6",
"org.codehaus.groovy:groovy-all:3.0.19",
"org.codehaus.groovy:groovy-all:3.0.20",
'ar.com.fdvs:DynamicJasper:5.3.9',
"net.sf.jasperreports:jasperreports-fonts:6.20.6",
"net.sf.jasperreports:jasperreports-functions:6.20.6",
'joda-time:joda-time:2.12.5'
'joda-time:joda-time:2.12.6'
)
implementation(
'com.google.guava:guava:33.0.0-jre',
"org.slf4j:slf4j-api:2.0.9",
"org.slf4j:jcl-over-slf4j:2.0.9",
"org.slf4j:jul-to-slf4j:2.0.9",
"org.slf4j:slf4j-api:2.0.11",
"org.slf4j:jcl-over-slf4j:2.0.11",
"org.slf4j:jul-to-slf4j:2.0.11",
"ch.qos.logback:logback-classic:1.4.14",
"ch.qos.logback:logback-access:1.4.14",
'org.json:json:20231013',
'org.yaml:snakeyaml:2.2',
'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.605',
'com.amazonaws:aws-java-sdk-s3:1.12.638',
'com.adobe.xmp:xmpcore:6.1.11',
'io.sentry:sentry-logback:7.0.0',
'net.logstash.logback:logstash-logback-encoder:7.4',
Expand Down
2 changes: 1 addition & 1 deletion docs/build.gradle
View file
Open in desktop
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.19",
implementation ("org.codehaus.groovy:groovy-all:3.0.20",
"org.springframework:spring-test:5.3.31",
'org.ccil.cowan.tagsoup:tagsoup:1.2.1',
'com.samskivert:jmustache:1.15',
Expand Down