diff --git a/src/BytecodeVersionJarValidatorJP.java b/src/BytecodeVersionJarValidatorJP.java index 7bdb509..7d4f359 100644 --- a/src/BytecodeVersionJarValidatorJP.java +++ b/src/BytecodeVersionJarValidatorJP.java @@ -66,7 +66,7 @@ public class BytecodeVersionJarValidatorJP extends BytecodeVersionJarValidator { for (var entry : classVersions.entrySet()) { Path classPath = entry.getKey(); int version = entry.getValue().major(); - int maxAllowedVersion = 17; + int maxAllowedVersion = 21; int expected; if (classPath.endsWith("module-info.class") || classPath.endsWith("package-info.class")) { diff --git a/src/DuplicateFileValidatorJP.java b/src/DuplicateFileValidatorJP.java index c50be84..cd8f923 100644 --- a/src/DuplicateFileValidatorJP.java +++ b/src/DuplicateFileValidatorJP.java @@ -16,18 +16,15 @@ public class DuplicateFileValidatorJP extends DefaultDuplicateFileValidator { @Override public boolean allowedDuplicateFile(Path path, Collection providerRpms) throws Exception { + if (path.getParent().equals(Path.of("/usr/share/jpbinding"))) { + return true; + } + + // FIXME we want to get rid of these duplicates if (path.toString().startsWith("/usr/share/licenses/")) { return providerRpms.stream().map(Common::getPackageName).distinct().count() == 1; } - if (providerRpms.stream().allMatch(rpm -> rpm.getName().startsWith("maven-openjdk"))) { - return true; - } - - if (providerRpms.stream().allMatch(rpm -> rpm.getName().startsWith("maven-local-openjdk"))) { - return true; - } - return false; } } diff --git a/src/FilesValidatorJP.java b/src/FilesValidatorJP.java index 8fd3453..133860c 100644 --- a/src/FilesValidatorJP.java +++ b/src/FilesValidatorJP.java @@ -2,16 +2,20 @@ package org.fedoraproject.javapackages.validator.validators.jp; import java.nio.file.Path; import java.util.Collections; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.TreeMap; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.fedoraproject.javapackages.validator.spi.Decorated; import org.fedoraproject.javapackages.validator.util.Common; import org.fedoraproject.javapackages.validator.util.FilesValidator; import io.kojan.javadeptools.rpm.RpmInfo; +import io.kojan.javadeptools.rpm.RpmPackage; public class FilesValidatorJP extends FilesValidator { @Override @@ -29,11 +33,19 @@ public class FilesValidatorJP extends FilesValidator { } private static class Prefix { - static final String ETC = "/etc/${package}"; + static final String JPBINDING = "/usr/share/jpbinding"; + static final String ETC_PKG = "/etc/${package}"; + static final String ETC_JAVA = "/etc/java"; static final String USR_BIN = "/usr/bin/"; static final String USR_LIB_BUILD_ID = "/usr/lib/.build-id"; } + private static Set ignoredComponents = new LinkedHashSet<>(); + static { + ignoredComponents.add("javapackages-bootstrap"); + ignoredComponents.add("javapackages-tools"); + } + private static Map> nameAliases = new TreeMap<>(); static { nameAliases.put("maven-resolver", List.of("aether")); @@ -48,31 +60,28 @@ public class FilesValidatorJP extends FilesValidator { private static Map> prefixes = new TreeMap<>(); static { - prefixes.put("ant", List.of(Prefix.ETC, Prefix.USR_BIN)); + prefixes.put("ant", List.of(Prefix.ETC_PKG, Prefix.ETC_JAVA, Prefix.JPBINDING, Prefix.USR_BIN)); prefixes.put("antlr", List.of(Prefix.USR_BIN)); prefixes.put("aqute-bnd", List.of(Prefix.USR_BIN)); prefixes.put("byaccj", List.of(Prefix.USR_BIN, Prefix.USR_LIB_BUILD_ID)); prefixes.put("jansi", List.of(Prefix.USR_LIB_BUILD_ID)); prefixes.put("javacc", List.of(Prefix.USR_BIN)); prefixes.put("java_cup", List.of(Prefix.USR_BIN)); - prefixes.put("javapackages-bootstrap", List.of("/usr/lib/java/javapackages-bootstrap", "/usr/lib/javapackages-bootstrap", "/usr/lib/rpm", "/etc/rpm", "/usr/libexec/javapackages-bootstrap")); - prefixes.put("javapackages-tools", List.of(Prefix.USR_BIN, "/usr/share/xmvn/conf", "/usr/lib/rpm", "/usr/share/java-utils/", "/usr/lib/eclipse", "/usr/share/eclipse", "/etc/java", "/etc/jvm", "/usr/lib/java", "/usr/lib/jvm", "/etc/ivy", "/etc/ant.d")); prefixes.put("jflex", List.of(Prefix.USR_BIN)); - prefixes.put("maven", List.of(Prefix.ETC, Prefix.USR_BIN)); + prefixes.put("maven", List.of(Prefix.ETC_PKG, Prefix.ETC_JAVA, Prefix.JPBINDING, Prefix.USR_BIN)); prefixes.put("modello", List.of(Prefix.USR_BIN)); prefixes.put("objectweb-asm", List.of(Prefix.USR_BIN)); prefixes.put("xerces-j2", List.of(Prefix.USR_BIN)); prefixes.put("xml-commons-resolver", List.of(Prefix.USR_BIN)); - prefixes.put("xmvn", List.of(Prefix.USR_BIN)); + prefixes.put("xmvn", List.of(Prefix.JPBINDING, Prefix.USR_BIN)); prefixes.put("xmvn-generator", List.of("/usr/lib/rpm", "/etc/rpm")); } private static Map> exceptionalFiles = new TreeMap<>(); static { exceptionalFiles.put("aqute-bnd", List.of("/etc/ant.d/aqute-bnd")); - exceptionalFiles.put("maven", List.of("/etc/m2.conf", "/etc/java/maven.conf")); + exceptionalFiles.put("maven", List.of("/etc/m2.conf")); exceptionalFiles.put("jansi", List.of("/usr/lib/jansi", "/usr/lib/jansi/libjansi.so", "/usr/lib/java/jansi")); - exceptionalFiles.put("javapackages-tools", List.of("/usr/share/java-utils", "/usr/share/xmvn", "/usr/share/ivy-xmls", "/usr/share/java", "/usr/share/javadoc", "/usr/share/jvm", "/usr/share/jvm-common", "/usr/share/maven-metadata", "/usr/share/maven-poms")); } private static boolean namesRelated(String lhs, String rhs) { @@ -155,7 +164,7 @@ public class FilesValidatorJP extends FilesValidator { } if (patternsCache.computeIfAbsent(Common.getPackageName(rpm) + "/javadoc", - p -> Pattern.compile("/usr/share/javadoc/" + Common.getPackageName(rpm) + "(:?/.*)?")) + _ -> Pattern.compile("/usr/share/javadoc/" + Common.getPackageName(rpm) + "(:?/.*)?")) .matcher(filename).matches()) { return true; } @@ -317,6 +326,16 @@ public class FilesValidatorJP extends FilesValidator { return false; } + @Override + public void validate(RpmPackage rpm) throws Exception { + if (ignoredComponents.contains(rpm.getInfo().getSourceName())) { + skip("{0}: the component {1} is ignored", Decorated.rpm(rpm), + Decorated.actual(rpm.getInfo().getSourceName())); + } else { + super.validate(rpm); + } + } + @Override public boolean allowedFile(RpmInfo rpm, Path path) { if (rpm.isSourcePackage()) { @@ -324,11 +343,6 @@ public class FilesValidatorJP extends FilesValidator { return true; } - // if (Common.getPackageName(rpm).equals("javapackages-bootstrap")) { - // // TODO - // return true; - // } - String filename = path.toString(); if (rpm.getName().equals(Common.getPackageName(rpm) + "-javadoc") || rpm.getName().equals(Common.getPackageName(rpm) + "-javadocs")) { diff --git a/src/JavaExclusiveArchValidatorJP.java b/src/JavaExclusiveArchValidatorJP.java new file mode 100644 index 0000000..7d3de00 --- /dev/null +++ b/src/JavaExclusiveArchValidatorJP.java @@ -0,0 +1,27 @@ +package org.fedoraproject.javapackages.validator.validators.jp; + +import java.util.Set; + +import org.fedoraproject.javapackages.validator.spi.Decorated; +import org.fedoraproject.javapackages.validator.validators.JavaExclusiveArchValidator; + +import io.kojan.javadeptools.rpm.RpmPackage; + +public class JavaExclusiveArchValidatorJP extends JavaExclusiveArchValidator { + @Override + public String getTestName() { + return "/java/jp/exclusive_arch"; + } + + private static final Set SKIPPED = Set.of("javapackages-tools", "byaccj", "jurand"); + + @Override + public void validate(RpmPackage rpm) throws Exception { + String component = rpm.getInfo().getSourceName(); + if (SKIPPED.contains(component)) { + skip("Skipping rpm {0}", Decorated.rpm(rpm)); + return; + } + super.validate(rpm); + } +} diff --git a/src/ValidatorFactoryGeneric.java b/src/ValidatorFactoryGeneric.java index 60275b0..42716a3 100644 --- a/src/ValidatorFactoryGeneric.java +++ b/src/ValidatorFactoryGeneric.java @@ -12,7 +12,7 @@ public class ValidatorFactoryGeneric implements ValidatorFactory { return List.of(new Validator[] { new AttributeProvidesValidator(), new JavadocNoarchValidator(), - new JavaExclusiveArchValidator(), + new JavaExclusiveArchValidatorJP(), new MavenMetadataValidator(), new NoBootstrapValidator(), new JpmsProvidesValidatorJP(), diff --git a/src/javapackages-validator.properties b/src/javapackages-validator.properties index 2a50b1b..4ad3076 100644 --- a/src/javapackages-validator.properties +++ b/src/javapackages-validator.properties @@ -1,13 +1,13 @@ compiler.release=22 -repositories=https://s01.oss.sonatype.org/content/repositories/snapshots +#repositories=https://s01.oss.sonatype.org/content/repositories/snapshots dependencies=\ - io.kojan:runit-api:1.0.0-SNAPSHOT \ - io.kojan:runit-validator:1.0.0-SNAPSHOT \ + io.kojan:runit-api:1.0.0 \ + io.kojan:runit-validator:1.0.0 \ org.apiguardian:apiguardian-api:1.1.2 \ - org.hamcrest:hamcrest:2.2 \ - org.junit.jupiter:junit-jupiter-api:5.10.0 \ - org.junit.jupiter:junit-jupiter-engine:5.10.0 \ - org.junit.platform:junit-platform-commons:1.10.0 \ - org.junit.platform:junit-platform-engine:1.10.0 \ - org.junit.platform:junit-platform-launcher:1.10.0 \ + org.hamcrest:hamcrest:3.0 \ + org.junit.jupiter:junit-jupiter-api:5.11.3 \ + org.junit.jupiter:junit-jupiter-engine:5.11.3 \ + org.junit.platform:junit-platform-commons:1.11.3 \ + org.junit.platform:junit-platform-engine:1.11.3 \ + org.junit.platform:junit-platform-launcher:1.11.3 \ org.opentest4j:opentest4j:1.3.0 \ diff --git a/src/runit/ApacheCommonsCheck.java b/src/runit/ApacheCommonsCheck.java index 51b5b96..8a079c8 100644 --- a/src/runit/ApacheCommonsCheck.java +++ b/src/runit/ApacheCommonsCheck.java @@ -1,12 +1,9 @@ package tests; import static io.kojan.runit.api.RUnit.*; +import static io.kojan.runit.api.matcher.RUnitMatchers.*; import static org.hamcrest.Matchers.*; -import java.util.List; -import java.util.stream.Collectors; - -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; import io.kojan.javadeptools.rpm.*; @@ -26,12 +23,10 @@ public class ApacheCommonsCheck { @PackageTest @IncludeBinary("apache-commons-[a-z][a-z0-9]+") @ExcludeBinary("apache-commons-parent") // Parent POM, no Java code - @Disabled("JPMS provides are not generated for now") public void jpmsProvides(RpmInfo rpm) { String id = rpm.getName().substring("apache-commons-".length()); - List prov = rpm.getProvides().stream().map(RpmDependency::getName).collect(Collectors.toList()); - assertThat("Apache Commons packages should have jpms provides", prov, - hasItem("jpms(org.apache.commons." + id + ")")); + assertThat("Apache Commons packages should have jpms provides", rpm, + provides("jpms\\(org.apache.commons." + id + "\\)( = .*)?")); } @PackageTest diff --git a/src/runit/BasicCheck.java b/src/runit/BasicCheck.java index 2cd66de..6058c81 100644 --- a/src/runit/BasicCheck.java +++ b/src/runit/BasicCheck.java @@ -1,6 +1,7 @@ package tests; import static io.kojan.runit.api.RUnit.*; +import static io.kojan.runit.api.matcher.RUnitMatchers.*; import static org.hamcrest.Matchers.*; import java.util.regex.Matcher; @@ -26,7 +27,7 @@ public class BasicCheck { @ExcludeBinary("java_cup-manual") @ExcludeBinary("antlr-C\\+\\+") public void saneName(RpmInfo rpm) { - assertThat("Package name is sane", rpm.getName(), matchesRegex("[a-z][a-z0-9-]+[a-z0-9]")); + assertThat("Package name is sane", rpm.getName(), matchesRegex("[a-z][a-z0-9.-]+[a-z0-9]")); } @PackageTest @@ -34,8 +35,7 @@ public class BasicCheck { @ExcludeBinary("sisu") @ExcludeBinary("javapackages-bootstrap") public void bundledProvides(RpmInfo rpm) { - assertThat("No bundled(*) provides", () -> rpm.getProvides().stream().map(RpmDependency::getName).iterator(), - everyItem(not(startsWith("bundled(")))); + assertThat("No bundled(*) provides", rpm, not(provides("bundled\\(.*\\)"))); } @PackageTest @@ -48,4 +48,10 @@ public class BasicCheck { assertThat("Binary package Release matches SRPM Release", rpm.getRelease(), is(matcher.group(3))); } + @PackageTest + @IncludeBinary + public void noConflicts(RpmInfo rpm) { + assertThat("Packages have no explicit Conflicts", rpm, not(conflicts(".*"))); + } + } diff --git a/src/runit/FileCheck.java b/src/runit/FileCheck.java index 40a2a4d..5e4a2e3 100644 --- a/src/runit/FileCheck.java +++ b/src/runit/FileCheck.java @@ -34,6 +34,8 @@ public class FileCheck { assertThat("ELF files must have mode 755", mode, is("755")); } else if (entry.getSize() >= 2 && data[0] == '#' && data[1] == '!') { assertThat("Files with shebang must have mode 755", mode, is("755")); + } else if (entry.getSize() == 0) { + assertThat("Empty files must have mode 644 or 0", mode, either(is("644")).or(is("0"))); } else { assertThat("Other regular files must have mode 644", mode, is("644")); }