Java 17: maven.compiler.release, контейнер (temurin-17), CI setup-java

This commit is contained in:
Pjandro
2026-10-24 22:07:30 +00:00
parent ef2656a364
commit 166bd43ba7
4 changed files with 7 additions and 7 deletions
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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-стенде
+1 -1
View File
@@ -18,7 +18,7 @@
</modules>
<properties>
<maven.compiler.release>21</maven.compiler.release>
<maven.compiler.release>17</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- docx4j: последняя стабильная версия на Maven Central -->