diff --git a/Source/JNA/pom.xml b/Source/JNA/pom.xml
index 2e13683651..8a32d90356 100644
--- a/Source/JNA/pom.xml
+++ b/Source/JNA/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
     <packaging>pom</packaging>
 
     <name>waffle</name>
@@ -107,7 +107,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
     <issueManagement>
@@ -167,7 +167,7 @@
         <module.name>waffle.parent</module.name>
 
         <!-- Reproducible Builds -->
-        <project.build.outputTimestamp>1715040462</project.build.outputTimestamp>
+        <project.build.outputTimestamp>1727048887</project.build.outputTimestamp>
 
         <!-- Checkstyle -->
         <checkstyle.config>checkstyle.xml</checkstyle.config>
diff --git a/Source/JNA/waffle-bom/pom.xml b/Source/JNA/waffle-bom/pom.xml
index e59202f241..f18866576f 100644
--- a/Source/JNA/waffle-bom/pom.xml
+++ b/Source/JNA/waffle-bom/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle-bom</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
     <packaging>pom</packaging>
 
     <name>waffle-bom</name>
@@ -46,7 +46,7 @@
         <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>
+        <tag>waffle-3.5.0</tag>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-demo/pom.xml b/Source/JNA/waffle-demo/pom.xml
index e6c5ab5c22..1aa0014c0a 100644
--- a/Source/JNA/waffle-demo/pom.xml
+++ b/Source/JNA/waffle-demo/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle.demo</groupId>
     <artifactId>waffle-demo-parent</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
     <packaging>pom</packaging>
 
     <name>waffle-demo-parent</name>
@@ -58,7 +58,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-demo/waffle-filter/pom.xml b/Source/JNA/waffle-demo/waffle-filter/pom.xml
index d092a831d8..7f9cb2fd75 100644
--- a/Source/JNA/waffle-demo/waffle-filter/pom.xml
+++ b/Source/JNA/waffle-demo/waffle-filter/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle.demo</groupId>
         <artifactId>waffle-demo-parent</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle.demo</groupId>
     <artifactId>waffle-filter</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
     <packaging>war</packaging>
 
     <name>waffle-filter</name>
@@ -45,7 +45,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-demo/waffle-form/pom.xml b/Source/JNA/waffle-demo/waffle-form/pom.xml
index 018a13f82a..57e392c093 100644
--- a/Source/JNA/waffle-demo/waffle-form/pom.xml
+++ b/Source/JNA/waffle-demo/waffle-form/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle.demo</groupId>
         <artifactId>waffle-demo-parent</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle.demo</groupId>
     <artifactId>waffle-form</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
     <packaging>war</packaging>
 
     <name>waffle-form</name>
@@ -45,7 +45,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-demo/waffle-jaas/pom.xml b/Source/JNA/waffle-demo/waffle-jaas/pom.xml
index 044b5b37e9..2667a00f76 100644
--- a/Source/JNA/waffle-demo/waffle-jaas/pom.xml
+++ b/Source/JNA/waffle-demo/waffle-jaas/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle.demo</groupId>
         <artifactId>waffle-demo-parent</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle.demo</groupId>
     <artifactId>waffle-jaas</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
     <packaging>war</packaging>
 
     <name>waffle-jaas</name>
@@ -45,7 +45,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-demo/waffle-mixed-post/pom.xml b/Source/JNA/waffle-demo/waffle-mixed-post/pom.xml
index 2f321b5be3..65cc1c5ca9 100644
--- a/Source/JNA/waffle-demo/waffle-mixed-post/pom.xml
+++ b/Source/JNA/waffle-demo/waffle-mixed-post/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle.demo</groupId>
         <artifactId>waffle-demo-parent</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle.demo</groupId>
     <artifactId>waffle-mixed-post</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
     <packaging>war</packaging>
 
     <name>waffle-mixed-post</name>
@@ -45,7 +45,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-demo/waffle-mixed/pom.xml b/Source/JNA/waffle-demo/waffle-mixed/pom.xml
index 3289009dd4..b6956856ca 100644
--- a/Source/JNA/waffle-demo/waffle-mixed/pom.xml
+++ b/Source/JNA/waffle-demo/waffle-mixed/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle.demo</groupId>
         <artifactId>waffle-demo-parent</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle.demo</groupId>
     <artifactId>waffle-mixed</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
     <packaging>war</packaging>
 
     <name>waffle-mixed</name>
@@ -45,7 +45,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-demo/waffle-negotiate/pom.xml b/Source/JNA/waffle-demo/waffle-negotiate/pom.xml
index be8feff86e..a7ab71a72a 100644
--- a/Source/JNA/waffle-demo/waffle-negotiate/pom.xml
+++ b/Source/JNA/waffle-demo/waffle-negotiate/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle.demo</groupId>
         <artifactId>waffle-demo-parent</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle.demo</groupId>
     <artifactId>waffle-negotiate</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
     <packaging>war</packaging>
 
     <name>waffle-negotiate</name>
@@ -45,7 +45,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
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 659fcb5e51..437e9b3d0b 100644
--- a/Source/JNA/waffle-demo/waffle-spring-boot-filter2/pom.xml
+++ b/Source/JNA/waffle-demo/waffle-spring-boot-filter2/pom.xml
@@ -29,12 +29,12 @@
     <parent>
         <groupId>com.github.waffle.demo</groupId>
         <artifactId>waffle-demo-parent</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle.demo</groupId>
     <artifactId>waffle-spring-boot-filter2</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
 
     <name>waffle-spring-boot-filter2</name>
     <description>Spring Boot Filter 2 Demo for WAFFLE</description>
@@ -43,7 +43,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
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 a93230ad35..455e6c4afa 100644
--- a/Source/JNA/waffle-demo/waffle-spring-boot-filter3/pom.xml
+++ b/Source/JNA/waffle-demo/waffle-spring-boot-filter3/pom.xml
@@ -29,12 +29,12 @@
     <parent>
         <groupId>com.github.waffle.demo</groupId>
         <artifactId>waffle-demo-parent</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle.demo</groupId>
     <artifactId>waffle-spring-boot-filter3</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
 
     <name>waffle-spring-boot-filter3</name>
     <description>Spring Boot Filter 3 Demo for WAFFLE</description>
@@ -43,7 +43,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-demo/waffle-spring-filter/pom.xml b/Source/JNA/waffle-demo/waffle-spring-filter/pom.xml
index 283902d15f..3db72b1f52 100644
--- a/Source/JNA/waffle-demo/waffle-spring-filter/pom.xml
+++ b/Source/JNA/waffle-demo/waffle-spring-filter/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle.demo</groupId>
         <artifactId>waffle-demo-parent</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle.demo</groupId>
     <artifactId>waffle-spring-filter</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
     <packaging>war</packaging>
 
     <name>waffle-spring-filter</name>
@@ -45,7 +45,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-demo/waffle-spring-form/pom.xml b/Source/JNA/waffle-demo/waffle-spring-form/pom.xml
index 42881bce9c..c93ff68a41 100644
--- a/Source/JNA/waffle-demo/waffle-spring-form/pom.xml
+++ b/Source/JNA/waffle-demo/waffle-spring-form/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle.demo</groupId>
         <artifactId>waffle-demo-parent</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle.demo</groupId>
     <artifactId>waffle-spring-form</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
     <packaging>war</packaging>
 
     <name>waffle-spring-form</name>
@@ -45,7 +45,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-distro/pom.xml b/Source/JNA/waffle-distro/pom.xml
index c86b8671fc..9f478e0fac 100644
--- a/Source/JNA/waffle-distro/pom.xml
+++ b/Source/JNA/waffle-distro/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle-distro</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
     <packaging>pom</packaging>
 
     <name>waffle-distro</name>
@@ -46,7 +46,7 @@
         <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>
+        <tag>waffle-3.5.0</tag>
     </scm>
 
     <properties>
diff --git a/Source/JNA/waffle-jetty-jakarta/pom.xml b/Source/JNA/waffle-jetty-jakarta/pom.xml
index adf9157271..0cd14ea336 100644
--- a/Source/JNA/waffle-jetty-jakarta/pom.xml
+++ b/Source/JNA/waffle-jetty-jakarta/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle-jetty-jakarta</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
 
     <name>waffle-jetty-jakarta</name>
     <description>Jetty Jakarta integration for WAFFLE</description>
@@ -44,7 +44,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-jetty/pom.xml b/Source/JNA/waffle-jetty/pom.xml
index c5ed8be76d..01b9aa99a3 100644
--- a/Source/JNA/waffle-jetty/pom.xml
+++ b/Source/JNA/waffle-jetty/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle-jetty</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
 
     <name>waffle-jetty</name>
     <description>Jetty integration for WAFFLE</description>
@@ -44,7 +44,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-jna-jakarta/pom.xml b/Source/JNA/waffle-jna-jakarta/pom.xml
index fe42690675..1ff36c000b 100644
--- a/Source/JNA/waffle-jna-jakarta/pom.xml
+++ b/Source/JNA/waffle-jna-jakarta/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle-jna-jakarta</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
 
     <name>waffle-jna-jakarta</name>
     <description>WAFFLE JNA Jakarta Pakage implementation</description>
@@ -44,7 +44,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-jna/pom.xml b/Source/JNA/waffle-jna/pom.xml
index d66102a2c7..0c602434ed 100644
--- a/Source/JNA/waffle-jna/pom.xml
+++ b/Source/JNA/waffle-jna/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle-jna</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
 
     <name>waffle-jna</name>
     <description>WAFFLE JNA implementation</description>
@@ -44,7 +44,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-shiro/pom.xml b/Source/JNA/waffle-shiro/pom.xml
index c6fa9ea538..0b13a92558 100644
--- a/Source/JNA/waffle-shiro/pom.xml
+++ b/Source/JNA/waffle-shiro/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle-shiro</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
 
     <name>waffle-shiro</name>
     <description>Shiro integration for WAFFLE</description>
@@ -44,7 +44,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-spring-boot2/pom.xml b/Source/JNA/waffle-spring-boot2/pom.xml
index ca346f9caa..b7f6c3a34f 100644
--- a/Source/JNA/waffle-spring-boot2/pom.xml
+++ b/Source/JNA/waffle-spring-boot2/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle-spring-boot2</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
     <packaging>pom</packaging>
 
     <name>waffle-spring-boot2</name>
@@ -50,7 +50,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
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 38898f3824..71313cbfdd 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
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle-spring-boot2</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle-spring-boot-autoconfigure2</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
 
     <name>waffle-spring-boot-autoconfigure2</name>
     <description>Spring Boot Autoconfigure for WAFFLE</description>
@@ -44,7 +44,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
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 f82266c6b7..7a9e6cf861 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
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle-spring-boot2</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle-spring-boot-starter2</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
 
     <name>waffle-spring-boot-starter2</name>
     <description>Spring Boot Starter for WAFFLE</description>
@@ -44,7 +44,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-spring-boot3/pom.xml b/Source/JNA/waffle-spring-boot3/pom.xml
index 9d71a23cca..e140b3991e 100644
--- a/Source/JNA/waffle-spring-boot3/pom.xml
+++ b/Source/JNA/waffle-spring-boot3/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle-spring-boot3</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
     <packaging>pom</packaging>
 
     <name>waffle-spring-boot3</name>
@@ -50,7 +50,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
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 0ed66f0300..f039b33bee 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
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle-spring-boot3</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle-spring-boot-autoconfigure3</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
 
     <name>waffle-spring-boot-autoconfigure3</name>
     <description>Spring Boot Autoconfigure for WAFFLE</description>
@@ -44,7 +44,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
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 11f9e56eb7..238ba136bf 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
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle-spring-boot3</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle-spring-boot-starter3</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
 
     <name>waffle-spring-boot-starter3</name>
     <description>Spring Boot Starter for WAFFLE</description>
@@ -44,7 +44,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-spring-security5/pom.xml b/Source/JNA/waffle-spring-security5/pom.xml
index 130901d25f..74a02e4f57 100644
--- a/Source/JNA/waffle-spring-security5/pom.xml
+++ b/Source/JNA/waffle-spring-security5/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle-spring-security5</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
 
     <name>waffle-spring-security5</name>
     <description>Spring Security 5 integration for WAFFLE</description>
@@ -44,7 +44,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-spring-security6/pom.xml b/Source/JNA/waffle-spring-security6/pom.xml
index 6512895c2b..547997997b 100644
--- a/Source/JNA/waffle-spring-security6/pom.xml
+++ b/Source/JNA/waffle-spring-security6/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle-spring-security6</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
 
     <name>waffle-spring-security6</name>
     <description>Spring Security 6 integration for WAFFLE</description>
@@ -44,7 +44,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-tests-jakarta/pom.xml b/Source/JNA/waffle-tests-jakarta/pom.xml
index c1e3899e90..7eeaa0f581 100644
--- a/Source/JNA/waffle-tests-jakarta/pom.xml
+++ b/Source/JNA/waffle-tests-jakarta/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle-tests-jakarta</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
 
     <name>waffle-tests-jakarta</name>
     <description>Tests Jakarta Package for WAFFLE</description>
@@ -44,7 +44,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-tests/pom.xml b/Source/JNA/waffle-tests/pom.xml
index f09a5c353d..103086ad84 100644
--- a/Source/JNA/waffle-tests/pom.xml
+++ b/Source/JNA/waffle-tests/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle-tests</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
 
     <name>waffle-tests</name>
     <description>Tests for WAFFLE</description>
@@ -44,7 +44,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-tomcat10/pom.xml b/Source/JNA/waffle-tomcat10/pom.xml
index d64deec235..4c6591b0cd 100644
--- a/Source/JNA/waffle-tomcat10/pom.xml
+++ b/Source/JNA/waffle-tomcat10/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle-tomcat10</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
 
     <name>waffle-tomcat10</name>
     <description>Tomcat 10 integration for WAFFLE</description>
@@ -44,7 +44,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-tomcat11/pom.xml b/Source/JNA/waffle-tomcat11/pom.xml
index e512d76422..54e01a5271 100644
--- a/Source/JNA/waffle-tomcat11/pom.xml
+++ b/Source/JNA/waffle-tomcat11/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle-tomcat11</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
 
     <name>waffle-tomcat11</name>
     <description>Tomcat 11 integration for WAFFLE</description>
@@ -44,7 +44,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>
 
diff --git a/Source/JNA/waffle-tomcat9/pom.xml b/Source/JNA/waffle-tomcat9/pom.xml
index 32276b9da9..6d442758c0 100644
--- a/Source/JNA/waffle-tomcat9/pom.xml
+++ b/Source/JNA/waffle-tomcat9/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>com.github.waffle</groupId>
         <artifactId>waffle</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>com.github.waffle</groupId>
     <artifactId>waffle-tomcat9</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.5.0</version>
 
     <name>waffle-tomcat9</name>
     <description>Tomcat 9 integration for WAFFLE</description>
@@ -44,7 +44,7 @@
     <scm>
         <connection>scm:git:ssh://git@github.com/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/waffle/waffle.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>waffle-3.5.0</tag>
         <url>https://github.com/Waffle/waffle</url>
     </scm>