[eclipse-m2e-core] Revert "Remove workaround for rhbz#911365"

[Gerard Ryan]

commit 7e9c1112a12e0c7aa3eda16ab007e2c6aabdd376
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Thu Jan 2 22:37:27 2014 +0000

    Revert "Remove workaround for rhbz#911365"
    
    This reverts commit 20079d0be6ac865e38dffc3a086bb92506aa358f.
    
    Conflicts:
    	eclipse-m2e-core.spec

 eclipse-m2e-core.spec |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec
index 643c1a6..563bc28 100644
--- a/eclipse-m2e-core.spec
+++ b/eclipse-m2e-core.spec
@@ -7,7 +7,7 @@
 
 Name:           eclipse-m2e-core
 Version:        1.4.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Maven integration for Eclipse
 
 Group:          Development/Tools
@@ -66,12 +66,14 @@ BuildRequires:  aether-transport-http
 BuildRequires:  aether-impl
 BuildRequires:  aether-spi
 BuildRequires:  aether-util
+BuildRequires:  aopalliance
 BuildRequires:  apache-commons-cli
 BuildRequires:  apache-commons-collections
 BuildRequires:  apache-commons-io
 BuildRequires:  apache-commons-lang
 BuildRequires:  async-http-client
 BuildRequires:  atinject
+BuildRequires:  cglib
 BuildRequires:  dom4j
 BuildRequires:  eclipse-emf >= 2.9.0
 BuildRequires:  eclipse-emf-core >= 2.9.0
@@ -130,12 +132,14 @@ Requires:       aether-transport-wagon
 Requires:       aether-impl
 Requires:       aether-spi
 Requires:       aether-util
+Requires:       aopalliance
 Requires:       apache-commons-cli
 Requires:       apache-commons-collections
 Requires:       apache-commons-io
 Requires:       apache-commons-lang
 Requires:       async-http-client
 Requires:       atinject
+Requires:       cglib
 Requires:       dom4j
 Requires:       eclipse-emf >= 2.9.0
 Requires:       eclipse-emf-core >= 2.9.0
@@ -257,6 +261,12 @@ pushd m2e-maven-runtime
   done
 popd
 
+# Add these dependencies so that they get added to OSGi classpath
+pushd m2e-maven-runtime/org.eclipse.m2e.maven.runtime
+      %pom_add_dep cglib:cglib
+      %pom_add_dep aopalliance:aopalliance
+popd
+
 # oro is jakarta-oro in Fedora
 pushd m2e-maven-runtime/org.eclipse.m2e.archetype.common/
   sed -i -e 's/oro,/jakarta-oro,/g' pom.xml
@@ -361,6 +371,9 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
 
 %changelog
+* Thu Jan 02 2014 Gerard Ryan <galileo at fedoraproject.org> - 1.4.0-10
+- Revert removal of workaround for missing cglib and aopalliance
+
 * Tue Dec 31 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.4.0-9
 - Remove workaround for rhbz#911365 (missing cglib and aopalliance)
 - Add NOP SLF4J implementation JAR to classpath