Skip to content

Update to XMvn version 5.0.0 #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkoncek merged 1 commit into from
Jun 11, 2025
Merged

Update to XMvn version 5.0.0 #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x
<dependency>
<groupId>org.fedoraproject.xmvn</groupId>
<artifactId>xmvn-api</artifactId>
<version>4.3.0</version>
<version>5.0.0</version>
</dependency>
<dependency>
<groupId>io.kojan</groupId>
<artifactId>kojan-xml</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
Expand Down
13 changes: 6 additions & 7 deletions ...main/java/org/fedoraproject/javapackages/validator/validators/MavenMetadataValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
package org.fedoraproject.javapackages.validator.validators;

import java.io.ByteArrayInputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Map;
import java.util.TreeSet;
import java.util.function.Predicate;
import java.util.stream.Collectors;

import javax.xml.stream.XMLStreamException;

import org.apache.commons.compress.archivers.cpio.CpioArchiveEntry;
import org.apache.commons.io.IOUtils;
import org.fedoraproject.javapackages.validator.spi.Decorated;
import org.fedoraproject.javapackages.validator.util.Common;
import org.fedoraproject.javapackages.validator.util.ElementwiseValidator;
import org.fedoraproject.xmvn.metadata.PackageMetadata;
import org.fedoraproject.xmvn.metadata.io.stax.MetadataStaxReader;

import io.kojan.javadeptools.rpm.RpmArchiveInputStream;
import io.kojan.javadeptools.rpm.RpmInfo;
import io.kojan.javadeptools.rpm.RpmPackage;
import io.kojan.xml.XMLException;

/// Validator which checks that Maven metadata XML stored in
/// `/usr/share/maven-metadata/`.
Expand Down Expand Up @@ -75,9 +73,10 @@ public void validate(RpmPackage rpm) throws Exception {
for (var entry : metadataXmls) {
PackageMetadata packageMetadata = null;

try (var is = new ByteArrayInputStream(entry.getValue())) {
packageMetadata = new MetadataStaxReader().read(is, true);
} catch (XMLStreamException ex) {
try {
String xml = new String(entry.getValue(), StandardCharsets.UTF_8);
packageMetadata = PackageMetadata.fromXML(xml);
} catch (XMLException ex) {
fail("{0}: metadata validation failed: {1}", Decorated.rpm(rpm), Decorated.plain(ex.getMessage()));
continue;
}
Expand Down