Skip to content

Commit 1fbe649

Browse files
authored
fix: read pom file encoding other than UTF-8 (#10)
1 parent b00df52 commit 1fbe649

File tree

6 files changed

+25
-2
lines changed

6 files changed

+25
-2
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@
1010
[submodule "src/test/resources/persistence/persistence"]
1111
path = src/test/resources/persistence/persistence
1212
url = [email protected]:jakartaee/persistence.git
13+
[submodule "src/test/resources/sling-maven/sling-maven"]
14+
path = src/test/resources/sling-maven/sling-maven
15+
url = [email protected]:apache/sling-slingfeature-maven-plugin.git

src/main/java/io/github/algomaster99/maven_module_graph/Utility.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import com.fasterxml.jackson.databind.node.ObjectNode;
88
import org.apache.maven.model.Model;
99
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
10+
import org.codehaus.plexus.util.ReaderFactory;
1011
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
1112

12-
import java.io.FileReader;
1313
import java.io.IOException;
1414
import java.nio.file.Files;
1515
import java.nio.file.Path;
@@ -49,7 +49,7 @@ public static MavenModule createMavenModuleGraph(Path projectRoot, MavenModule p
4949

5050
private static Model readPomModel(Path pomPath) throws IOException, XmlPullParserException {
5151
MavenXpp3Reader reader = new MavenXpp3Reader();
52-
return reader.read(new FileReader(pomPath.toFile()));
52+
return reader.read(ReaderFactory.newXmlReader(pomPath.toFile()));
5353
}
5454

5555
private static List<String> getAllModules(Model model) {

src/test/java/io/github/algomaster99/maven_module_graph/MavenModuleTest.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,18 @@ void persistence_differentProjectRoot(@TempDir Path temp) throws XmlPullParserEx
6464
);
6565
}
6666

67+
@Test
68+
void slingfeature_maven_plugin_differentPomEncoding(@TempDir Path temp) throws XmlPullParserException, IOException {
69+
runTest(
70+
"src/test/resources/sling-maven/sling-maven",
71+
"src/test/resources/sling-maven/output.txt",
72+
"src/test/resources/sling-maven/output.json",
73+
temp.resolve("slingfeature-maven-plugin.txt"),
74+
temp.resolve("slingfeature-maven-plugin.json"),
75+
2, 2
76+
);
77+
}
78+
6779
private void runTest(
6880
String modulePath,
6981
String expectedTextPath,
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"depth" : 0,
3+
"groupId" : "org.apache.sling",
4+
"artifactId" : "slingfeature-maven-plugin",
5+
"version" : "1.6.8"
6+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.apache.sling:slingfeature-maven-plugin:1.6.8
Submodule sling-maven added at ad5cd47

0 commit comments

Comments
 (0)