Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #251 #252

Merged
merged 1 commit into from
Oct 4, 2022
Merged

Fixes #251 #252

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions ...c/main/java/org/ndx/aadarchi/maven/plugin/asciidoctor/AbstractAsciidoctorCallingMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ public abstract class AbstractAsciidoctorCallingMojo extends AbstractMojoExecuto
*/
@Parameter(name = "structurizr-dir", defaultValue = "${project.build.directory}/structurizr/diagrams", property = "aadarchi.output.diagrams")
private String structurizrDir;
private static GemExtractor gemExtractor;

protected String executedMojo() {
return goal("process-asciidoc");
Expand Down Expand Up @@ -149,7 +148,7 @@ protected final Dependency dependencyJRuby() {
}

protected Xpp3Dom configuration() {
Element requiredGems = getGemExtractor().processContainedGems(requiredGems());
Element requiredGems = new GemExtractor(gemsPath, getLog()).processContainedGems(requiredGems());
Xpp3Dom returned = MojoExecutor.configuration(
// TODO conditionalize that invocation : add all gems dependencies here
requiredGems, gemsPath(),
Expand All @@ -160,13 +159,6 @@ requiredGems, gemsPath(),
return returned;
}

private GemExtractor getGemExtractor() {
if(gemExtractor==null) {
gemExtractor = new GemExtractor(gemsPath, getLog());
}
return gemExtractor;
}

public Element configurationSourceDirectory() {
return element(name("sourceDirectory"), getSourceDirectory());
}
Expand Down