diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml index f4369b27e..2373f1d19 100644 --- a/.github/workflows/build-deploy.yml +++ b/.github/workflows/build-deploy.yml @@ -37,6 +37,9 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v2 - name: Download war artifact uses: actions/download-artifact@v2 @@ -79,6 +82,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . + platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.metadata.outputs.tags }} labels: ${{ steps.metadata.outputs.labels }} diff --git a/Dockerfile b/Dockerfile index 1ba2f6959..86a76d223 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ENV JETTY_VERSION 11.0.20 ENV JETTY_HOME /opt/jetty # Install packages -RUN apt-get update && \ +RUN apt-get update && && apt-get upgrade libgnutls30 -y -q && \ apt-get -y -q --no-install-recommends install \ vim less procps unzip wget tzdata openjdk-11-jdk \ ffmpeg \ diff --git a/docs-core/pom.xml b/docs-core/pom.xml index dd5d2c0f6..03d85df24 100644 --- a/docs-core/pom.xml +++ b/docs-core/pom.xml @@ -63,13 +63,13 @@ - log4j - log4j + org.apache.logging.log4j + log4j-core org.slf4j - slf4j-log4j12 + slf4j-reload4j @@ -158,6 +158,11 @@ fr.opensagres.poi.xwpf.converter.pdf + + xerces + xercesImpl + + com.twelvemonkeys.imageio diff --git a/docs-web-common/pom.xml b/docs-web-common/pom.xml index 2de08cee6..9406978a8 100644 --- a/docs-web-common/pom.xml +++ b/docs-web-common/pom.xml @@ -31,6 +31,11 @@ org.glassfish.jersey.media jersey-media-json-processing + + + org.eclipse.parsson + parsson + @@ -49,8 +54,8 @@ - log4j - log4j + org.apache.logging.log4j + log4j-core diff --git a/docs-web/pom.xml b/docs-web/pom.xml index 47efd9225..212f3b77f 100644 --- a/docs-web/pom.xml +++ b/docs-web/pom.xml @@ -46,6 +46,11 @@ org.glassfish.jersey.inject jersey-hk2 + + + org.eclipse.parsson + parsson + @@ -64,8 +69,8 @@ - log4j - log4j + org.apache.logging.log4j + log4j-core diff --git a/pom.xml b/pom.xml index b2240060e..daeae2d58 100644 --- a/pom.xml +++ b/pom.xml @@ -16,18 +16,19 @@ UTF-8 - 1.22 + 1.25.0 3.12.0 2.11.0 1.5 2.3.32 - 31.1-jre - 1.2.17 + 33.0.0-jre + 2.22.1 1.7.30 + 2.0.11 1.7.30 1.7.30 4.13.2 - 1.4.199 + 2.2.224 2.1.1 0.10.2 8.7.0 @@ -37,6 +38,7 @@ 2.12.2 6.3.1.Final 2.0.4 + 2.12.2 5.13.0 3.9.4 2.0 @@ -45,11 +47,12 @@ 1.2 1.6.14 1.15.4 - 4.10.0 + 4.12.0 2.1.3 2.0.0.AM27 - 3.0.10 + 3.1.5 + 1.1.5 5.0.0 11.0.20 11.0.20 @@ -219,15 +222,15 @@ - log4j - log4j + org.apache.logging.log4j + log4j-core ${log4j.log4j.version} org.slf4j - slf4j-log4j12 - ${org.slf4j.version} + slf4j-reload4j + ${org.slf4j-reload4j.version} @@ -270,6 +273,12 @@ org.glassfish.jersey.media jersey-media-json-processing ${org.glassfish.jersey.version} + + + org.eclipse.parsson + parsson + + @@ -315,6 +324,12 @@ ${org.glassfish.jersey.version} + + org.eclipse.parsson + parsson + ${parsson.version} + + jakarta.json jakarta.json-api @@ -403,6 +418,12 @@ fr.opensagres.xdocreport fr.opensagres.odfdom.converter.pdf ${fr.opensagres.xdocreport.version} + + + xerces + xercesImpl + + @@ -411,6 +432,12 @@ ${fr.opensagres.xdocreport.version} + + xerces + xercesImpl + ${xerces.xercesImpl.version} + + org.subethamail subethasmtp-wiser @@ -420,6 +447,10 @@ javax.mail mail + + log4j + log4j +