From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1120172-garchives=archives.gentoo.org@lists.gentoo.org>
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 0F4C3138335
for <garchives@archives.gentoo.org>; Sun, 3 Nov 2019 10:12:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E847CE0835;
Sun, 3 Nov 2019 10:12:28 +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 BDB5EE0835
for <gentoo-commits@lists.gentoo.org>; Sun, 3 Nov 2019 10:12:28 +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 819BF34C787
for <gentoo-commits@lists.gentoo.org>; Sun, 3 Nov 2019 10:12:27 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C8E438A4
for <gentoo-commits@lists.gentoo.org>; Sun, 3 Nov 2019 10:12:25 +0000 (UTC)
From: "Miroslav Šulc" <fordfrog@gentoo.org>
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" <fordfrog@gentoo.org>
Message-ID: <1572775932.19b00d811bf2c5ef67146a8afabed9c7b09e984a.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/MavenProject.java src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java
X-VCS-Directories: src/main/java/org/gentoo/java/ebuilder/maven/ src/main/java/org/gentoo/java/ebuilder/portage/
X-VCS-Committer: fordfrog
X-VCS-Committer-Name: Miroslav Šulc
X-VCS-Revision: 19b00d811bf2c5ef67146a8afabed9c7b09e984a
X-VCS-Branch: master
Date: Sun, 3 Nov 2019 10:12:25 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b8073482-29e1-4183-bcb3-fe613fb3c43d
X-Archives-Hash: 21d3582d91895ff81d62361038fa4d25
commit: 19b00d811bf2c5ef67146a8afabed9c7b09e984a
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 3 10:12:12 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Nov 3 10:12:12 2019 +0000
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=19b00d81
fixed project dump maven version output
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../java/org/gentoo/java/ebuilder/maven/MavenProject.java | 2 +-
.../org/gentoo/java/ebuilder/portage/MavenVersion.java | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
index c3f45f8..6cead37 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
@@ -185,7 +185,7 @@ public class MavenProject {
writer.print(" artifactId: ");
writer.println(dependency.getArtifactId());
writer.print(" mavenVersion: ");
- writer.println(dependency.getMavenVersion());
+ writer.println(dependency.getMavenVersion().getVersion());
writer.print(" scope: ");
writer.println(dependency.getScope());
writer.print(" systemDependency: ");
diff --git a/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java b/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java
index 657d3c4..1de54e1 100644
--- a/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java
+++ b/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java
@@ -36,6 +36,10 @@ public class MavenVersion implements Comparable<MavenVersion> {
* Version qualifier.
*/
private final String qualifier;
+ /**
+ * Original version string.
+ */
+ private final String version;
/**
* Creates new instance of MavenVersion.
@@ -43,6 +47,8 @@ public class MavenVersion implements Comparable<MavenVersion> {
* @param version version string
*/
public MavenVersion(final String version) {
+ this.version = version;
+
final Matcher matcherRange = PATTERN_VERSION_RANGE.matcher(version);
final String useVersion;
@@ -115,4 +121,13 @@ public class MavenVersion implements Comparable<MavenVersion> {
public String getQualifier() {
return qualifier;
}
+
+ /**
+ * Getter for {@link #version}.
+ *
+ * @return {@link #version}
+ */
+ public String getVersion() {
+ return version;
+ }
}