From 736c1e91b14cf16678f2def1a164d15a1d249742 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 14 Jun 2015 22:21:06 -0400
Subject: [PATCH 1/6] Upgrade to tomcat 8.0.23

---
 Source/JNA/waffle-tomcat8/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/JNA/waffle-tomcat8/pom.xml b/Source/JNA/waffle-tomcat8/pom.xml
index 851272930b..c52f3c569b 100644
--- a/Source/JNA/waffle-tomcat8/pom.xml
+++ b/Source/JNA/waffle-tomcat8/pom.xml
@@ -20,7 +20,7 @@
         <src.relative.loc>..</src.relative.loc>
         <git.relative.loc>../../..</git.relative.loc>
 
-        <tomcat.version>8.0.22</tomcat.version>
+        <tomcat.version>8.0.23</tomcat.version>
     </properties>
     <scm>
         <connection>scm:git:ssh://git@github.com/dblock/waffle.git</connection>

From 5d047e5db70834ca845bdcc4df97586e58e2d0db Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 14 Jun 2015 22:21:24 -0400
Subject: [PATCH 2/6] Upgrade to java 7

---
 Source/JNA/pom.xml                         | 4 ++--
 Source/JNA/waffle-jetty/pom.xml            | 3 ---
 Source/JNA/waffle-spring-security4/pom.xml | 3 ---
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Source/JNA/pom.xml b/Source/JNA/pom.xml
index 657e256355..c7c01fe2f5 100644
--- a/Source/JNA/pom.xml
+++ b/Source/JNA/pom.xml
@@ -102,8 +102,8 @@
         <copyright>2015</copyright>
         <jacoco.minimum.coverage>0.0</jacoco.minimum.coverage>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
-        <maven.compiler.source>1.6</maven.compiler.source>
-        <maven.compiler.target>1.6</maven.compiler.target>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
         <maven.compiler.testSource>1.7</maven.compiler.testSource>
         <maven.compiler.testTarget>1.7</maven.compiler.testTarget>
         <maven.min-version>3.2.3</maven.min-version>
diff --git a/Source/JNA/waffle-jetty/pom.xml b/Source/JNA/waffle-jetty/pom.xml
index 5680507b23..5cbf562a8d 100644
--- a/Source/JNA/waffle-jetty/pom.xml
+++ b/Source/JNA/waffle-jetty/pom.xml
@@ -14,9 +14,6 @@
     <description>Jetty integration for WAFFLE</description>
     <url>http://dblock.github.com/waffle/</url>
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-
         <src.relative.loc>..</src.relative.loc>
         <git.relative.loc>../../..</git.relative.loc>
 
diff --git a/Source/JNA/waffle-spring-security4/pom.xml b/Source/JNA/waffle-spring-security4/pom.xml
index 4fc93d8ace..8199218b92 100644
--- a/Source/JNA/waffle-spring-security4/pom.xml
+++ b/Source/JNA/waffle-spring-security4/pom.xml
@@ -14,9 +14,6 @@
     <description>Spring Security 4 integration for WAFFLE</description>
     <url>http://dblock.github.com/waffle/</url>
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-
         <src.relative.loc>..</src.relative.loc>
         <git.relative.loc>../../..</git.relative.loc>
 

From ba6badecd3b4a31ef686a779a12ba1a27841fb94 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 14 Jun 2015 22:21:36 -0400
Subject: [PATCH 3/6] Update jetty and el

---
 Source/JNA/waffle-jetty/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/JNA/waffle-jetty/pom.xml b/Source/JNA/waffle-jetty/pom.xml
index 5cbf562a8d..4b736e8939 100644
--- a/Source/JNA/waffle-jetty/pom.xml
+++ b/Source/JNA/waffle-jetty/pom.xml
@@ -17,9 +17,9 @@
         <src.relative.loc>..</src.relative.loc>
         <git.relative.loc>../../..</git.relative.loc>
 
-        <el.version>3.0.1-b05</el.version>
+        <el.version>3.0.1-b08</el.version>
         <el-api.version>3.0.1-b04</el-api.version>
-        <jetty.version>9.2.10.v20150310</jetty.version>
+        <jetty.version>9.2.11.v20150529</jetty.version>
         <jdt.version>4.4.2</jdt.version>
         <jsp.version>2.3.3-b02</jsp.version>
         <jsp-api.version>2.3.2-b01</jsp-api.version>

From e64d141a9615365d5d07dee2620231aa8e7d99bc Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 14 Jun 2015 22:34:58 -0400
Subject: [PATCH 4/6] Update logback

---
 Source/JNA/waffle-distro/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/JNA/waffle-distro/pom.xml b/Source/JNA/waffle-distro/pom.xml
index 941e11c139..b722f47b31 100644
--- a/Source/JNA/waffle-distro/pom.xml
+++ b/Source/JNA/waffle-distro/pom.xml
@@ -17,7 +17,7 @@
         <src.relative.loc>..</src.relative.loc>
         <git.relative.loc>../../..</git.relative.loc>
 
-        <logback.version>1.1.2</logback.version>
+        <logback.version>1.1.3</logback.version>
     </properties>
     <scm>
         <connection>scm:git:ssh://git@github.com/dblock/waffle.git</connection>

From 9cc1b9e67e13f4a95e9c21bfa7d9634a01c4e41f Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 14 Jun 2015 22:35:09 -0400
Subject: [PATCH 5/6] Java 7 signatures

---
 Source/JNA/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/JNA/pom.xml b/Source/JNA/pom.xml
index c7c01fe2f5..deb6f95b48 100644
--- a/Source/JNA/pom.xml
+++ b/Source/JNA/pom.xml
@@ -122,8 +122,8 @@
         <mockito.version>1.10.19</mockito.version>
         <slf4j.version>1.7.12</slf4j.version>
 
-        <signature.artifact>java16</signature.artifact>
-        <signature.version>1.1</signature.version>
+        <signature.artifact>java17</signature.artifact>
+        <signature.version>1.0</signature.version>
     </properties>
     <dependencies>
         <dependency>

From a5bd13010127f54f8a7de971d0b46b3cf635beab Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 14 Jun 2015 22:37:23 -0400
Subject: [PATCH 6/6] Maven Plugin updates

git-commit-id-plugin to 2.1.15
maven-assembly-plugin to 2.5.5
jacoco-maven-plugin to 0.7.5.201505241946
dependency-check-maven to 1.2.11

switch maven-java-formatter-plugin to new official
formatter-maven-plugin 0.5.2 which is based on luna

update jsch to 0.1.53
update jgit to 4.0.0.201506090130-r
---
 Source/JNA/pom.xml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Source/JNA/pom.xml b/Source/JNA/pom.xml
index deb6f95b48..b34f7ca86a 100644
--- a/Source/JNA/pom.xml
+++ b/Source/JNA/pom.xml
@@ -267,7 +267,7 @@
                 <plugin>
                     <groupId>pl.project13.maven</groupId>
                     <artifactId>git-commit-id-plugin</artifactId>
-                    <version>2.1.13</version>
+                    <version>2.1.15</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -310,7 +310,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.5.4</version>
+                    <version>2.5.5</version>
                     <configuration>
                         <descriptor>${project.basedir}/src/assembly/assembly.xml</descriptor>
                     </configuration>
@@ -359,7 +359,7 @@
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.7.4.201502262128</version>
+                    <version>0.7.5.201505241946</version>
                 </plugin>
                 <plugin>
                     <groupId>org.eluder.coveralls</groupId>
@@ -384,9 +384,9 @@
                     </dependencies>
                 </plugin>
                 <plugin>
-                    <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
-                    <artifactId>maven-java-formatter-plugin</artifactId>
-                    <version>0.4</version>
+                    <groupId>net.revelc.code</groupId>
+                    <artifactId>formatter-maven-plugin</artifactId>
+                    <version>0.5.2</version>
                 </plugin>
                 <plugin>
                     <groupId>com.mycila</groupId>
@@ -461,12 +461,12 @@
                         <dependency>
                             <groupId>com.jcraft</groupId>
                             <artifactId>jsch</artifactId>
-                            <version>0.1.52</version>
+                            <version>0.1.53</version>
                         </dependency>
                         <dependency>
                             <groupId>org.eclipse.jgit</groupId>
                             <artifactId>org.eclipse.jgit</artifactId>
-                            <version>3.7.1.201504261725-r </version>
+                            <version>4.0.0.201506090130-r</version>
                         </dependency>
                         <dependency>
                             <groupId>org.codehaus.plexus</groupId>
@@ -502,7 +502,7 @@
                 <plugin>
                     <groupId>org.owasp</groupId>
                     <artifactId>dependency-check-maven</artifactId>
-                    <version>1.2.10</version>
+                    <version>1.2.11</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -1026,9 +1026,9 @@
                                         </pluginExecution>
                                         <pluginExecution>
                                             <pluginExecutionFilter>
-                                                <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
-                                                <artifactId>maven-java-formatter-plugin</artifactId>
-                                                <versionRange>[0.4,)</versionRange>
+                                                <groupId>net.revelc.code</groupId>
+                                                <artifactId>formatter-maven-plugin</artifactId>
+                                                <versionRange>[0.5.2,)</versionRange>
                                                 <goals>
                                                     <goal>format</goal>
                                                 </goals>
@@ -1068,8 +1068,8 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
-                        <artifactId>maven-java-formatter-plugin</artifactId>
+                        <groupId>net.revelc.code</groupId>
+                        <artifactId>formatter-maven-plugin</artifactId>
                         <configuration>
                             <configFile>${src.relative.loc}/format.xml</configFile>
                         </configuration>