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 B3F86138334 for ; Wed, 30 Oct 2019 17:35:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05660E089F; Wed, 30 Oct 2019 17:35:23 +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 B1EEEE088B for ; Wed, 30 Oct 2019 17:35:22 +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 DDAD934C5CC for ; Wed, 30 Oct 2019 17:35:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D8D98B6 for ; Wed, 30 Oct 2019 17:35:17 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1483965810.304e54ebfcd4e20ca3e54aaf6add7e02a9f15210.mgorny@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 X-VCS-Directories: src/main/java/org/gentoo/java/ebuilder/maven/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 304e54ebfcd4e20ca3e54aaf6add7e02a9f15210 X-VCS-Branch: master Date: Wed, 30 Oct 2019 17:35: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: 31b665db-cf41-4ffd-ac81-7e6e13e03900 X-Archives-Hash: fc08404f2f0f66aebb8363baa8146617 commit: 304e54ebfcd4e20ca3e54aaf6add7e02a9f15210 Author: Benda Xu gentoo org> AuthorDate: Mon Jan 9 11:48:48 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Jan 9 12:43:30 2017 +0000 URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=304e54eb MavenVersion.java: _rc3 should not be stripped. >=cat/pkg-1.0 does not match cat/pkg-1.0_rc3 src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java | 4 ++-- 1 file changed, 2 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 1295856..9d91528 100644 --- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java +++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java @@ -163,13 +163,13 @@ public class MavenCache { } /** - * Strips all -r* and _* segments from the version string. + * Strips all -r* from the version string. * * @param version version string * * @return stripped version string */ private String stripExtraFromVersion(final String version) { - return version.replaceAll("-r\\d+", "").replaceAll("_.*", ""); + return version.replaceAll("-r\\d+", ""); } }