Return-Path: 
 <scm-return-44097-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 36423 invoked from network); 22 Sep 2010 00:00:40 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 22 Sep 2010 00:00:40 -0000
Received: (qmail 71099 invoked by uid 500); 22 Sep 2010 00:00:40 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 70970 invoked by uid 500); 22 Sep 2010 00:00:40 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 70963 invoked by uid 99); 22 Sep 2010 00:00:39 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Sep 2010 00:00:39 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Sep 2010 00:00:37 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id F276F2388B1B; Wed, 22 Sep 2010 00:00:15 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r999693 -
 /geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml
Date: Wed, 22 Sep 2010 00:00:15 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100922000015.F276F2388B1B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: djencks
Date: Wed Sep 22 00:00:15 2010
New Revision: 999693

URL: http://svn.apache.org/viewvc?rev=999693&view=rev
Log:
GERONIMO-5616 revert rev 999289 since it introduces a circular dependency that breaks the build

Modified:
    geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml

Modified: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml?rev=999693&r1=999692&r2=999693&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml Wed Sep 22 00:00:15 2010
@@ -28,39 +28,12 @@
     <packaging>bundle</packaging>
 
     <name>Apache Geronimo Tomcat fork: Tribes</name>
-    <properties>
-			<pkgGroupId>${project.groupId}</pkgGroupId>
-			<pkgArtifactId>${project.artifactId}</pkgArtifactId>
-			<pkgVersion>${project.version}</pkgVersion>
-		</properties>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>juli</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.ext.tomcat</groupId>
-            <artifactId>catalina-ha</artifactId>
-            <exclusions>
-        			<exclusion>
-            		<groupId>org.apache.geronimo.specs</groupId>
-            		<artifactId>geronimo-servlet_3.0_spec</artifactId>
-        			</exclusion>
-        			<exclusion>
-            		<groupId>org.apache.geronimo.ext.tomcat</groupId>
-            		<artifactId>juli</artifactId>
-        			</exclusion>
-        			<exclusion>
-            		<groupId>org.apache.geronimo.ext.tomcat</groupId>
-            		<artifactId>tribes</artifactId>
-        			</exclusion>
-        			<exclusion>
-            		<groupId>org.apache.geronimo.ext.tomcat</groupId>
-            		<artifactId>catalina</artifactId>
-        			</exclusion>        			
-      			</exclusions>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -68,19 +41,7 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
-                    <instructions>
-											<Import-Package>
-                           org.apache.catalina.ha.authenticator; 
-                           org.apache.catalina.ha.backend; 
-                           org.apache.catalina.ha.context; 
-                           org.apache.catalina.ha.deploy; 
-                           org.apache.catalina.ha.jmx; 
-                           org.apache.catalina.ha.session; 
-                           org.apache.catalina.ha.tcp; 
-                           org.apache.catalina.ha.util;
-                           org.apache.juli.logging*;
-											</Import-Package>
-                    </instructions>
+                    <instructions />
                 </configuration>
             </plugin>
         </plugins>