Skip to content

Commit

Permalink
Generalised previous fix to other executables (not only openjfx)
Browse files Browse the repository at this point in the history
  • Loading branch information
salmonb committed Mar 23, 2024
1 parent 81c28fc commit 16ae624
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/main/java/dev/webfx/cli/core/JavaSourceRootAnalyzer.java
Original file line number Diff line number Diff line change
Expand Up @@ -611,11 +611,11 @@ private static ReusableStream<Providers> 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
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/dev/webfx/cli/version/dev/version.ini
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=0.1.0-SNAPSHOT
build.timestamp=2024-03-21 19:29
build.timestamp=2024-03-23 19:08

0 comments on commit 16ae624

Please sign in to comment.