IJPL-238 remove the unnecessary usage of commons-lang library (part 5 - introduce commons-text)

GitOrigin-RevId: cd43b822494cea06bfd4eba2af1f70869b954024
2026-09-27 10:03:11 +07:00 · 2023-09-15 20:50:06 +00:00
parent e6bb4d161e
commit 80492a3161
19 changed files with 126 additions and 195 deletions
@@ -5,22 +5,18 @@
        <artifact url="file://$MAVEN_REPOSITORY$/org/apache/velocity/velocity-engine-core/2.3/velocity-engine-core-2.3.jar">
          <sha256sum>b086cee8fd8183e240b4afcf54fe38ec33dd8eb0da414636e5bf7aa4d9856629</sha256sum>
        </artifact>
-        <artifact url="file://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.11/commons-lang3-3.11.jar">
-          <sha256sum>4ee380259c068d1dbe9e84ab52186f2acd65de067ec09beff731fca1697fdb16</sha256sum>
-        </artifact>
      </verification>
      <exclude>
+        <dependency maven-id="org.apache.commons:commons-lang3" />
        <dependency maven-id="org.slf4j:slf4j-api" />
      </exclude>
    </properties>
    <CLASSES>
      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity-engine-core/2.3/velocity-engine-core-2.3.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.11/commons-lang3-3.11.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES>
      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity-engine-core/2.3/velocity-engine-core-2.3-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.11/commons-lang3-3.11-sources.jar!/" />
    </SOURCES>
  </library>
 </component>
@@ -0,0 +1,18 @@
+<component name="libraryTable">
+  <library name="commons-text" type="repository">
+    <properties include-transitive-deps="false" jar-repository-id="central-proxy" maven-id="org.apache.commons:commons-text:1.10.0">
+      <verification>
+        <artifact url="file://$MAVEN_REPOSITORY$/org/apache/commons/commons-text/1.10.0/commons-text-1.10.0.jar">
+          <sha256sum>770cd903fa7b604d1f7ef7ba17f84108667294b2b478be8ed1af3bffb4ae0018</sha256sum>
+        </artifact>
+      </verification>
+    </properties>
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-text/1.10.0/commons-text-1.10.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-text/1.10.0/commons-text-1.10.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
@@ -1,18 +1,18 @@
 <component name="libraryTable">
  <library name="kotlinx-datetime-jvm" type="repository">
-    <properties include-transitive-deps="false" jar-repository-id="central-proxy" maven-id="org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.4.0">
+    <properties include-transitive-deps="false" jar-repository-id="central-proxy" maven-id="org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.4.1">
      <verification>
-        <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-datetime-jvm/0.4.0/kotlinx-datetime-jvm-0.4.0.jar">
-          <sha256sum>075ca75a16e356484c07de3cc7bce79da9e4adbc670bbcf23c5e13f4e12ee6e7</sha256sum>
+        <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-datetime-jvm/0.4.1/kotlinx-datetime-jvm-0.4.1.jar">
+          <sha256sum>7ddf52a4d3bbf3138fff1f8c581a3149ca7ff2c4895f33dcdb20c759a3dda050</sha256sum>
        </artifact>
      </verification>
    </properties>
    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-datetime-jvm/0.4.0/kotlinx-datetime-jvm-0.4.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-datetime-jvm/0.4.1/kotlinx-datetime-jvm-0.4.1.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-datetime-jvm/0.4.0/kotlinx-datetime-jvm-0.4.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-datetime-jvm/0.4.1/kotlinx-datetime-jvm-0.4.1-sources.jar!/" />
    </SOURCES>
  </library>
 </component>
@@ -1,92 +1,79 @@
 <component name="libraryTable">
  <library name="maven-resolver-provider" type="repository">
-    <properties jar-repository-id="central-proxy" maven-id="org.apache.maven:maven-resolver-provider:3.9.4">
+    <properties jar-repository-id="central-proxy" maven-id="org.apache.maven:maven-resolver-provider:3.8.8">
      <verification>
-        <artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/maven-resolver-provider/3.9.4/maven-resolver-provider-3.9.4.jar">
-          <sha256sum>ba9bf12fd2fa45780235bb61bbf7e4593c60d741f008e089b99929e8c6b58aa9</sha256sum>
+        <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>
-        <artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/maven-model/3.9.4/maven-model-3.9.4.jar">
-          <sha256sum>7931dc8dda878eef46988d9fd07c4ade3c91892d7fb3208c742cb9457135bb15</sha256sum>
+        <artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/maven-model/3.8.8/maven-model-3.8.8.jar">
+          <sha256sum>c392548bc1a3f0c6a180f888bd2349602de5b1e30059fe0ec46f81ed4ce14129</sha256sum>
        </artifact>
-        <artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/maven-model-builder/3.9.4/maven-model-builder-3.9.4.jar">
-          <sha256sum>815b1886d1ec8e1d8b57b61e6ac83235be3f6a60159c8ee5a6f4e91f513f497f</sha256sum>
+        <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>
        <artifact url="file://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26.jar">
          <sha256sum>b3b5412ce17889103ea564bcdfcf9fb3dfa540344ffeac6b538a73c9d7182662</sha256sum>
        </artifact>
-        <artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact/3.9.4/maven-artifact-3.9.4.jar">
-          <sha256sum>7dd352fd9f8ff86a1d0a7d89e6289d8d3cd346ac9b214ed85868d585be05ab78</sha256sum>
+        <artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/maven-artifact/3.8.8/maven-artifact-3.8.8.jar">
+          <sha256sum>813233a8485cbaf97b1f9a2c17cef723b068f7260a4319cf4958f221d04b9937</sha256sum>
        </artifact>
-        <artifact url="file://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar">
-          <sha256sum>d919d904486c037f8d193412da0c92e22a9fa24230b9d67a57855c5c31c7e94e</sha256sum>
-        </artifact>
-        <artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/maven-builder-support/3.9.4/maven-builder-support-3.9.4.jar">
-          <sha256sum>86946fb06cb205515539b93b005c3bb928ba3d0d140af68079cc4cc815125096</sha256sum>
+        <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>
        <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>
-        <artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/maven-repository-metadata/3.9.4/maven-repository-metadata-3.9.4.jar">
-          <sha256sum>1d5c3393aa39f807837fb058d78ac8d0a287adf19f4ba6ad5070353acf61b081</sha256sum>
+        <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>
-        <artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-api/1.9.14/maven-resolver-api-1.9.14.jar">
-          <sha256sum>2b8939ebb46a760deca82faae356145105d27a01748aac30d202ce9d4494edf4</sha256sum>
+        <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>
-        <artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-spi/1.9.14/maven-resolver-spi-1.9.14.jar">
-          <sha256sum>5989f5060b163230b2c3f99d93f68622d6c33cce1a24f0077059dc69d2f7375b</sha256sum>
+        <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>
-        <artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-util/1.9.14/maven-resolver-util-1.9.14.jar">
-          <sha256sum>04d47ff236f63ddd61cb2d6e537d2ffd4d326370d5d73fb480ba47b08760ffef</sha256sum>
+        <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>
-        <artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-impl/1.9.14/maven-resolver-impl-1.9.14.jar">
-          <sha256sum>80903754456410ae4c8eb5db2a773b2cbcc3e2eb3f9cffed414cb516d13ff7a0</sha256sum>
-        </artifact>
-        <artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-named-locks/1.9.14/maven-resolver-named-locks-1.9.14.jar">
-          <sha256sum>a5b11158da6c26a09bf894b90df12d11a6a6293790f25c96a4a7e509b6ac59f2</sha256sum>
-        </artifact>
-        <artifact url="file://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-utils/3.5.1/plexus-utils-3.5.1.jar">
-          <sha256sum>86e0255d4c879c61b4833ed7f13124e8bb679df47debb127326e7db7dd49a07b</sha256sum>
+        <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>
      </verification>
      <exclude>
+        <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.9.4/maven-resolver-provider-3.9.4.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model/3.9.4/maven-model-3.9.4.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model-builder/3.9.4/maven-model-builder-3.9.4.jar!/" />
+      <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.9.4/maven-artifact-3.9.4.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-builder-support/3.9.4/maven-builder-support-3.9.4.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.9.4/maven-repository-metadata-3.9.4.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-api/1.9.14/maven-resolver-api-1.9.14.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-spi/1.9.14/maven-resolver-spi-1.9.14.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-util/1.9.14/maven-resolver-util-1.9.14.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-impl/1.9.14/maven-resolver-impl-1.9.14.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-named-locks/1.9.14/maven-resolver-named-locks-1.9.14.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-utils/3.5.1/plexus-utils-3.5.1.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!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-resolver-provider/3.9.4/maven-resolver-provider-3.9.4-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model/3.9.4/maven-model-3.9.4-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-model-builder/3.9.4/maven-model-builder-3.9.4-sources.jar!/" />
+      <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.9.4/maven-artifact-3.9.4-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/maven-builder-support/3.9.4/maven-builder-support-3.9.4-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.9.4/maven-repository-metadata-3.9.4-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-api/1.9.14/maven-resolver-api-1.9.14-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-spi/1.9.14/maven-resolver-spi-1.9.14-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-util/1.9.14/maven-resolver-util-1.9.14-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-impl/1.9.14/maven-resolver-impl-1.9.14-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-named-locks/1.9.14/maven-resolver-named-locks-1.9.14-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-utils/3.5.1/plexus-utils-3.5.1-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!/" />
    </SOURCES>
  </library>
 </component>
@@ -1,6 +1,6 @@
 <component name="libraryTable">
  <library name="org.codehaus.groovy:groovy" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.codehaus.groovy:groovy:3.0.19">
+    <properties include-transitive-deps="false" jar-repository-id="central-proxy" maven-id="org.codehaus.groovy:groovy:3.0.19">
      <verification>
        <artifact url="file://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy/3.0.19/groovy-3.0.19.jar">
          <sha256sum>7ad326b0a7e49791f552313e35df7406c1a46bb6faf7908c2ecbb74daeff23fb</sha256sum>
@@ -1,18 +1,18 @@
 <component name="libraryTable">
  <library name="plexus-utils" type="repository">
-    <properties jar-repository-id="central-proxy" maven-id="org.codehaus.plexus:plexus-utils:4.0.0">
+    <properties jar-repository-id="central-proxy" maven-id="org.codehaus.plexus:plexus-utils:3.5.1">
      <verification>
-        <artifact url="file://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-utils/4.0.0/plexus-utils-4.0.0.jar">
-          <sha256sum>270cd703b48c6e5c8c691f1875f22d62d22cfe072c73ae2f5814d83d68c1da0b</sha256sum>
+        <artifact url="file://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-utils/3.5.1/plexus-utils-3.5.1.jar">
+          <sha256sum>86e0255d4c879c61b4833ed7f13124e8bb679df47debb127326e7db7dd49a07b</sha256sum>
        </artifact>
      </verification>
    </properties>
    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-utils/4.0.0/plexus-utils-4.0.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-utils/3.5.1/plexus-utils-3.5.1.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-utils/4.0.0/plexus-utils-4.0.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-utils/3.5.1/plexus-utils-3.5.1-sources.jar!/" />
    </SOURCES>
  </library>
 </component>
@@ -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 jar-repository-id="central-proxy" maven-id="org.apache.maven.resolver:maven-resolver-transport-file:1.9.15">
+        <properties maven-id="org.apache.maven.resolver:maven-resolver-transport-file:1.4.2">
          <verification>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-file/1.9.15/maven-resolver-transport-file-1.9.15.jar">
-              <sha256sum>2402405da2a24324d5b15009c9cf65fc22a3b0d662af1533831c3b8b1ec5ceeb</sha256sum>
+            <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>
          </verification>
          <exclude>
@@ -46,20 +46,20 @@
          </exclude>
        </properties>
        <CLASSES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-file/1.9.15/maven-resolver-transport-file-1.9.15.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-file/1.4.2/maven-resolver-transport-file-1.4.2.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-file/1.9.15/maven-resolver-transport-file-1.9.15-sources.jar!/" />
+          <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!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="org.apache.maven.resolver:maven-resolver-transport-http" type="repository">
-        <properties jar-repository-id="central-proxy" maven-id="org.apache.maven.resolver:maven-resolver-transport-http:1.9.15">
+        <properties jar-repository-id="central-proxy" maven-id="org.apache.maven.resolver:maven-resolver-transport-http:1.4.2">
          <verification>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-http/1.9.15/maven-resolver-transport-http-1.9.15.jar">
-              <sha256sum>903130fb398dbedb1364cded7717ba3aa44084a1e403160cfb17e7ecbdc4e459</sha256sum>
+            <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>
          </verification>
          <exclude>
@@ -74,20 +74,20 @@
          </exclude>
        </properties>
        <CLASSES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-http/1.9.15/maven-resolver-transport-http-1.9.15.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-http/1.4.2/maven-resolver-transport-http-1.4.2.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-http/1.9.15/maven-resolver-transport-http-1.9.15-sources.jar!/" />
+          <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!/" />
        </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.9.15">
+        <properties jar-repository-id="central-proxy" maven-id="org.apache.maven.resolver:maven-resolver-connector-basic:1.4.2">
          <verification>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-connector-basic/1.9.15/maven-resolver-connector-basic-1.9.15.jar">
-              <sha256sum>36b7449dc69418d8ecb421fc06a72453980dcc56d57db3c343b16f44c797726c</sha256sum>
+            <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>
          </verification>
          <exclude>
@@ -98,14 +98,16 @@
          </exclude>
        </properties>
        <CLASSES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-connector-basic/1.9.15/maven-resolver-connector-basic-1.9.15.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-connector-basic/1.4.2/maven-resolver-connector-basic-1.4.2.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-connector-basic/1.9.15/maven-resolver-connector-basic-1.9.15-sources.jar!/" />
+          <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!/" />
        </SOURCES>
      </library>
    </orderEntry>
+    <orderEntry type="library" name="commons-lang3" level="project" />
+    <orderEntry type="library" name="plexus-utils" level="project" />
    <orderEntry type="library" name="commons-codec" level="project" />
    <orderEntry type="module" module-name="intellij.platform.util" />
  </component>
@@ -48,7 +48,7 @@ import java.util.stream.Collectors;
 * Aether-based repository manager and dependency resolver using maven implementation of this functionality.
 * <p>
 * instance of this component should be managed by the code which requires dependency resolution functionality
- * all necessary params like path to local repo should be passed in constructor
+ * all necessary params like a path to local repo should be passed in constructor
 */
 public final class ArtifactRepositoryManager {
  private static final VersionScheme ourVersioning = new GenericVersionScheme();
@@ -281,7 +281,7 @@ public final class ArtifactRepositoryManager {
      org.slf4j.impl.JDK14LoggerFactory.class, // slf4j-jdk14 - required for aether resolver at runtime
      org.apache.commons.codec.binary.Base64.class // commons-codec
    ));
-    result.addAll(Arrays.asList(ClassPathUtil.getUtilClasses())); // intellij.platform.util module
+    result.addAll(List.of(ClassPathUtil.getUtilClasses())); // intellij.platform.util module

    return result.toArray(ArrayUtil.EMPTY_CLASS_ARRAY);
  }
@@ -330,7 +330,7 @@ public final class ArtifactRepositoryManager {
    VersionConstraint originalConstraints = asVersionConstraint(versionConstraint);
    for (ArtifactKind kind : artifactKinds) {
      // RepositorySystem.resolveDependencies() ignores classifiers, so we need to set classifiers explicitly for discovered dependencies.
-      // Because of that we have to first discover deps and then resolve corresponding artifacts
+      // Because of that, we have to first discover deps and then resolve corresponding artifacts
      try {
        List<ArtifactRequest> requests = new ArrayList<>();
        Set<VersionConstraint> constraints;
@@ -362,7 +362,7 @@ public final class ArtifactRepositoryManager {
          }
          catch (ArtifactResolutionException e) {
            if (kind != ArtifactKind.ARTIFACT) {
-              // for sources and javadocs try to process requests one-by-one and fetch at least something
+              // for sources and javadocs, try to process requests one-by-one and fetch at least something
              if (requests.size() > 1) {
                for (ArtifactRequest request : requests) {
                  try {
@@ -463,7 +463,7 @@ public final class ArtifactRepositoryManager {
   * Modify version constraint to look for applicable "annotations" artifact.
   * <p>
   * "Annotations" artifact for a given library is matched by Group ID, Artifact ID, and classifier "annotations".
-   * "Annotations" version is selected using following rules:
+   * "Annotations" version is selected using the following rules:
   * <ul>
   *   <li>it is larger or equal to major component of library version (or lower constraint bound).
   *   E.g., annotations artifact ver 3.1 is applicable to library ver 3.6.5 (3.1 > 3.0)</li>
@@ -471,7 +471,7 @@ public final class ArtifactRepositoryManager {
   *   E.g., annotations artifact ver 3.2-an3 is applicable to library ver 3.2</li>
   * </ul>
   * This allows to re-use existing annotations artifacts across different library versions
-   * @param constraint - version or range constraint of original library
+   * @param constraint - version or range constraint of an original library
   * @return resulting relaxed constraint to select "annotations" artifact.
   */
  private static Set<VersionConstraint> relaxForAnnotations(VersionConstraint constraint) {
@@ -4,8 +4,6 @@
 package org.jetbrains.intellij.build.impl

 import org.jetbrains.intellij.build.BuildContext
-import org.jetbrains.jps.model.library.JpsLibrary
-import org.jetbrains.jps.model.module.JpsModuleReference

 suspend fun createDistributionBuilderState(pluginsToPublish: Set<PluginLayout>, context: BuildContext): DistributionBuilderState {
  val pluginsToPublishEffective = pluginsToPublish.toMutableSet()
@@ -78,8 +76,4 @@ internal fun filterPluginsToPublish(plugins: MutableSet<PluginLayout>, context:
 internal fun getToolModules(): List<String> {
  return java.util.List.of("intellij.java.rt", "intellij.platform.main",
                           /*required to build searchable options index*/ "intellij.platform.updater")
-}
-
-internal fun isProjectLibraryUsedByPlugin(library: JpsLibrary, plugin: BaseLayout): Boolean {
-  return library.createReference().parentReference !is JpsModuleReference && !plugin.hasLibrary(library.name)
-}
+}
@@ -8,7 +8,6 @@ import com.intellij.openapi.util.io.NioFiles
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.platform.diagnostic.telemetry.helpers.useWithScope
 import com.intellij.platform.diagnostic.telemetry.helpers.useWithScope2
-import com.intellij.util.containers.MultiMap
 import com.intellij.util.io.Compressor
 import com.jetbrains.plugin.blockmap.core.BlockMap
 import com.jetbrains.plugin.blockmap.core.FileHash
@@ -22,7 +21,6 @@ import io.opentelemetry.extension.kotlin.asContextElement
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.*
 import org.apache.commons.compress.archivers.zip.Zip64Mode
-import org.jetbrains.annotations.TestOnly
 import org.jetbrains.annotations.VisibleForTesting
 import org.jetbrains.intellij.build.*
 import org.jetbrains.intellij.build.TraceManager.spanBuilder
@@ -32,12 +30,8 @@ import org.jetbrains.intellij.build.io.*
 import org.jetbrains.jps.model.artifact.JpsArtifact
 import org.jetbrains.jps.model.artifact.JpsArtifactService
 import org.jetbrains.jps.model.artifact.elements.JpsLibraryFilesPackagingElement
-import org.jetbrains.jps.model.java.JpsJavaClasspathKind
-import org.jetbrains.jps.model.java.JpsJavaExtensionService
 import org.jetbrains.jps.model.java.JpsProductionModuleOutputPackagingElement
 import org.jetbrains.jps.model.java.JpsTestModuleOutputPackagingElement
-import org.jetbrains.jps.model.library.JpsLibrary
-import org.jetbrains.jps.model.module.JpsModule
 import org.jetbrains.jps.model.module.JpsModuleReference
 import org.jetbrains.jps.util.JpsPathUtil
 import java.nio.ByteBuffer
@@ -101,9 +95,12 @@ internal suspend fun buildDistribution(state: DistributionBuilderState,

        val distAllDir = context.paths.distAllDir
        val libDir = distAllDir.resolve("lib")
-        context.bootClassPathJarNames =
-          if (context.useModularLoader) persistentListOf(PLATFORM_LOADER_JAR)
-          else generateClasspath(homeDir = distAllDir, libDir = libDir, antTargetFile = antTargetFile)
+        context.bootClassPathJarNames = if (context.useModularLoader) {
+          persistentListOf(PLATFORM_LOADER_JAR)
+        }
+        else {
+          generateClasspath(homeDir = distAllDir, libDir = libDir, antTargetFile = antTargetFile)
+        }
        result
      }
    }
@@ -137,7 +134,7 @@ internal suspend fun buildDistribution(state: DistributionBuilderState,
    val pluginDir = context.paths.distAllDir.resolve("plugins")
    withContext(Dispatchers.IO) {
      for (sourceDir in additionalPluginPaths) {
-        copyDir(sourceDir, pluginDir.resolve(sourceDir.fileName))
+        copyDir(sourceDir = sourceDir, targetDir = pluginDir.resolve(sourceDir.fileName))
      }
    }
  }
@@ -147,9 +144,7 @@ internal suspend fun buildDistribution(state: DistributionBuilderState,
      spanBuilder("generate content report").useWithScope2 {
        Files.createDirectories(context.paths.artifactDir)
        val contentMappingJson = context.paths.artifactDir.resolve("content-mapping.json")
-        writeProjectStructureReport(entries = entries,
-                                    file = contentMappingJson,
-                                    buildPaths = context.paths)
+        writeProjectStructureReport(entries = entries, file = contentMappingJson, buildPaths = context.paths)
        val contentJson = context.paths.artifactDir.resolve("content.json")
        Files.newOutputStream(contentJson).use {
          buildJarContentReport(entries = entries, out = it, buildPaths = context.paths, context = context)
@@ -488,7 +483,7 @@ private suspend fun buildPlugins(moduleOutputPatcher: ModuleOutputPatcher,
          Span.current().addEvent("skip scrambling plugin because step is disabled", attributes)
        }
        else {
-          // we can not start executing right now because the plugin can use other plugins in a scramble classpath
+          // we cannot start executing right now because the plugin can use other plugins in a scramble classpath
          scrambleTasks.add(ScrambleTask(plugin, pluginDir, targetDir))
        }
      }
@@ -531,7 +526,7 @@ internal class PluginRepositorySpec(@JvmField val pluginZip: Path, @JvmField val

 fun getPluginLayoutsByJpsModuleNames(modules: Collection<String>, productLayout: ProductModulesLayout): MutableSet<PluginLayout> {
  if (modules.isEmpty()) {
-    return createPluginLayoutSet(0)
+    return createPluginLayoutSet(expectedSize = 0)
  }

  val pluginLayouts = productLayout.pluginLayouts
@@ -540,7 +535,7 @@ fun getPluginLayoutsByJpsModuleNames(modules: Collection<String>, productLayout:
  for (moduleName in modules) {
    val customLayouts = pluginLayoutsByMainModule.get(moduleName)
    if (customLayouts == null) {
-      check(moduleName == "kotlin-ultimate.kmm-plugin" || result.add(PluginLayout.plugin(moduleName))) {
+      check(moduleName == "kotlin-ultimate.kmm-plugin" || result.add(PluginLayout.pluginAuto(listOf(moduleName)))) {
        "Plugin layout for module $moduleName is already added (duplicated module name?)"
      }
    }
@@ -555,21 +550,6 @@ fun getPluginLayoutsByJpsModuleNames(modules: Collection<String>, productLayout:
  return result
 }

-@TestOnly
-fun collectProjectLibrariesWhichShouldBeProvidedByPlatform(plugin: BaseLayout,
-                                                           result: MultiMap<JpsLibrary, JpsModule>,
-                                                           context: BuildContext) {
-  for (moduleName in plugin.includedModules.map { it.moduleName }.distinct()) {
-    val module = context.findRequiredModule((moduleName))
-    val dependencies = JpsJavaExtensionService.dependencies(module)
-    for (library in dependencies.includedIn(JpsJavaClasspathKind.PRODUCTION_RUNTIME).libraries) {
-      if (isProjectLibraryUsedByPlugin(library, plugin)) {
-        result.putValue(library, module)
-      }
-    }
-  }
-}
-
 private fun basePath(buildContext: BuildContext, moduleName: String): Path {
  return Path.of(JpsPathUtil.urlToPath(buildContext.findRequiredModule(moduleName).contentRootsList.urls.first()))
 }
@@ -604,6 +604,7 @@ private fun getLibraryFiles(library: JpsLibrary,
    val alreadyCopiedLibraryName = alreadyCopiedFor.library.name
    alreadyCopiedFor.targetFile == targetFile &&
    (alreadyCopiedLibraryName.startsWith("ktor-") ||
+     alreadyCopiedLibraryName.startsWith("commons-") ||
     alreadyCopiedLibraryName.startsWith("ai.grazie.") ||
     (isModuleLevel && alreadyCopiedLibraryName == libName))
  }
@@ -184,7 +184,7 @@ internal suspend fun createPlatformLayout(addPlatformCoverage: Boolean,
  ), productLayout = productLayout, layout = layout)
  layout.withProjectLibrary(libraryName = "ion", jarName = UTIL_RT_JAR)

-  // JDOM is used by maven in an external process
+  // Maven uses JDOM in an external process
  addModule(UTIL_8_JAR, listOf(
    "intellij.platform.util.jdom",
    "intellij.platform.util.xmlDom",
@@ -199,6 +199,9 @@ internal suspend fun createPlatformLayout(addPlatformCoverage: Boolean,
  // Space plugin uses it and bundles into IntelliJ IDEA, but not bundles into DataGrip, so, or Space plugin should bundle this lib,
  // or IJ Platform. As it is a small library and consistency is important across other coroutine libs, bundle to IJ Platform.
  layout.withProjectLibrary(libraryName = "kotlinx-coroutines-slf4j", jarName = APP_JAR)
+  // make sure that all ktor libraries bundled into the platform
+  layout.withProjectLibrary(libraryName = "ktor-client-content-negotiation")
+  layout.withProjectLibrary(libraryName = "ktor-client-logging")

  // used by intellij.database.jdbcConsole -
  // cannot be in 3rd-party-rt.jar, because this JAR must contain classes for java versions <= 7 only
@@ -29,6 +29,5 @@
    <orderEntry type="module" module-name="intellij.platform.statistics" />
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
    <orderEntry type="library" name="ec4j-core" level="project" />
-    <orderEntry type="library" name="commons-lang3" level="project" />
  </component>
 </module>
@@ -40,7 +40,6 @@ For more information, check the documentation for <a href="https://editorconfig.
    <trailingSpacesOptionsProvider implementation="org.editorconfig.configmanagement.EditorConfigTrailingSpacesOptionsProvider" id="editorConfigTrailingSpacesOptionsProvider"/>
    <fileEditorProvider implementation="org.editorconfig.configmanagement.editor.EditorConfigEditorProvider" fileType="EditorConfig"/>
    <codeInsight.lineMarkerProvider language="" implementationClass="org.editorconfig.configmanagement.editor.EditorConfigPreviewMarkerProvider"/>
-    <projectService serviceImplementation="org.editorconfig.configmanagement.editor.EditorConfigPreviewManager"/>
    <gotoFileContributor implementation="org.editorconfig.configmanagement.finder.EditorConfigGotoFileContributor"/>
    <stripTrailingSpacesFilterFactory implementation="org.editorconfig.configmanagement.EditorConfigTrailingSpacesFilterFactory"/>
    <editorNotificationProvider implementation="org.editorconfig.configmanagement.editor.EditorConfigEditorNotificationProvider"/>
@@ -1,41 +1,33 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.editorconfig.configmanagement.editor;

-import com.intellij.openapi.components.PersistentStateComponent;
-import com.intellij.openapi.components.State;
-import com.intellij.openapi.components.Storage;
-import com.intellij.openapi.components.StoragePathMacros;
+import com.intellij.openapi.components.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import org.apache.commons.lang3.CharUtils;
-import org.editorconfig.language.psi.EditorConfigHeader;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;

+@Service(Service.Level.PROJECT)
@State(
  name = "EditorConfigPreviewManager",
  storages = @Storage(StoragePathMacros.WORKSPACE_FILE)
 )
-public class EditorConfigPreviewManager implements PersistentStateComponent<Element> {
-
+public final class EditorConfigPreviewManager implements PersistentStateComponent<Element> {
  private final Map<String, String> myPreviewMap = new HashMap<>();

  public static final String PREVIEW_RECORD_TAG     = "editorConfig";
  public static final String EDITORCONFIG_FILE_ATTR = "file";
  public static final String PREVIEW_FILE_ATTR      = "previewFile";

-  @Nullable
  @Override
-  public Element getState() {
+  public @NotNull Element getState() {
    Element state = new Element("previewData");
    for (String key : myPreviewMap.keySet()) {
      String value = myPreviewMap.get(key);
@@ -64,32 +56,6 @@ public class EditorConfigPreviewManager implements PersistentStateComponent<Elem
    return project.getService(EditorConfigPreviewManager.class);
  }

-  @NotNull
-  static List<String> extractExtensions(@NotNull EditorConfigHeader header) {
-    List<String> extensions = new ArrayList<>();
-    CharSequence headerChars = header.getNode().getChars();
-    boolean isInExt = false;
-    StringBuilder extBuilder = new StringBuilder();
-    for (int i = 0; i < headerChars.length(); i ++) {
-      char c = headerChars.charAt(i);
-      if (c == '.') {
-        isInExt = true;
-      }
-      else if ((CharUtils.isAsciiAlpha(c) || CharUtils.isAsciiNumeric(c)) && isInExt) {
-        extBuilder.append(c);
-      }
-      else {
-        if (isInExt && !extBuilder.isEmpty()) {
-          extensions.add(extBuilder.toString());
-          extBuilder = new StringBuilder();
-        }
-        isInExt = false;
-      }
-    }
-    return extensions;
-  }
-
-
  public void associateWithPreviewFile(@NotNull VirtualFile editorConfigFile, @Nullable VirtualFile previewFile) {
    if (previewFile != null) {
      myPreviewMap.put(editorConfigFile.getPath(), previewFile.getPath());
@@ -99,8 +65,7 @@ public class EditorConfigPreviewManager implements PersistentStateComponent<Elem
    }
  }

-  @Nullable
-  public VirtualFile getAssociatedPreviewFile(@NotNull VirtualFile editorConfigFile) {
+  public @Nullable VirtualFile getAssociatedPreviewFile(@NotNull VirtualFile editorConfigFile) {
    final String editorConfigFilePath = editorConfigFile.getPath();
    String previewPathStr = myPreviewMap.get(editorConfigFilePath);
    if (previewPathStr != null) {
@@ -14,5 +14,6 @@
    <orderEntry type="library" name="commons-compress" level="project" />
    <orderEntry type="library" name="kotlinx-html-jvm" level="project" />
    <orderEntry type="library" name="commons-lang3" level="project" />
+    <orderEntry type="library" name="commons-text" level="project" />
  </component>
 </module>
@@ -5,6 +5,7 @@ import com.intellij.cce.core.Lookup
 import com.intellij.cce.core.Session
 import com.intellij.cce.metric.util.Bootstrap
 import org.apache.commons.lang3.StringUtils
+import org.apache.commons.text.similarity.LevenshteinDistance
 import kotlin.math.max
 import kotlin.math.min

@@ -87,8 +88,9 @@ class EditSimilarity(showByDefault: Boolean = false) : SimilarityMetric(showByDe
  override val name = "Edit Similarity"
  override val description: String = "The minimum edit similarity among proposals normalized by expected text (avg by invocations)"

-  override fun computeSimilarity(lookup: Lookup, expectedText: String): Double? =
-    lookup.suggestions.maxOfOrNull {
-      expectedText.length - StringUtils.getLevenshteinDistance(it.text.drop(lookup.prefix.length), expectedText)
+  override fun computeSimilarity(lookup: Lookup, expectedText: String): Double? {
+    return lookup.suggestions.maxOfOrNull {
+      expectedText.length - LevenshteinDistance.getDefaultInstance().apply(it.text.drop(lookup.prefix.length), expectedText)
    }?.toDouble()
+  }
 }
@@ -21,5 +21,6 @@
    <orderEntry type="module" module-name="intellij.platform.ml" />
    <orderEntry type="library" name="clikt" level="project" />
    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="library" name="commons-text" level="project" />
  </component>
 </module>
@@ -15,24 +15,7 @@
    <orderEntry type="library" name="Slf4j" level="project" />
    <orderEntry type="library" name="slf4j-jdk14" level="project" />
    <orderEntry type="library" name="commons-logging" level="project" />
-    <orderEntry type="module-library">
-      <library name="commons-text" type="repository">
-        <properties include-transitive-deps="false" jar-repository-id="central-proxy" maven-id="org.apache.commons:commons-text:1.10.0">
-          <verification>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/apache/commons/commons-text/1.10.0/commons-text-1.10.0.jar">
-              <sha256sum>770cd903fa7b604d1f7ef7ba17f84108667294b2b478be8ed1af3bffb4ae0018</sha256sum>
-            </artifact>
-          </verification>
-        </properties>
-        <CLASSES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-text/1.10.0/commons-text-1.10.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-text/1.10.0/commons-text-1.10.0-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
+    <orderEntry type="library" name="commons-text" level="project" />
    <orderEntry type="module" module-name="intellij.platform.lang" />
    <orderEntry type="module" module-name="intellij.platform.serviceContainer" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />