MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 06:39:38 +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

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