From: Lubomir Rintel <lkundrak@v3.sk>
Date: Wed, 10 Mar 2010 08:55:15 +0000 (+0100)
Subject: Pull cglib 2.2
X-Git-Url: https://repo.or.cz/w/fedora-idea.git/commitdiff_plain/21a13597a21538edbde6f3146467d20e7ff3c27c

Pull cglib 2.2

Replaced -nodeps flavour with a clean one, so that it uses the same ASM
as we bundle.
---

diff --git a/.idea/libraries/CGLIB.xml b/.idea/libraries/CGLIB.xml
index 061f6f2137..21e9a8cc13 100644
--- a/.idea/libraries/CGLIB.xml
+++ b/.idea/libraries/CGLIB.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="CGLIB">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/cglib-nodep-2.1_3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/cglib-2.2.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/cglib-src-2.1_3.jar!/src/proxy" />
+      <root url="jar://$PROJECT_DIR$/lib/src/cglib-src-2.2.jar!/src/proxy" />
     </SOURCES>
   </library>
-</component>
\ No newline at end of file
+</component>
diff --git a/lib/cglib-2.2.jar b/lib/cglib-2.2.jar
new file mode 100644
index 0000000000..084ef6e54b
Binary files /dev/null and b/lib/cglib-2.2.jar differ
diff --git a/lib/cglib-nodep-2.1_3.jar b/lib/cglib-nodep-2.1_3.jar
deleted file mode 100644
index e9b17ebf12..0000000000
Binary files a/lib/cglib-nodep-2.1_3.jar and /dev/null differ
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index efa13bac09..b347e1add5 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -4,7 +4,7 @@ asm-commons-3.2.jar
 asm-3.2.jar
 asm-tree-3.0.jar
 bcel.jar
-cglib-nodep-2.1_3.jar
+cglib-2.2.jar
 coverage-agent.jar
 coverage-report.jar
 coverage-report-idea.jar
diff --git a/lib/src/cglib-src-2.1_3.jar b/lib/src/cglib-src-2.2.jar
similarity index 66%
rename from lib/src/cglib-src-2.1_3.jar
rename to lib/src/cglib-src-2.2.jar
index cd4e57a7e3..4a32ba9861 100644
Binary files a/lib/src/cglib-src-2.1_3.jar and b/lib/src/cglib-src-2.2.jar differ
diff --git a/platform/extensions/extensions.iml b/platform/extensions/extensions.iml
index 86d5a5dbaf..8648132b49 100644
--- a/platform/extensions/extensions.iml
+++ b/platform/extensions/extensions.iml
@@ -14,6 +14,7 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" scope="TEST" name="JMock1" level="project" />
+    <orderEntry type="library" scope="TEST" name="asm" level="project" />
     <orderEntry type="library" scope="TEST" name="CGLIB" level="project" />
     <orderEntry type="library" name="Mocks" level="project" />
   </component>
diff --git a/platform/platform-impl/platform-impl.iml b/platform/platform-impl/platform-impl.iml
index 3f163f7e75..083e1839d6 100644
--- a/platform/platform-impl/platform-impl.iml
+++ b/platform/platform-impl/platform-impl.iml
@@ -19,6 +19,7 @@
     <orderEntry type="library" name="OroMatcher" level="project" />
     <orderEntry type="library" name="XmlRPC" level="project" />
     <orderEntry type="library" name="commons-net" level="project" />
+    <orderEntry type="library" name="asm" level="project" />
     <orderEntry type="library" name="CGLIB" level="project" />
     <orderEntry type="module" module-name="lvcs-api" exported="" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
diff --git a/xml/dom-impl/dom-impl.iml b/xml/dom-impl/dom-impl.iml
index 0e93e87a43..f244459061 100644
--- a/xml/dom-impl/dom-impl.iml
+++ b/xml/dom-impl/dom-impl.iml
@@ -8,6 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="dom-openapi" exported="" />
+    <orderEntry type="library" name="asm" level="project" />
     <orderEntry type="library" name="CGLIB" level="project" />
     <orderEntry type="module" module-name="resources" />
     <orderEntry type="library" name="Xerces" level="project" />