From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/, ...
Date: Sun, 3 Nov 2019 10:12:25 +0000 (UTC) [thread overview]
Message-ID: <1572775932.19b00d811bf2c5ef67146a8afabed9c7b09e984a.fordfrog@gentoo> (raw)
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;
+ }
}
next reply other threads:[~2019-11-03 10:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-03 10:12 Miroslav Šulc [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-08-05 14:31 [gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/, Miroslav Šulc
2020-08-05 14:31 Miroslav Šulc
2019-11-02 21:32 Miroslav Šulc
2019-10-30 19:26 Miroslav Šulc
2019-10-30 19:26 Miroslav Šulc
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1572775932.19b00d811bf2c5ef67146a8afabed9c7b09e984a.fordfrog@gentoo \
--to=fordfrog@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox