[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/, ...

[Miroslav Šulc]

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;
+    }
 }