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

update maven resolver to 3.9.9

Browse Source 
GitOrigin-RevId: 2abdd551becaf6a62dcc87a3db2f3bd7366ecd1c
This commit is contained in:
Eugene Zhuravlev
2024-09-17 14:22:30 +02:00
committed by intellij-monorepo-bot
parent 79562e04d2
commit 242b41635a
5 changed files with 166 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/libraries/XStream.xml generated
View File

@@ -12,6 +12,10 @@
<sha256sum>34e08ee62116071cbb69c0ed70d15a7a5b208d62798c59f2120bb8929324cb63</sha256sum>
</artifact>
</verification>
<exclude>
<dependency maven-id="xml-apis:xml-apis" />
<dependency maven-id="xerces:xercesImpl" />
</exclude>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/thoughtworks/xstream/xstream/1.4.20/xstream-1.4.20.jar!/" />

103
.idea/libraries/maven_resolver_provider.xml generated
View File

@@ -1,42 +1,45 @@
<component name="libraryTable">
<library name="maven-resolver-provider" type="repository">
<properties maven-id="org.apache.maven:maven-resolver-provider:3.8.8">
<properties maven-id="org.apache.maven:maven-resolver-provider:3.9.9">
<verification>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/maven-resolver-provider/3.8.8/maven-resolver-provider-3.8.8.jar">
<sha256sum>197a8a6e7c7df66dd1fa70bb495ac7616f0e96f43d354d69ff4794d725d47427</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/maven-resolver-provider/3.9.9/maven-resolver-provider-3.9.9.jar">
<sha256sum>5dea05049c94f952f48ce2bfe0111afdf986acc591fcc11d23fe3b8dcb70291e</sha256sum>
</artifact>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/maven-model/3.8.8/maven-model-3.8.8.jar">
<sha256sum>c392548bc1a3f0c6a180f888bd2349602de5b1e30059fe0ec46f81ed4ce14129</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/maven-model/3.9.9/maven-model-3.9.9.jar">
<sha256sum>8f59b0a16fe9c933be749a60ae0705a0cb337bb5abaf38801b40b740ff775727</sha256sum>
</artifact>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/maven-model-builder/3.8.8/maven-model-builder-3.8.8.jar">
<sha256sum>288c29acda1d26138c8a53fff326ee79bbce870c63c9ac876e7fe8c2944044d3</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/maven-model-builder/3.9.9/maven-model-builder-3.9.9.jar">
<sha256sum>a4377182ac2e5adfe16be3b3c81981a5ecddab014184de72ae1e522f04a77602</sha256sum>
</artifact>
<artifact url="file://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26.jar">
<sha256sum>b3b5412ce17889103ea564bcdfcf9fb3dfa540344ffeac6b538a73c9d7182662</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-interpolation/1.27/plexus-interpolation-1.27.jar">
<sha256sum>3fb4fb6143fdf964024c3cb738551524b9ea84e5c211cd660c559ad0703e5230</sha256sum>
</artifact>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact/3.8.8/maven-artifact-3.8.8.jar">
<sha256sum>813233a8485cbaf97b1f9a2c17cef723b068f7260a4319cf4958f221d04b9937</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact/3.9.9/maven-artifact-3.9.9.jar">
<sha256sum>30f015d1c1a393e19c18cd4f43532089c36d4ca328608ce3dda78b74d3d31515</sha256sum>
</artifact>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/maven-builder-support/3.8.8/maven-builder-support-3.8.8.jar">
<sha256sum>c425ca169d67217256a8d1991144691fcf23351e09431890af240bfeed33b902</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/maven-builder-support/3.9.9/maven-builder-support-3.9.9.jar">
<sha256sum>2ca4a967bdd12a9e85d40e012374f86e63d4a1030c199da4832e3d0a1c6770d8</sha256sum>
</artifact>
<artifact url="file://$MAVEN_REPOSITORY$/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.5/org.eclipse.sisu.inject-0.3.5.jar">
<sha256sum>c5994010bcdce1d2bd603a4d50c47191ddbd7875d1157b23aaa26d33c82fda13</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/eclipse/sisu/org.eclipse.sisu.inject/0.9.0.M3/org.eclipse.sisu.inject-0.9.0.M3.jar">
<sha256sum>15335c4dcf082f599fb8eddcfb58d6a7e9a9c97de2883c257089a479b9b24522</sha256sum>
</artifact>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/maven-repository-metadata/3.8.8/maven-repository-metadata-3.8.8.jar">
<sha256sum>b396d3b081b353541ea9a147ab2d3eee5723b460d130ef7cb1d95366aeab7c31</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/maven-repository-metadata/3.9.9/maven-repository-metadata-3.9.9.jar">
<sha256sum>137c297e6a52d489b76663c82324d54e40f5d498a8fc015c0203fd91df8623b0</sha256sum>
</artifact>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-api/1.6.3/maven-resolver-api-1.6.3.jar">
<sha256sum>d0b28ed944058ba4f9be4b54c25d6d5269cc4f3f3c49aa450d4dc2f7e0d552f6</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-api/1.9.22/maven-resolver-api-1.9.22.jar">
<sha256sum>63f5f665e44a09ef55463b3b91fda0b78ff07dd24b1060d56e79c10b6e32cbfb</sha256sum>
</artifact>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-spi/1.6.3/maven-resolver-spi-1.6.3.jar">
<sha256sum>17441a39045ac19bc4a8068fb7284facebf6337754bf2bf8f26a76b5f98ed108</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-spi/1.9.22/maven-resolver-spi-1.9.22.jar">
<sha256sum>99ad721e4631d9bd0c4f9e29c869672577c66f2a674a5723ce38eff13c75cbfd</sha256sum>
</artifact>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-util/1.6.3/maven-resolver-util-1.6.3.jar">
<sha256sum>cdcad9355b625743f40e4cead9a96353404e010c39c808d23b044be331afa251</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-util/1.9.22/maven-resolver-util-1.9.22.jar">
<sha256sum>4aaea1584c39294ca926fc474723d9684473609ef4490c4eb169d6ea7daca6b5</sha256sum>
</artifact>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-impl/1.6.3/maven-resolver-impl-1.6.3.jar">
<sha256sum>17aaebe6e3e59df8cb5b4ec210196f7084637312b9bc4ff14cb77ad1ae3c381b</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-impl/1.9.22/maven-resolver-impl-1.9.22.jar">
<sha256sum>e4dafb8acc13d736377c02d2170d869438dd74b98b860745909d238726babcbb</sha256sum>
</artifact>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-named-locks/1.9.22/maven-resolver-named-locks-1.9.22.jar">
<sha256sum>0685f29ec3b548d9b6917c527f13c667685a3394b955aaa5b25d0559818b7fc5</sha256sum>
</artifact>
</verification>
<exclude>
@@ -47,33 +50,35 @@
</exclude>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-resolver-provider/3.8.8/maven-resolver-provider-3.8.8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model/3.8.8/maven-model-3.8.8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model-builder/3.8.8/maven-model-builder-3.8.8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact/3.8.8/maven-artifact-3.8.8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-builder-support/3.8.8/maven-builder-support-3.8.8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.5/org.eclipse.sisu.inject-0.3.5.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-repository-metadata/3.8.8/maven-repository-metadata-3.8.8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-api/1.6.3/maven-resolver-api-1.6.3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-spi/1.6.3/maven-resolver-spi-1.6.3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-util/1.6.3/maven-resolver-util-1.6.3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-impl/1.6.3/maven-resolver-impl-1.6.3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-resolver-provider/3.9.9/maven-resolver-provider-3.9.9.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model/3.9.9/maven-model-3.9.9.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model-builder/3.9.9/maven-model-builder-3.9.9.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-interpolation/1.27/plexus-interpolation-1.27.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact/3.9.9/maven-artifact-3.9.9.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-builder-support/3.9.9/maven-builder-support-3.9.9.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/eclipse/sisu/org.eclipse.sisu.inject/0.9.0.M3/org.eclipse.sisu.inject-0.9.0.M3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-repository-metadata/3.9.9/maven-repository-metadata-3.9.9.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-api/1.9.22/maven-resolver-api-1.9.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-spi/1.9.22/maven-resolver-spi-1.9.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-util/1.9.22/maven-resolver-util-1.9.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-impl/1.9.22/maven-resolver-impl-1.9.22.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-named-locks/1.9.22/maven-resolver-named-locks-1.9.22.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-resolver-provider/3.8.8/maven-resolver-provider-3.8.8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model/3.8.8/maven-model-3.8.8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model-builder/3.8.8/maven-model-builder-3.8.8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact/3.8.8/maven-artifact-3.8.8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-builder-support/3.8.8/maven-builder-support-3.8.8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.5/org.eclipse.sisu.inject-0.3.5-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-repository-metadata/3.8.8/maven-repository-metadata-3.8.8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-api/1.6.3/maven-resolver-api-1.6.3-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-spi/1.6.3/maven-resolver-spi-1.6.3-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-util/1.6.3/maven-resolver-util-1.6.3-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-impl/1.6.3/maven-resolver-impl-1.6.3-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-resolver-provider/3.9.9/maven-resolver-provider-3.9.9-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model/3.9.9/maven-model-3.9.9-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model-builder/3.9.9/maven-model-builder-3.9.9-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-interpolation/1.27/plexus-interpolation-1.27-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact/3.9.9/maven-artifact-3.9.9-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-builder-support/3.9.9/maven-builder-support-3.9.9-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/eclipse/sisu/org.eclipse.sisu.inject/0.9.0.M3/org.eclipse.sisu.inject-0.9.0.M3-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-repository-metadata/3.9.9/maven-repository-metadata-3.9.9-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-api/1.9.22/maven-resolver-api-1.9.22-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-spi/1.9.22/maven-resolver-spi-1.9.22-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-util/1.9.22/maven-resolver-util-1.9.22-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-impl/1.9.22/maven-resolver-impl-1.9.22-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-named-locks/1.9.22/maven-resolver-named-locks-1.9.22-sources.jar!/" />
</SOURCES>
</library>
</component>

30
aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml
View File

@@ -33,10 +33,10 @@
<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.4.2">
<properties maven-id="org.apache.maven.resolver:maven-resolver-transport-file:1.9.22">
<verification>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-file/1.4.2/maven-resolver-transport-file-1.4.2.jar">
<sha256sum>663bc1ab1f5b2e2462d241e48934d84e4cddc950a17f7f19c53ebf1b39cc5569</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-file/1.9.22/maven-resolver-transport-file-1.9.22.jar">
<sha256sum>4f2a857d8b832494bae9ef6d7db7bb8409378b28aabd3615f03faebe42a4ad1d</sha256sum>
</artifact>
</verification>
<exclude>
@@ -46,20 +46,20 @@
</exclude>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-file/1.4.2/maven-resolver-transport-file-1.4.2.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-file/1.9.22/maven-resolver-transport-file-1.9.22.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-file/1.4.2/maven-resolver-transport-file-1.4.2-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-file/1.9.22/maven-resolver-transport-file-1.9.22-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="org.apache.maven.resolver:maven-resolver-transport-http" type="repository">
<properties maven-id="org.apache.maven.resolver:maven-resolver-transport-http:1.4.2">
<properties maven-id="org.apache.maven.resolver:maven-resolver-transport-http:1.9.22">
<verification>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-http/1.4.2/maven-resolver-transport-http-1.4.2.jar">
<sha256sum>465bbb05ee2e1504738d26a1bfeca0c85d133476f3f625ceb1c7eb57e39b15ac</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-http/1.9.22/maven-resolver-transport-http-1.9.22.jar">
<sha256sum>1cf2a88c984e0eae8b3f13e1eec904eedead2f076d1f3c1d5cb5103a21538bd1</sha256sum>
</artifact>
</verification>
<exclude>
@@ -74,20 +74,20 @@
</exclude>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-http/1.4.2/maven-resolver-transport-http-1.4.2.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-http/1.9.22/maven-resolver-transport-http-1.9.22.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-http/1.4.2/maven-resolver-transport-http-1.4.2-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-http/1.9.22/maven-resolver-transport-http-1.9.22-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="org.apache.maven.resolver:maven-resolver-connector-basic" type="repository">
<properties maven-id="org.apache.maven.resolver:maven-resolver-connector-basic:1.4.2">
<properties maven-id="org.apache.maven.resolver:maven-resolver-connector-basic:1.9.22">
<verification>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-connector-basic/1.4.2/maven-resolver-connector-basic-1.4.2.jar">
<sha256sum>50174586a20ab1d0082bafaa12939932592164fd0fecdcac2f60af26684b6e34</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-connector-basic/1.9.22/maven-resolver-connector-basic-1.9.22.jar">
<sha256sum>4ab68bdec97eec318b2a3bd27e7c954e316f890df92d544b68afd0bf666c9588</sha256sum>
</artifact>
</verification>
<exclude>
@@ -98,11 +98,11 @@
</exclude>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-connector-basic/1.4.2/maven-resolver-connector-basic-1.4.2.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-connector-basic/1.9.22/maven-resolver-connector-basic-1.9.22.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-connector-basic/1.4.2/maven-resolver-connector-basic-1.4.2-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-connector-basic/1.9.22/maven-resolver-connector-basic-1.9.22-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>

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

@@ -4,6 +4,13 @@ package org.jetbrains.idea.maven.aether;
import com.intellij.openapi.application.ClassPathUtil;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.util.ArrayUtil;
import org.apache.maven.model.Activation;
import org.apache.maven.model.Profile;
import org.apache.maven.model.building.DefaultModelBuilderFactory;
import org.apache.maven.model.building.ModelBuilder;
import org.apache.maven.model.building.ModelProblemCollector;
import org.apache.maven.model.profile.ProfileActivationContext;
import org.apache.maven.model.profile.activation.ProfileActivator;
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.eclipse.aether.*;
import org.eclipse.aether.artifact.Artifact;
@@ -63,6 +70,14 @@ public final class ArtifactRepositoryManager {
locator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);
locator.addService(TransporterFactory.class, FileTransporterFactory.class);
locator.addService(TransporterFactory.class, HttpTransporterFactory.class);
locator.setServices(ModelBuilder.class, new DefaultModelBuilderFactory() {
@Override
public ProfileActivator[] newProfileActivators() {
// allow pom profiles to make dependency resolution deterministic and predictable:
// consider all possible dependencies the artifact can potentially have.
return new ProfileActivator[] {new ProfileActivatorProxy(super.newProfileActivators())};
}
}.newInstance());
locator.setErrorHandler(new DefaultServiceLocator.ErrorHandler() {
@Override
public void serviceCreationFailed(Class<?> type, Class<?> impl, Throwable exception) {
@@ -168,7 +183,9 @@ public final class ArtifactRepositoryManager {
}
private RepositorySystemSession createDefaultSession() {
return new DefaultRepositorySystemSession(sessionTemplate);
DefaultRepositorySystemSession session = new DefaultRepositorySystemSession(sessionTemplate);
session.setReadOnly();
return session;
}
/**
@@ -184,13 +201,12 @@ public final class ArtifactRepositoryManager {
private RepositorySystemSession createSession(@NotNull List<String> excludedDependencies) {
DefaultRepositorySystemSession session = new DefaultRepositorySystemSession(sessionTemplate);
if (excludedDependencies.isEmpty()) {
return session;
if (!excludedDependencies.isEmpty()) {
session.setDependencySelector(new AndDependencySelector(
session.getDependencySelector(),
new ExclusionDependencySelector(exclusions(excludedDependencies)))
);
}
session.setDependencySelector(new AndDependencySelector(
session.getDependencySelector(),
new ExclusionDependencySelector(exclusions(excludedDependencies)))
);
session.setReadOnly();
return session;
}
@@ -223,6 +239,7 @@ public final class ArtifactRepositoryManager {
private static RepositorySystemSession cloneSessionAndClearData(RepositorySystemSession session) {
DefaultRepositorySystemSession newSession = new DefaultRepositorySystemSession(session);
newSession.setData(new DefaultSessionData());
newSession.setReadOnly();
return newSession;
}
@@ -266,13 +283,16 @@ public final class ArtifactRepositoryManager {
org.eclipse.aether.spi.connector.RepositoryConnector.class, //aether-spi
org.eclipse.aether.util.ConfigUtils.class, //aether-util
org.eclipse.aether.impl.ArtifactResolver.class, //aether-impl
org.eclipse.sisu.Nullable.class, // sisu.inject
org.eclipse.aether.transport.file.FileTransporterFactory.class, //aether-transport-file
org.eclipse.aether.transport.http.HttpTransporterFactory.class, //aether-transport-http
org.apache.http.HttpConnection.class, //http-core
org.apache.http.client.HttpClient.class, //http-client
org.apache.http.entity.mime.MIME.class, //http-mime
org.apache.commons.logging.LogFactory.class, // commons-logging
org.slf4j.Marker.class, // slf4j, - required for aether resolver at runtime
org.slf4j.jul.JDK14LoggerFactory.class, // slf4j-jdk14 - required for aether resolver at runtime
org.eclipse.aether.named.providers.NoopNamedLockFactory.class, // resolver-named-locks
org.apache.commons.codec.binary.Base64.class // commons-codec
));
result.addAll(List.of(ClassPathUtil.getUtilClasses())); // intellij.platform.util module
@@ -546,8 +566,8 @@ public final class ArtifactRepositoryManager {
// explicitly set UPDATE_POLICY_ALWAYS, because default setting is UPDATE_POLICY_DAILY, and 5xx resolution errors are cached
// in local repository for one day and retry does not work
RepositoryPolicy enabledRepositoryPolicy = new RepositoryPolicy(true, RepositoryPolicy.UPDATE_POLICY_ALWAYS, null);
RepositoryPolicy disabledRepositoryPolicy = new RepositoryPolicy(false, null, null);
RepositoryPolicy enabledRepositoryPolicy = new RepositoryPolicy(true, RepositoryPolicy.UPDATE_POLICY_ALWAYS, RepositoryPolicy.CHECKSUM_POLICY_WARN);
RepositoryPolicy disabledRepositoryPolicy = new RepositoryPolicy(false, null, RepositoryPolicy.CHECKSUM_POLICY_WARN);
builder.setReleasePolicy(enabledRepositoryPolicy);
builder.setSnapshotPolicy(allowSnapshots ? enabledRepositoryPolicy : disabledRepositoryPolicy);
@@ -756,4 +776,48 @@ public final class ArtifactRepositoryManager {
return rootNodes.isEmpty() ? null : rootNodes.get(0);
}
}
// 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
private static class ProfileActivatorProxy implements ProfileActivator {
private final ProfileActivator[] myDelegates;
ProfileActivatorProxy(ProfileActivator[] delegates) {
myDelegates = delegates;
}
private static boolean isForceActivation(Profile profile) {
Activation activation = profile.getActivation();
return activation != null && (activation.getJdk() != null || activation.getOs() != null);
}
@Override
public boolean isActive(Profile profile, ProfileActivationContext context, ModelProblemCollector problems) {
if (isForceActivation(profile)) {
return true;
}
Boolean active = null;
for (ProfileActivator delegate : myDelegates) {
if (delegate.presentInConfig(profile, context, problems)) {
boolean activeValue = delegate.isActive(profile, context, problems);
active = active == null? activeValue : active && activeValue;
}
}
return Boolean.TRUE.equals(active);
}
@Override
public boolean presentInConfig(Profile profile, ProfileActivationContext context, ModelProblemCollector problems) {
if (isForceActivation(profile)) {
return true;
}
for (ProfileActivator delegate : myDelegates) {
if (delegate.presentInConfig(profile, context, problems)) {
return true;
}
}
return false;
}
}
}

47
java/openapi/src/org/jetbrains/idea/maven/utils/library/RepositoryLibraryProperties.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2018 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-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.maven.utils.library;
import com.intellij.java.library.LibraryWithMavenCoordinatesProperties;
@@ -45,12 +45,10 @@ public class RepositoryLibraryProperties extends LibraryProperties<RepositoryLib
this(groupId, artifactId, version, true, ContainerUtil.emptyList());
}
public RepositoryLibraryProperties(@NotNull String groupId,
@NotNull String artifactId,
@NotNull String version,
boolean includeTransitiveDependencies, @NotNull List<String> excludedDependencies) {
this(new JpsMavenRepositoryLibraryDescriptor(groupId, artifactId, version, includeTransitiveDependencies,
excludedDependencies));
public RepositoryLibraryProperties(
@NotNull String groupId, @NotNull String artifactId, @NotNull String version, boolean includeTransitiveDependencies, @NotNull List<String> excludedDependencies
) {
this(new JpsMavenRepositoryLibraryDescriptor(groupId, artifactId, version, includeTransitiveDependencies, excludedDependencies));
}
@Override
@@ -95,15 +93,11 @@ public class RepositoryLibraryProperties extends LibraryProperties<RepositoryLib
}
public void setMavenId(String mavenId) {
myDescriptor = new JpsMavenRepositoryLibraryDescriptor(mavenId, getPackaging(), isIncludeTransitiveDependencies(),
getExcludedDependencies(), getArtifactsVerification(),
getJarRepositoryId());
myDescriptor = new JpsMavenRepositoryLibraryDescriptor(mavenId, getPackaging(), isIncludeTransitiveDependencies(), getExcludedDependencies(), getArtifactsVerification(), getJarRepositoryId());
}
public void setPackaging(String packaging) {
myDescriptor = new JpsMavenRepositoryLibraryDescriptor(getMavenId(), packaging, isIncludeTransitiveDependencies(),
getExcludedDependencies(), getArtifactsVerification(),
getJarRepositoryId());
myDescriptor = new JpsMavenRepositoryLibraryDescriptor(getMavenId(), packaging, isIncludeTransitiveDependencies(), getExcludedDependencies(), getArtifactsVerification(), getJarRepositoryId());
}
@@ -112,10 +106,8 @@ public class RepositoryLibraryProperties extends LibraryProperties<RepositoryLib
return call(JpsMavenRepositoryLibraryDescriptor::isIncludeTransitiveDependencies, Boolean.TRUE);
}
public void setIncludeTransitiveDependencies(boolean value) {
myDescriptor = new JpsMavenRepositoryLibraryDescriptor(getMavenId(), getPackaging(), value,
getExcludedDependencies(), getArtifactsVerification(),
getJarRepositoryId());
public void setIncludeTransitiveDependencies(boolean includeTransitiveDeps) {
myDescriptor = new JpsMavenRepositoryLibraryDescriptor(getMavenId(), getPackaging(), includeTransitiveDeps, getExcludedDependencies(), getArtifactsVerification(), getJarRepositoryId());
}
@@ -125,8 +117,7 @@ public class RepositoryLibraryProperties extends LibraryProperties<RepositoryLib
}
public void setJarRepositoryId(String jarRepositoryId) {
myDescriptor = new JpsMavenRepositoryLibraryDescriptor(getMavenId(), getPackaging(), isIncludeTransitiveDependencies(),
getExcludedDependencies(), getArtifactsVerification(), jarRepositoryId);
myDescriptor = new JpsMavenRepositoryLibraryDescriptor(getMavenId(), getPackaging(), isIncludeTransitiveDependencies(), getExcludedDependencies(), getArtifactsVerification(), jarRepositoryId);
}
@Transient
@@ -167,10 +158,8 @@ public class RepositoryLibraryProperties extends LibraryProperties<RepositoryLib
return call(JpsMavenRepositoryLibraryDescriptor::getExcludedDependencies, Collections.emptyList());
}
public void setExcludedDependencies(List<String> dependencyMavenIds) {
myDescriptor = new JpsMavenRepositoryLibraryDescriptor(getMavenId(), getPackaging(), isIncludeTransitiveDependencies(),
dependencyMavenIds, getArtifactsVerification(),
getJarRepositoryId());
public void setExcludedDependencies(List<String> excludedDeps) {
myDescriptor = new JpsMavenRepositoryLibraryDescriptor(getMavenId(), getPackaging(), isIncludeTransitiveDependencies(), excludedDeps != null? excludedDeps : Collections.emptyList(), getArtifactsVerification(), getJarRepositoryId());
}
@@ -180,10 +169,14 @@ public class RepositoryLibraryProperties extends LibraryProperties<RepositoryLib
}
public void setArtifactsVerification(@Nullable List<ArtifactVerification> artifactsVerification) {
List<ArtifactVerification> effectiveValue = artifactsVerification == null ? Collections.emptyList() : artifactsVerification;
myDescriptor = new JpsMavenRepositoryLibraryDescriptor(getMavenId(), getPackaging(), isIncludeTransitiveDependencies(),
getExcludedDependencies(), effectiveValue,
getJarRepositoryId());
myDescriptor = new JpsMavenRepositoryLibraryDescriptor(
getMavenId(),
getPackaging(),
isIncludeTransitiveDependencies(),
getExcludedDependencies(),
artifactsVerification != null? artifactsVerification : Collections.emptyList(),
getJarRepositoryId()
);
}
@SuppressWarnings("unused") //we need to have a separate method here because XmlSerializer fails if the returned list is unmodifiable