update commons-collection (IDEA-198976)

2026-04-21 05:51:25 +07:00 · 2018-10-25 09:37:06 +03:00
parent 88e5cf965f
commit 224d9ced70
12 changed files with 77 additions and 14 deletions
--- a/.idea/libraries/Velocity.xml
+++ b/.idea/libraries/Velocity.xml
@@ -1,15 +1,17 @@
 <component name="libraryTable">
  <library name="Velocity" type="repository">
-    <properties maven-id="org.apache.velocity:velocity:1.7" />
+    <properties maven-id="org.apache.velocity:velocity:1.7">
+      <exclude>
+        <dependency maven-id="commons-collections:commons-collections" />
+      </exclude>
+    </properties>
    <CLASSES>
      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity/1.7/velocity-1.7.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES>
      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity/1.7/velocity-1.7-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar!/" />
      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.4/commons-lang-2.4-sources.jar!/" />
    </SOURCES>
  </library>
--- a/.idea/libraries/commons_collections.xml
+++ b/.idea/libraries/commons_collections.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="commons-collections" type="repository">
+    <properties maven-id="commons-collections:commons-collections:3.2.2" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/java/java-impl/intellij.java.impl.iml
+++ b/java/java-impl/intellij.java.impl.iml
@@ -42,6 +42,7 @@
    <orderEntry type="library" name="Guava" level="project" />
    <orderEntry type="library" name="Xerces" level="project" />
    <orderEntry type="library" name="Velocity" level="project" />
+    <orderEntry type="library" name="commons-collections" level="project" />
    <orderEntry type="module" module-name="intellij.java.structureView" exported="" />
    <orderEntry type="module" module-name="intellij.spellchecker" />
    <orderEntry type="library" name="nekohtml" level="project" />
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/annotations.xml
@@ -823,10 +823,7 @@
    <item name='org.apache.commons.collections.CollectionUtils java.util.Collection removeAll(java.util.Collection, java.util.Collection) 0'>
        <annotation name='org.jetbrains.annotations.NotNull'/>
    </item>
-    <item name='org.apache.commons.collections.CollectionUtils java.util.Collection removeAll(java.util.Collection, java.util.Collection) 1'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.apache.commons.collections.CollectionUtils java.util.Collection retainAll(java.util.Collection, java.util.Collection)'>
+  <item name='org.apache.commons.collections.CollectionUtils java.util.Collection retainAll(java.util.Collection, java.util.Collection)'>
        <annotation name='org.jetbrains.annotations.Contract'>
            <val val="&quot;_,_-&gt;new&quot;"/>
        </annotation>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/bidimap/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/bidimap/annotations.xml
@@ -402,12 +402,7 @@
        </annotation>
        <annotation name='org.jetbrains.annotations.NotNull'/>
    </item>
-    <item name='org.apache.commons.collections.bidimap.TreeBidiMap java.util.Set entrySet()'>
-        <annotation name='org.jetbrains.annotations.Contract'>
-            <val name="pure" val="true"/>
-        </annotation>
-    </item>
-    <item name='org.apache.commons.collections.bidimap.TreeBidiMap org.apache.commons.collections.bidimap.TreeBidiMap.Node getGrandParent(org.apache.commons.collections.bidimap.TreeBidiMap.Node, int)'>
+  <item name='org.apache.commons.collections.bidimap.TreeBidiMap org.apache.commons.collections.bidimap.TreeBidiMap.Node getGrandParent(org.apache.commons.collections.bidimap.TreeBidiMap.Node, int)'>
        <annotation name='org.jetbrains.annotations.Contract'>
            <val name="pure" val="true"/>
        </annotation>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/functors/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/functors/annotations.xml
@@ -133,6 +133,12 @@
            <val name="pure" val="true"/>
        </annotation>
    </item>
+    <item name='org.apache.commons.collections.functors.CloneTransformer void readObject(java.io.ObjectInputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.collections.functors.CloneTransformer void writeObject(java.io.ObjectOutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
    <item name='org.apache.commons.collections.functors.ClosureTransformer ClosureTransformer(org.apache.commons.collections.Closure)'>
        <annotation name='org.jetbrains.annotations.Contract'>
            <val name="pure" val="true"/>
@@ -366,6 +372,12 @@
    <item name='org.apache.commons.collections.functors.ForClosure org.apache.commons.collections.Closure getInstance(int, org.apache.commons.collections.Closure) 1'>
        <annotation name='org.jetbrains.annotations.Nullable'/>
    </item>
+    <item name='org.apache.commons.collections.functors.ForClosure void readObject(java.io.ObjectInputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.collections.functors.ForClosure void writeObject(java.io.ObjectOutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
    <item name='org.apache.commons.collections.functors.FunctorUtils FunctorUtils()'>
        <annotation name='org.jetbrains.annotations.Contract'>
            <val name="pure" val="true"/>
@@ -543,6 +555,12 @@
    <item name='org.apache.commons.collections.functors.InstantiateFactory org.apache.commons.collections.Factory getInstance(java.lang.Class, java.lang.Class[], java.lang.Object[]) 0'>
        <annotation name='org.jetbrains.annotations.NotNull'/>
    </item>
+    <item name='org.apache.commons.collections.functors.InstantiateFactory void readObject(java.io.ObjectInputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.collections.functors.InstantiateFactory void writeObject(java.io.ObjectOutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
    <item name='org.apache.commons.collections.functors.InstantiateTransformer InstantiateTransformer()'>
        <annotation name='org.jetbrains.annotations.Contract'>
            <val name="pure" val="true"/>
@@ -556,6 +574,12 @@
    <item name='org.apache.commons.collections.functors.InstantiateTransformer java.lang.Object transform(java.lang.Object) 0'>
        <annotation name='org.jetbrains.annotations.NotNull'/>
    </item>
+    <item name='org.apache.commons.collections.functors.InstantiateTransformer void readObject(java.io.ObjectInputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.collections.functors.InstantiateTransformer void writeObject(java.io.ObjectOutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
    <item name='org.apache.commons.collections.functors.InvokerTransformer InvokerTransformer(java.lang.String)'>
        <annotation name='org.jetbrains.annotations.Contract'>
            <val name="pure" val="true"/>
@@ -594,6 +618,12 @@
    <item name='org.apache.commons.collections.functors.InvokerTransformer org.apache.commons.collections.Transformer getInstance(java.lang.String, java.lang.Class[], java.lang.Object[]) 0'>
        <annotation name='org.jetbrains.annotations.NotNull'/>
    </item>
+    <item name='org.apache.commons.collections.functors.InvokerTransformer void readObject(java.io.ObjectInputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.collections.functors.InvokerTransformer void writeObject(java.io.ObjectOutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
    <item name='org.apache.commons.collections.functors.MapTransformer MapTransformer(java.util.Map)'>
        <annotation name='org.jetbrains.annotations.Contract'>
            <val name="pure" val="true"/>
@@ -1119,4 +1149,10 @@
            <val name="pure" val="true"/>
        </annotation>
    </item>
+    <item name='org.apache.commons.collections.functors.WhileClosure void readObject(java.io.ObjectInputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.apache.commons.collections.functors.WhileClosure void writeObject(java.io.ObjectOutputStream) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/keyvalue/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/keyvalue/annotations.xml
@@ -106,13 +106,22 @@
            <val name="pure" val="true"/>
        </annotation>
    </item>
+    <item name='org.apache.commons.collections.keyvalue.MultiKey java.lang.Object readResolve()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+        <annotation name='org.jetbrains.annotations.Contract'>
+            <val val="&quot;-&gt;this&quot;"/>
+        </annotation>
+    </item>
    <item name='org.apache.commons.collections.keyvalue.MultiKey java.lang.String toString()'>
        <annotation name='org.jetbrains.annotations.Contract'>
            <val name="pure" val="true"/>
        </annotation>
        <annotation name='org.jetbrains.annotations.NotNull'/>
    </item>
-    <item name='org.apache.commons.collections.keyvalue.TiedMapEntry TiedMapEntry(java.util.Map, java.lang.Object)'>
+  <item name='org.apache.commons.collections.keyvalue.MultiKey void calculateHashCode(java.lang.Object[]) 0'>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
+  <item name='org.apache.commons.collections.keyvalue.TiedMapEntry TiedMapEntry(java.util.Map, java.lang.Object)'>
        <annotation name='org.jetbrains.annotations.Contract'>
            <val name="pure" val="true"/>
        </annotation>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/list/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/list/annotations.xml
@@ -569,6 +569,9 @@
    </item>
    <item name='org.apache.commons.collections.list.SetUniqueList java.util.List subList(int, int)'>
        <annotation name='org.jetbrains.annotations.NotNull'/>
+      <annotation name='org.jetbrains.annotations.Contract'>
+        <val val="&quot;_,_-&gt;new&quot;"/>
+      </annotation>
    </item>
    <item name='org.apache.commons.collections.list.SetUniqueList java.util.ListIterator listIterator()'>
        <annotation name='org.jetbrains.annotations.NotNull'/>
@@ -581,6 +584,9 @@
            <val name="pure" val="true"/>
        </annotation>
    </item>
+    <item name='org.apache.commons.collections.list.SetUniqueList java.util.Set createSetBasedOnList(java.util.Set, java.util.List) 0'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
    <item name='org.apache.commons.collections.list.SetUniqueList org.apache.commons.collections.list.SetUniqueList decorate(java.util.List)'>
        <annotation name='org.jetbrains.annotations.Contract'>
            <val val="&quot;_-&gt;new&quot;"/>
--- a/java/java-tests/testSrc/com/intellij/java/codeInspection/bytecodeAnalysis/BytecodeAnalysisIntegrationTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/bytecodeAnalysis/BytecodeAnalysisIntegrationTest.java
@@ -57,6 +57,7 @@ public class BytecodeAnalysisIntegrationTest extends LightCodeInsightFixtureTest
      super.configureModule(module, model, contentEntry);

      PsiTestUtil.addProjectLibrary(model, "velocity", IntelliJProjectConfiguration.getProjectLibraryClassesRootPaths("Velocity"));
+      PsiTestUtil.addProjectLibrary(model, "commons-collections", IntelliJProjectConfiguration.getProjectLibraryClassesRootPaths("commons-collections"));

      VirtualFile annotationsRoot = getAnnotationsRoot();
      for (OrderEntry entry : model.getOrderEntries()) {
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
@@ -84,6 +84,8 @@ class CommunityLibraryLicenses {
                       url: "http://commons.apache.org/beanutils/"),
    new LibraryLicense(name: "Apache Commons Codec", libraryName: "commons-codec", version: "1.8", license: "Apache 2.0",
                       url: "http://commons.apache.org/codec/", licenseUrl: "http://www.apache.org/licenses/"),
+    new LibraryLicense(name: "Apache Commons Collections", libraryName: "commons-collections", version: "3.2.2", license: "Apache 2.0",
+                       url: "https://commons.apache.org/proper/commons-collections/"),
    new LibraryLicense(name: "Apache Commons Compress", libraryName: "commons-compress", version: "1.10", license: "Apache 2.0",
                       url: "http://commons.apache.org/proper/commons-compress/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0"),
    new LibraryLicense(name: "Apache Commons Discovery", libraryName: "commons-discovery", version: "0.4", license: "Apache 2.0",
--- a/platform/lang-impl/intellij.platform.lang.impl.iml
+++ b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.platform.vcs" />
    <orderEntry type="library" name="OroMatcher" level="project" />
    <orderEntry type="library" name="Velocity" level="project" />
+    <orderEntry type="library" name="commons-collections" level="project" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" exported="" />
    <orderEntry type="module" module-name="intellij.platform.usageView" exported="" />
    <orderEntry type="library" name="cli-parser" level="project" />
--- a/plugins/copyright/intellij.copyright.iml
+++ b/plugins/copyright/intellij.copyright.iml
@@ -14,6 +14,7 @@
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.java" />
    <orderEntry type="library" name="Velocity" level="project" />
+    <orderEntry type="library" name="commons-collections" level="project" />
    <orderEntry type="module" module-name="intellij.xml.impl" />
    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />