From 3ff0727bae58dec3345483e7c63882d854bd3bc4 Mon Sep 17 00:00:00 2001
From: Louis Vignier <Louis.Vignier@jetbrains.com>
Date: Wed, 13 Nov 2024 21:37:20 +0100
Subject: [PATCH] [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
---
 .../idea/maven/aether/ArtifactRepositoryManager.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aether-dependency-resolver/src/org/jetbrains/idea/maven/aether/ArtifactRepositoryManager.java b/aether-dependency-resolver/src/org/jetbrains/idea/maven/aether/ArtifactRepositoryManager.java
index b9a35bc24729..3e4d4d258718 100644
--- a/aether-dependency-resolver/src/org/jetbrains/idea/maven/aether/ArtifactRepositoryManager.java
+++ b/aether-dependency-resolver/src/org/jetbrains/idea/maven/aether/ArtifactRepositoryManager.java
@@ -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