From db715aff4657cf91c74f0f0ca1de1f0edad3cc8e Mon Sep 17 00:00:00 2001 From: Alexander Bubenchikov Date: Wed, 3 Jul 2024 14:48:03 +0200 Subject: [PATCH] maven [IDEA-353303] remove deps from maven-archetype-common to make scanners happy GitOrigin-RevId: 4eebdb547f9bb5fb3de63ba6b88e62c245d7a07f --- .../build/CommunityLibraryLicenses.kt | 6 +- .../build/CommunityRepositoryModules.kt | 4 +- .../intellij.maven.server.indexer.iml | 206 ++---------------- 3 files changed, 32 insertions(+), 184 deletions(-) diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt index 931a744c9541..18bcafefc08f 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt @@ -756,7 +756,11 @@ object CommunityLibraryLicenses { licenseUrl = "https://github.com/mathjax/MathJax/blob/master/LICENSE").apache(), - LibraryLicense(name = "Maven archetype common", libraryName = "apache.maven.archetype.common:3.2.1", + LibraryLicense(name = "Maven archetype catalog", libraryName = "apache.maven.archetype.catalog-no-trans:321", + url = "https://maven.apache.org/archetype/archetype-common/index.html") + .apache("https://github.com/apache/maven-archetype"), + + LibraryLicense(name = "Maven archetype common", libraryName = "apache.maven.archetype.common-no-trans:3.2.1", url = "https://maven.apache.org/archetype/archetype-common/index.html") .apache("https://github.com/apache/maven-archetype"), diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt index 826cac6d29e1..87b65f079473 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt @@ -98,7 +98,9 @@ object CommunityRepositoryModules { relativeOutputPath = "intellij.maven.server.indexer/lib") spec.withModuleLibrary(libraryName = "apache.maven.wagon.provider.api:3.5.2", moduleName = "intellij.maven.server.indexer", relativeOutputPath = "intellij.maven.server.indexer/lib") - spec.withModuleLibrary(libraryName = "apache.maven.archetype.common:3.2.1", moduleName = "intellij.maven.server.indexer", + spec.withModuleLibrary(libraryName = "apache.maven.archetype.common-no-trans:3.2.1", moduleName = "intellij.maven.server.indexer", + relativeOutputPath = "intellij.maven.server.indexer/lib") + spec.withModuleLibrary(libraryName = "apache.maven.archetype.catalog-no-trans:321", moduleName = "intellij.maven.server.indexer", relativeOutputPath = "intellij.maven.server.indexer/lib") spec.withModule("intellij.maven.artifactResolver.m31", "artifact-resolver-m31.jar") diff --git a/plugins/maven/maven-server-indexer/intellij.maven.server.indexer.iml b/plugins/maven/maven-server-indexer/intellij.maven.server.indexer.iml index 744cd2edfda7..5f0d1a9dc93b 100644 --- a/plugins/maven/maven-server-indexer/intellij.maven.server.indexer.iml +++ b/plugins/maven/maven-server-indexer/intellij.maven.server.indexer.iml @@ -306,200 +306,42 @@ - - + + 7816a7d7c9a5c64b77a7fd1ebe203a1ce92b924638dd2216f81ea5bcebea6abc - - 2aa061856e5e124facf7bf16831069015f98406969a7ba534e1ee557950d6680 - - - a20edcd3b38675827209068c544426f2ef03ed506d226f1d4c99a734948f8e36 - - - 42106c60e08eb147c294722b9c26bad26a148636ef244ab8d6092f5a09fa409e - - - 2f4c835b52311df922f8a8eb057843de5485088b234ccd03e478b9066b5e6bfc - - - 405eef6fc9188241ec88579c3e473f5c8997455c69bcd62e142492aca15106bc - - - 1345f11ba606d15603d6740551a8c21947c0215640770ec67271fe78bea97cf5 - - - d20e5d26c19c04199c73fd4f0b6caebf4bbdc6b872a4504c5e71a192751d9464 - - - 1205a1f229999170dcadcfb885a278ad0bc2295540a251f4c438f887ead7bbd9 - - - 1c98a4ec9eb0cb86ecf01710aa75c0346ee3f96edc6edeabcb21ed984120e154 - - - 7fc63378d3e84663619b9bedace9f9fe78b276c2be3c62ca2245449294c84176 - - - 27e426d73f8662b47f60df0e43439b3dec2909c42b89175a6e4431dfed3edafd - - - c938e4d8cdf0674496749a87e6d3b29aa41b1b35a39898a1ade2bc9eae214c17 - - - 1c5c5ac5e8f29aefc8faa051ffa14eccd85b9e20f4bb35dc82fba7d5da50d326 - - - ff690ffc550b7ada3a4b79ef4ca89bf002b24f43a13a35d10195c3bba63d7654 - - - 288149850d8d131763df4151f7e443fd2739e48510a6e4cfe49ca082c76130fa - - - f54a0a28ce3d62af0e1cfe41dde616f645c28e452e77f77b78bc36e74d5e1a69 - - - 1ac88accde99ed71e65253bd130868c0e654f940f01ade073b895eb2f817cf06 - - - ba03294ee53e7ba31838e4950f280d033c7744c6c7b31253afc75aa351fbd989 - - - 3b1a46b4bc26a0176acaf99312ff2f3a631faf3224b0996af546aa48bd73c647 - - - e17e706c6f03c453f6000599cab607c2af5f1cc6e3a3b1e6fce27e5ef4999eab - - - f5ecc6eaa4a32ee0c115d31525f588f491b2cc75fdeb4ed3c0c662c12ac0c32f - - - a65e27aefbe74102d73cd7e3c5c7637021d294a9e7f33132f3c782a76714d0a3 - - - fb3160e1e3a7852b441016dbcc97a34e3cf4eeb8ceb9e82edf2729439858f080 - - - 240113a2f22fd1f0b182b32baecf0e7876b3a8e41f3c4da3335eeb9ffb24b9f4 - - - 7d95ad21733b060bfda2142b62439a196bde7644f9f127c299ae86d92179b518 - - - 3b0559bb8432f28937efe6ca193ef54a8506d0075d73fd7406b9b116c6a11063 - - - 5a15fdba22669e0fdd06e10dcce6320879e1f7398fbc910cd0677b50672a78c4 - - - 759079b9cf0cddae5ba06c96fd72347d82d0bc1d903c95d398c96522b139e470 - - - 82a584c58bd6a1b13861e2d4cc194b5afc09ca0adad9fda741f16337dcda2e96 - - - fe30825245d2336c859dc38d60c0fc5f3668dbf29cd586828d2b5667ec355b91 - - - eeeae917917144a68a741d4c0dff66aa5c5c5fd85593ff217bced3fc8ca783b8 - - - b4c4a0dbeacad54306a1ae230eff5ab45d58e3ab88c86ab7245d3a0772be57ab - - - ec92dae810034f4b46dbb16ef4364a4013b0efb24a8c5dd67435cae46a290d8e - - - 2c73b940c91250bc98346926270f13a6a10bb6e29d2c9316a70d134e382c873e - - - 2b4d8d4e098e86aa5f905ec81c46751d218b16afd3f7fc02b64f80dd20fffa20 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + 2aa061856e5e124facf7bf16831069015f98406969a7ba534e1ee557950d6680 + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -