From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 78F76138359 for ; Mon, 6 Jul 2020 10:56:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4257CE0905; Mon, 6 Jul 2020 10:56:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 26419E0905 for ; Mon, 6 Jul 2020 10:56:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1159034F0E0 for ; Mon, 6 Jul 2020 10:56:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 964092CE for ; Mon, 6 Jul 2020 10:56:07 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1594028907.ddca794355fa2f062a5c6c711e91ec80f18ef936.fordfrog@gentoo> Subject: [gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/ X-VCS-Repository: proj/java-ebuilder X-VCS-Files: src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java X-VCS-Directories: src/main/java/org/gentoo/java/ebuilder/maven/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: ddca794355fa2f062a5c6c711e91ec80f18ef936 X-VCS-Branch: master Date: Mon, 6 Jul 2020 10:56:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 30778053-36ed-496b-a4f8-9d6832efa309 X-Archives-Hash: 2d373942b7fec5c26b550acaaa935b3f commit: ddca794355fa2f062a5c6c711e91ec80f18ef936 Author: zongyu gmail com> AuthorDate: Mon Jun 15 01:39:41 2020 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Mon Jul 6 09:48:27 2020 +0000 URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=ddca7943 run simple_formatter after mvn -f, which enables us to re-format the irregular xml file produced by mvn Signed-off-by: zongyu gmail.com> .../java/org/gentoo/java/ebuilder/maven/MavenCache.java | 4 ++-- .../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>> 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:");