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 6DF0A138335 for ; Wed, 27 Nov 2019 09:50:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B80EE08EB; Wed, 27 Nov 2019 09:50:22 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 0864CE08C2 for ; Wed, 27 Nov 2019 09:50:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 C2F7034D488 for ; Wed, 27 Nov 2019 09:50:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 79EA48C4 for ; Wed, 27 Nov 2019 09:50:17 +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: <1574848165.ca925dfbe04523d44329cd4f9233f763bf8974da.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/MavenEbuilder.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: ca925dfbe04523d44329cd4f9233f763bf8974da X-VCS-Branch: master Date: Wed, 27 Nov 2019 09:50:17 +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: b5d1dbb0-551e-447c-90eb-c653108318ac X-Archives-Hash: a63031899a331352a93317ba49a22f6c commit: ca925dfbe04523d44329cd4f9233f763bf8974da Author: Miroslav Šulc gentoo org> AuthorDate: Wed Nov 27 09:46:30 2019 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Wed Nov 27 09:49:25 2019 +0000 URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=ca925dfb reformatted Signed-off-by: Miroslav Šulc gentoo.org> .../gentoo/java/ebuilder/maven/MavenEbuilder.java | 49 ++++++++++++---------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java index c9ec5b9..4becd69 100644 --- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java +++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java @@ -88,18 +88,21 @@ public class MavenEbuilder { sbCP.append(','); } - String[] parts = dependency.getSystemDependency(). - replaceAll(".*/", ""). - replaceAll("\\[.*\\]", ""). - split(":"); - String PN = parts[0].replaceAll("-r\\d+$", ""); - if (parts.length == 2) { - PN = PN.substring(0, PN.lastIndexOf('-')); - if (!parts[1].equals("0")) { - PN += "-" + parts[1]; - } - } - sbCP.append(PN); + final String[] parts = dependency.getSystemDependency(). + replaceAll(".*/", ""). + replaceAll("\\[.*\\]", ""). + split(":"); + String pn = parts[0].replaceAll("-r\\d+$", ""); + + if (parts.length == 2) { + pn = pn.substring(0, pn.lastIndexOf('-')); + + if (!parts[1].equals("0")) { + pn += "-" + parts[1]; + } + } + + sbCP.append(pn); }); return sbCP.toString(); @@ -155,7 +158,7 @@ public class MavenEbuilder { /** * Retrieves minimum source version from the maven projects. * - * @param mavenProjects list of maven projects + * @param mavenProjects list of maven projects * @param forceMinVersion optional minimum version to force * * @return minimum source version @@ -182,7 +185,7 @@ public class MavenEbuilder { /** * Retrieves minimum target version from the maven projects. * - * @param mavenProjects list of maven projects + * @param mavenProjects list of maven projects * @param forceMinVersion optional minimum version to force * * @return minimum target version @@ -371,7 +374,7 @@ public class MavenEbuilder { mavenProjects.stream(). filter((mavenProject) - -> !mavenProject.getCommonDependencies().isEmpty()). + -> !mavenProject.getCommonDependencies().isEmpty()). forEach((mavenProject) -> { writeDependenciesInfo(config, writer, mavenProject.getPomFile(), @@ -395,8 +398,8 @@ public class MavenEbuilder { writer.println("# Compile dependencies"); mavenProjects.stream(). - filter((mavenProject) -> - !mavenProject.getCompileDependencies().isEmpty() + filter((mavenProject) + -> !mavenProject.getCompileDependencies().isEmpty() || !mavenProject.getTestDependencies().isEmpty()) .forEach((mavenProject) -> { if (!mavenProject.getCompileDependencies().isEmpty()) { @@ -546,7 +549,7 @@ public class MavenEbuilder { * @param writer ebuild writer */ private void writeInherit(final MavenProject mavenProject, - final PrintWriter writer) { + final PrintWriter writer) { writer.println(); writer.print("JAVA_PKG_IUSE=\"doc source"); @@ -764,11 +767,11 @@ public class MavenEbuilder { mavenProject.getTestResourceDirectories(). forEach((directory) -> { - writer.print("\t\""); - writer.print(replaceWithVars(config.getWorkdir(). - relativize(directory).toString(), config)); - writer.println('"'); - }); + writer.print("\t\""); + writer.print(replaceWithVars(config.getWorkdir(). + relativize(directory).toString(), config)); + writer.println('"'); + }); writer.println(')'); }