From 72e96856cef0f8b78b66e070b3cab958748eead4 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Sun, 20 Dec 2020 10:20:52 +0100
Subject: [PATCH] update maven-resolver-provider from 3.6.1 to 3.6.3 and
 exclude transitive dependency plexus-utils (already added as library to
 project)

GitOrigin-RevId: 18e79bba9941818936c22915b0096c271fd13bea
---
 ...ovider.xml => maven_resolver_provider.xml} | 32 +++++++++----------
 ...intellij.java.aetherDependencyResolver.iml |  3 +-
 .../aether/ArtifactRepositoryManager.java     |  6 ++--
 3 files changed, 21 insertions(+), 20 deletions(-)
 rename .idea/libraries/{org_apache_maven_maven_resolver_provider.xml => maven_resolver_provider.xml} (56%)

diff --git a/.idea/libraries/org_apache_maven_maven_resolver_provider.xml b/.idea/libraries/maven_resolver_provider.xml
similarity index 56%
rename from .idea/libraries/org_apache_maven_maven_resolver_provider.xml
rename to .idea/libraries/maven_resolver_provider.xml
index 07d6e19763bf..d376b9484856 100644
--- a/.idea/libraries/org_apache_maven_maven_resolver_provider.xml
+++ b/.idea/libraries/maven_resolver_provider.xml
@@ -1,26 +1,26 @@
 <component name="libraryTable">
-  <library name="org.apache.maven:maven-resolver-provider" type="repository">
-    <properties maven-id="org.apache.maven:maven-resolver-provider:3.6.1">
+  <library name="maven-resolver-provider" type="repository">
+    <properties maven-id="org.apache.maven:maven-resolver-provider:3.6.3">
       <exclude>
-        <dependency maven-id="org.slf4j:slf4j-api" />
-        <dependency maven-id="javax.inject:javax.inject" />
         <dependency maven-id="org.apache.commons:commons-lang3" />
+        <dependency maven-id="org.codehaus.plexus:plexus-utils" />
+        <dependency maven-id="javax.inject:javax.inject" />
+        <dependency maven-id="org.slf4j:slf4j-api" />
       </exclude>
     </properties>
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-resolver-provider/3.6.1/maven-resolver-provider-3.6.1.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model/3.6.1/maven-model-3.6.1.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model-builder/3.6.1/maven-model-builder-3.6.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-resolver-provider/3.6.3/maven-resolver-provider-3.6.3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model/3.6.3/maven-model-3.6.3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model-builder/3.6.3/maven-model-builder-3.6.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-interpolation/1.25/plexus-interpolation-1.25.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-component-annotations/1.7.1/plexus-component-annotations-1.7.1.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact/3.6.1/maven-artifact-3.6.1.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-builder-support/3.6.1/maven-builder-support-3.6.1.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-repository-metadata/3.6.1/maven-repository-metadata-3.6.1.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-api/1.3.3/maven-resolver-api-1.3.3.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-spi/1.3.3/maven-resolver-spi-1.3.3.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-util/1.3.3/maven-resolver-util-1.3.3.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-impl/1.3.3/maven-resolver-impl-1.3.3.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-utils/3.2.0/plexus-utils-3.2.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact/3.6.3/maven-artifact-3.6.3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-builder-support/3.6.3/maven-builder-support-3.6.3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.4/org.eclipse.sisu.inject-0.3.4.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-repository-metadata/3.6.3/maven-repository-metadata-3.6.3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-api/1.4.1/maven-resolver-api-1.4.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-spi/1.4.1/maven-resolver-spi-1.4.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-util/1.4.1/maven-resolver-util-1.4.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-impl/1.4.1/maven-resolver-impl-1.4.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml b/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml
index 1780858afc0e..017967293a5a 100644
--- a/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml
+++ b/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml
@@ -14,7 +14,7 @@
     <orderEntry type="library" exported="" name="Slf4j" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" name="Guava" level="project" />
-    <orderEntry type="library" exported="" name="org.apache.maven:maven-resolver-provider" level="project" />
+    <orderEntry type="library" exported="" name="maven-resolver-provider" level="project" />
     <orderEntry type="module-library">
       <library name="org.apache.maven.resolver:maven-resolver-transport-file" type="repository">
         <properties maven-id="org.apache.maven.resolver:maven-resolver-transport-file:1.3.3">
@@ -70,5 +70,6 @@
       </library>
     </orderEntry>
     <orderEntry type="library" name="commons-lang3" level="project" />
+    <orderEntry type="library" name="plexus-utils" level="project" />
   </component>
 </module>
\ No newline at end of file
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 fe73d9ec8260..e5261d40b166 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
@@ -1,4 +1,4 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.idea.maven.aether;
 
 import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
@@ -202,7 +202,7 @@ public final class ArtifactRepositoryManager {
       org.apache.maven.model.Model.class, //maven-model
       org.apache.maven.model.building.ModelBuilder.class, //maven-model-builder
       org.apache.maven.artifact.repository.metadata.Metadata.class, //maven-repository-metadata
-      org.codehaus.plexus.component.annotations.Component.class, //plexus-component-annotations
+      //org.codehaus.plexus.component.annotations.Component.class, //plexus-component-annotations
       org.codehaus.plexus.interpolation.Interpolator.class, //plexus-interpolation
       org.eclipse.aether.RepositorySystem.class, //aether-api
       org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory.class, //aether-connector-basic
@@ -356,7 +356,7 @@ public final class ArtifactRepositoryManager {
     final Version version = constraint.getVersion();
     if (version != null) {
       final String major = version.toString().split("[.\\-_]")[0];
-      annotationsConstraint = "[" + major + ", " + version.toString() + "-an10000]";
+      annotationsConstraint = "[" + major + ", " + version + "-an10000]";
     }
 
     final VersionRange range = constraint.getRange();