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

Activated profiles should not always deactivate POM profiles that are active by default #4270

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Activated profiles should not always deactivate POM profiles that are active by default #4270

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
01f91a0
[4269] partial
crankydillo Nov 1, 2024
400bd51
Make activeProfiles method package private.
crankydillo Nov 2, 2024
1f36d4d
Tweaks to test and add test showing issue with settings active profiles
crankydillo Nov 2, 2024
7533efc
Merge branch 'main' into 4269_maven-activebydefault-profiles
timtebeek Dec 17, 2024
36656de
Update rewrite-maven/src/test/java/org/openrewrite/maven/MavenParserT…
crankydillo Dec 18, 2024
e5f0689
Merge branch 'main' into 4269_maven-activebydefault-profiles
timtebeek Dec 18, 2024
20f325b
Merge branch 'main' into 4269_maven-activebydefault-profiles
timtebeek Dec 31, 2024
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
21 changes: 17 additions & 4 deletions rewrite-maven/src/main/java/org/openrewrite/maven/tree/Pom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@

import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;

Expand Down Expand Up @@ -163,6 +160,22 @@ public List<MavenRepository> getEffectiveRepositories() {
.collect(Collectors.toList());
}

List<Profile> activeProfiles(final Iterable<String> explicitActiveProfiles) {
final List<Profile> pomActivatedProfiles =
profiles.stream()
.filter(p -> p.isActive(explicitActiveProfiles))
.collect(Collectors.toList());

if (!pomActivatedProfiles.isEmpty()) {
return pomActivatedProfiles;
}

return profiles
.stream()
.filter(p -> p.getActivation() != null && Boolean.TRUE.equals(p.getActivation().getActiveByDefault()))
.collect(Collectors.toList());
}

/**
* @param downloader A POM downloader to download dependencies and parents.
* @param ctx An execution context containing any maven-specific requirements.
Expand Down
24 changes: 11 additions & 13 deletions rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedPom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,19 +397,17 @@ void resolveParentsRecursively(Pom requested) throws MavenDownloadingException {
private void resolveParentPropertiesAndRepositoriesRecursively(List<Pom> pomAncestry) throws MavenDownloadingException {
Pom pom = pomAncestry.get(0);

List<Profile> reallyActiveProfiles = pom.activeProfiles(activeProfiles);

//Resolve properties
for (Profile profile : pom.getProfiles()) {
if (profile.isActive(activeProfiles)) {
mergeProperties(profile.getProperties(), pom);
}
for (Profile profile : reallyActiveProfiles) {
mergeProperties(profile.getProperties(), pom);
}
mergeProperties(pom.getProperties(), pom);

//Resolve repositories (which may rely on properties ^^^)
for (Profile profile : pom.getProfiles()) {
if (profile.isActive(activeProfiles)) {
mergeRepositories(profile.getRepositories());
}
for (Profile profile : reallyActiveProfiles) {
mergeRepositories(profile.getRepositories());
}
mergeRepositories(pom.getRepositories());

Expand All @@ -431,11 +429,11 @@ private void resolveParentPropertiesAndRepositoriesRecursively(List<Pom> pomAnce
private void resolveParentDependenciesRecursively(List<Pom> pomAncestry) throws MavenDownloadingException {
Pom pom = pomAncestry.get(0);

for (Profile profile : pom.getProfiles()) {
if (profile.isActive(activeProfiles)) {
mergeDependencyManagement(profile.getDependencyManagement(), pomAncestry);
mergeRequestedDependencies(profile.getDependencies());
}
List<Profile> reallyActiveProfiles = pom.activeProfiles(activeProfiles);

for (Profile profile : reallyActiveProfiles) {
mergeDependencyManagement(profile.getDependencyManagement(), pomAncestry);
mergeRequestedDependencies(profile.getDependencies());
}

mergeDependencyManagement(pom.getDependencyManagement(), pomAncestry);
Expand Down
Loading