MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-13 06:59:44 +07:00
Code Issues Packages Projects Releases Wiki Activity

[maven] Do not force activate os-specific maven profiles

Browse Source 
#IJPL-171448 Fixed
#IDEA-362994 Fixed


(cherry picked from commit fd879a9255358203b7c485c90fb7a576293b1eb3)

IJ-CR-149798

GitOrigin-RevId: 1dd54eb556ff0fed79c92db5a3efa426a5f49ab6
This commit is contained in:
Louis Vignier
2024-11-13 21:37:20 +01:00
committed by intellij-monorepo-bot
parent 36558d7ec6
commit 3ff0727bae
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
aether-dependency-resolver/src/org/jetbrains/idea/maven/aether/ArtifactRepositoryManager.java
View File

@@ -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 // 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 static class ProfileActivatorProxy implements ProfileActivator {
private final ProfileActivator[] myDelegates; private final ProfileActivator[] myDelegates;
@@ -789,7 +789,7 @@ public final class ArtifactRepositoryManager {
private static boolean isForceActivation(Profile profile) { private static boolean isForceActivation(Profile profile) {
Activation activation = profile.getActivation(); Activation activation = profile.getActivation();
return activation != null && (activation.getJdk() != null || activation.getOs() != null); return activation != null && activation.getJdk() != null;
} }
@Override @Override