[eclipse-m2e-core/1.5.0-experimental: 5/9] Remove pom macros for aether namespace change

[Gerard Ryan]

commit c7bf42de932dea1e9871c375c95c647c19288dcf
Author: Gerard Ryan 
Date:   Wed Feb 19 20:45:31 2014 +0000

Remove pom macros for aether namespace change

eclipse-m2e-core.spec |   39 ---------------------------------------
 1 files changed, 0 insertions(+), 39 deletions(-)
---
diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec
index 6fd0f48..131003d 100644
--- a/eclipse-m2e-core.spec
+++ b/eclipse-m2e-core.spec
@@ -214,45 +214,6 @@ cp -p m2e-maven-runtime/org.eclipse.m2e.maven.indexer/src/main/resources/about_f
 %pom_disable_module org.eclipse.m2e.logback.feature
 %pom_disable_module org.eclipse.m2e.sdk.feature
 %pom_disable_module org.eclipse.m2e.site
-%pom_disable_module org.jboss.netty m2e-maven-runtime
-
-# jetty already has OSGI info, so doesn't need to be bundled like it is
-%pom_remove_dep org.eclipse.m2e:org.jboss.netty
-%pom_add_dep io.netty:netty:3.6.6
-
-# async-http-client already has OSGI info, so doesn't need to be bundled
-# adding packaged version as a dep here causes some 'tycholock' problem
-%pom_remove_dep org.eclipse.m2e:com.ning.async-http-client
-
-# Use Eclipse Sisu.  Be careful to keep the same dependency scope and
-# appropriate exclusions.
-%pom_remove_dep org.sonatype.sisu:sisu-inject-plexus m2e-maven-runtime/org.eclipse.m2e.maven.indexer
-%pom_add_dep org.eclipse.sisu:org.eclipse.sisu.plexus::provided m2e-maven-runtime/org.eclipse.m2e.maven.indexer
-
-%pom_remove_dep org.sonatype.sisu.inject:guice-plexus-shim m2e-maven-runtime/org.eclipse.m2e.maven.runtime
-%pom_add_dep org.eclipse.sisu:org.eclipse.sisu.inject m2e-maven-runtime/org.eclipse.m2e.maven.runtime "
-    <exclusions>
-      <exclusion>
-        <groupId>com.google.inject</groupId>
-        <artifactId>guice</artifactId>
-      </exclusion>
-    </exclusions>"
-
-# Use Eclipse Aether
-%pom_remove_dep org.sonatype.aether:aether-connector-wagon m2e-maven-runtime/org.eclipse.m2e.maven.runtime
-%pom_add_dep org.eclipse.aether:aether-transport-wagon m2e-maven-runtime/org.eclipse.m2e.maven.runtime
-
-%pom_remove_dep org.sonatype.aether:aether-impl m2e-maven-runtime/org.eclipse.m2e.maven.runtime
-%pom_add_dep org.eclipse.aether:aether-impl m2e-maven-runtime/org.eclipse.m2e.maven.runtime
-
-%pom_remove_dep org.sonatype.aether:aether-connector-asynchttpclient m2e-maven-runtime/org.eclipse.m2e.maven.runtime
-%pom_add_dep org.eclipse.aether:aether-transport-http m2e-maven-runtime/org.eclipse.m2e.maven.runtime
-
-%pom_add_dep org.eclipse.aether:aether-connector-basic m2e-maven-runtime/org.eclipse.m2e.maven.runtime
-
-find -name *.java -exec sed -i -e "s/org.sonatype.aether/org.eclipse.aether/g" {} ;
-
-sed -i -e "s/org.sonatype.aether/org.eclipse.aether/g" m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml

# Don't add version to jar names that get bundled - easier for symlinking
 pushd m2e-maven-runtime