Skip to content

Commit 68a1bbe

Browse files
committed
Go back to raw Maven read/write for bootstrap
Follow up of quarkusio#39382. Per gripe from Alexey.
1 parent fa57326 commit 68a1bbe

File tree

4 files changed

+11
-29
lines changed

4 files changed

+11
-29
lines changed

independent-projects/bootstrap/bom/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -481,11 +481,6 @@
481481
</exclusion>
482482
</exclusions>
483483
</dependency>
484-
<dependency>
485-
<groupId>io.fabric8</groupId>
486-
<artifactId>maven-model-helper</artifactId>
487-
<version>${maven-model-helper.version}</version>
488-
</dependency>
489484
<!-- Smallrye Common dependencies, imported as a BOM -->
490485
<dependency>
491486
<groupId>io.smallrye.common</groupId>

independent-projects/bootstrap/maven-resolver/pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,6 @@
125125
</exclusion>
126126
</exclusions>
127127
</dependency>
128-
<dependency>
129-
<groupId>io.fabric8</groupId>
130-
<artifactId>maven-model-helper</artifactId>
131-
</dependency>
132128
<dependency>
133129
<groupId>org.junit.jupiter</groupId>
134130
<artifactId>junit-jupiter</artifactId>

independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/ModelUtils.java

+11-19
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.quarkus.bootstrap.resolver.maven.workspace;
22

33
import java.io.BufferedReader;
4+
import java.io.BufferedWriter;
45
import java.io.IOException;
56
import java.io.InputStream;
6-
import java.io.UncheckedIOException;
77
import java.nio.file.DirectoryStream;
88
import java.nio.file.FileSystem;
99
import java.nio.file.Files;
@@ -16,9 +16,10 @@
1616

1717
import org.apache.maven.model.Model;
1818
import org.apache.maven.model.Parent;
19+
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
20+
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
21+
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
1922

20-
import io.fabric8.maven.Maven;
21-
import io.fabric8.maven.XMLFormat;
2223
import io.quarkus.bootstrap.util.PropertyUtils;
2324
import io.quarkus.fs.util.ZipUtils;
2425
import io.quarkus.maven.dependency.ArtifactCoords;
@@ -231,30 +232,21 @@ private static Properties loadPomProps(Path appJar, Path artifactIdPath) throws
231232
}
232233

233234
public static Model readModel(final Path pomXml) throws IOException {
234-
try {
235-
return Maven.readModel(pomXml);
236-
} catch (UncheckedIOException e) {
237-
throw e.getCause();
238-
} catch (RuntimeException e) {
239-
throw new IOException("Failed to read model", e.getCause());
240-
}
235+
return readModel(Files.newInputStream(pomXml));
241236
}
242237

243238
public static Model readModel(InputStream stream) throws IOException {
244239
try (InputStream is = stream) {
245-
return Maven.readModel(is);
246-
} catch (UncheckedIOException e) {
247-
throw e.getCause();
248-
} catch (RuntimeException e) {
249-
throw new IOException("Failed to read model", e.getCause());
240+
return new MavenXpp3Reader().read(stream);
241+
} catch (XmlPullParserException e) {
242+
throw new IOException("Failed to parse POM", e);
250243
}
251244
}
252245

253246
public static void persistModel(Path pomFile, Model model) throws IOException {
254-
try {
255-
Maven.writeModel(model, pomFile, XMLFormat.builder().indent(" ").insertLineBreakBetweenMajorSections().build());
256-
} catch (UncheckedIOException e) {
257-
throw e.getCause();
247+
final MavenXpp3Writer xpp3Writer = new MavenXpp3Writer();
248+
try (BufferedWriter pomFileWriter = Files.newBufferedWriter(pomFile)) {
249+
xpp3Writer.write(pomFileWriter, model);
258250
}
259251
}
260252
}

independent-projects/bootstrap/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
<org-crac.version>0.1.3</org-crac.version>
8181
<formatter-maven-plugin.version>2.23.0</formatter-maven-plugin.version>
8282
<impsort-maven-plugin.version>1.9.0</impsort-maven-plugin.version>
83-
<maven-model-helper.version>36</maven-model-helper.version>
8483
</properties>
8584
<modules>
8685
<module>bom</module>

0 commit comments

Comments
 (0)