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

Jump to bottom

Add propagation of maven.repo.local on windows machine #1373

Merged
merged 1 commit into from
Oct 17, 2024
Merged

Add propagation of maven.repo.local on windows machine #1373

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
7 changes: 7 additions & 0 deletions ...st-core/src/main/java/io/quarkus/test/services/quarkus/QuarkusMavenPluginBuildHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import static io.quarkus.test.services.quarkus.model.QuarkusProperties.getPluginVersion;
import static io.quarkus.test.services.quarkus.model.QuarkusProperties.getVersion;
import static io.quarkus.test.utils.FileUtils.findTargetFile;
import static io.quarkus.test.utils.MavenUtils.MVN_REPOSITORY_LOCAL;
import static io.quarkus.test.utils.PropertiesUtils.SLASH;
import static io.quarkus.test.utils.PropertiesUtils.toMvnSystemProperty;
import static java.util.stream.Collectors.toSet;
Expand Down Expand Up @@ -237,6 +238,12 @@ private String[] getBuildCmd(Mode mode) {
toMvnSystemProperty(PLATFORM_VERSION.getPropertyKey(), getVersion()),
toMvnSystemProperty(PLATFORM_GROUP_ID.getPropertyKey(), PLATFORM_GROUP_ID.get()),
toMvnSystemProperty(PLUGIN_VERSION.getPropertyKey(), getPluginVersion())));

// Need to add local maven repo due to differences in `getCmdLineBuildArgs` as by default it's not picked on Windows
if (OS.WINDOWS.isCurrent() && System.getProperty(MVN_REPOSITORY_LOCAL) != null) {
cmdStream = Stream.concat(cmdStream,
Stream.of(toMvnSystemProperty(MVN_REPOSITORY_LOCAL, System.getProperty(MVN_REPOSITORY_LOCAL))));
}
var cmdLineBuildArgs = getCmdLineBuildArgs();
if (!cmdLineBuildArgs.isEmpty()) {
cmdStream = Stream.concat(cmdStream, cmdLineBuildArgs.stream());
Expand Down