mirror of
https://gitflic.ru/project/openide/openide.git
synced 2025-12-12 13:40:19 +07:00
[maven] Do not force activate os-specific maven profiles
#IJPL-171448 Fixed #IDEA-362994 Fixed (cherry picked from commit fd879a9255358203b7c485c90fb7a576293b1eb3) IJ-CR-149798 GitOrigin-RevId: 1dd54eb556ff0fed79c92db5a3efa426a5f49ab6
This commit is contained in:
committed by
intellij-monorepo-bot
parent
36558d7ec6
commit
3ff0727bae
@@ -778,7 +778,7 @@ public final class ArtifactRepositoryManager {
|
||||
}
|
||||
|
||||
// Force certain activation kinds to be always active in order to include such dependencies in dependency resolution process
|
||||
// Currently OS and JDK activations are always enabled for the purpose of transitive artifact discovery
|
||||
// Currently JDK activations are always enabled for the purpose of transitive artifact discovery
|
||||
private static class ProfileActivatorProxy implements ProfileActivator {
|
||||
|
||||
private final ProfileActivator[] myDelegates;
|
||||
@@ -789,7 +789,7 @@ public final class ArtifactRepositoryManager {
|
||||
|
||||
private static boolean isForceActivation(Profile profile) {
|
||||
Activation activation = profile.getActivation();
|
||||
return activation != null && (activation.getJdk() != null || activation.getOs() != null);
|
||||
return activation != null && activation.getJdk() != null;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user