mirror of
https://github.com/praktimarc/kst4contest.git
synced 2026-08-23 18:47:34 +02:00
Rsclub2_2andClaude Opus 5
f014b4697b
The jdk.net incident was caused by duplication rather than by a single oversight: the module list existed in module-info.java, in the jpackage Maven plugin and in fourteen hardcoded --add-modules arguments across the workflows and AUR PKGBUILDs. Only the path that CI does not use was kept up to date, so every packaged build shipped a runtime image without jdk.net. Add packaging/AddModules.java, a single file source program that reads the requires clauses and prints the platform modules. It runs identically on the Linux, macOS and Windows runners without a build step, and skips third party requires such as jlayer, which is an automatic module and cannot be linked into a runtime image at all, as well as test only requires and requires static. All sixteen packaging call sites now resolve the list through it, so they can no longer drift from the descriptor. The jpackage Maven plugin takes its modules as individual XML elements and cannot consume a generated value, so it remains a second copy. To keep it honest the helper has a pom verification mode, bound to the validate phase via exec-maven-plugin. Binding it to the build rather than to a workflow trigger means it also fires on direct pushes to main, on tagged releases, in both AUR PKGBUILDs and on local builds, none of which run the pull request check. The released AUR PKGBUILD builds from a tag tarball that may predate the helper, and aur-publish.yml rewrites pkgver to the latest release, so it falls back to the list carried in that tarball's own pom.xml. Verified that the generated list produces a byte identical runtime image to the previous hardcoded one, that removing a requires fails the build with a precise diff, and that the pull request check and the push triggered nightly AppImage job both succeed under act. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Generated-By: Claude Code (Claude Opus 5)
510 lines
21 KiB
XML
510 lines
21 KiB
XML
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
|
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
<groupId>de.x08</groupId>
|
|
<artifactId>praktiKST</artifactId>
|
|
<version>1.42.0-nightly</version>
|
|
|
|
<name>praktiKST</name>
|
|
|
|
<organization>
|
|
<name>DO5AMF</name>
|
|
</organization>
|
|
|
|
<url>http://www.x08.de</url>
|
|
|
|
<packaging>jar</packaging>
|
|
|
|
<properties>
|
|
<!-- Application Properties -->
|
|
<link.name>${project.artifactId}</link.name>
|
|
<launcher>${project.artifactId}</launcher>
|
|
<appName>${project.artifactId}</appName>
|
|
<main.class>kst4contest.view.Kst4ContestApplication</main.class>
|
|
<java.version>21</java.version>
|
|
<required.maven.version>3.6.3</required.maven.version>
|
|
<jar.filename>${project.artifactId}-${project.version}</jar.filename>
|
|
|
|
<!-- Dependency versions -->
|
|
<javafx.version>21.0.5</javafx.version>
|
|
<jetbrains.annotations.version>24.0.1</jetbrains.annotations.version>
|
|
<junit.version>5.10.1</junit.version>
|
|
<lombok.version>1.18.44</lombok.version>
|
|
<mockito.version>5.7.0</mockito.version>
|
|
<sqlite.version>3.43.2.2</sqlite.version>
|
|
|
|
<!-- Plugin dependencies -->
|
|
<maven.clean.plugin>3.3.2</maven.clean.plugin>
|
|
<maven.compiler.plugin>3.11.0</maven.compiler.plugin>
|
|
<maven.dependency.plugin>3.3.0</maven.dependency.plugin>
|
|
<maven.deploy.plugin>3.1.1</maven.deploy.plugin>
|
|
<maven.enforcer.plugin>3.4.1</maven.enforcer.plugin>
|
|
<maven.install.plugin>3.1.1</maven.install.plugin>
|
|
<maven.jar.plugin>3.3.0</maven.jar.plugin>
|
|
<maven.resources.plugin>3.3.1</maven.resources.plugin>
|
|
<maven.site.plugin>4.0.0-M11</maven.site.plugin>
|
|
<maven.surfire.plugin>3.2.2</maven.surfire.plugin>
|
|
<maven.wrapper.plugin>3.2.0</maven.wrapper.plugin>
|
|
<moditect.maven.plugin>1.0.0.RC2</moditect.maven.plugin>
|
|
<jpackage.maven.plugin>0.1.3</jpackage.maven.plugin>
|
|
<maven.pmd.version>3.28.0</maven.pmd.version>
|
|
<pmd.version>7.17.0</pmd.version>
|
|
<codehaus.version.plugin>2.16.1</codehaus.version.plugin>
|
|
<javafx.maven.plugin>0.0.8</javafx.maven.plugin>
|
|
<spotbugs.maven.plugin>4.9.8.2</spotbugs.maven.plugin>
|
|
<spotbugs.version>4.9.8</spotbugs.version>
|
|
<exec.maven.plugin>3.1.0</exec.maven.plugin>
|
|
|
|
<!-- other properties -->
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
<maven.compiler.source>${java.version}</maven.compiler.source>
|
|
<maven.compiler.target>${java.version}</maven.compiler.target>
|
|
<maven.compiler.release>${java.version}</maven.compiler.release>
|
|
<maven.plugin.validation>VERBOSE</maven.plugin.validation>
|
|
</properties>
|
|
|
|
<dependencies>
|
|
<!-- JavaFX dependencies -->
|
|
<dependency>
|
|
<groupId>org.openjfx</groupId>
|
|
<artifactId>javafx-controls</artifactId>
|
|
<version>${javafx.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.openjfx</groupId>
|
|
<artifactId>javafx-graphics</artifactId>
|
|
<version>${javafx.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.openjfx</groupId>
|
|
<artifactId>javafx-fxml</artifactId>
|
|
<version>${javafx.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.openjfx</groupId>
|
|
<artifactId>javafx-web</artifactId>
|
|
<version>${javafx.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.openjfx</groupId>
|
|
<artifactId>javafx-media</artifactId>
|
|
<version>${javafx.version}</version>
|
|
</dependency>
|
|
|
|
<!-- JLayer: pure-Java MP3 decoder, used instead of JavaFX Media for Flatpak audio compatibility -->
|
|
<dependency>
|
|
<groupId>javazoom</groupId>
|
|
<artifactId>jlayer</artifactId>
|
|
<version>1.0.1</version>
|
|
</dependency>
|
|
|
|
<!-- SQLite -->
|
|
<dependency>
|
|
<groupId>org.xerial</groupId>
|
|
<artifactId>sqlite-jdbc</artifactId>
|
|
<version>${sqlite.version}</version>
|
|
</dependency>
|
|
|
|
<!-- Lombok -->
|
|
<dependency>
|
|
<groupId>org.projectlombok</groupId>
|
|
<artifactId>lombok</artifactId>
|
|
<version>${lombok.version}</version>
|
|
<scope>provided</scope>
|
|
</dependency>
|
|
|
|
<!-- JUnit 5 -->
|
|
<dependency>
|
|
<groupId>org.junit.jupiter</groupId>
|
|
<artifactId>junit-jupiter-engine</artifactId>
|
|
<version>${junit.version}</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.junit.jupiter</groupId>
|
|
<artifactId>junit-jupiter-params</artifactId>
|
|
<version>${junit.version}</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
|
|
<!-- Mockito -->
|
|
<dependency>
|
|
<groupId>org.mockito</groupId>
|
|
<artifactId>mockito-core</artifactId>
|
|
<version>${mockito.version}</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.mockito</groupId>
|
|
<artifactId>mockito-junit-jupiter</artifactId>
|
|
<version>${mockito.version}</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
|
|
<!-- Dependency used for @NotNull / @Nullable -->
|
|
<dependency>
|
|
<groupId>org.jetbrains</groupId>
|
|
<artifactId>annotations</artifactId>
|
|
<version>${jetbrains.annotations.version}</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.junit.jupiter</groupId>
|
|
<artifactId>junit-jupiter-api</artifactId>
|
|
<version>${junit.version}</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.mockito</groupId>
|
|
<artifactId>mockito-core</artifactId>
|
|
<version>5.17.0</version>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
|
|
<!--
|
|
<dependency>
|
|
<groupId>xml-apis</groupId>
|
|
<artifactId>xml-apis</artifactId>
|
|
<version>2.0.2</version>
|
|
</dependency>
|
|
|
|
<dependency>
|
|
<groupId>javax.xml.parsers</groupId>
|
|
<artifactId>jaxp-api</artifactId>
|
|
<version>1.4.5</version>
|
|
</dependency>
|
|
-->
|
|
|
|
</dependencies>
|
|
|
|
<build>
|
|
<finalName>${jar.filename}</finalName>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-wrapper-plugin</artifactId>
|
|
<version>${maven.wrapper.plugin}</version>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-enforcer-plugin</artifactId>
|
|
<version>${maven.enforcer.plugin}</version>
|
|
<executions>
|
|
<execution>
|
|
<id>enforce-versions</id>
|
|
<goals>
|
|
<goal>enforce</goal>
|
|
</goals>
|
|
<configuration>
|
|
<rules>
|
|
<requireMavenVersion>
|
|
<version>${required.maven.version}</version>
|
|
</requireMavenVersion>
|
|
</rules>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
|
|
<!--
|
|
Fails the build whenever the jpackage module list below drifts
|
|
from the requires clauses in src/main/java/module-info.java.
|
|
This is bound to validate rather than to a workflow trigger so
|
|
it also fires on direct pushes to main, on local builds and in
|
|
the AUR PKGBUILDs, which never run the pull request check.
|
|
-->
|
|
<plugin>
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
<artifactId>exec-maven-plugin</artifactId>
|
|
<version>${exec.maven.plugin}</version>
|
|
<executions>
|
|
<execution>
|
|
<id>verify-packaging-module-list</id>
|
|
<phase>validate</phase>
|
|
<goals>
|
|
<goal>exec</goal>
|
|
</goals>
|
|
<configuration>
|
|
<executable>${java.home}/bin/java</executable>
|
|
<workingDirectory>${project.basedir}</workingDirectory>
|
|
<arguments>
|
|
<argument>packaging/AddModules.java</argument>
|
|
<argument>--verify-pom</argument>
|
|
</arguments>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-compiler-plugin</artifactId>
|
|
<version>${maven.compiler.plugin}</version>
|
|
<configuration>
|
|
<release>${java.version}</release>
|
|
<annotationProcessorPaths>
|
|
<path>
|
|
<groupId>org.projectlombok</groupId>
|
|
<artifactId>lombok</artifactId>
|
|
<version>${lombok.version}</version>
|
|
</path>
|
|
</annotationProcessorPaths>
|
|
</configuration>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-clean-plugin</artifactId>
|
|
<version>${maven.clean.plugin}</version>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-deploy-plugin</artifactId>
|
|
<version>${maven.deploy.plugin}</version>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-install-plugin</artifactId>
|
|
<version>${maven.install.plugin}</version>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-jar-plugin</artifactId>
|
|
<version>${maven.jar.plugin}</version>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-resources-plugin</artifactId>
|
|
<version>${maven.resources.plugin}</version>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-site-plugin</artifactId>
|
|
<version>${maven.site.plugin}</version>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-surefire-plugin</artifactId>
|
|
<version>${maven.surfire.plugin}</version>
|
|
<configuration>
|
|
<testFailureIgnore>true</testFailureIgnore>
|
|
<!--
|
|
Without this, Surefire's automatic module-path detection splits the
|
|
JUnit Platform jars across classpath and module-path inconsistently
|
|
(module org.junit.platform.commons ends up loaded while a class from
|
|
junit-platform-engine stays in the unnamed module), which fails with
|
|
an IllegalAccessError before any test can run. The project itself has
|
|
no module-info.java, so plain classpath execution is correct here.
|
|
-->
|
|
<useModulePath>false</useModulePath>
|
|
</configuration>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>com.github.spotbugs</groupId>
|
|
<artifactId>spotbugs-maven-plugin</artifactId>
|
|
<version>${spotbugs.maven.plugin}</version>
|
|
<dependencies>
|
|
<!-- overwrite dependency on spotbugs if you want to specify the version of spotbugs -->
|
|
<dependency>
|
|
<groupId>com.github.spotbugs</groupId>
|
|
<artifactId>spotbugs</artifactId>
|
|
<version>${spotbugs.version}</version>
|
|
</dependency>
|
|
</dependencies>
|
|
<executions>
|
|
<execution>
|
|
<phase>prepare-package</phase>
|
|
<goals>
|
|
<!-- spotbugs does not stop build when violations are found -->
|
|
<goal>spotbugs</goal>
|
|
|
|
<!-- check stops the build when violations are found -->
|
|
<!-- <goal>check</goal> -->
|
|
</goals>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-pmd-plugin</artifactId>
|
|
<version>${maven.pmd.version}</version>
|
|
<configuration>
|
|
<minimumTokens>100</minimumTokens>
|
|
<targetJdk>${java.version}</targetJdk>
|
|
<linkXRef>false</linkXRef>
|
|
<rulesets>
|
|
<ruleset>pmd-ruleset.xml</ruleset>
|
|
</rulesets>
|
|
</configuration>
|
|
<executions>
|
|
<execution>
|
|
<phase>prepare-package</phase>
|
|
<goals>
|
|
<!-- pmd does not stop build when violations are found -->
|
|
<goal>pmd</goal>
|
|
|
|
<!-- check stops the build when violations are found -->
|
|
<!-- <goal>check</goal> -->
|
|
</goals>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
<artifactId>versions-maven-plugin</artifactId>
|
|
<version>${codehaus.version.plugin}</version>
|
|
<executions>
|
|
<execution>
|
|
<phase>validate</phase>
|
|
<goals>
|
|
<goal>display-dependency-updates</goal>
|
|
<goal>display-plugin-updates</goal>
|
|
<goal>display-property-updates</goal>
|
|
</goals>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
|
|
<!-- JavaFX Plugin to start application -->
|
|
<plugin>
|
|
<groupId>org.openjfx</groupId>
|
|
<artifactId>javafx-maven-plugin</artifactId>
|
|
<version>${javafx.maven.plugin}</version>
|
|
<configuration>
|
|
<mainClass>${main.class}</mainClass>
|
|
</configuration>
|
|
</plugin>
|
|
|
|
</plugins>
|
|
</build>
|
|
|
|
<profiles>
|
|
|
|
<!-- Profile that adds JLink and JPackage runs.
|
|
|
|
Add -PImage or -DImage to use this profile.
|
|
-->
|
|
<profile>
|
|
<id>Image</id>
|
|
<activation>
|
|
<property>
|
|
<name>Image</name>
|
|
</property>
|
|
</activation>
|
|
<build>
|
|
<plugins>
|
|
<!-- Copy dependencies -->
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-dependency-plugin</artifactId>
|
|
<version>${maven.dependency.plugin}</version>
|
|
<executions>
|
|
<!-- erstmal Abhängigkeiten für den Class-Path kopieren -->
|
|
<execution>
|
|
<id>copy-dependencies</id>
|
|
<phase>package</phase>
|
|
<goals>
|
|
<goal>copy-dependencies</goal>
|
|
</goals>
|
|
<configuration>
|
|
<outputDirectory>${project.build.directory}/modules</outputDirectory>
|
|
<includeScope>runtime</includeScope>
|
|
<overWriteReleases>false</overWriteReleases>
|
|
<overWriteSnapshots>false</overWriteSnapshots>
|
|
<overWriteIfNewer>true</overWriteIfNewer>
|
|
</configuration>
|
|
</execution>
|
|
|
|
<!-- dazu noch das Projekt-JAR -->
|
|
<execution>
|
|
<id>copy</id>
|
|
<phase>install</phase>
|
|
<goals>
|
|
<goal>copy</goal>
|
|
</goals>
|
|
<configuration>
|
|
<outputDirectory>${project.build.directory}/modules</outputDirectory>
|
|
<artifactItems>
|
|
<artifactItem>
|
|
<groupId>${project.groupId}</groupId>
|
|
<artifactId>${project.artifactId}</artifactId>
|
|
<version>${project.version}</version>
|
|
<type>${project.packaging}</type>
|
|
<destFileName>${project.build.finalName}.jar</destFileName>
|
|
</artifactItem>
|
|
</artifactItems>
|
|
<overWriteIfNewer>true</overWriteIfNewer>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
|
|
<plugin>
|
|
<groupId>com.github.akman</groupId>
|
|
<artifactId>jpackage-maven-plugin</artifactId>
|
|
<version>${jpackage.maven.plugin}</version>
|
|
<configuration>
|
|
<name>${appName}</name>
|
|
<type>IMAGE</type>
|
|
<modulepath>
|
|
<dependencysets>
|
|
<dependencyset>
|
|
<includenames>
|
|
<includename>javafx\..*</includename>
|
|
</includenames>
|
|
</dependencyset>
|
|
</dependencysets>
|
|
</modulepath>
|
|
<!--
|
|
Keep in sync with the requires clauses in
|
|
src/main/java/module-info.java. The packaging
|
|
scripts derive this list automatically via
|
|
packaging/AddModules.java, and the PR check
|
|
runs that helper in its pom verification mode
|
|
so this block cannot drift unnoticed.
|
|
-->
|
|
<addmodules>
|
|
<addmodule>java.desktop</addmodule>
|
|
<addmodule>java.net.http</addmodule>
|
|
<addmodule>java.sql</addmodule>
|
|
<addmodule>javafx.controls</addmodule>
|
|
<addmodule>javafx.fxml</addmodule>
|
|
<addmodule>javafx.media</addmodule>
|
|
<addmodule>javafx.web</addmodule>
|
|
<addmodule>jdk.crypto.ec</addmodule>
|
|
<addmodule>jdk.jsobject</addmodule>
|
|
<addmodule>jdk.net</addmodule>
|
|
<addmodule>jdk.xml.dom</addmodule>
|
|
</addmodules>
|
|
<mainclass>${main.class}</mainclass>
|
|
<input>${project.build.directory}/modules</input>
|
|
<mainjar>${jar.filename}.jar</mainjar>
|
|
</configuration>
|
|
<executions>
|
|
<execution>
|
|
<phase>install</phase>
|
|
<goals>
|
|
<goal>jpackage</goal>
|
|
</goals>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
</profile>
|
|
|
|
</profiles>
|
|
|
|
</project> |