diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index ca894d6..84ab633 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -5,6 +5,6 @@ me.qoomon maven-git-versioning-extension - 9.6.4 + 9.6.5 diff --git a/boms-parent/maven-plugin-bom/pom.xml b/boms-parent/maven-plugin-bom/pom.xml index a9c5594..4aff97d 100644 --- a/boms-parent/maven-plugin-bom/pom.xml +++ b/boms-parent/maven-plugin-bom/pom.xml @@ -102,7 +102,7 @@ org.apache.maven.plugin-testing maven-plugin-testing-harness - 3.3.0 + 4.0.0-alpha-1 test diff --git a/pom.xml b/pom.xml index b732908..acf3299 100644 --- a/pom.xml +++ b/pom.xml @@ -172,6 +172,12 @@ pom test + + pl.wavesoftware.sampler + sampler-spring + 1.1.0 + test + @@ -291,7 +297,7 @@ maven-javadoc-plugin - 3.0.1 + 3.5.0 attach-javadocs @@ -303,7 +309,7 @@ maven-gpg-plugin - 1.6 + 3.0.1 sign-artifacts @@ -316,28 +322,52 @@ maven-clean-plugin - 3.1.0 + 3.2.0 maven-install-plugin - 2.5.2 + 3.1.0 maven-resources-plugin - 3.1.0 + 3.3.0 maven-site-plugin - 3.7.1 + 3.12.1 maven-plugin-plugin - 3.6.0 + 3.8.1 - org.codehaus.gmaven - groovy-maven-plugin - 2.1 + maven-enforcer-plugin + 3.2.1 + + + enforce-maven + + enforce + + + + + ${maven.version} + + + + + + + + org.codehaus.mojo + versions-maven-plugin + 2.15.0 + + + me.qoomon + maven-git-versioning-extension + 9.6.5 @@ -347,6 +377,10 @@ maven-failsafe-plugin + + maven-enforcer-plugin + + maven-dependency-plugin diff --git a/tools/plugs-maven-plugin/pom.xml b/tools/plugs-maven-plugin/pom.xml index a7a224a..14dcbe8 100644 --- a/tools/plugs-maven-plugin/pom.xml +++ b/tools/plugs-maven-plugin/pom.xml @@ -32,7 +32,7 @@ Plugs :: Tools :: Plugs Maven Plugin - 3.3 + 3.8.8 diff --git a/tools/plugs-maven-plugin/src/test/java/pl/wavesoftware/maven/testing/junit5/DefaultMojoConfigurator.java b/tools/plugs-maven-plugin/src/test/java/pl/wavesoftware/maven/testing/junit5/DefaultMojoConfigurator.java index 6dc4036..d3c4022 100644 --- a/tools/plugs-maven-plugin/src/test/java/pl/wavesoftware/maven/testing/junit5/DefaultMojoConfigurator.java +++ b/tools/plugs-maven-plugin/src/test/java/pl/wavesoftware/maven/testing/junit5/DefaultMojoConfigurator.java @@ -29,15 +29,19 @@ import org.apache.maven.project.ProjectBuilder; import org.apache.maven.project.ProjectBuildingRequest; import org.apache.maven.repository.internal.MavenRepositorySystemUtils; -import org.apache.maven.settings.MavenSettingsBuilder; import org.apache.maven.settings.Settings; +import org.apache.maven.settings.building.DefaultSettingsBuildingRequest; +import org.apache.maven.settings.building.SettingsBuilder; +import org.apache.maven.settings.building.SettingsBuildingException; +import org.apache.maven.settings.building.SettingsBuildingResult; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.eclipse.aether.DefaultRepositorySystemSession; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import pl.wavesoftware.eid.utils.EidPreconditions; import java.io.File; -import java.io.IOException; import java.nio.file.Path; import java.util.Collections; import java.util.Optional; @@ -51,6 +55,8 @@ */ final class DefaultMojoConfigurator implements MojoConfigurator { + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultMojoConfigurator.class); + private final Supplier> customizer; DefaultMojoConfigurator(Supplier> customizer) { @@ -80,15 +86,22 @@ public MojoExecution getMojoExecution(MojoRule rule, String goal) { } private MavenExecutionRequest createMavenExecutionRequest(MojoRule rule) - throws ComponentLookupException, IOException, - XmlPullParserException, MavenExecutionRequestPopulationException { + throws ComponentLookupException, MavenExecutionRequestPopulationException, + SettingsBuildingException { PlexusContainer container = rule.getContainer(); MavenExecutionRequest request = new DefaultMavenExecutionRequest(); MavenExecutionRequestPopulator requestPopulator = container.lookup(MavenExecutionRequestPopulator.class); - MavenSettingsBuilder settingsBuilder = container.lookup(MavenSettingsBuilder.class); - Settings settings = settingsBuilder.buildSettings(); + SettingsBuilder settingsBuilder = container.lookup(SettingsBuilder.class); + SettingsBuildingResult sbr = settingsBuilder.build( + new DefaultSettingsBuildingRequest() + ); + sbr.getProblems().forEach(problem -> + LOGGER.error(problem.getMessage(), problem.getException()) + ); + EidPreconditions.checkState(sbr.getProblems().isEmpty(), "20230320:004212"); + Settings settings = sbr.getEffectiveSettings(); requestPopulator.populateFromSettings(request, settings); requestPopulator.populateDefaults(request); return request; diff --git a/tools/plugs-maven-plugin/src/test/java/pl/wavesoftware/maven/testing/junit5/MavenInvokerExtension.java b/tools/plugs-maven-plugin/src/test/java/pl/wavesoftware/maven/testing/junit5/MavenInvokerExtension.java index 007b7ae..9ff6458 100644 --- a/tools/plugs-maven-plugin/src/test/java/pl/wavesoftware/maven/testing/junit5/MavenInvokerExtension.java +++ b/tools/plugs-maven-plugin/src/test/java/pl/wavesoftware/maven/testing/junit5/MavenInvokerExtension.java @@ -21,6 +21,8 @@ import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.api.extension.ParameterResolutionException; import org.junit.jupiter.api.extension.ParameterResolver; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author Krzysztof Suszynski @@ -28,6 +30,8 @@ */ public final class MavenInvokerExtension implements ParameterResolver { + private static final Logger LOGGER = LoggerFactory.getLogger(MavenInvokerExtension.class); + @Override public boolean supportsParameter( ParameterContext parameterContext, @@ -45,6 +49,7 @@ public Object resolveParameter( ) throws ParameterResolutionException { return (MavenInvoker) pomDirectory -> goals -> { MavenCli cli = new MavenCli(); + LOGGER.info("Invoking Maven {} in {}", goals, pomDirectory); System.setProperty( MavenCli.MULTIMODULE_PROJECT_DIRECTORY, pomDirectory.toString() ); diff --git a/tools/plugs-maven-plugin/src/test/resources/code-with-deps/pom.xml b/tools/plugs-maven-plugin/src/test/resources/code-with-deps/pom.xml index 19e8513..6535b18 100644 --- a/tools/plugs-maven-plugin/src/test/resources/code-with-deps/pom.xml +++ b/tools/plugs-maven-plugin/src/test/resources/code-with-deps/pom.xml @@ -18,8 +18,8 @@ 4.0.0 org.springframework.boot - spring-boot-parent - 2.1.5.RELEASE + spring-boot-dependencies + 3.0.4 org.example @@ -29,7 +29,7 @@ UTF-8 UTF-8 - 1.8 + 11 ${maven.compiler.source} @@ -42,7 +42,7 @@ org.apiguardian apiguardian-api - 1.0.0 + 1.1.2 @@ -54,7 +54,7 @@ org.osgi osgi.core - 7.0.0 + 8.0.0 provided @@ -84,4 +84,15 @@ test + + + + + + maven-surefire-plugin + 3.0.0 + + + + diff --git a/tools/plugs-packager-samples/pom.xml b/tools/plugs-packager-samples/pom.xml index 96cc3c0..f114f4d 100644 --- a/tools/plugs-packager-samples/pom.xml +++ b/tools/plugs-packager-samples/pom.xml @@ -43,7 +43,7 @@ pl.wavesoftware.sampler sampler-spring - 1.0.0 + compile com.google.jimfs