From 939a978bb4610b09cbf45d8f1f2a0dee97c9ef47 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mar 06 2025 17:07:41 +0000 Subject: [PATCH 1/2] Java: update BuildRequires to mention versioned Java bindings --- diff --git a/guidelines/modules/ROOT/pages/Java.adoc b/guidelines/modules/ROOT/pages/Java.adoc index d6d8604..bf13589 100644 --- a/guidelines/modules/ROOT/pages/Java.adoc +++ b/guidelines/modules/ROOT/pages/Java.adoc @@ -78,11 +78,10 @@ the split packaging SHOULD be preferred. == BuildRequires and Requires -Java packages MUST BuildRequire their respective build system: +Java packages MUST BuildRequire their respective build system (or a versioned binding thereof): -* `+BuildRequires: maven-local+` for packages built with Maven -* `+BuildRequires: ant+` for packages built with ant -* `+BuildRequires: java-devel+` for packages built with javac +* `+BuildRequires: maven-local+` or `+maven-local-openjdk${N}+` for packages built with Maven +* `+BuildRequires: javapackages-local+` or `+javapackages-local-openjdk${N}+` for packages not built with Maven Java applications or their dependencies MUST have `+Requires+` on: From bafd389e405043f20d6a71b0d26468503c173c75 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mar 06 2025 17:07:41 +0000 Subject: [PATCH 2/2] Java: update guidelines related to runtime Requires --- diff --git a/guidelines/modules/ROOT/pages/Java.adoc b/guidelines/modules/ROOT/pages/Java.adoc index bf13589..2d4a7d4 100644 --- a/guidelines/modules/ROOT/pages/Java.adoc +++ b/guidelines/modules/ROOT/pages/Java.adoc @@ -83,14 +83,11 @@ Java packages MUST BuildRequire their respective build system (or a versioned bi * `+BuildRequires: maven-local+` or `+maven-local-openjdk${N}+` for packages built with Maven * `+BuildRequires: javapackages-local+` or `+javapackages-local-openjdk${N}+` for packages not built with Maven -Java applications or their dependencies MUST have `+Requires+` on: +Java applications SHOULD have `+Requires+` on an appropriate Java runtime package: -* `+java-headless+` or `+java-headless >= 1:minimal_required_version+` -* `+javapackages-filesystem+` - -If a `+java-headless+` requirement is insufficient, -then the package MUST have `+Requires+` for -`+java+` or `+java >= 1:minimal_required_version+`. +* `+java-headless+` for applications not requiring graphical interface +* `+java+` for applications requiring graphical interface +* `+java-devel+` for applications requiring additional content related to Java development == Javadoc installation