diff --git a/maven/src/it/multimodule/multiparent/singlestore/invoker.properties b/maven/src/it/multimodule/multiparent/singlestore/invoker.properties index 9428c8e89a..eb4b635188 100644 --- a/maven/src/it/multimodule/multiparent/singlestore/invoker.properties +++ b/maven/src/it/multimodule/multiparent/singlestore/invoker.properties @@ -1,5 +1,5 @@ invoker.goals.1 = install \ - -Djqassistant.store.directory=${project.build.directory}/it/multimodule/multiparent/singlestore/target/jqassistant/store \ - -Djqassistant.store.reset=false \ + -Djqassistant.store.uri=file://${project.build.directory}/it/multimodule/multiparent/singlestore/target/jqassistant/store \ + -Djqassistant.scan.reset=false \ -T2 \ -e diff --git a/maven/src/it/multimodule/multiparent/singlestore/verify.groovy b/maven/src/it/multimodule/multiparent/singlestore/verify.groovy index 0d280768e4..7dba0355ab 100644 --- a/maven/src/it/multimodule/multiparent/singlestore/verify.groovy +++ b/maven/src/it/multimodule/multiparent/singlestore/verify.groovy @@ -1 +1,3 @@ assert new File(basedir, 'target/jqassistant').exists() +assert !new File(basedir, 'module1/target/jqassistant').exists() +assert !new File(basedir, 'module2/target/jqassistant').exists() diff --git a/maven/src/main/java/com/buschmais/jqassistant/scm/maven/AbstractMojo.java b/maven/src/main/java/com/buschmais/jqassistant/scm/maven/AbstractMojo.java index 752c897c06..c81a0cdb11 100644 --- a/maven/src/main/java/com/buschmais/jqassistant/scm/maven/AbstractMojo.java +++ b/maven/src/main/java/com/buschmais/jqassistant/scm/maven/AbstractMojo.java @@ -45,6 +45,8 @@ public abstract class AbstractMojo extends org.apache.maven.plugin.AbstractMojo private static final int CONFIGURATION_ORDINAL_EXECUTION_ROOT = 100; + private static final String PROPERTY_CONFIGURATION_LOCATIONS = "jqassistant.configuration.locations"; + private static String createExecutionKey(MojoExecution mojoExecution) { // Do NOT use a custom class for execution keys, as different modules may use // different classloaders @@ -54,7 +56,7 @@ private static String createExecutionKey(MojoExecution mojoExecution) { /** * The config locations. */ - @Parameter(property = "jqassistant.configuration.locations") + @Parameter(property = PROPERTY_CONFIGURATION_LOCATIONS) private List configurationLocations; @Parameter @@ -276,7 +278,8 @@ private MavenConfiguration getConfiguration() { .withEnvVariables() .withClasspath() .withProfiles(session.getProjectBuildingRequest() - .getActiveProfileIds()); + .getActiveProfileIds()) + .withIgnoreProperties(Set.of(PROPERTY_CONFIGURATION_LOCATIONS)); if (!executionRootDirectory.equals(currentProject.getBasedir())) { builder.withWorkingDirectory(currentProject.getBasedir()); }