[maven2-common-poms] Add eclipse orbit relocations needed for jetty

[Stanislav Ochotnicky]

commit c92f2019fdee2273da9e506bed1b2324548e3d91
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Thu Apr 26 13:34:55 2012 +0200

    Add eclipse orbit relocations needed for jetty

 maven2-common-poms-jpp-depmap.xml |  174 +++++++++++++++++++++++++++++++++++++
 maven2-common-poms.spec           |    5 +-
 2 files changed, 178 insertions(+), 1 deletions(-)
---
diff --git a/maven2-common-poms-jpp-depmap.xml b/maven2-common-poms-jpp-depmap.xml
index 9d0f491..381fc46 100644
--- a/maven2-common-poms-jpp-depmap.xml
+++ b/maven2-common-poms-jpp-depmap.xml
@@ -618,4 +618,178 @@
             <version>1.0-beta-1</version>
         </maven>
     </dependency>
+
+
+    <!-- Ugly as hell, but Eclipse relocated various artifacts under
+         their own groupId. We need to fix this globally -->
+    <dependency>
+        <maven>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>javax.activation</artifactId>
+            <version>3.0</version>
+        </maven>
+    </dependency>
+    <dependency>
+        <maven>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>3.0</version>
+        </maven>
+    </dependency>
+    <dependency>
+        <maven>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>javax.servlet</artifactId>
+            <version>3.0</version>
+        </maven>
+        <jpp>
+            <groupId>JPP</groupId>
+            <artifactId>tomcat-servlet-3.0-api</artifactId>
+            <version>3.0</version>
+        </jpp>
+    </dependency>
+    <dependency>
+        <maven>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>javax.security.auth.message</artifactId>
+            <version>1.0</version>
+        </maven>
+        <jpp>
+            <groupId>JPP</groupId>
+            <artifactId>geronimo-jaspic-spec</artifactId>
+            <version>1.0</version>
+        </jpp>
+    </dependency>
+    <dependency>
+        <maven>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>javax.mail.glassfish</artifactId>
+            <version>1.0</version>
+        </maven>
+        <jpp>
+            <groupId>JPP/javamail</groupId>
+            <artifactId>mail</artifactId>
+            <version>1.0</version>
+        </jpp>
+    </dependency>
+    <dependency>
+        <maven>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>javax.transaction</artifactId>
+            <version>1.0</version>
+        </maven>
+        <jpp>
+            <groupId>JPP</groupId>
+            <artifactId>geronimo-jta</artifactId>
+            <version>1.0</version>
+        </jpp>
+    </dependency>
+    <dependency>
+        <maven>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>javax.annotation</artifactId>
+            <version>1.0</version>
+        </maven>
+        <jpp>
+            <groupId>JPP</groupId>
+            <artifactId>geronimo-annotation</artifactId>
+            <version>1.0</version>
+        </jpp>
+    </dependency>
+    <dependency>
+        <maven>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>org.objectweb.asm</artifactId>
+            <version>1.0</version>
+        </maven>
+        <jpp>
+            <groupId>JPP/objectweb-asm</groupId>
+            <artifactId>asm-all</artifactId>
+            <version>1.0</version>
+        </jpp>
+    </dependency>
+    <dependency>
+        <maven>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>javax.servlet.jsp</artifactId>
+            <version>1.0</version>
+        </maven>
+        <jpp>
+            <groupId>JPP</groupId>
+            <artifactId>tomcat-jsp-api</artifactId>
+            <version>1.0</version>
+        </jpp>
+    </dependency>
+    <dependency>
+        <maven>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>org.apache.jasper.glassfish</artifactId>
+            <version>1.0</version>
+        </maven>
+        <jpp>
+            <groupId>JPP</groupId>
+            <artifactId>glassfish-jsp</artifactId>
+            <version>1.0</version>
+        </jpp>
+    </dependency>
+    <dependency>
+        <maven>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>javax.servlet.jsp.jstl</artifactId>
+            <version>1.0</version>
+        </maven>
+        <jpp>
+            <groupId>JPP</groupId>
+            <artifactId>taglibs-core</artifactId>
+            <version>1.0</version>
+        </jpp>
+    </dependency>
+    <dependency>
+        <maven>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>org.apache.taglibs.standard.glassfish</artifactId>
+            <version>1.0</version>
+        </maven>
+        <jpp>
+            <groupId>JPP</groupId>
+            <artifactId>taglibs-standard</artifactId>
+            <version>1.0</version>
+        </jpp>
+    </dependency>
+    <dependency>
+        <maven>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>javax.el</artifactId>
+            <version>1.0</version>
+        </maven>
+        <jpp>
+            <groupId>JPP</groupId>
+            <artifactId>tomcat-el-2.2-api</artifactId>
+            <version>1.0</version>
+        </jpp>
+    </dependency>
+    <dependency>
+        <maven>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>com.sun.el</artifactId>
+            <version>1.0</version>
+        </maven>
+        <jpp>
+            <groupId>JPP</groupId>
+            <artifactId>tomcat-el-2.2-api</artifactId>
+            <version>1.0</version>
+        </jpp>
+    </dependency>
+    <dependency>
+        <maven>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>org.eclipse.jdt.core</artifactId>
+            <version>1.0</version>
+        </maven>
+        <jpp>
+            <groupId>JPP/eclipse</groupId>
+            <artifactId>jdt.core</artifactId>
+            <version>1.0</version>
+        </jpp>
+    </dependency>
 </dependencies>
diff --git a/maven2-common-poms.spec b/maven2-common-poms.spec
index e3c8ac3..a3ed90e 100644
--- a/maven2-common-poms.spec
+++ b/maven2-common-poms.spec
@@ -33,7 +33,7 @@
 
 Name:              %{parent}-%{subname}
 Version:           1.0
-Release:           45%{?dist}
+Release:           46%{?dist}
 Epoch:             0
 Summary:           Common poms for maven2
 License:           ASL 2.0 and BSD
@@ -81,6 +81,9 @@ ln -s %{_datadir}/maven2/default_poms $RPM_BUILD_ROOT%{_javadir}/maven2
 %{_datadir}/maven2
 
 %changelog
+* Thu Apr 26 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.0-46
+- Add eclipse orbit relocations needed for jetty
+
 * Wed Feb 29 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> 0:1.0-45
 - Remove xom dependencies from poms