diff --git a/java/idea-ui/resources/messages/JavaUiBundle.properties b/java/idea-ui/resources/messages/JavaUiBundle.properties index 456b70034fe2..e106b26e2877 100644 --- a/java/idea-ui/resources/messages/JavaUiBundle.properties +++ b/java/idea-ui/resources/messages/JavaUiBundle.properties @@ -657,8 +657,6 @@ language.level.combo.experimental.versions=Experimental Versions project.or.module.jdk.misconfigured={0, choice, 0#Project|1#Module} JDK is misconfigured notification.group.build.script.found=Build script found -label.verification.settings=Verification Settings -checkbox.sha256.checksum=S&HA256 checksum label.bind.remote.repository=&Bind remote repository repository.library.utils.library.update.title=Repository library update diff --git a/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibraryUtils.kt b/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibraryUtils.kt index ef1648fc8008..1eb4aee1ea90 100644 --- a/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibraryUtils.kt +++ b/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibraryUtils.kt @@ -75,8 +75,7 @@ class RepositoryLibraryUtils(private val project: Project) : Disposable { /* Build verification only for libraries with stable version and if verification is enabled */ if (descriptor.version == RepositoryLibraryDescription.LatestVersionId || descriptor.version == RepositoryLibraryDescription.ReleaseVersionId || - descriptor.version.endsWith(RepositoryLibraryDescription.SnapshotVersionSuffix) || - !descriptor.isVerifySha256Checksum) { + descriptor.version.endsWith(RepositoryLibraryDescription.SnapshotVersionSuffix)) { return emptyList() } @@ -147,7 +146,7 @@ class RepositoryLibraryUtils(private val project: Project) : Disposable { * Libraries with disabled checksums are excluded. * Global libraries are excluded. * - * See [JpsMavenRepositoryLibraryDescriptor.ArtifactVerification], [JpsMavenRepositoryLibraryDescriptor.myVerifySha256Checksum]. + * See [JpsMavenRepositoryLibraryDescriptor.ArtifactVerification], [JpsMavenRepositoryLibraryDescriptor.isVerifySha256Checksum]. */ fun rebuildExistingSha256ChecksumsBackground() = BuildSha256SumJob(true, false).runBackground( JavaUiBundle.message("repository.library.utils.progress.title.building.sha256sum") @@ -158,7 +157,7 @@ class RepositoryLibraryUtils(private val project: Project) : Disposable { * * Global libraries are excluded. * - * See [JpsMavenRepositoryLibraryDescriptor.ArtifactVerification], [JpsMavenRepositoryLibraryDescriptor.myVerifySha256Checksum]. + * See [JpsMavenRepositoryLibraryDescriptor.ArtifactVerification], [JpsMavenRepositoryLibraryDescriptor.isVerifySha256Checksum]. */ fun buildMissingSha256ChecksumsBackground() = BuildSha256SumJob(false, true).runBackground( JavaUiBundle.message("repository.library.utils.progress.title.building.sha256sum") @@ -168,7 +167,7 @@ class RepositoryLibraryUtils(private val project: Project) : Disposable { /** * Disable SHA256 checksum for all [RepositoryLibraryType] libraries. Global libraries are excluded. * - * See [JpsMavenRepositoryLibraryDescriptor.ArtifactVerification], [JpsMavenRepositoryLibraryDescriptor.myVerifySha256Checksum]. + * See [JpsMavenRepositoryLibraryDescriptor.ArtifactVerification], [JpsMavenRepositoryLibraryDescriptor.isVerifySha256Checksum]. */ fun removeSha256ChecksumsBackground() = RemoveSha256ChecksumsJob().runBackground( JavaUiBundle.message("repository.library.utils.progress.title.removing.sha256sum") @@ -309,7 +308,6 @@ class RepositoryLibraryUtils(private val project: Project) : Disposable { .filter { it.type == LibraryRootTypeId.COMPILED } .map { JpsPathUtil.urlToFile(it.url.url) } - this.isEnableSha256Checksum = true this.artifactsVerification = buildRepositoryLibraryArtifactsVerification(this.repositoryLibraryDescriptor, verifiableJars) return this } @@ -455,7 +453,6 @@ class RepositoryLibraryUtils(private val project: Project) : Disposable { override suspend fun transform() { filteredProperties.forEach { (entity, properties) -> - properties.isEnableSha256Checksum = false properties.artifactsVerification = emptyList() entity.modifyProperties(properties) } diff --git a/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibraryWithDescriptionEditor.java b/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibraryWithDescriptionEditor.java index 1ae0c175ed23..a0f804c714d4 100644 --- a/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibraryWithDescriptionEditor.java +++ b/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibraryWithDescriptionEditor.java @@ -78,7 +78,7 @@ public class RepositoryLibraryWithDescriptionEditor RepositoryLibraryPropertiesModel model = new RepositoryLibraryPropertiesModel( properties.getVersion(), artifactKinds, properties.isIncludeTransitiveDependencies(), - properties.getExcludedDependencies(), properties.isEnableSha256Checksum(), + properties.getExcludedDependencies(), RemoteRepositoriesConfiguration.getInstance(project).getRepositories(), properties.getJarRepositoryId()); boolean isGlobalLibrary = false; @@ -104,7 +104,6 @@ public class RepositoryLibraryWithDescriptionEditor myEditorComponent.getProperties().changeVersion(model.getVersion()); myEditorComponent.getProperties().setIncludeTransitiveDependencies(model.isIncludeTransitiveDependencies()); myEditorComponent.getProperties().setExcludedDependencies(model.getExcludedDependencies()); - myEditorComponent.getProperties().setEnableSha256Checksum(model.isSha256ChecksumEnabled()); myEditorComponent.getProperties().setJarRepositoryId(model.getRemoteRepositoryId()); if (wasGeneratedName) { @@ -118,11 +117,6 @@ public class RepositoryLibraryWithDescriptionEditor ); libraryEditor.removeAllRoots(); if (roots != null) { - myEditorComponent.getProperties().setArtifactsVerification(RepositoryLibraryUtils.buildRepositoryLibraryArtifactsVerification( - properties.getRepositoryLibraryDescriptor(), - roots) - ); - libraryEditor.addRoots(roots); } else { properties.setArtifactsVerification(Collections.emptyList()); diff --git a/java/idea-ui/src/com/intellij/jarRepository/settings/RepositoryLibraryPropertiesEditor.form b/java/idea-ui/src/com/intellij/jarRepository/settings/RepositoryLibraryPropertiesEditor.form index bb4a8efd51e9..92e3ca3d479f 100644 --- a/java/idea-ui/src/com/intellij/jarRepository/settings/RepositoryLibraryPropertiesEditor.form +++ b/java/idea-ui/src/com/intellij/jarRepository/settings/RepositoryLibraryPropertiesEditor.form @@ -55,7 +55,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -146,42 +146,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/idea-ui/src/com/intellij/jarRepository/settings/RepositoryLibraryPropertiesEditor.java b/java/idea-ui/src/com/intellij/jarRepository/settings/RepositoryLibraryPropertiesEditor.java index 373249afc8c7..1f5b6689e498 100644 --- a/java/idea-ui/src/com/intellij/jarRepository/settings/RepositoryLibraryPropertiesEditor.java +++ b/java/idea-ui/src/com/intellij/jarRepository/settings/RepositoryLibraryPropertiesEditor.java @@ -58,10 +58,6 @@ public final class RepositoryLibraryPropertiesEditor { private final ThreeStateCheckBox myIncludeTransitiveDepsCheckBox; private JPanel myPropertiesPanel; private JPanel myTransitiveDependenciesPanel; - - private JPanel myVerificationSettingsPanel; - - private JBCheckBox myVerificationSha256ChecksumCheckBox; private ComboBox myRemoteRepositoryComboBox; private JPanel myRemoteRepositoryOptionsPanel; @@ -129,11 +125,9 @@ public final class RepositoryLibraryPropertiesEditor { myTransitiveDependenciesPanel.setVisible(allowExcludingTransitiveDependencies); if (globalLibrary) { - myVerificationSettingsPanel.setVisible(false); myRemoteRepositoryOptionsPanel.setVisible(false); } else { RepositoryLibrarySettings intSettings = RepositoryLibrarySettings.getInstanceOrDefaults(project); - myVerificationSettingsPanel.setVisible(intSettings.isSha256ChecksumUiSettingsDisplayed()); myRemoteRepositoryOptionsPanel.setVisible(intSettings.isBindJarRepositoryUiSettingsDisplayed()); } @@ -267,15 +261,6 @@ public final class RepositoryLibraryPropertiesEditor { } }); updateManageDependenciesLink(); - - myVerificationSha256ChecksumCheckBox.setSelected(model.isSha256ChecksumEnabled()); - myVerificationSha256ChecksumCheckBox.addChangeListener(new ChangeListener() { - @Override - public void stateChanged(ChangeEvent e) { - model.setVerificationSha256Checksum(myVerificationSha256ChecksumCheckBox.isSelected()); - onChangeListener.onChange(RepositoryLibraryPropertiesEditor.this); - } - }); } private void updateIncludeTransitiveDepsCheckBoxState() { diff --git a/java/idea-ui/src/org/jetbrains/idea/maven/utils/library/propertiesEditor/RepositoryLibraryPropertiesModel.java b/java/idea-ui/src/org/jetbrains/idea/maven/utils/library/propertiesEditor/RepositoryLibraryPropertiesModel.java index 44376923792f..0629d727cbae 100644 --- a/java/idea-ui/src/org/jetbrains/idea/maven/utils/library/propertiesEditor/RepositoryLibraryPropertiesModel.java +++ b/java/idea-ui/src/org/jetbrains/idea/maven/utils/library/propertiesEditor/RepositoryLibraryPropertiesModel.java @@ -24,13 +24,10 @@ import org.jetbrains.idea.maven.aether.ArtifactKind; import javax.swing.*; import java.util.*; -import static org.jetbrains.jps.model.library.JpsMavenRepositoryLibraryDescriptor.VERIFY_SHA256_CHECKSUM_DEFAULT; - public class RepositoryLibraryPropertiesModel { private String version; private final EnumSet myArtifactKinds = EnumSet.noneOf(ArtifactKind.class); private boolean includeTransitiveDependencies; - private boolean mySha256ChecksumEnabled; private List myExcludedDependencies; private final List myAvailableRemoteRepositories; private final CollectionComboBoxModel myRemoteRepositoryModel; @@ -47,18 +44,15 @@ public class RepositoryLibraryPropertiesModel { public RepositoryLibraryPropertiesModel(String version, EnumSet artifactKinds, boolean includeTransitiveDependencies, List excludedDependencies) { - this(version, artifactKinds, includeTransitiveDependencies, excludedDependencies, VERIFY_SHA256_CHECKSUM_DEFAULT, - Collections.emptyList(), null); + this(version, artifactKinds, includeTransitiveDependencies, excludedDependencies, Collections.emptyList(), null); } public RepositoryLibraryPropertiesModel(String version, EnumSet artifactKinds, boolean includeTransitiveDependencies, List excludedDependencies, - boolean mySha256ChecksumEnabled, List availableRemoteRepositories, String remoteRepositoryId) { this.version = version; this.myArtifactKinds.addAll(artifactKinds); this.includeTransitiveDependencies = includeTransitiveDependencies; - this.mySha256ChecksumEnabled = mySha256ChecksumEnabled; myExcludedDependencies = new ArrayList<>(excludedDependencies); myAvailableRemoteRepositories = availableRemoteRepositories; @@ -75,7 +69,7 @@ public class RepositoryLibraryPropertiesModel { @Override public RepositoryLibraryPropertiesModel clone() { return new RepositoryLibraryPropertiesModel(version, myArtifactKinds, includeTransitiveDependencies, - new ArrayList<>(myExcludedDependencies), mySha256ChecksumEnabled, + new ArrayList<>(myExcludedDependencies), myAvailableRemoteRepositories, getRemoteRepositoryId()); } @@ -135,14 +129,6 @@ public class RepositoryLibraryPropertiesModel { } } - public boolean isSha256ChecksumEnabled() { - return mySha256ChecksumEnabled; - } - - public void setVerificationSha256Checksum(boolean value) { - this.mySha256ChecksumEnabled = value; - } - public EnumSet getArtifactKinds() { return EnumSet.copyOf(myArtifactKinds); } @@ -179,7 +165,6 @@ public class RepositoryLibraryPropertiesModel { if (includeTransitiveDependencies != model.includeTransitiveDependencies) return false; if (version != null ? !version.equals(model.version) : model.version != null) return false; if (!myExcludedDependencies.equals(model.myExcludedDependencies)) return false; - if (mySha256ChecksumEnabled != model.mySha256ChecksumEnabled) return false; if (!Objects.equals(getRemoteRepositoryId(), model.getRemoteRepositoryId())) return false; return true; } @@ -190,7 +175,6 @@ public class RepositoryLibraryPropertiesModel { result = 31 * result + (includeTransitiveDependencies ? 1 : 0); result = 31 * result + (version != null ? version.hashCode() : 0); result = 31 * result + myExcludedDependencies.hashCode(); - result = 31 * result + (mySha256ChecksumEnabled ? 1 : 0); result = 31 * result + (getRemoteRepositoryId() != null ? getRemoteRepositoryId().hashCode() : 0); return result; } diff --git a/java/idea-ui/testData/testProjectAllPropertiesFilled/.idea/libraries/smallSampleLibRelease.xml b/java/idea-ui/testData/testProjectAllPropertiesFilled/.idea/libraries/smallSampleLibRelease.xml index f20f57789526..082ce484995b 100644 --- a/java/idea-ui/testData/testProjectAllPropertiesFilled/.idea/libraries/smallSampleLibRelease.xml +++ b/java/idea-ui/testData/testProjectAllPropertiesFilled/.idea/libraries/smallSampleLibRelease.xml @@ -1,6 +1,6 @@ - + f0aaca850dd5e399541a9614da99dd194c122e9252b35dafeb088b77b8baf6b1 diff --git a/java/idea-ui/testData/testProjectAllPropertiesFilled/.idea/libraries/smallSampleLibSnapshot.xml b/java/idea-ui/testData/testProjectAllPropertiesFilled/.idea/libraries/smallSampleLibSnapshot.xml index c24ea95cd776..5b302fe8502b 100644 --- a/java/idea-ui/testData/testProjectAllPropertiesFilled/.idea/libraries/smallSampleLibSnapshot.xml +++ b/java/idea-ui/testData/testProjectAllPropertiesFilled/.idea/libraries/smallSampleLibSnapshot.xml @@ -1,6 +1,6 @@ - + diff --git a/java/idea-ui/testData/testProjectAllPropertiesFilled/testProject.iml b/java/idea-ui/testData/testProjectAllPropertiesFilled/testProject.iml index 5106d683f130..75caa20a7a1e 100644 --- a/java/idea-ui/testData/testProjectAllPropertiesFilled/testProject.iml +++ b/java/idea-ui/testData/testProjectAllPropertiesFilled/testProject.iml @@ -11,7 +11,7 @@ - + f0aaca850dd5e399541a9614da99dd194c122e9252b35dafeb088b77b8baf6b1 diff --git a/java/idea-ui/testData/testProjectBadChecksum/.idea/libraries/smallSampleLibRelease.xml b/java/idea-ui/testData/testProjectBadChecksum/.idea/libraries/smallSampleLibRelease.xml index 41acae3d14f2..a99e0aeb5cff 100644 --- a/java/idea-ui/testData/testProjectBadChecksum/.idea/libraries/smallSampleLibRelease.xml +++ b/java/idea-ui/testData/testProjectBadChecksum/.idea/libraries/smallSampleLibRelease.xml @@ -1,6 +1,6 @@ - + badchecksum diff --git a/java/idea-ui/testData/testProjectBadChecksum/.idea/libraries/smallSampleLibSnapshot.xml b/java/idea-ui/testData/testProjectBadChecksum/.idea/libraries/smallSampleLibSnapshot.xml index 85cca7c1ed39..43603c6129c9 100644 --- a/java/idea-ui/testData/testProjectBadChecksum/.idea/libraries/smallSampleLibSnapshot.xml +++ b/java/idea-ui/testData/testProjectBadChecksum/.idea/libraries/smallSampleLibSnapshot.xml @@ -1,6 +1,6 @@ - + diff --git a/java/idea-ui/testData/testProjectBadChecksum/testProject.iml b/java/idea-ui/testData/testProjectBadChecksum/testProject.iml index 72d9b61fe42f..fa05d702b4ae 100644 --- a/java/idea-ui/testData/testProjectBadChecksum/testProject.iml +++ b/java/idea-ui/testData/testProjectBadChecksum/testProject.iml @@ -11,7 +11,7 @@ - + badchecksumhere diff --git a/java/idea-ui/testData/testProjectChecksumBuilt/.idea/libraries/smallSampleLibRelease.xml b/java/idea-ui/testData/testProjectChecksumBuilt/.idea/libraries/smallSampleLibRelease.xml index 39a7901d807e..782e3e630611 100644 --- a/java/idea-ui/testData/testProjectChecksumBuilt/.idea/libraries/smallSampleLibRelease.xml +++ b/java/idea-ui/testData/testProjectChecksumBuilt/.idea/libraries/smallSampleLibRelease.xml @@ -1,6 +1,6 @@ - + f0aaca850dd5e399541a9614da99dd194c122e9252b35dafeb088b77b8baf6b1 diff --git a/java/idea-ui/testData/testProjectChecksumBuilt/.idea/libraries/smallSampleLibSnapshot.xml b/java/idea-ui/testData/testProjectChecksumBuilt/.idea/libraries/smallSampleLibSnapshot.xml index 85cca7c1ed39..43603c6129c9 100644 --- a/java/idea-ui/testData/testProjectChecksumBuilt/.idea/libraries/smallSampleLibSnapshot.xml +++ b/java/idea-ui/testData/testProjectChecksumBuilt/.idea/libraries/smallSampleLibSnapshot.xml @@ -1,6 +1,6 @@ - + diff --git a/java/idea-ui/testData/testProjectChecksumBuilt/testProject.iml b/java/idea-ui/testData/testProjectChecksumBuilt/testProject.iml index feb1dad562d2..c3521962b264 100644 --- a/java/idea-ui/testData/testProjectChecksumBuilt/testProject.iml +++ b/java/idea-ui/testData/testProjectChecksumBuilt/testProject.iml @@ -11,7 +11,7 @@ - + f0aaca850dd5e399541a9614da99dd194c122e9252b35dafeb088b77b8baf6b1 diff --git a/java/idea-ui/testSrc/com/intellij/jarRepository/JarRepositoryManagerTest.kt b/java/idea-ui/testSrc/com/intellij/jarRepository/JarRepositoryManagerTest.kt index 6eef6812a243..56e67f10a8f3 100644 --- a/java/idea-ui/testSrc/com/intellij/jarRepository/JarRepositoryManagerTest.kt +++ b/java/idea-ui/testSrc/com/intellij/jarRepository/JarRepositoryManagerTest.kt @@ -207,7 +207,7 @@ class JarRepositoryManagerTest : UsefulTestCase() { assertEquals(expected, actual) } - private fun createDescriptorWithJarRepoId(jarRepoId: String?) = JpsMavenRepositoryLibraryDescriptor("id", false, emptyList(), false, + private fun createDescriptorWithJarRepoId(jarRepoId: String?) = JpsMavenRepositoryLibraryDescriptor("id", false, emptyList(), emptyList(), jarRepoId) private fun getResultingRoots(promise: Promise>): List? { diff --git a/java/openapi/src/org/jetbrains/idea/maven/utils/library/RepositoryLibraryProperties.java b/java/openapi/src/org/jetbrains/idea/maven/utils/library/RepositoryLibraryProperties.java index f9033597d622..0e471d7c9e8d 100644 --- a/java/openapi/src/org/jetbrains/idea/maven/utils/library/RepositoryLibraryProperties.java +++ b/java/openapi/src/org/jetbrains/idea/maven/utils/library/RepositoryLibraryProperties.java @@ -96,13 +96,13 @@ public class RepositoryLibraryProperties extends LibraryProperties dependencyMavenIds) { myDescriptor = new JpsMavenRepositoryLibraryDescriptor(getMavenId(), getPackaging(), isIncludeTransitiveDependencies(), - dependencyMavenIds, isEnableSha256Checksum(), getArtifactsVerification(), + dependencyMavenIds, getArtifactsVerification(), getJarRepositoryId()); } @@ -189,7 +182,7 @@ public class RepositoryLibraryProperties extends LibraryProperties artifactsVerification) { List effectiveValue = artifactsVerification == null ? Collections.emptyList() : artifactsVerification; myDescriptor = new JpsMavenRepositoryLibraryDescriptor(getMavenId(), getPackaging(), isIncludeTransitiveDependencies(), - getExcludedDependencies(), isEnableSha256Checksum(), effectiveValue, + getExcludedDependencies(), effectiveValue, getJarRepositoryId()); } @@ -228,7 +221,6 @@ public class RepositoryLibraryProperties extends LibraryProperties myArtifactsVerification; public JpsMavenRepositoryLibraryDescriptor(@NotNull String groupId, @NotNull String artifactId, @NotNull String version) { @@ -56,23 +53,19 @@ public class JpsMavenRepositoryLibraryDescriptor { public JpsMavenRepositoryLibraryDescriptor(@NotNull String groupId, @NotNull String artifactId, @NotNull String version, @NotNull final String packaging, boolean includeTransitiveDependencies, @NotNull List excludedDependencies) { - this(groupId, artifactId, version, packaging, includeTransitiveDependencies, excludedDependencies, - VERIFY_SHA256_CHECKSUM_DEFAULT, Collections.emptyList()); + this(groupId, artifactId, version, packaging, includeTransitiveDependencies, excludedDependencies, Collections.emptyList()); } public JpsMavenRepositoryLibraryDescriptor(@NotNull String groupId, @NotNull String artifactId, @NotNull String version, @NotNull final String packaging, boolean includeTransitiveDependencies, @NotNull List excludedDependencies, - boolean verifySha256Checksum, @NotNull List metadata) { - this(groupId, artifactId, version, packaging, includeTransitiveDependencies, excludedDependencies, - verifySha256Checksum, metadata, null); + this(groupId, artifactId, version, packaging, includeTransitiveDependencies, excludedDependencies, metadata, null); } public JpsMavenRepositoryLibraryDescriptor(@NotNull String groupId, @NotNull String artifactId, @NotNull String version, @NotNull final String packaging, boolean includeTransitiveDependencies, @NotNull List excludedDependencies, - boolean verifySha256Checksum, @NotNull List metadata, @Nullable String jarRepositoryId) { myGroupId = groupId; @@ -82,7 +75,6 @@ public class JpsMavenRepositoryLibraryDescriptor { myIncludeTransitiveDependencies = includeTransitiveDependencies; myExcludedDependencies = excludedDependencies; myMavenId = groupId + ":" + artifactId + ":" + version; - myVerifySha256Checksum = verifySha256Checksum; myArtifactsVerification = metadata; myJarRepositoryId = jarRepositoryId; } @@ -101,25 +93,23 @@ public class JpsMavenRepositoryLibraryDescriptor { } public JpsMavenRepositoryLibraryDescriptor(@Nullable String mavenId, @NotNull String packaging, boolean includeTransitiveDependencies, List excludedDependencies) { - this(mavenId, packaging, includeTransitiveDependencies, excludedDependencies, VERIFY_SHA256_CHECKSUM_DEFAULT, Collections.emptyList(), - null); + this(mavenId, packaging, includeTransitiveDependencies, excludedDependencies, Collections.emptyList(), null); } public JpsMavenRepositoryLibraryDescriptor(@Nullable String mavenId, boolean includeTransitiveDependencies, List excludedDependencies, - boolean verifySha256Checksum, @NotNull List artifactsVerification, + @NotNull List artifactsVerification, @Nullable String jarRepositoryId) { - this(mavenId, DEFAULT_PACKAGING, includeTransitiveDependencies, excludedDependencies, verifySha256Checksum, artifactsVerification, + this(mavenId, DEFAULT_PACKAGING, includeTransitiveDependencies, excludedDependencies, artifactsVerification, jarRepositoryId); } public JpsMavenRepositoryLibraryDescriptor(@Nullable String mavenId, @NotNull String packaging, boolean includeTransitiveDependencies, List excludedDependencies, - boolean verifySha256Checksum, @NotNull List artifactsVerification, + @NotNull List artifactsVerification, @Nullable String jarRepositoryId) { myMavenId = mavenId; myIncludeTransitiveDependencies = includeTransitiveDependencies; myExcludedDependencies = excludedDependencies; myPackaging = packaging; - myVerifySha256Checksum = verifySha256Checksum; myArtifactsVerification = artifactsVerification; myJarRepositoryId = jarRepositoryId; @@ -178,13 +168,12 @@ public class JpsMavenRepositoryLibraryDescriptor { myPackaging.equals(that.myPackaging) && myExcludedDependencies.equals(that.myExcludedDependencies) && myArtifactsVerification.equals(that.myArtifactsVerification) && - myVerifySha256Checksum == that.myVerifySha256Checksum && Objects.equals(myJarRepositoryId, that.myJarRepositoryId); } public int hashCode() { return Objects.hash(myMavenId, myPackaging, myIncludeTransitiveDependencies, myExcludedDependencies, myArtifactsVerification, - myVerifySha256Checksum, myJarRepositoryId); + myJarRepositoryId); } @Override @@ -193,7 +182,7 @@ public class JpsMavenRepositoryLibraryDescriptor { } public boolean isVerifySha256Checksum() { - return myVerifySha256Checksum; + return ContainerUtil.exists(myArtifactsVerification, it -> it.getSha256sum() != null); } public List getArtifactsVerification() { diff --git a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/java/JpsJavaModelSerializerExtension.java b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/java/JpsJavaModelSerializerExtension.java index d0130efb81b6..c7f530a8723a 100644 --- a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/java/JpsJavaModelSerializerExtension.java +++ b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/java/JpsJavaModelSerializerExtension.java @@ -312,8 +312,6 @@ public class JpsJavaModelSerializerExtension extends JpsModelSerializerExtension private static final String EXCLUDE_TAG = "exclude"; private static final String DEPENDENCY_TAG = "dependency"; - private static final String VERIFY_SHA25_CHECKSUM_ATTRIBUTE = "verify-sha256-checksum"; - private static final String JAR_REPOSITORY_ID_ATTRIBUTE = "jar-repository-id"; private static final String VERIFICATION_TAG = "verification"; @@ -339,7 +337,6 @@ public class JpsJavaModelSerializerExtension extends JpsModelSerializerExtension String mavenId = elem.getAttributeValue(MAVEN_ID_ATTRIBUTE, (String)null); boolean includeTransitiveDependencies = Boolean.parseBoolean(elem.getAttributeValue(INCLUDE_TRANSITIVE_DEPS_ATTRIBUTE, "true")); - boolean verifySha256Checksum = Boolean.parseBoolean(elem.getAttributeValue(VERIFY_SHA25_CHECKSUM_ATTRIBUTE, "false")); String jarRepositoryId = elem.getAttributeValue(JAR_REPOSITORY_ID_ATTRIBUTE); @@ -349,7 +346,6 @@ public class JpsJavaModelSerializerExtension extends JpsModelSerializerExtension var verificationProperties = loadArtifactsVerificationProperties(mavenId, elem.getChild(VERIFICATION_TAG)); return new JpsMavenRepositoryLibraryDescriptor(mavenId, includeTransitiveDependencies, excludedDependencies, - verifySha256Checksum, verificationProperties, jarRepositoryId); } @@ -367,8 +363,11 @@ public class JpsJavaModelSerializerExtension extends JpsModelSerializerExtension if (artifactUrl != null) { Element sha256sumElement = child.getChild(SHA256SUM_TAG); String sha256sum = sha256sumElement != null ? sha256sumElement.getText() : null; - - result.add(new ArtifactVerification(artifactUrl, sha256sum)); + if (sha256sum == null) { + LOG.warn("Missing sha256sum attribute for verification artifact tag for descriptor maven-id=" + mavenId); + } else { + result.add(new ArtifactVerification(artifactUrl, sha256sum)); + } } else { LOG.warn("Missing url attribute for verification artifact tag for descriptor maven-id=" + mavenId); }