commit: 1d76ee8e7d73653f56e228fb3cc30742bfa0abd4
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 3 15:14:27 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Nov 3 15:14:27 2019 +0000
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=1d76ee8e
fixed test dependencies and reformatted dependencies
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../gentoo/java/ebuilder/maven/MavenEbuilder.java | 132 ++++++++++-----------
1 file changed, 62 insertions(+), 70 deletions(-)
diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
index 61f97f2..5ddfd9b 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
@@ -324,125 +324,117 @@ public class MavenEbuilder {
mavenProjects, "compile");
final List<String> runtimeDependencies = mergeSystemDependencies(
mavenProjects, "runtime");
- boolean hasCDepend = !commonDependencies.isEmpty()
- || !testDependencies.isEmpty();
+ final boolean hasCDepend = !commonDependencies.isEmpty();
+
+ writer.println();
if (hasCDepend) {
- writer.println();
writer.println("# Common dependencies");
- for (final MavenProject mavenProject : mavenProjects) {
- if (mavenProject.getCommonDependencies().isEmpty()
- && mavenProject.getTestDependencies().isEmpty()) {
- continue;
- }
-
- if (!mavenProject.getCommonDependencies().isEmpty()) {
- writeDependenciesInfo(config, writer,
- mavenProject.getPomFile(),
- mavenProject.getCommonDependencies(), null);
- }
-
- if (mavenProject.getTargetVersion() != null) {
- writeDependenciesInfo(config, writer,
- mavenProject.getPomFile(),
- mavenProject.getTestDependencies(), "test?");
- }
-
- hasCDepend = true;
- }
+ mavenProjects.stream().
+ filter((mavenProject)
+ -> !mavenProject.getCommonDependencies().isEmpty()).
+ forEach((mavenProject) -> {
+ writeDependenciesInfo(config, writer,
+ mavenProject.getPomFile(),
+ mavenProject.getCommonDependencies(), null);
+ });
writer.println("\nCDEPEND=\"");
- if (!commonDependencies.isEmpty()) {
- commonDependencies.stream().forEach((dependency) -> {
- writer.print('\t');
- writer.println(dependency);
- });
- }
-
- if (!testDependencies.isEmpty()) {
- writer.println("\ttest? (");
-
- testDependencies.stream().forEach((dependency) -> {
- writer.print("\t\t");
- writer.println(dependency);
- });
-
- writer.println("\t)");
- }
+ commonDependencies.stream().forEach((dependency) -> {
+ writer.print('\t');
+ writer.println(dependency);
+ });
writer.println('"');
}
- if (!compileDependencies.isEmpty()) {
+ writer.println();
+
+ if (!compileDependencies.isEmpty()
+ || !testDependencies.isEmpty()) {
writer.println("# Compile dependencies");
- mavenProjects.stream().filter((mavenProject) ->
- (!mavenProject.getCompileDependencies().isEmpty()))
+ mavenProjects.stream().
+ filter((mavenProject) ->
+ !mavenProject.getCompileDependencies().isEmpty()
+ || !mavenProject.getTestDependencies().isEmpty())
.forEach((mavenProject) -> {
- writeDependenciesInfo(config, writer,
- mavenProject.getPomFile(),
- mavenProject.getCompileDependencies(), null);
+ if (!mavenProject.getCompileDependencies().isEmpty()) {
+ writeDependenciesInfo(config, writer,
+ mavenProject.getPomFile(),
+ mavenProject.getCompileDependencies(),
+ null);
+ }
+
+ if (!mavenProject.getTestDependencies().isEmpty()) {
+ writeDependenciesInfo(config, writer,
+ mavenProject.getPomFile(),
+ mavenProject.getTestDependencies(),
+ "test?");
+ }
});
- } else {
- writer.println();
}
- writer.print("DEPEND=\"");
+ writer.print("\nDEPEND=\"\n\t=virtual/jdk-");
+ writer.print(getMinSourceVersion(
+ mavenProjects, config.getForceMinJavaVersion()));
+ writer.println(":*");
if (hasCDepend) {
- writer.print("${CDEPEND}");
+ writer.println("\t${CDEPEND}");
}
- writer.println();
- writer.print("\t>=virtual/jdk-");
- writer.print(getMinSourceVersion(
- mavenProjects, config.getForceMinJavaVersion()));
- writer.print(":*");
-
if (config.getDownloadUri() != null && config.getDownloadUri().
toString().matches("^.*?\\.(jar|zip)$")) {
- writer.println();
- writer.print("\tapp-arch/unzip");
+ writer.println("\tapp-arch/unzip");
}
if (!compileDependencies.isEmpty()) {
compileDependencies.stream().forEach((dependency) -> {
- writer.println();
writer.print('\t');
writer.println(dependency);
});
}
+ if (!testDependencies.isEmpty()) {
+ writer.println("\ttest? (");
+
+ testDependencies.stream().forEach((dependency) -> {
+ writer.print("\t\t");
+ writer.println(dependency);
+ });
+
+ writer.println("\t)");
+ }
+
writer.println('"');
+ writer.println();
+
if (!runtimeDependencies.isEmpty()) {
writer.println("# Runtime dependencies");
- mavenProjects.stream().filter((mavenProject) -> (!mavenProject.
- getRuntimeDependencies().isEmpty()))
+ mavenProjects.stream().
+ filter((mavenProject)
+ ->
!mavenProject.getRuntimeDependencies().isEmpty())
.forEach((mavenProject) -> {
writeDependenciesInfo(config, writer,
mavenProject.getPomFile(),
mavenProject.getRuntimeDependencies(), null);
});
- } else {
- writer.println();
}
- writer.print("RDEPEND=\"");
+ writer.print("RDEPEND=\"\n\t>=virtual/jre-");
+ writer.print(getMinTargetVersion(
+ mavenProjects, config.getForceMinJavaVersion()));
+ writer.println(":*");
if (hasCDepend) {
writer.print("${CDEPEND}");
}
- writer.println();
- writer.print("\t>=virtual/jre-");
- writer.print(getMinTargetVersion(
- mavenProjects, config.getForceMinJavaVersion()));
- writer.print(":*");
-
if (!runtimeDependencies.isEmpty()) {
runtimeDependencies.stream().forEach((dependency) -> {
writer.println();
