From 903fe019713d5a5bd5fe764271893fbfcf2525b7 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sat, 20 Jan 2024 15:28:03 -0500
Subject: [PATCH 1/7] [pom] Correct alpha order of plugin properties

---
 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 91e9586402..84c25c88d3 100644
--- a/Source/JNA/pom.xml
+++ b/Source/JNA/pom.xml
@@ -214,11 +214,11 @@
         <release.plugin>3.0.1</release.plugin>
         <resources.plugin>3.3.1</resources.plugin>
         <scm.plugin>2.0.1</scm.plugin>
-        <source.plugin>3.3.0</source.plugin>
-        <spotbugs.plugin>4.8.3.0</spotbugs.plugin>
         <site.plugin>3.12.1</site.plugin>
         <sonar.plugin>3.10.0.2594</sonar.plugin>
         <sortpom.plugin>3.3.0</sortpom.plugin>
+        <source.plugin>3.3.0</source.plugin>
+        <spotbugs.plugin>4.8.3.0</spotbugs.plugin>
         <surefire.plugin>3.2.5</surefire.plugin>
         <taglist.plugin>3.0.0</taglist.plugin>
         <versions.plugin>2.16.2</versions.plugin>

From 2eda7fd00431df0b0a2af380e671caa9b0ce2472 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sat, 20 Jan 2024 15:28:40 -0500
Subject: [PATCH 2/7] [pom] Add spotless plugin

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

diff --git a/Source/JNA/pom.xml b/Source/JNA/pom.xml
index 84c25c88d3..c7d4fa8820 100644
--- a/Source/JNA/pom.xml
+++ b/Source/JNA/pom.xml
@@ -219,6 +219,7 @@
         <sortpom.plugin>3.3.0</sortpom.plugin>
         <source.plugin>3.3.0</source.plugin>
         <spotbugs.plugin>4.8.3.0</spotbugs.plugin>
+        <spotless.plugin>2.42.0</spotless.plugin>
         <surefire.plugin>3.2.5</surefire.plugin>
         <taglist.plugin>3.0.0</taglist.plugin>
         <versions.plugin>2.16.2</versions.plugin>
@@ -329,6 +330,49 @@
     <build>
         <pluginManagement>
             <plugins>
+                <!-- Diff Plug Maven Plugins -->
+                <plugin>
+                    <groupId>com.diffplug.spotless</groupId>
+                    <artifactId>spotless-maven-plugin</artifactId>
+                    <version>${spotless.plugin}</version>
+                    <configuration>
+                        <formats>
+                            <format>
+                                <includes>
+                                    <include>**/*.sh</include>
+                                    <include>**/*.yml</include>
+                                    <include>**/*.yaml</include>
+                                </includes>
+                                <excludes>
+                                    <exclude>**/node_modules/**</exclude>
+                                    <exclude>**/target/**</exclude>
+                                </excludes>
+                                <trimTrailingWhitespace />
+                                <endWithNewline />
+                                <indent>
+                                    <spaces>true</spaces>
+                                    <spacesPerTab>2</spacesPerTab>
+                                </indent>
+                            </format>
+                            <format>
+                                <includes>
+                                    <include>**/*.xml</include>
+                                </includes>
+                                <excludes>
+                                    <exclude>**/node_modules/**</exclude>
+                                    <exclude>**/target/**</exclude>
+                                </excludes>
+                                <trimTrailingWhitespace />
+                                <endWithNewline />
+                                <indent>
+                                    <spaces>true</spaces>
+                                    <spacesPerTab>4</spacesPerTab>
+                                </indent>
+                            </format>
+                        </formats>
+                    </configuration>
+                </plugin>
+
                 <!-- Core plugins -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -1435,6 +1479,18 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>com.diffplug.spotless</groupId>
+                        <artifactId>spotless-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>apply</goal>
+                                </goals>
+                                <phase>process-sources</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
                 </plugins>
             </build>
         </profile>

From 42426012f5b1d142c9b4e9cee0957bf666b94cdd Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sat, 20 Jan 2024 15:29:05 -0500
Subject: [PATCH 3/7] [pom] Add rewrite plugin to prevent star imports

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

diff --git a/Source/JNA/pom.xml b/Source/JNA/pom.xml
index c7d4fa8820..803e751454 100644
--- a/Source/JNA/pom.xml
+++ b/Source/JNA/pom.xml
@@ -213,6 +213,7 @@
         <project-info-reports.plugin>3.5.0</project-info-reports.plugin>
         <release.plugin>3.0.1</release.plugin>
         <resources.plugin>3.3.1</resources.plugin>
+        <rewrite.plugin>5.20.0</rewrite.plugin>
         <scm.plugin>2.0.1</scm.plugin>
         <site.plugin>3.12.1</site.plugin>
         <sonar.plugin>3.10.0.2594</sonar.plugin>
@@ -934,6 +935,13 @@
                     <version>${wagon.plugin}</version>
                 </plugin>
 
+                <!-- Openwrite Maven Plugins -->
+                <plugin>
+                    <groupId>org.openrewrite.maven</groupId>
+                    <artifactId>rewrite-maven-plugin</artifactId>
+                    <version>${rewrite.plugin}</version>
+                </plugin>
+
                 <!-- Owasp Dependency Scan -->
                 <plugin>
                     <groupId>org.owasp</groupId>
@@ -1479,6 +1487,23 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>org.openrewrite.maven</groupId>
+                        <artifactId>rewrite-maven-plugin</artifactId>
+                        <configuration>
+                            <activeRecipes>
+                                <recipe>org.openrewrite.java.RemoveUnusedImports</recipe>
+                            </activeRecipes>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <phase>process-sources</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>com.diffplug.spotless</groupId>
                         <artifactId>spotless-maven-plugin</artifactId>

From b2060dab21b664b47c09a821044f5fae18e99976 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sat, 20 Jan 2024 16:43:26 -0500
Subject: [PATCH 4/7] [ci] Update copyright dates and update internal readme

---
 Source/JNA/src/site/markdown/README.md                         | 3 ++-
 Source/JNA/waffle-jna-jakarta/pom.xml                          | 2 +-
 .../src/main/java/waffle/mock/http/SimpleHttpSession.java      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Source/JNA/src/site/markdown/README.md b/Source/JNA/src/site/markdown/README.md
index d7389eb011..391e4f7e35 100644
--- a/Source/JNA/src/site/markdown/README.md
+++ b/Source/JNA/src/site/markdown/README.md
@@ -4,7 +4,8 @@ WAFFLE - Windows Authentication Framework
 [![Java CI](https://github.com/Waffle/waffle/workflows/Java%20CI/badge.svg)](https://github.com/Waffle/waffle/actions?query=workflow%3A%22Java+CI%22)
 [![DotNET CI](https://github.com/Waffle/waffle/workflows/DotNET/badge.svg)](https://github.com/Waffle/waffle/workflows/DotNET)
 [![Coverity Scan Status](https://scan.coverity.com/projects/22153/badge.svg)](https://scan.coverity.com/projects/22153)
-[![Coverage Status](https://sonarcloud.io/api/project_badges/measure?project=Waffle_waffle&metric=coverage)](https://sonarcloud.io/dashboard?id=Waffle_waffle)
+[![Coverage Status Sonar](https://sonarcloud.io/api/project_badges/measure?project=Waffle_waffle&metric=coverage)](https://sonarcloud.io/component_measures?id=Waffle_waffle&metric=coverage)
+[![Coverage Status Coveralls](https://coveralls.io/repos/Waffle/waffle/badge.svg?branch=master&service=github)](https://coveralls.io/github/Waffle/waffle?branch=master)
 [![Maven central](https://maven-badges.herokuapp.com/maven-central/com.github.waffle/waffle-jna/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.waffle/waffle-jna)
 [![releases](https://img.shields.io/github/v/release/Waffle/waffle)](https://github.com/Waffle/waffle/releases/tag/waffle-parent-2.3.0)
 [![MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/MIT)
diff --git a/Source/JNA/waffle-jna-jakarta/pom.xml b/Source/JNA/waffle-jna-jakarta/pom.xml
index 22be717fcf..831d453205 100644
--- a/Source/JNA/waffle-jna-jakarta/pom.xml
+++ b/Source/JNA/waffle-jna-jakarta/pom.xml
@@ -3,7 +3,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2023 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
diff --git a/Source/JNA/waffle-tests-jakarta/src/main/java/waffle/mock/http/SimpleHttpSession.java b/Source/JNA/waffle-tests-jakarta/src/main/java/waffle/mock/http/SimpleHttpSession.java
index 3701c76efd..d26f149996 100644
--- a/Source/JNA/waffle-tests-jakarta/src/main/java/waffle/mock/http/SimpleHttpSession.java
+++ b/Source/JNA/waffle-tests-jakarta/src/main/java/waffle/mock/http/SimpleHttpSession.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2010-2023 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+ * Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

From 1ea9b85757e1030caaa334af6e4ef29e831c849c Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sat, 20 Jan 2024 15:29:49 -0500
Subject: [PATCH 5/7] [pom] Move sortpom into formatting and add configuration
 for it

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

diff --git a/Source/JNA/pom.xml b/Source/JNA/pom.xml
index 803e751454..7ef7e8a708 100644
--- a/Source/JNA/pom.xml
+++ b/Source/JNA/pom.xml
@@ -745,6 +745,14 @@
                     <groupId>com.github.ekryd.sortpom</groupId>
                     <artifactId>sortpom-maven-plugin</artifactId>
                     <version>${sortpom.plugin}</version>
+                    <configuration>
+                        <predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
+                        <createBackupFile>false</createBackupFile>
+                        <expandEmptyElements>false</expandEmptyElements>
+                        <keepBlankLines>true</keepBlankLines>
+                        <nrOfIndentSpace>4</nrOfIndentSpace>
+                        <spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>com.github.hazendaz.maven</groupId>
@@ -1504,6 +1512,18 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>com.github.ekryd.sortpom</groupId>
+                        <artifactId>sortpom-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>sort</goal>
+                                </goals>
+                                <phase>verify</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>com.diffplug.spotless</groupId>
                         <artifactId>spotless-maven-plugin</artifactId>
@@ -1553,26 +1573,6 @@
             </build>
         </profile>
 
-        <profile>
-            <id>sort</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.github.ekryd.sortpom</groupId>
-                        <artifactId>sortpom-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sort</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>release</id>
             <build>

From 61637a54a9e2105997894578e93099b357224b86 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sat, 20 Jan 2024 15:30:08 -0500
Subject: [PATCH 6/7] [pom] Add whitespace plugin to ensure not trailing
 whitespace

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

diff --git a/Source/JNA/pom.xml b/Source/JNA/pom.xml
index 7ef7e8a708..c785160c7b 100644
--- a/Source/JNA/pom.xml
+++ b/Source/JNA/pom.xml
@@ -226,6 +226,7 @@
         <versions.plugin>2.16.2</versions.plugin>
         <wagon.plugin>2.0.2</wagon.plugin>
         <war.plugin>3.4.0</war.plugin>
+        <whitespace.plugin>1.3.1</whitespace.plugin>
         <yuicompressor.plugin>2.0.0</yuicompressor.plugin>
 
         <!-- Plugin Dependency Versions -->
@@ -731,6 +732,12 @@
                         </dependency>
                     </dependencies>
                 </plugin>
+                <plugin>
+                    <groupId>com.github.hazendaz.maven</groupId>
+                    <artifactId>whitespace-maven-plugin</artifactId>
+                    <version>${whitespace.plugin}</version>
+                </plugin>
+
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
@@ -1536,6 +1543,18 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>com.github.hazendaz.maven</groupId>
+                        <artifactId>whitespace-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>trim</goal>
+                                </goals>
+                                <phase>process-sources</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
                 </plugins>
             </build>
         </profile>

From 404ac24beadfa2a955e02bb5e4cb9eab978d5b21 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sat, 20 Jan 2024 17:32:23 -0500
Subject: [PATCH 7/7] [ci] Formatting

---
 Source/JNA/pom.xml                            | 80 ++++++++++---------
 Source/JNA/waffle-demo/pom.xml                |  2 +-
 Source/JNA/waffle-demo/waffle-filter/pom.xml  |  2 +-
 .../waffle-filter/src/main/webapp/index.jsp   |  4 +-
 Source/JNA/waffle-demo/waffle-form/pom.xml    |  2 +-
 .../waffle-form/src/main/webapp/index.jsp     |  4 +-
 Source/JNA/waffle-demo/waffle-jaas/pom.xml    |  2 +-
 .../waffle-jaas/src/main/webapp/index.jsp     |  4 +-
 .../JNA/waffle-demo/waffle-mixed-post/pom.xml |  2 +-
 .../src/main/webapp/index.jsp                 |  4 +-
 Source/JNA/waffle-demo/waffle-mixed/pom.xml   |  2 +-
 .../waffle-mixed/src/main/webapp/index.jsp    |  4 +-
 .../JNA/waffle-demo/waffle-negotiate/pom.xml  |  2 +-
 .../src/main/webapp/index.jsp                 |  4 +-
 .../waffle-spring-boot-filter2/pom.xml        |  2 +-
 .../waffle-spring-boot-filter3/pom.xml        |  2 +-
 .../waffle-demo/waffle-spring-filter/pom.xml  |  2 +-
 .../src/main/webapp/WEB-INF/waffle-filter.xml |  4 +-
 .../src/main/webapp/index.jsp                 |  4 +-
 .../waffle-demo/waffle-spring-form/pom.xml    |  2 +-
 .../src/main/webapp/index.jsp                 |  4 +-
 Source/JNA/waffle-jetty/pom.xml               | 14 ++--
 Source/JNA/waffle-jna-jakarta/pom.xml         |  2 +-
 Source/JNA/waffle-jna/pom.xml                 |  2 +-
 Source/JNA/waffle-shiro/pom.xml               |  2 +-
 Source/JNA/waffle-spring-boot2/pom.xml        | 12 +--
 .../waffle-spring-boot-autoconfigure2/pom.xml |  2 +-
 .../waffle-spring-boot-starter2/pom.xml       |  2 +-
 Source/JNA/waffle-spring-boot3/pom.xml        | 12 +--
 .../waffle-spring-boot-autoconfigure3/pom.xml |  2 +-
 .../waffle-spring-boot-starter3/pom.xml       |  2 +-
 Source/JNA/waffle-spring-security5/pom.xml    |  4 +-
 Source/JNA/waffle-spring-security6/pom.xml    |  4 +-
 Source/JNA/waffle-tests-jakarta/pom.xml       |  2 +-
 Source/JNA/waffle-tests/pom.xml               |  2 +-
 Source/JNA/waffle-tomcat10/pom.xml            |  2 +-
 Source/JNA/waffle-tomcat85/pom.xml            |  2 +-
 Source/JNA/waffle-tomcat9/pom.xml             |  2 +-
 38 files changed, 105 insertions(+), 103 deletions(-)

diff --git a/Source/JNA/pom.xml b/Source/JNA/pom.xml
index c785160c7b..f22c4b1c0b 100644
--- a/Source/JNA/pom.xml
+++ b/Source/JNA/pom.xml
@@ -105,8 +105,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
     <issueManagement>
         <system>Github</system>
@@ -117,19 +117,19 @@
         <url>https://github.com/Waffle/waffle/actions</url>
     </ciManagement>
     <distributionManagement>
+        <repository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
         <site>
             <id>gh-pages-scm</id>
             <name>Waffle GitHub Pages</name>
             <url>scm:git:ssh://git@github.com/Waffle/waffle.git</url>
         </site>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-        <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
     </distributionManagement>
 
     <properties>
@@ -254,7 +254,8 @@
     </properties>
 
     <dependencies>
-        <dependency><!-- prevent warning: SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder". -->
+        <dependency>
+            <!-- prevent warning: SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder". -->
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <version>${slf4j.version}</version>
@@ -280,7 +281,7 @@
             <version>${spotbugs.version}</version>
             <scope>provided</scope>
         </dependency>
- 
+
         <!-- Test Dependencies -->
         <dependency>
             <groupId>org.assertj</groupId>
@@ -513,7 +514,7 @@
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>${surefire.plugin}</version>
                     <configuration>
-                       <excludes>
+                        <excludes>
                             <exclude>**/*LoadTest.java</exclude>
                         </excludes>
                     </configuration>
@@ -620,7 +621,8 @@
                             </manifestEntries>
                         </archive>
                         <quiet>true</quiet>
-                        <failOnError>false</failOnError> <!-- TODO: Research why we are getting a null pointer! -->
+                        <failOnError>false</failOnError>
+                        <!-- TODO: Research why we are getting a null pointer! -->
                     </configuration>
                 </plugin>
                 <plugin>
@@ -833,6 +835,10 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-changes-plugin</artifactId>
                     <version>${changes.plugin}</version>
+                    <configuration>
+                        <githubAPIScheme>https</githubAPIScheme>
+                        <githubAPIPort>443</githubAPIPort>
+                    </configuration>
                     <dependencies>
                         <dependency>
                             <groupId>org.eclipse.jgit</groupId>
@@ -845,10 +851,6 @@
                             <version>${scm.plugin}</version>
                         </dependency>
                     </dependencies>
-                    <configuration>
-                        <githubAPIScheme>https</githubAPIScheme>
-                        <githubAPIPort>443</githubAPIPort>
-                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -907,7 +909,7 @@
                                         </tag>
                                     </tags>
                                 </tagClass>
-                           </tagClasses>
+                            </tagClasses>
                         </tagListOptions>
                     </configuration>
                 </plugin>
@@ -1073,17 +1075,17 @@
                     </execution>
                     <execution>
                         <id>enforce-clean</id>
-                        <phase>pre-clean</phase>
                         <goals>
                             <goal>enforce</goal>
                         </goals>
+                        <phase>pre-clean</phase>
                     </execution>
                     <execution>
                         <id>enforce-site</id>
-                        <phase>pre-site</phase>
                         <goals>
                             <goal>enforce</goal>
                         </goals>
+                        <phase>pre-site</phase>
                     </execution>
                 </executions>
             </plugin>
@@ -1092,10 +1094,10 @@
                 <artifactId>license-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>compile</phase>
                         <goals>
                             <goal>format</goal>
                         </goals>
+                        <phase>compile</phase>
                     </execution>
                 </executions>
             </plugin>
@@ -1184,10 +1186,10 @@
                 <executions>
                     <execution>
                         <id>modernizer</id>
-                        <phase>verify</phase>
                         <goals>
                             <goal>modernizer</goal>
                         </goals>
+                        <phase>verify</phase>
                     </execution>
                 </executions>
             </plugin>
@@ -1348,15 +1350,6 @@
                     <plugin>
                         <groupId>com.github.hazendaz.maven</groupId>
                         <artifactId>htmlcompressor-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>default-compile</id>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>html</goal>
-                                </goals>
-                            </execution>
-                        </executions>
                         <configuration>
                             <compressCss>true</compressCss>
                             <compressJavaScript>true</compressJavaScript>
@@ -1372,19 +1365,19 @@
                                 <fileExt>xml</fileExt>
                             </fileExt>
                         </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>com.github.hazendaz.maven</groupId>
-                        <artifactId>yuicompressor-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>default-compile</id>
-                                <phase>compile</phase>
                                 <goals>
-                                    <goal>compress</goal>
+                                    <goal>html</goal>
                                 </goals>
+                                <phase>compile</phase>
                             </execution>
                         </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>com.github.hazendaz.maven</groupId>
+                        <artifactId>yuicompressor-maven-plugin</artifactId>
                         <configuration>
                             <nomunge>true</nomunge>
                             <nosuffix>true</nosuffix>
@@ -1393,6 +1386,15 @@
                                 <exclude>**/*.min.css</exclude>
                             </excludes>
                         </configuration>
+                        <executions>
+                            <execution>
+                                <id>default-compile</id>
+                                <goals>
+                                    <goal>compress</goal>
+                                </goals>
+                                <phase>compile</phase>
+                            </execution>
+                        </executions>
                     </plugin>
                 </plugins>
             </build>
@@ -1432,7 +1434,7 @@
             <build>
                 <pluginManagement>
                     <plugins>
-                        <!--This plugin's configuration is used to store Eclipse m2e settings only. It 
+                        <!--This plugin's configuration is used to store Eclipse m2e settings only. It
                             has no influence on the Maven build itself. -->
                         <plugin>
                             <groupId>org.eclipse.m2e</groupId>
@@ -1602,10 +1604,10 @@
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
-                                <phase>verify</phase>
                                 <goals>
                                     <goal>sign</goal>
                                 </goals>
+                                <phase>verify</phase>
                             </execution>
                         </executions>
                     </plugin>
diff --git a/Source/JNA/waffle-demo/pom.xml b/Source/JNA/waffle-demo/pom.xml
index 9ac576c881..58a783a9e1 100644
--- a/Source/JNA/waffle-demo/pom.xml
+++ b/Source/JNA/waffle-demo/pom.xml
@@ -58,8 +58,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-demo/waffle-filter/pom.xml b/Source/JNA/waffle-demo/waffle-filter/pom.xml
index 8375a498c9..58765fd998 100644
--- a/Source/JNA/waffle-demo/waffle-filter/pom.xml
+++ b/Source/JNA/waffle-demo/waffle-filter/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-demo/waffle-filter/src/main/webapp/index.jsp b/Source/JNA/waffle-demo/waffle-filter/src/main/webapp/index.jsp
index e8f63448f7..6740f5d7bd 100644
--- a/Source/JNA/waffle-demo/waffle-filter/src/main/webapp/index.jsp
+++ b/Source/JNA/waffle-demo/waffle-filter/src/main/webapp/index.jsp
@@ -2,7 +2,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -79,7 +79,7 @@
   <form method="GET" action='<%= response.encodeURL("index.jsp") %>'>
    <input type="text" name="role" value="<%= role %>">
   </form>
-  <br><br> 
+  <br><br>
   You can logoff by clicking
   <a href='<%= response.encodeURL("index.jsp?logoff=true") %>'>here</a>.
   This should cause automatic re-logon with Waffle and a new session ID.
diff --git a/Source/JNA/waffle-demo/waffle-form/pom.xml b/Source/JNA/waffle-demo/waffle-form/pom.xml
index d27a6e6865..cf27ea6bf0 100644
--- a/Source/JNA/waffle-demo/waffle-form/pom.xml
+++ b/Source/JNA/waffle-demo/waffle-form/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-demo/waffle-form/src/main/webapp/index.jsp b/Source/JNA/waffle-demo/waffle-form/src/main/webapp/index.jsp
index 372d55e915..eda5fb155f 100644
--- a/Source/JNA/waffle-demo/waffle-form/src/main/webapp/index.jsp
+++ b/Source/JNA/waffle-demo/waffle-form/src/main/webapp/index.jsp
@@ -2,7 +2,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -77,7 +77,7 @@
   <form method="GET" action='<%= response.encodeURL("index.jsp") %>'>
    <input type="text" name="role" value="<%= role %>">
   </form>
-  <br><br> 
+  <br><br>
   You can logoff by clicking
   <a href='<%= response.encodeURL("index.jsp?logoff=true") %>'>here</a>.
   This should cause automatic re-logon with Waffle and a new session ID.
diff --git a/Source/JNA/waffle-demo/waffle-jaas/pom.xml b/Source/JNA/waffle-demo/waffle-jaas/pom.xml
index 50d3dd6f51..c9f4ebd3a7 100644
--- a/Source/JNA/waffle-demo/waffle-jaas/pom.xml
+++ b/Source/JNA/waffle-demo/waffle-jaas/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-demo/waffle-jaas/src/main/webapp/index.jsp b/Source/JNA/waffle-demo/waffle-jaas/src/main/webapp/index.jsp
index 372d55e915..eda5fb155f 100644
--- a/Source/JNA/waffle-demo/waffle-jaas/src/main/webapp/index.jsp
+++ b/Source/JNA/waffle-demo/waffle-jaas/src/main/webapp/index.jsp
@@ -2,7 +2,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -77,7 +77,7 @@
   <form method="GET" action='<%= response.encodeURL("index.jsp") %>'>
    <input type="text" name="role" value="<%= role %>">
   </form>
-  <br><br> 
+  <br><br>
   You can logoff by clicking
   <a href='<%= response.encodeURL("index.jsp?logoff=true") %>'>here</a>.
   This should cause automatic re-logon with Waffle and a new session ID.
diff --git a/Source/JNA/waffle-demo/waffle-mixed-post/pom.xml b/Source/JNA/waffle-demo/waffle-mixed-post/pom.xml
index 0ac86f715a..112488d7b6 100644
--- a/Source/JNA/waffle-demo/waffle-mixed-post/pom.xml
+++ b/Source/JNA/waffle-demo/waffle-mixed-post/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-demo/waffle-mixed-post/src/main/webapp/index.jsp b/Source/JNA/waffle-demo/waffle-mixed-post/src/main/webapp/index.jsp
index de9b27a30b..d0332aecd6 100644
--- a/Source/JNA/waffle-demo/waffle-mixed-post/src/main/webapp/index.jsp
+++ b/Source/JNA/waffle-demo/waffle-mixed-post/src/main/webapp/index.jsp
@@ -2,7 +2,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -73,7 +73,7 @@
   <form method="GET" action='<%= response.encodeURL("index.jsp") %>'>
    <input type="text" name="role" value="<%= role %>">
   </form>
-  <br><br> 
+  <br><br>
   You can logoff by clicking
   <a href='<%= response.encodeURL("index.jsp?logoff=true") %>'>here</a>.
   This should cause automatic re-logon with Waffle and a new session ID.
diff --git a/Source/JNA/waffle-demo/waffle-mixed/pom.xml b/Source/JNA/waffle-demo/waffle-mixed/pom.xml
index 6093541c4a..54ac9ce418 100644
--- a/Source/JNA/waffle-demo/waffle-mixed/pom.xml
+++ b/Source/JNA/waffle-demo/waffle-mixed/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-demo/waffle-mixed/src/main/webapp/index.jsp b/Source/JNA/waffle-demo/waffle-mixed/src/main/webapp/index.jsp
index de9b27a30b..d0332aecd6 100644
--- a/Source/JNA/waffle-demo/waffle-mixed/src/main/webapp/index.jsp
+++ b/Source/JNA/waffle-demo/waffle-mixed/src/main/webapp/index.jsp
@@ -2,7 +2,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -73,7 +73,7 @@
   <form method="GET" action='<%= response.encodeURL("index.jsp") %>'>
    <input type="text" name="role" value="<%= role %>">
   </form>
-  <br><br> 
+  <br><br>
   You can logoff by clicking
   <a href='<%= response.encodeURL("index.jsp?logoff=true") %>'>here</a>.
   This should cause automatic re-logon with Waffle and a new session ID.
diff --git a/Source/JNA/waffle-demo/waffle-negotiate/pom.xml b/Source/JNA/waffle-demo/waffle-negotiate/pom.xml
index a0dafa8008..d1450191e1 100644
--- a/Source/JNA/waffle-demo/waffle-negotiate/pom.xml
+++ b/Source/JNA/waffle-demo/waffle-negotiate/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-demo/waffle-negotiate/src/main/webapp/index.jsp b/Source/JNA/waffle-demo/waffle-negotiate/src/main/webapp/index.jsp
index de9b27a30b..d0332aecd6 100644
--- a/Source/JNA/waffle-demo/waffle-negotiate/src/main/webapp/index.jsp
+++ b/Source/JNA/waffle-demo/waffle-negotiate/src/main/webapp/index.jsp
@@ -2,7 +2,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -73,7 +73,7 @@
   <form method="GET" action='<%= response.encodeURL("index.jsp") %>'>
    <input type="text" name="role" value="<%= role %>">
   </form>
-  <br><br> 
+  <br><br>
   You can logoff by clicking
   <a href='<%= response.encodeURL("index.jsp?logoff=true") %>'>here</a>.
   This should cause automatic re-logon with Waffle and a new session ID.
diff --git a/Source/JNA/waffle-demo/waffle-spring-boot-filter2/pom.xml b/Source/JNA/waffle-demo/waffle-spring-boot-filter2/pom.xml
index c8328f8f9e..69e29c0d3e 100644
--- a/Source/JNA/waffle-demo/waffle-spring-boot-filter2/pom.xml
+++ b/Source/JNA/waffle-demo/waffle-spring-boot-filter2/pom.xml
@@ -43,8 +43,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-demo/waffle-spring-boot-filter3/pom.xml b/Source/JNA/waffle-demo/waffle-spring-boot-filter3/pom.xml
index ccbcb18cc1..aa0967d6f3 100644
--- a/Source/JNA/waffle-demo/waffle-spring-boot-filter3/pom.xml
+++ b/Source/JNA/waffle-demo/waffle-spring-boot-filter3/pom.xml
@@ -43,8 +43,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-demo/waffle-spring-filter/pom.xml b/Source/JNA/waffle-demo/waffle-spring-filter/pom.xml
index ee074b19af..14e1880049 100644
--- a/Source/JNA/waffle-demo/waffle-spring-filter/pom.xml
+++ b/Source/JNA/waffle-demo/waffle-spring-filter/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-demo/waffle-spring-filter/src/main/webapp/WEB-INF/waffle-filter.xml b/Source/JNA/waffle-demo/waffle-spring-filter/src/main/webapp/WEB-INF/waffle-filter.xml
index 4f0635f553..8e3b0f23e2 100644
--- a/Source/JNA/waffle-demo/waffle-spring-filter/src/main/webapp/WEB-INF/waffle-filter.xml
+++ b/Source/JNA/waffle-demo/waffle-spring-filter/src/main/webapp/WEB-INF/waffle-filter.xml
@@ -3,7 +3,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -27,7 +27,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:sec="http://www.springframework.org/schema/security"
     xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd">
+        http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd">
 
     <!-- windows authentication provider -->
     <bean id="waffleWindowsAuthProvider" class="waffle.windows.auth.impl.WindowsAuthProviderImpl" />
diff --git a/Source/JNA/waffle-demo/waffle-spring-filter/src/main/webapp/index.jsp b/Source/JNA/waffle-demo/waffle-spring-filter/src/main/webapp/index.jsp
index de9b27a30b..d0332aecd6 100644
--- a/Source/JNA/waffle-demo/waffle-spring-filter/src/main/webapp/index.jsp
+++ b/Source/JNA/waffle-demo/waffle-spring-filter/src/main/webapp/index.jsp
@@ -2,7 +2,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -73,7 +73,7 @@
   <form method="GET" action='<%= response.encodeURL("index.jsp") %>'>
    <input type="text" name="role" value="<%= role %>">
   </form>
-  <br><br> 
+  <br><br>
   You can logoff by clicking
   <a href='<%= response.encodeURL("index.jsp?logoff=true") %>'>here</a>.
   This should cause automatic re-logon with Waffle and a new session ID.
diff --git a/Source/JNA/waffle-demo/waffle-spring-form/pom.xml b/Source/JNA/waffle-demo/waffle-spring-form/pom.xml
index 0504012519..25d22c65d8 100644
--- a/Source/JNA/waffle-demo/waffle-spring-form/pom.xml
+++ b/Source/JNA/waffle-demo/waffle-spring-form/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-demo/waffle-spring-form/src/main/webapp/index.jsp b/Source/JNA/waffle-demo/waffle-spring-form/src/main/webapp/index.jsp
index de9b27a30b..d0332aecd6 100644
--- a/Source/JNA/waffle-demo/waffle-spring-form/src/main/webapp/index.jsp
+++ b/Source/JNA/waffle-demo/waffle-spring-form/src/main/webapp/index.jsp
@@ -2,7 +2,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -73,7 +73,7 @@
   <form method="GET" action='<%= response.encodeURL("index.jsp") %>'>
    <input type="text" name="role" value="<%= role %>">
   </form>
-  <br><br> 
+  <br><br>
   You can logoff by clicking
   <a href='<%= response.encodeURL("index.jsp?logoff=true") %>'>here</a>.
   This should cause automatic re-logon with Waffle and a new session ID.
diff --git a/Source/JNA/waffle-jetty/pom.xml b/Source/JNA/waffle-jetty/pom.xml
index 088ffc992a..4f029c4377 100644
--- a/Source/JNA/waffle-jetty/pom.xml
+++ b/Source/JNA/waffle-jetty/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
@@ -113,8 +113,8 @@
                     <artifactId>apache-el</artifactId>
                 </exclusion>
                 <exclusion>
-                     <groupId>javax.servlet</groupId>
-                     <artifactId>javax.servlet-api</artifactId>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -154,10 +154,10 @@
             <version>${jsp.version}</version>
             <scope>provided</scope>
             <exclusions>
-                 <exclusion>
-                      <groupId>org.glassfish</groupId>
-                      <artifactId>javax.el</artifactId>
-                 </exclusion>
+                <exclusion>
+                    <groupId>org.glassfish</groupId>
+                    <artifactId>javax.el</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/Source/JNA/waffle-jna-jakarta/pom.xml b/Source/JNA/waffle-jna-jakarta/pom.xml
index 831d453205..f1b85de833 100644
--- a/Source/JNA/waffle-jna-jakarta/pom.xml
+++ b/Source/JNA/waffle-jna-jakarta/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-jna/pom.xml b/Source/JNA/waffle-jna/pom.xml
index 0b3abd2ffb..482356bbfa 100644
--- a/Source/JNA/waffle-jna/pom.xml
+++ b/Source/JNA/waffle-jna/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-shiro/pom.xml b/Source/JNA/waffle-shiro/pom.xml
index 9de8959210..542190588c 100644
--- a/Source/JNA/waffle-shiro/pom.xml
+++ b/Source/JNA/waffle-shiro/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-spring-boot2/pom.xml b/Source/JNA/waffle-spring-boot2/pom.xml
index f185a1397e..d9480bec55 100644
--- a/Source/JNA/waffle-spring-boot2/pom.xml
+++ b/Source/JNA/waffle-spring-boot2/pom.xml
@@ -41,11 +41,16 @@
     <description>Sping Boot integration for WAFFLE</description>
     <url>https://waffle.github.io/waffle/</url>
 
+    <modules>
+        <module>waffle-spring-boot-autoconfigure2</module>
+        <module>waffle-spring-boot-starter2</module>
+    </modules>
+
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
@@ -60,11 +65,6 @@
         <module.name>waffle.spring.boot2</module.name>
     </properties>
 
-    <modules>
-        <module>waffle-spring-boot-autoconfigure2</module>
-        <module>waffle-spring-boot-starter2</module>
-    </modules>
-
     <dependencyManagement>
         <dependencies>
             <!-- Internal Dependencies -->
diff --git a/Source/JNA/waffle-spring-boot2/waffle-spring-boot-autoconfigure2/pom.xml b/Source/JNA/waffle-spring-boot2/waffle-spring-boot-autoconfigure2/pom.xml
index 13ab3d2f7c..62ebb22e16 100644
--- a/Source/JNA/waffle-spring-boot2/waffle-spring-boot-autoconfigure2/pom.xml
+++ b/Source/JNA/waffle-spring-boot2/waffle-spring-boot-autoconfigure2/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-spring-boot2/waffle-spring-boot-starter2/pom.xml b/Source/JNA/waffle-spring-boot2/waffle-spring-boot-starter2/pom.xml
index fd2a9b2874..3368d36503 100644
--- a/Source/JNA/waffle-spring-boot2/waffle-spring-boot-starter2/pom.xml
+++ b/Source/JNA/waffle-spring-boot2/waffle-spring-boot-starter2/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-spring-boot3/pom.xml b/Source/JNA/waffle-spring-boot3/pom.xml
index 8feb5a9a82..7cc59ac31d 100644
--- a/Source/JNA/waffle-spring-boot3/pom.xml
+++ b/Source/JNA/waffle-spring-boot3/pom.xml
@@ -41,11 +41,16 @@
     <description>Sping Boot integration for WAFFLE</description>
     <url>https://waffle.github.io/waffle/</url>
 
+    <modules>
+        <module>waffle-spring-boot-autoconfigure3</module>
+        <module>waffle-spring-boot-starter3</module>
+    </modules>
+
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
@@ -63,11 +68,6 @@
         <module.name>waffle.spring.boot2</module.name>
     </properties>
 
-    <modules>
-        <module>waffle-spring-boot-autoconfigure3</module>
-        <module>waffle-spring-boot-starter3</module>
-    </modules>
-
     <dependencyManagement>
         <dependencies>
             <!-- Internal Dependencies -->
diff --git a/Source/JNA/waffle-spring-boot3/waffle-spring-boot-autoconfigure3/pom.xml b/Source/JNA/waffle-spring-boot3/waffle-spring-boot-autoconfigure3/pom.xml
index cf58d0a970..ce6798a635 100644
--- a/Source/JNA/waffle-spring-boot3/waffle-spring-boot-autoconfigure3/pom.xml
+++ b/Source/JNA/waffle-spring-boot3/waffle-spring-boot-autoconfigure3/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-spring-boot3/waffle-spring-boot-starter3/pom.xml b/Source/JNA/waffle-spring-boot3/waffle-spring-boot-starter3/pom.xml
index cb7a2ec88f..0952b045b5 100644
--- a/Source/JNA/waffle-spring-boot3/waffle-spring-boot-starter3/pom.xml
+++ b/Source/JNA/waffle-spring-boot3/waffle-spring-boot-starter3/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-spring-security5/pom.xml b/Source/JNA/waffle-spring-security5/pom.xml
index ff76c404a2..f5adc2b234 100644
--- a/Source/JNA/waffle-spring-security5/pom.xml
+++ b/Source/JNA/waffle-spring-security5/pom.xml
@@ -40,12 +40,12 @@
     <name>waffle-spring-security5</name>
     <description>Spring Security 5 integration for WAFFLE</description>
     <url>https://waffle.github.io/waffle/</url>
-   
+
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-spring-security6/pom.xml b/Source/JNA/waffle-spring-security6/pom.xml
index 834a936f23..74a2c4bed8 100644
--- a/Source/JNA/waffle-spring-security6/pom.xml
+++ b/Source/JNA/waffle-spring-security6/pom.xml
@@ -40,12 +40,12 @@
     <name>waffle-spring-security6</name>
     <description>Spring Security 6 integration for WAFFLE</description>
     <url>https://waffle.github.io/waffle/</url>
-   
+
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-tests-jakarta/pom.xml b/Source/JNA/waffle-tests-jakarta/pom.xml
index 8bb4856fa2..aae1b945cc 100644
--- a/Source/JNA/waffle-tests-jakarta/pom.xml
+++ b/Source/JNA/waffle-tests-jakarta/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-tests/pom.xml b/Source/JNA/waffle-tests/pom.xml
index c3be5bd24e..5871695ebc 100644
--- a/Source/JNA/waffle-tests/pom.xml
+++ b/Source/JNA/waffle-tests/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-tomcat10/pom.xml b/Source/JNA/waffle-tomcat10/pom.xml
index 09043632e4..2ac74e2993 100644
--- a/Source/JNA/waffle-tomcat10/pom.xml
+++ b/Source/JNA/waffle-tomcat10/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-tomcat85/pom.xml b/Source/JNA/waffle-tomcat85/pom.xml
index 0c0dfefb47..7b712633f7 100644
--- a/Source/JNA/waffle-tomcat85/pom.xml
+++ b/Source/JNA/waffle-tomcat85/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-tomcat9/pom.xml b/Source/JNA/waffle-tomcat9/pom.xml
index c4c56f9695..d145faa589 100644
--- a/Source/JNA/waffle-tomcat9/pom.xml
+++ b/Source/JNA/waffle-tomcat9/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>