From e262854e2a1b7548efa0a1eb50d350ecd215231b Mon Sep 17 00:00:00 2001
From: Aaron Johnson <aaron.johnson@pearson.com>
Date: Fri, 22 May 2015 09:28:08 -0500
Subject: [PATCH 1/2] WW-4503 Build Struts with JDK 7

---
 pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b99e47e2d7..83582ec329 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,9 +146,10 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.3</version>
                     <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
+                        <source>1.7</source>
+                        <target>1.7</target>
                     </configuration>
                 </plugin>
                 <plugin>

From 08fad71aafb1215438d65f817412a04b3584f5bb Mon Sep 17 00:00:00 2001
From: Aaron Johnson <aaron.johnson@pearson.com>
Date: Tue, 26 May 2015 09:36:33 -0500
Subject: [PATCH 2/2] WW-4402 JDK 8: build fails due to missing apt tool

---
 core/pom.xml | 47 +++++++++++++++++------------------------------
 pom.xml      |  2 +-
 2 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 6eed44f489..6d63119103 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -40,38 +40,25 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.myfaces.tobago</groupId>
-                <artifactId>maven-apt-plugin</artifactId>
-                <version>1.0.15</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <A>uri=/struts-tags,tlibVersion=${tlib.version},jspVersion=2.0,shortName=s,displayName=Struts Tags,
-                        outFile=${basedir}/target/classes/META-INF/struts-tags.tld,
-                        description="To make it easier to access dynamic data;
-                        the Apache Struts framework includes a library of custom tags.
-                        The tags interact with the framework's validation and internationalization features;
-                        to ensure that input is correct and output is localized.
-                        The Struts Tags can be used with JSP FreeMarker or Velocity.",
-                        outTemplatesDir=${basedir}/src/site/resources/tags
-                    </A>
-                    <resourceTargetPath>target</resourceTargetPath>
-                    <fork>false</fork>
-                    <force>true</force>
-                    <nocompile>true</nocompile>
-                    <showWarnings>true</showWarnings>
-                    <factory>org.apache.struts.annotations.taglib.apt.TLDAnnotationProcessorFactory</factory>
-                    <target>1.5</target>
-                    <includes>
-                        <include>**/*.java</include>
-                    </includes>
+                    <compilerArgs>
+                        <arg>-Auri=/struts-tags</arg>
+                        <arg>-AtlibVersion=${tlib.version}</arg>
+                        <arg>-AjspVersion=2.0</arg>
+                        <arg>-AshortName=s</arg>
+                        <arg>-AdisplayName=Struts Tags</arg>
+                        <arg>-AoutFile=${basedir}/target/classes/META-INF/struts-tags.tld</arg>
+                        <arg>-Adescription="To make it easier to access dynamic data;
+                            the Apache Struts framework includes a library of custom tags.
+                            The tags interact with the framework's validation and
+                            internationalization features;
+                            to ensure that input is correct and output is localized.
+                            The Struts Tags can be used with JSP FreeMarker or Velocity."</arg>
+                        <arg>-AoutTemplatesDir=${basedir}/src/site/resources/tags</arg>
+                    </compilerArgs>
                 </configuration>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/pom.xml b/pom.xml
index 83582ec329..08e0d54549 100644
--- a/pom.xml
+++ b/pom.xml
@@ -353,7 +353,7 @@
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts-annotations</artifactId>
-                <version>1.0.5</version>
+                <version>1.0.6-SNAPSHOT</version>
             </dependency>
 
             <dependency>