diff options
author | zongyu <zzy2529420793@gmail.com> | 2020-06-15 09:39:41 +0800 |
---|---|---|
committer | zongyu <zzy2529420793@gmail.com> | 2020-07-06 17:48:27 +0800 |
commit | ddca794355fa2f062a5c6c711e91ec80f18ef936 (patch) | |
tree | d26a0e523143031b6ad3bc8af28362d8364a51fe | |
parent | modify PATTERN_VERSION_RANGE to match things like "[3.0, )" (diff) | |
download | java-ebuilder-ddca794355fa2f062a5c6c711e91ec80f18ef936.tar.gz java-ebuilder-ddca794355fa2f062a5c6c711e91ec80f18ef936.tar.bz2 java-ebuilder-ddca794355fa2f062a5c6c711e91ec80f18ef936.zip |
run simple_formatter after mvn -f, which enables us to re-format the irregular xml file produced by mvn
Signed-off-by: zongyu <zzy2529420793@gmail.com>
-rw-r--r-- | src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java | 4 | ||||
-rw-r--r-- | src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java | 17 |
2 files changed, 19 insertions, 2 deletions
diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java index 4e8767e..19e40f9 100644 --- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java +++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java @@ -24,7 +24,7 @@ public class MavenCache { * items. */ private final Map<String, Map<String, List<CacheItem>>> cache - = new HashMap<>(200); + = new HashMap<>(); /** * Searches for system dependency using maven group id, artifact id and @@ -151,7 +151,7 @@ public class MavenCache { = cache.get(cacheItem.getGroupId()); if (artifactIds == null) { - artifactIds = new HashMap<>(100); + artifactIds = new HashMap<>(); cache.put(cacheItem.getGroupId(), artifactIds); } diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java index 7c9d162..63ba043 100644 --- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java +++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java @@ -102,6 +102,9 @@ public class MavenParser { pomFile.toString(), "help:effective-pom", "-Doutput=" + outputPath); processBuilder.directory(config.getWorkdir().toFile()); + final ProcessBuilder xmlBuilder = new ProcessBuilder("/usr/lib/java-ebuilder/simple_formatter", + "" + outputPath); + xmlBuilder.directory(config.getWorkdir().toFile()); final Process process; @@ -119,6 +122,20 @@ public class MavenParser { Runtime.getRuntime().exit(1); } + final Process xmlProcess; + try { + xmlProcess = xmlBuilder.start(); + } catch (final IOException ex) { + throw new RuntimeException("Failed to format xml", ex); + } + try { + xmlProcess.waitFor(10, TimeUnit.MINUTES); + } catch (final InterruptedException ex) { + config.getErrorWriter().println("ERROR: xml formatter run 10 minutes??"); + Runtime.getRuntime().exit(1); + } + + if (process.exitValue() != 0) { config.getErrorWriter().println( "ERROR: Failed to run mvn command:"); |