You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/09/22 02:00:15 UTC
svn commit: r999693 -
/geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml
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>