1 |
commit: ca925dfbe04523d44329cd4f9233f763bf8974da |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 27 09:46:30 2019 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 27 09:49:25 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=ca925dfb |
7 |
|
8 |
reformatted |
9 |
|
10 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
11 |
|
12 |
.../gentoo/java/ebuilder/maven/MavenEbuilder.java | 49 ++++++++++++---------- |
13 |
1 file changed, 26 insertions(+), 23 deletions(-) |
14 |
|
15 |
diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java |
16 |
index c9ec5b9..4becd69 100644 |
17 |
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java |
18 |
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java |
19 |
@@ -88,18 +88,21 @@ public class MavenEbuilder { |
20 |
sbCP.append(','); |
21 |
} |
22 |
|
23 |
- String[] parts = dependency.getSystemDependency(). |
24 |
- replaceAll(".*/", ""). |
25 |
- replaceAll("\\[.*\\]", ""). |
26 |
- split(":"); |
27 |
- String PN = parts[0].replaceAll("-r\\d+$", ""); |
28 |
- if (parts.length == 2) { |
29 |
- PN = PN.substring(0, PN.lastIndexOf('-')); |
30 |
- if (!parts[1].equals("0")) { |
31 |
- PN += "-" + parts[1]; |
32 |
- } |
33 |
- } |
34 |
- sbCP.append(PN); |
35 |
+ final String[] parts = dependency.getSystemDependency(). |
36 |
+ replaceAll(".*/", ""). |
37 |
+ replaceAll("\\[.*\\]", ""). |
38 |
+ split(":"); |
39 |
+ String pn = parts[0].replaceAll("-r\\d+$", ""); |
40 |
+ |
41 |
+ if (parts.length == 2) { |
42 |
+ pn = pn.substring(0, pn.lastIndexOf('-')); |
43 |
+ |
44 |
+ if (!parts[1].equals("0")) { |
45 |
+ pn += "-" + parts[1]; |
46 |
+ } |
47 |
+ } |
48 |
+ |
49 |
+ sbCP.append(pn); |
50 |
}); |
51 |
|
52 |
return sbCP.toString(); |
53 |
@@ -155,7 +158,7 @@ public class MavenEbuilder { |
54 |
/** |
55 |
* Retrieves minimum source version from the maven projects. |
56 |
* |
57 |
- * @param mavenProjects list of maven projects |
58 |
+ * @param mavenProjects list of maven projects |
59 |
* @param forceMinVersion optional minimum version to force |
60 |
* |
61 |
* @return minimum source version |
62 |
@@ -182,7 +185,7 @@ public class MavenEbuilder { |
63 |
/** |
64 |
* Retrieves minimum target version from the maven projects. |
65 |
* |
66 |
- * @param mavenProjects list of maven projects |
67 |
+ * @param mavenProjects list of maven projects |
68 |
* @param forceMinVersion optional minimum version to force |
69 |
* |
70 |
* @return minimum target version |
71 |
@@ -371,7 +374,7 @@ public class MavenEbuilder { |
72 |
|
73 |
mavenProjects.stream(). |
74 |
filter((mavenProject) |
75 |
- -> !mavenProject.getCommonDependencies().isEmpty()). |
76 |
+ -> !mavenProject.getCommonDependencies().isEmpty()). |
77 |
forEach((mavenProject) -> { |
78 |
writeDependenciesInfo(config, writer, |
79 |
mavenProject.getPomFile(), |
80 |
@@ -395,8 +398,8 @@ public class MavenEbuilder { |
81 |
writer.println("# Compile dependencies"); |
82 |
|
83 |
mavenProjects.stream(). |
84 |
- filter((mavenProject) -> |
85 |
- !mavenProject.getCompileDependencies().isEmpty() |
86 |
+ filter((mavenProject) |
87 |
+ -> !mavenProject.getCompileDependencies().isEmpty() |
88 |
|| !mavenProject.getTestDependencies().isEmpty()) |
89 |
.forEach((mavenProject) -> { |
90 |
if (!mavenProject.getCompileDependencies().isEmpty()) { |
91 |
@@ -546,7 +549,7 @@ public class MavenEbuilder { |
92 |
* @param writer ebuild writer |
93 |
*/ |
94 |
private void writeInherit(final MavenProject mavenProject, |
95 |
- final PrintWriter writer) { |
96 |
+ final PrintWriter writer) { |
97 |
writer.println(); |
98 |
writer.print("JAVA_PKG_IUSE=\"doc source"); |
99 |
|
100 |
@@ -764,11 +767,11 @@ public class MavenEbuilder { |
101 |
|
102 |
mavenProject.getTestResourceDirectories(). |
103 |
forEach((directory) -> { |
104 |
- writer.print("\t\""); |
105 |
- writer.print(replaceWithVars(config.getWorkdir(). |
106 |
- relativize(directory).toString(), config)); |
107 |
- writer.println('"'); |
108 |
- }); |
109 |
+ writer.print("\t\""); |
110 |
+ writer.print(replaceWithVars(config.getWorkdir(). |
111 |
+ relativize(directory).toString(), config)); |
112 |
+ writer.println('"'); |
113 |
+ }); |
114 |
|
115 |
writer.println(')'); |
116 |
} |