From 16ae62495db92c4b091e501e8391958bdc6c8f41 Mon Sep 17 00:00:00 2001 From: Bruno Salmon Date: Sat, 23 Mar 2024 19:09:28 +0000 Subject: [PATCH] Generalised previous fix to other executables (not only openjfx) --- .../java/dev/webfx/cli/core/JavaSourceRootAnalyzer.java | 8 ++++---- src/main/resources/dev/webfx/cli/version/dev/version.ini | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/dev/webfx/cli/core/JavaSourceRootAnalyzer.java b/src/main/java/dev/webfx/cli/core/JavaSourceRootAnalyzer.java index 59d8bad1..e07bc78d 100644 --- a/src/main/java/dev/webfx/cli/core/JavaSourceRootAnalyzer.java +++ b/src/main/java/dev/webfx/cli/core/JavaSourceRootAnalyzer.java @@ -611,11 +611,11 @@ private static ReusableStream collectExecutableModuleProviders(JavaSo // implementing modules may also declare additional providers .flatMap(collectingSourceRoot::resolveInterfaceDependencyIfExecutable) )).collect(Collectors.toList())); - // Doing it again on openjfx executable modules, because in some case the previous list is not complete for any - // strange reason, and some optional services are missing in the end in the pom.xml. - // Ex: webfx update -p -M kbs-backoffice-application-openjfx + // Doing it again on executable modules, because in some cases the previous list is not complete for any strange + // reason, and some optional services are consequently missing in the end. + // Ex: webfx update -p -M kbs-backoffice-application-openjfx => missing dependencies in pom.xml // TODO Investigate why and provide a better fix - if (executableSourceRoot == collectingSourceRoot && executableModule.getTarget().hasTag(TargetTag.OPENJFX)) { + if (executableSourceRoot == collectingSourceRoot) { walkingModules.addAll(ProjectModule.filterProjectModules(mapDestinationModules( collectingSourceRoot.getTransitiveDependenciesWithoutImplicitProviders() // Note: the previous stream may contain interface modules, so we resolve them here because the diff --git a/src/main/resources/dev/webfx/cli/version/dev/version.ini b/src/main/resources/dev/webfx/cli/version/dev/version.ini index e3c2ee20..856082c3 100644 --- a/src/main/resources/dev/webfx/cli/version/dev/version.ini +++ b/src/main/resources/dev/webfx/cli/version/dev/version.ini @@ -1,2 +1,2 @@ version=0.1.0-SNAPSHOT -build.timestamp=2024-03-21 19:29 \ No newline at end of file +build.timestamp=2024-03-23 19:08 \ No newline at end of file