MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

update maven-resolver-provider from 3.6.1 to 3.6.3 and exclude transitive dependency plexus-utils (already added as library to project)

Browse Source 
GitOrigin-RevId: 18e79bba9941818936c22915b0096c271fd13bea
This commit is contained in:
Vladimir Krivosheev
2020-12-23 11:26:08 +00:00
committed by intellij-monorepo-bot
parent 4e1ed1070d
commit 72e96856ce
3 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/org_apache_maven_maven_resolver_provider.xml → .idea/libraries/maven_resolver_provider.xml
Generated
+16 -16
View File
@@ -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 />
aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml
+2 -1
View File
@@ -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>
aether-dependency-resolver/src/org/jetbrains/idea/maven/aether/ArtifactRepositoryManager.java
+3 -3
View File
@@ -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();