1 |
commit: 19b00d811bf2c5ef67146a8afabed9c7b09e984a |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 3 10:12:12 2019 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 3 10:12:12 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=19b00d81 |
7 |
|
8 |
fixed project dump maven version output |
9 |
|
10 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
11 |
|
12 |
.../java/org/gentoo/java/ebuilder/maven/MavenProject.java | 2 +- |
13 |
.../org/gentoo/java/ebuilder/portage/MavenVersion.java | 15 +++++++++++++++ |
14 |
2 files changed, 16 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java |
17 |
index c3f45f8..6cead37 100644 |
18 |
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java |
19 |
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java |
20 |
@@ -185,7 +185,7 @@ public class MavenProject { |
21 |
writer.print(" artifactId: "); |
22 |
writer.println(dependency.getArtifactId()); |
23 |
writer.print(" mavenVersion: "); |
24 |
- writer.println(dependency.getMavenVersion()); |
25 |
+ writer.println(dependency.getMavenVersion().getVersion()); |
26 |
writer.print(" scope: "); |
27 |
writer.println(dependency.getScope()); |
28 |
writer.print(" systemDependency: "); |
29 |
|
30 |
diff --git a/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java b/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java |
31 |
index 657d3c4..1de54e1 100644 |
32 |
--- a/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java |
33 |
+++ b/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java |
34 |
@@ -36,6 +36,10 @@ public class MavenVersion implements Comparable<MavenVersion> { |
35 |
* Version qualifier. |
36 |
*/ |
37 |
private final String qualifier; |
38 |
+ /** |
39 |
+ * Original version string. |
40 |
+ */ |
41 |
+ private final String version; |
42 |
|
43 |
/** |
44 |
* Creates new instance of MavenVersion. |
45 |
@@ -43,6 +47,8 @@ public class MavenVersion implements Comparable<MavenVersion> { |
46 |
* @param version version string |
47 |
*/ |
48 |
public MavenVersion(final String version) { |
49 |
+ this.version = version; |
50 |
+ |
51 |
final Matcher matcherRange = PATTERN_VERSION_RANGE.matcher(version); |
52 |
final String useVersion; |
53 |
|
54 |
@@ -115,4 +121,13 @@ public class MavenVersion implements Comparable<MavenVersion> { |
55 |
public String getQualifier() { |
56 |
return qualifier; |
57 |
} |
58 |
+ |
59 |
+ /** |
60 |
+ * Getter for {@link #version}. |
61 |
+ * |
62 |
+ * @return {@link #version} |
63 |
+ */ |
64 |
+ public String getVersion() { |
65 |
+ return version; |
66 |
+ } |
67 |
} |