Skip to content

Commit 0fa2202

Browse files
mizdebskmkoncek
authored andcommitted
Update to XMvn version 5.0.0
1 parent 1d041d7 commit 0fa2202

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x
7474
<dependency>
7575
<groupId>org.fedoraproject.xmvn</groupId>
7676
<artifactId>xmvn-api</artifactId>
77-
<version>4.3.0</version>
77+
<version>5.0.0</version>
78+
</dependency>
79+
<dependency>
80+
<groupId>io.kojan</groupId>
81+
<artifactId>kojan-xml</artifactId>
82+
<version>1.0.1</version>
7883
</dependency>
7984
<dependency>
8085
<groupId>org.yaml</groupId>

src/main/java/org/fedoraproject/javapackages/validator/validators/MavenMetadataValidator.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11
package org.fedoraproject.javapackages.validator.validators;
22

3-
import java.io.ByteArrayInputStream;
3+
import java.nio.charset.StandardCharsets;
44
import java.nio.file.Path;
55
import java.util.ArrayList;
66
import java.util.Map;
77
import java.util.TreeSet;
88
import java.util.function.Predicate;
99
import java.util.stream.Collectors;
1010

11-
import javax.xml.stream.XMLStreamException;
12-
1311
import org.apache.commons.compress.archivers.cpio.CpioArchiveEntry;
1412
import org.apache.commons.io.IOUtils;
1513
import org.fedoraproject.javapackages.validator.spi.Decorated;
1614
import org.fedoraproject.javapackages.validator.util.Common;
1715
import org.fedoraproject.javapackages.validator.util.ElementwiseValidator;
1816
import org.fedoraproject.xmvn.metadata.PackageMetadata;
19-
import org.fedoraproject.xmvn.metadata.io.stax.MetadataStaxReader;
2017

2118
import io.kojan.javadeptools.rpm.RpmArchiveInputStream;
2219
import io.kojan.javadeptools.rpm.RpmInfo;
2320
import io.kojan.javadeptools.rpm.RpmPackage;
21+
import io.kojan.xml.XMLException;
2422

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

78-
try (var is = new ByteArrayInputStream(entry.getValue())) {
79-
packageMetadata = new MetadataStaxReader().read(is, true);
80-
} catch (XMLStreamException ex) {
76+
try {
77+
String xml = new String(entry.getValue(), StandardCharsets.UTF_8);
78+
packageMetadata = PackageMetadata.fromXML(xml);
79+
} catch (XMLException ex) {
8180
fail("{0}: metadata validation failed: {1}", Decorated.rpm(rpm), Decorated.plain(ex.getMessage()));
8281
continue;
8382
}

0 commit comments

Comments
 (0)