Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/
Date: Wed, 30 Oct 2019 17:35:32
Message-Id: 1483965810.304e54ebfcd4e20ca3e54aaf6add7e02a9f15210.mgorny@gentoo
1 commit: 304e54ebfcd4e20ca3e54aaf6add7e02a9f15210
2 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 9 11:48:48 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 9 12:43:30 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=304e54eb
7
8 MavenVersion.java: _rc3 should not be stripped.
9
10 >=cat/pkg-1.0 does not match cat/pkg-1.0_rc3
11
12 src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15 diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java
16 index 1295856..9d91528 100644
17 --- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java
18 +++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java
19 @@ -163,13 +163,13 @@ public class MavenCache {
20 }
21
22 /**
23 - * Strips all -r* and _* segments from the version string.
24 + * Strips all -r* from the version string.
25 *
26 * @param version version string
27 *
28 * @return stripped version string
29 */
30 private String stripExtraFromVersion(final String version) {
31 - return version.replaceAll("-r\\d+", "").replaceAll("_.*", "");
32 + return version.replaceAll("-r\\d+", "");
33 }
34 }