Merge pull request #483 from hazendaz/master

[drop] Remove tomcat6 as it reached EOL - Fixes #323

CHANGELOG.md

@@ -1,9 +1,10 @@
-1.9.0 (in-progress
-==================
+1.9.0 (in-progress)
+===================
 * Java 8 only
 * Dropped Tomcat 6 and Spring 3 modules
 * [#479](https://github.com/Waffle/waffle/pull/479): Upgrade to Java 8 - using caffeine #304[@ben-manes](https://github.com/ben-manes).
 * [#482](https://github.com/Waffle/waffle/pull/482): Remove Spring Security 3 #478[@hazendaz](https://github.com/hazendaz).
+* [#483](https://github.com/Waffle/waffle/pull/483): Remove Tomcat 6 #323[@hazendaz](https://github.com/hazendaz).
 
 1.8.2 (12/31/2016)
 ================

README.md

@@ -86,7 +86,7 @@ Contributing
 License and Copyright
 ---------------------
 
-Copyright (c) [Application Security Inc.](https://www.trustwave.com/Company/AppSecInc-is-now-Trustwave/), 2010-2016 and Contributors. 
+Copyright (c) [Application Security Inc.](https://www.trustwave.com/Company/AppSecInc-is-now-Trustwave/), 2010-2017 and Contributors. 
 
 This project is licensed under the [Eclipse Public License](https://github.com/Waffle/waffle/blob/master/LICENSE).
 

Source/JNA/pom.xml

@@ -83,7 +83,6 @@
         <module>waffle-shiro</module>
         <module>waffle-spring-security4</module>
         <module>waffle-tests</module>
-        <module>waffle-tomcat6</module>
         <module>waffle-tomcat7</module>
         <module>waffle-tomcat8</module>
         <module>waffle-tomcat85</module>

Source/JNA/waffle-demo/pom.xml

@@ -50,21 +50,11 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>com.github.waffle</groupId>
-                <artifactId>waffle-tomcat6</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.github.waffle</groupId>
                 <artifactId>waffle-tomcat7</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.github.waffle</groupId>
-                <artifactId>waffle-tomcat8</artifactId>
-                <version>${project.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
@@ -78,21 +68,11 @@
     <build>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>org.apache.tomcat.maven</groupId>
-                    <artifactId>tomcat6-maven-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.tomcat.maven</groupId>
                     <artifactId>tomcat7-maven-plugin</artifactId>
                     <version>2.2</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.tomcat.maven</groupId>
-                    <artifactId>tomcat8-maven-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
             </plugins>
         </pluginManagement>
     </build>

Source/JNA/waffle-demo/waffle-filter/README.md

@@ -1,9 +1,9 @@
 Waffle Filter Setup Instructions Using Tomcat Plugins
 =====================================================
 
-Plugins currently only available for tomcat 6 and 7.
+Plugins currently only available for tomcat 7.
 
-To deploy to a local running tomcat 6 or 7 instance, make the following changes
+To deploy to a local running tomcat 7 instance, make the following changes
 
 - Add a server block to .m2/settings.xml
 
@@ -24,14 +24,12 @@ To deploy to a local running tomcat 6 or 7 instance, make the following changes
 <user username="tomcat" password="tomcat" roles="tomcat,manager-gui,manager-script,manager-jmx,manager-status" />
 ```
 
-- Start your tomcat server. You can launch a locally installed tomcat with remote debugging enabled on port 8000 using one of these
+- Start your tomcat server. You can launch a locally installed tomcat with remote debugging enabled on port 8000 using this
 
-    apache-tomcat-6.0.45$ bin/catalina.sh jpda start
-    apache-tomcat-7.0.70$ bin/catalina.sh jpda start
+    apache-tomcat-7.0.75$ bin/catalina.sh jpda start
 
-- Build and Deploy the demo application to the local tomcat 6 instance using one of these
+- Build and Deploy the demo application to the local tomcat instance using this
 
-    mvn clean package tomcat6:redeploy
     mvn clean package tomcat7:redeploy
 
 - The app will be available at:

Source/JNA/waffle-demo/waffle-filter/pom.xml

@@ -43,7 +43,7 @@
     <dependencies>
         <dependency>
             <groupId>com.github.waffle</groupId>
-            <artifactId>waffle-tomcat6</artifactId>
+            <artifactId>waffle-tomcat7</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -57,14 +57,6 @@
     <build>
         <finalName>${project.name}</finalName>
         <plugins>
-            <plugin>
-                <groupId>org.apache.tomcat.maven</groupId>
-                <artifactId>tomcat6-maven-plugin</artifactId>
-                <configuration>
-                    <server>mylocalserver</server>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.tomcat.maven</groupId>
                 <artifactId>tomcat7-maven-plugin</artifactId>

Source/JNA/waffle-distro/pom.xml

@@ -75,12 +75,6 @@
             <version>${project.version}</version>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>com.github.waffle</groupId>
-            <artifactId>waffle-tomcat6</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>com.github.waffle</groupId>
             <artifactId>waffle-tomcat7</artifactId>