remove configuration for tomcat6 plugin

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1542908 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index a09189963f2ba468536aac86641b887d1122ef4e..a492182acda618886cbf692660257cd27ed94183 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -970,43 +970,6 @@
         </executions>
       </plugin>
       -->
-      <plugin>
-        <groupId>org.apache.tomcat.maven</groupId>
-        <artifactId>tomcat6-maven-plugin</artifactId>
-        <configuration>
-          <port>${tomcatRunPort}</port>
-          <path>${tomcatRunPath}</path>
-          <contextFile>${tomcatContextXml}</contextFile>
-          <systemProperties>
-            <plexus.home>${archivaAppServerBase}</plexus.home>
-            <appserver.base>${archivaAppServerBase}</appserver.base>
-            <appserver.home>${archivaAppServerBase}</appserver.home>
-            <derby.system.home>${archivaAppServerBase}/logs</derby.system.home>
-            <redback.admin.creation.file>${basedir}/target/auto-admin-creation.properties
-            </redback.admin.creation.file>
-            <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
-            <archiva.user.configFileName>${archivaAppServerBase}/conf/archiva.xml</archiva.user.configFileName>
-            <archiva.devMode>${archiva.devMode}</archiva.devMode>
-            <archiva.javascriptLog>${archiva.javascriptLog}</archiva.javascriptLog>
-            <archiva.logMissingI18n>${archiva.logMissingI18n}</archiva.logMissingI18n>
-          </systemProperties>
-          <additionalClasspathDirs>
-            <additionalClasspathDir>${basedir}/src/test/tomcat</additionalClasspathDir>
-          </additionalClasspathDirs>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>${derbyVersion}</version>
-          </dependency>
-          <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>${javaxMailVersion}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
       <plugin>
         <groupId>org.apache.tomcat.maven</groupId>
         <artifactId>tomcat7-maven-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
index 539523b29b9a9b6f1da2ad864eaca21b3bcdb8ef..3adaa808b68375a4d5a78a402cf1d379ee390d96 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1627,10 +1627,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.tomcat.maven</groupId>
-        <artifactId>tomcat6-maven-plugin</artifactId>
-       </plugin>
       <plugin>
         <groupId>org.apache.tomcat.maven</groupId>
         <artifactId>tomcat7-maven-plugin</artifactId>
@@ -1821,11 +1817,6 @@
             <jdkLevel>1.5</jdkLevel>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.tomcat.maven</groupId>
-          <artifactId>tomcat6-maven-plugin</artifactId>
-          <version>${asfTomcatMavenPluginVersion}</version>
-        </plugin>
         <plugin>
           <groupId>org.apache.tomcat.maven</groupId>
           <artifactId>tomcat7-maven-plugin</artifactId>