Fix site build for issue 593 - #596
Merged
Merged
Conversation
The version system property the generator tests set had no reader left, and resolving it from modello-test's pom.properties only works when that module is consumed as a jar; in a single-reactor site invocation it comes from target/classes, so getModelloVersion() returned null and setProperty threw. Do not reinstate the property to fix a version lookup — nothing reads it. The features site check now fails only under run-its, which is what produces the site it looks for. Fixes #593
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Both halves of #593: the generator tests no longer NPE when the site lifecycle runs in the same reactor invocation, and
-Preportingalone builds the site instead of failing on integration-test output nobody asked for.The
versionsystem property those five tests set has no reader anywhere in the tree — the last one was a commented-outaddDependencycall. Removing thesetPropertyis what fixes the NPE; hardeninggetModelloVersion()would have preserved dead code. That method is gone too, along with the era's other commented-outaddDependency/verify/compileleftovers.maven-verifier-plugin1.1 has noskipparameter, so the features-site check is made conditional throughfailOnError, driven by averifyFeaturesSiteproperty that therun-itsprofile flips totrue. Profile AND-activation and<activation><file>were both unusable here — the latter is evaluated before the ITs have run.Note for release notes: this drops
protected String getModelloVersion()frommodello-test, so downstream test code calling it breaks at compile time on upgrade.Verified:
mvn clean install→ 75 test runs, BUILD SUCCESSVerified:
mvn -pl modello-maven-plugin -Preporting site→ rc=0;-Preporting,run-its pre-siteon a clean target → still fails, guard intactThis change was created with AI assistance.