1 |
commit: 1d76ee8e7d73653f56e228fb3cc30742bfa0abd4 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 3 15:14:27 2019 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 3 15:14:27 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=1d76ee8e |
7 |
|
8 |
fixed test dependencies and reformatted dependencies |
9 |
|
10 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
11 |
|
12 |
.../gentoo/java/ebuilder/maven/MavenEbuilder.java | 132 ++++++++++----------- |
13 |
1 file changed, 62 insertions(+), 70 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 61f97f2..5ddfd9b 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 |
@@ -324,125 +324,117 @@ public class MavenEbuilder { |
20 |
mavenProjects, "compile"); |
21 |
final List<String> runtimeDependencies = mergeSystemDependencies( |
22 |
mavenProjects, "runtime"); |
23 |
- boolean hasCDepend = !commonDependencies.isEmpty() |
24 |
- || !testDependencies.isEmpty(); |
25 |
+ final boolean hasCDepend = !commonDependencies.isEmpty(); |
26 |
+ |
27 |
+ writer.println(); |
28 |
|
29 |
if (hasCDepend) { |
30 |
- writer.println(); |
31 |
writer.println("# Common dependencies"); |
32 |
|
33 |
- for (final MavenProject mavenProject : mavenProjects) { |
34 |
- if (mavenProject.getCommonDependencies().isEmpty() |
35 |
- && mavenProject.getTestDependencies().isEmpty()) { |
36 |
- continue; |
37 |
- } |
38 |
- |
39 |
- if (!mavenProject.getCommonDependencies().isEmpty()) { |
40 |
- writeDependenciesInfo(config, writer, |
41 |
- mavenProject.getPomFile(), |
42 |
- mavenProject.getCommonDependencies(), null); |
43 |
- } |
44 |
- |
45 |
- if (mavenProject.getTargetVersion() != null) { |
46 |
- writeDependenciesInfo(config, writer, |
47 |
- mavenProject.getPomFile(), |
48 |
- mavenProject.getTestDependencies(), "test?"); |
49 |
- } |
50 |
- |
51 |
- hasCDepend = true; |
52 |
- } |
53 |
+ mavenProjects.stream(). |
54 |
+ filter((mavenProject) |
55 |
+ -> !mavenProject.getCommonDependencies().isEmpty()). |
56 |
+ forEach((mavenProject) -> { |
57 |
+ writeDependenciesInfo(config, writer, |
58 |
+ mavenProject.getPomFile(), |
59 |
+ mavenProject.getCommonDependencies(), null); |
60 |
+ }); |
61 |
|
62 |
writer.println("\nCDEPEND=\""); |
63 |
|
64 |
- if (!commonDependencies.isEmpty()) { |
65 |
- commonDependencies.stream().forEach((dependency) -> { |
66 |
- writer.print('\t'); |
67 |
- writer.println(dependency); |
68 |
- }); |
69 |
- } |
70 |
- |
71 |
- if (!testDependencies.isEmpty()) { |
72 |
- writer.println("\ttest? ("); |
73 |
- |
74 |
- testDependencies.stream().forEach((dependency) -> { |
75 |
- writer.print("\t\t"); |
76 |
- writer.println(dependency); |
77 |
- }); |
78 |
- |
79 |
- writer.println("\t)"); |
80 |
- } |
81 |
+ commonDependencies.stream().forEach((dependency) -> { |
82 |
+ writer.print('\t'); |
83 |
+ writer.println(dependency); |
84 |
+ }); |
85 |
|
86 |
writer.println('"'); |
87 |
} |
88 |
|
89 |
- if (!compileDependencies.isEmpty()) { |
90 |
+ writer.println(); |
91 |
+ |
92 |
+ if (!compileDependencies.isEmpty() |
93 |
+ || !testDependencies.isEmpty()) { |
94 |
writer.println("# Compile dependencies"); |
95 |
|
96 |
- mavenProjects.stream().filter((mavenProject) -> |
97 |
- (!mavenProject.getCompileDependencies().isEmpty())) |
98 |
+ mavenProjects.stream(). |
99 |
+ filter((mavenProject) -> |
100 |
+ !mavenProject.getCompileDependencies().isEmpty() |
101 |
+ || !mavenProject.getTestDependencies().isEmpty()) |
102 |
.forEach((mavenProject) -> { |
103 |
- writeDependenciesInfo(config, writer, |
104 |
- mavenProject.getPomFile(), |
105 |
- mavenProject.getCompileDependencies(), null); |
106 |
+ if (!mavenProject.getCompileDependencies().isEmpty()) { |
107 |
+ writeDependenciesInfo(config, writer, |
108 |
+ mavenProject.getPomFile(), |
109 |
+ mavenProject.getCompileDependencies(), |
110 |
+ null); |
111 |
+ } |
112 |
+ |
113 |
+ if (!mavenProject.getTestDependencies().isEmpty()) { |
114 |
+ writeDependenciesInfo(config, writer, |
115 |
+ mavenProject.getPomFile(), |
116 |
+ mavenProject.getTestDependencies(), |
117 |
+ "test?"); |
118 |
+ } |
119 |
}); |
120 |
- } else { |
121 |
- writer.println(); |
122 |
} |
123 |
|
124 |
- writer.print("DEPEND=\""); |
125 |
+ writer.print("\nDEPEND=\"\n\t=virtual/jdk-"); |
126 |
+ writer.print(getMinSourceVersion( |
127 |
+ mavenProjects, config.getForceMinJavaVersion())); |
128 |
+ writer.println(":*"); |
129 |
|
130 |
if (hasCDepend) { |
131 |
- writer.print("${CDEPEND}"); |
132 |
+ writer.println("\t${CDEPEND}"); |
133 |
} |
134 |
|
135 |
- writer.println(); |
136 |
- writer.print("\t>=virtual/jdk-"); |
137 |
- writer.print(getMinSourceVersion( |
138 |
- mavenProjects, config.getForceMinJavaVersion())); |
139 |
- writer.print(":*"); |
140 |
- |
141 |
if (config.getDownloadUri() != null && config.getDownloadUri(). |
142 |
toString().matches("^.*?\\.(jar|zip)$")) { |
143 |
- writer.println(); |
144 |
- writer.print("\tapp-arch/unzip"); |
145 |
+ writer.println("\tapp-arch/unzip"); |
146 |
} |
147 |
|
148 |
if (!compileDependencies.isEmpty()) { |
149 |
compileDependencies.stream().forEach((dependency) -> { |
150 |
- writer.println(); |
151 |
writer.print('\t'); |
152 |
writer.println(dependency); |
153 |
}); |
154 |
} |
155 |
|
156 |
+ if (!testDependencies.isEmpty()) { |
157 |
+ writer.println("\ttest? ("); |
158 |
+ |
159 |
+ testDependencies.stream().forEach((dependency) -> { |
160 |
+ writer.print("\t\t"); |
161 |
+ writer.println(dependency); |
162 |
+ }); |
163 |
+ |
164 |
+ writer.println("\t)"); |
165 |
+ } |
166 |
+ |
167 |
writer.println('"'); |
168 |
|
169 |
+ writer.println(); |
170 |
+ |
171 |
if (!runtimeDependencies.isEmpty()) { |
172 |
writer.println("# Runtime dependencies"); |
173 |
|
174 |
- mavenProjects.stream().filter((mavenProject) -> (!mavenProject. |
175 |
- getRuntimeDependencies().isEmpty())) |
176 |
+ mavenProjects.stream(). |
177 |
+ filter((mavenProject) |
178 |
+ -> !mavenProject.getRuntimeDependencies().isEmpty()) |
179 |
.forEach((mavenProject) -> { |
180 |
writeDependenciesInfo(config, writer, |
181 |
mavenProject.getPomFile(), |
182 |
mavenProject.getRuntimeDependencies(), null); |
183 |
}); |
184 |
- } else { |
185 |
- writer.println(); |
186 |
} |
187 |
|
188 |
- writer.print("RDEPEND=\""); |
189 |
+ writer.print("RDEPEND=\"\n\t>=virtual/jre-"); |
190 |
+ writer.print(getMinTargetVersion( |
191 |
+ mavenProjects, config.getForceMinJavaVersion())); |
192 |
+ writer.println(":*"); |
193 |
|
194 |
if (hasCDepend) { |
195 |
writer.print("${CDEPEND}"); |
196 |
} |
197 |
|
198 |
- writer.println(); |
199 |
- writer.print("\t>=virtual/jre-"); |
200 |
- writer.print(getMinTargetVersion( |
201 |
- mavenProjects, config.getForceMinJavaVersion())); |
202 |
- writer.print(":*"); |
203 |
- |
204 |
if (!runtimeDependencies.isEmpty()) { |
205 |
runtimeDependencies.stream().forEach((dependency) -> { |
206 |
writer.println(); |