From 166bd43ba7238733587263860a9166592f35503d Mon Sep 17 00:00:00 2001 From: Pjandro Date: Sat, 24 Oct 2026 22:07:30 +0000 Subject: [PATCH] =?UTF-8?q?Java=2017:=20maven.compiler.release,=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BD=D1=82=D0=B5=D0=B9=D0=BD=D0=B5=D1=80=20(temurin-17)?= =?UTF-8?q?,=20CI=20setup-java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/main.yml | 4 ++-- .gitea/workflows/pr.yml | 4 ++-- Containerfile | 4 ++-- pom.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index 517dc41..092faee 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -11,10 +11,10 @@ jobs: steps: - uses: actions/checkout@v5 - - name: Setup JDK 21 + - name: Setup JDK 17 uses: actions/setup-java@v5 with: - java-version: '21' + java-version: '17' distribution: 'temurin' - name: Cache Maven repository diff --git a/.gitea/workflows/pr.yml b/.gitea/workflows/pr.yml index 6cb3b02..b790fb5 100644 --- a/.gitea/workflows/pr.yml +++ b/.gitea/workflows/pr.yml @@ -10,10 +10,10 @@ jobs: steps: - uses: actions/checkout@v5 - - name: Setup JDK 21 + - name: Setup JDK 17 uses: actions/setup-java@v5 with: - java-version: '21' + java-version: '17' distribution: 'temurin' - name: Cache Maven repository diff --git a/Containerfile b/Containerfile index ba45ec9..7ccb58c 100644 --- a/Containerfile +++ b/Containerfile @@ -1,6 +1,6 @@ # FROM с полным именем реестра: podman не резолвит short-name без # unqualified-search-registries в /etc/containers/registries.conf. -FROM docker.io/library/maven:3.9-eclipse-temurin-21 AS build +FROM docker.io/library/maven:3.9-eclipse-temurin-17 AS build WORKDIR /build COPY pom.xml . COPY wordpdf-core/pom.xml wordpdf-core/ @@ -9,7 +9,7 @@ RUN mvn -B -q dependency:go-offline COPY . . RUN mvn -B -q -DskipTests package -FROM docker.io/library/eclipse-temurin:21-jre-alpine +FROM docker.io/library/eclipse-temurin:17-jre-alpine # runtime alpine (минимальный): chart-движку нужен только модуль java.desktop # (Graphics2D), он внутри JRE; fontconfig и системные шрифты не нужны — # текст рисуется глифами fontbox (см. fonts/GlyphFont; проверено на musl-стенде diff --git a/pom.xml b/pom.xml index 29d2458..b5a3b14 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ - 21 + 17 UTF-8