From c41a9d12c7fedfb10396c4d139fda19ee6e9f274 Mon Sep 17 00:00:00 2001
From: Thorsten Marx <thmarx@gmx.net>
Date: Fri, 13 Sep 2024 12:24:22 +0200
Subject: [PATCH 1/2] update to condation cms 6.0.0

---
 pom.xml                                       | 63 +++++++++++++++----
 .../modules/forms/FormHandlingException.java  |  2 +-
 .../cms/modules/forms/FormsConfig.java        |  2 +-
 .../cms/modules/forms/FormsHandling.java      |  2 +-
 .../forms/FormsHttpHandlerExtension.java      | 16 ++---
 .../forms/FormsLifecycleExtension.java        | 12 ++--
 .../FormsTemplateModelExtensionPoint.java     | 12 ++--
 .../handler/AjaxCaptchaValidationHandler.java |  6 +-
 .../forms/handler/AjaxSubmitFormHandler.java  |  6 +-
 .../forms/handler/GenerateCaptchaHandler.java |  8 +--
 .../forms/handler/SubmitFormHandler.java      | 10 +--
 .../forms/template/FormsTemplateModel.java    |  4 +-
 .../cms/modules/forms/utils/StringUtil.java   |  2 +-
 .../cms/modules/forms/CaptchaTest.java        |  2 +-
 .../cms/modules/forms/MailTest.java           |  2 +-
 15 files changed, 94 insertions(+), 55 deletions(-)
 rename src/main/java/com/{github/thmarx => condation}/cms/modules/forms/FormHandlingException.java (97%)
 rename src/main/java/com/{github/thmarx => condation}/cms/modules/forms/FormsConfig.java (97%)
 rename src/main/java/com/{github/thmarx => condation}/cms/modules/forms/FormsHandling.java (98%)
 rename src/main/java/com/{github/thmarx => condation}/cms/modules/forms/FormsHttpHandlerExtension.java (72%)
 rename src/main/java/com/{github/thmarx => condation}/cms/modules/forms/FormsLifecycleExtension.java (85%)
 rename src/main/java/com/{github/thmarx => condation}/cms/modules/forms/FormsTemplateModelExtensionPoint.java (71%)
 rename src/main/java/com/{github/thmarx => condation}/cms/modules/forms/handler/AjaxCaptchaValidationHandler.java (92%)
 rename src/main/java/com/{github/thmarx => condation}/cms/modules/forms/handler/AjaxSubmitFormHandler.java (93%)
 rename src/main/java/com/{github/thmarx => condation}/cms/modules/forms/handler/GenerateCaptchaHandler.java (92%)
 rename src/main/java/com/{github/thmarx => condation}/cms/modules/forms/handler/SubmitFormHandler.java (94%)
 rename src/main/java/com/{github/thmarx => condation}/cms/modules/forms/template/FormsTemplateModel.java (89%)
 rename src/main/java/com/{github/thmarx => condation}/cms/modules/forms/utils/StringUtil.java (96%)
 rename src/test/java/com/{github/thmarx => condation}/cms/modules/forms/CaptchaTest.java (96%)
 rename src/test/java/com/{github/thmarx => condation}/cms/modules/forms/MailTest.java (97%)

diff --git a/pom.xml b/pom.xml
index e86200f..c93cd47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	
 
-	<groupId>com.github.thmarx.cms.modules</groupId>	
+	<groupId>com.condation.cms.modules</groupId>	
 	<artifactId>forms-module</artifactId>
-	<version>1.2.0</version>
+	<version>2.0.0</version>
 	<packaging>jar</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -14,16 +14,27 @@
 		<module.name>forms module</module.name>
 		<module.priority>NORMAL</module.priority>
 		
-		<cms.version>4.5.0</cms.version>
+		<cms.version>6.0.0-SNAPSHOT</cms.version>
 		<maven.compiler.source>21</maven.compiler.source>
 		<maven.compiler.target>21</maven.compiler.target>
 	</properties>
+	<inceptionYear>2024</inceptionYear>
+	<organization>
+		<name>CondationCMS</name>
+		<url>https://condation.com</url>
+	</organization>
+	<licenses>
+		<license>
+			<name>GPL v3</name>
+			<url>https://www.gnu.org/licenses/gpl-3.0.html</url>
+		</license>
+	</licenses>
 	<dependencies>
 		
 		<dependency>
 			<groupId>org.simplejavamail</groupId>
 			<artifactId>simple-java-mail</artifactId>
-			<version>8.5.1</version>
+			<version>8.11.2</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
@@ -34,7 +45,7 @@
 		<dependency>
 			<groupId>net.logicsquad</groupId>
 			<artifactId>nanocaptcha</artifactId>
-			<version>1.5</version>
+			<version>2.1</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
@@ -55,13 +66,13 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.10.1</version>
+			<version>2.11.0</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.10.1</version>
+			<version>5.11.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -79,19 +90,19 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>3.24.2</version>
+			<version>3.26.3</version>
 			<scope>test</scope>
 		</dependency>
 
 		
 		<dependency>
-			<groupId>com.github.thmarx.cms</groupId>
+			<groupId>com.condation.cms</groupId>
 			<artifactId>cms-api</artifactId>
 			<version>${cms.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.github.thmarx.cms.module.framework</groupId>
+			<groupId>com.condation.cms.module.framework</groupId>
 			<artifactId>modules-api</artifactId>
 			<version>${cms.version}</version>
 			<scope>provided</scope>
@@ -99,7 +110,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.30</version>
+			<version>1.18.34</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
@@ -107,7 +118,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>3.6.0</version>
+				<version>3.7.1</version>
 				<configuration>
 					<descriptors>
 						<descriptor>src/main/assembly/assembly.xml</descriptor>
@@ -122,7 +133,33 @@
 						</goals>
 					</execution>
 				</executions>
-			</plugin>			
+			</plugin>	
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>license-maven-plugin</artifactId>
+				<version>2.4.0</version>
+				<configuration>
+					<verbose>false</verbose>
+					<licenseName>gpl_v3</licenseName>
+				</configuration>
+				<executions>
+					<execution>
+						<id>first</id>
+						<goals>
+							<goal>update-file-header</goal>
+						</goals>
+						<phase>process-sources</phase>
+						<configuration>
+							<licenseName>gpl_v3</licenseName>
+							<roots>
+								<root>src/main/java</root>
+								<root>src/resources</root>
+								<root>src/test</root>
+							</roots>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>		
 		</plugins>
 	</build>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/FormHandlingException.java b/src/main/java/com/condation/cms/modules/forms/FormHandlingException.java
similarity index 97%
rename from src/main/java/com/github/thmarx/cms/modules/forms/FormHandlingException.java
rename to src/main/java/com/condation/cms/modules/forms/FormHandlingException.java
index 37ccb04..7789f22 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/FormHandlingException.java
+++ b/src/main/java/com/condation/cms/modules/forms/FormHandlingException.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.forms;
+package com.condation.cms.modules.forms;
 
 /*-
  * #%L
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/FormsConfig.java b/src/main/java/com/condation/cms/modules/forms/FormsConfig.java
similarity index 97%
rename from src/main/java/com/github/thmarx/cms/modules/forms/FormsConfig.java
rename to src/main/java/com/condation/cms/modules/forms/FormsConfig.java
index 10af5d0..185458a 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/FormsConfig.java
+++ b/src/main/java/com/condation/cms/modules/forms/FormsConfig.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.forms;
+package com.condation.cms.modules.forms;
 
 /*-
  * #%L
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/FormsHandling.java b/src/main/java/com/condation/cms/modules/forms/FormsHandling.java
similarity index 98%
rename from src/main/java/com/github/thmarx/cms/modules/forms/FormsHandling.java
rename to src/main/java/com/condation/cms/modules/forms/FormsHandling.java
index 7eec31f..489a3cb 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/FormsHandling.java
+++ b/src/main/java/com/condation/cms/modules/forms/FormsHandling.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.forms;
+package com.condation.cms.modules.forms;
 
 /*-
  * #%L
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/FormsHttpHandlerExtension.java b/src/main/java/com/condation/cms/modules/forms/FormsHttpHandlerExtension.java
similarity index 72%
rename from src/main/java/com/github/thmarx/cms/modules/forms/FormsHttpHandlerExtension.java
rename to src/main/java/com/condation/cms/modules/forms/FormsHttpHandlerExtension.java
index 8994c82..9df2792 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/FormsHttpHandlerExtension.java
+++ b/src/main/java/com/condation/cms/modules/forms/FormsHttpHandlerExtension.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.forms;
+package com.condation.cms.modules.forms;
 
 /*-
  * #%L
@@ -22,13 +22,13 @@
  * #L%
  */
 
-import com.github.thmarx.cms.api.extensions.HttpHandlerExtensionPoint;
-import com.github.thmarx.cms.api.extensions.Mapping;
-import com.github.thmarx.cms.modules.forms.handler.AjaxCaptchaValidationHandler;
-import com.github.thmarx.cms.modules.forms.handler.GenerateCaptchaHandler;
-import com.github.thmarx.cms.modules.forms.handler.AjaxSubmitFormHandler;
-import com.github.thmarx.cms.modules.forms.handler.SubmitFormHandler;
-import com.github.thmarx.modules.api.annotation.Extension;
+import com.condation.cms.api.extensions.HttpHandlerExtensionPoint;
+import com.condation.cms.api.extensions.Mapping;
+import com.condation.cms.modules.forms.handler.AjaxCaptchaValidationHandler;
+import com.condation.cms.modules.forms.handler.GenerateCaptchaHandler;
+import com.condation.cms.modules.forms.handler.AjaxSubmitFormHandler;
+import com.condation.cms.modules.forms.handler.SubmitFormHandler;
+import com.condation.modules.api.annotation.Extension;
 import org.eclipse.jetty.http.pathmap.PathSpec;
 
 /**
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/FormsLifecycleExtension.java b/src/main/java/com/condation/cms/modules/forms/FormsLifecycleExtension.java
similarity index 85%
rename from src/main/java/com/github/thmarx/cms/modules/forms/FormsLifecycleExtension.java
rename to src/main/java/com/condation/cms/modules/forms/FormsLifecycleExtension.java
index debbb75..2083003 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/FormsLifecycleExtension.java
+++ b/src/main/java/com/condation/cms/modules/forms/FormsLifecycleExtension.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.forms;
+package com.condation.cms.modules.forms;
 
 /*-
  * #%L
@@ -24,11 +24,11 @@
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
-import com.github.thmarx.cms.api.feature.features.DBFeature;
-import com.github.thmarx.cms.api.module.CMSModuleContext;
-import com.github.thmarx.cms.api.module.CMSRequestContext;
-import com.github.thmarx.modules.api.ModuleLifeCycleExtension;
-import com.github.thmarx.modules.api.annotation.Extension;
+import com.condation.cms.api.feature.features.DBFeature;
+import com.condation.cms.api.module.CMSModuleContext;
+import com.condation.cms.api.module.CMSRequestContext;
+import com.condation.modules.api.ModuleLifeCycleExtension;
+import com.condation.modules.api.annotation.Extension;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/FormsTemplateModelExtensionPoint.java b/src/main/java/com/condation/cms/modules/forms/FormsTemplateModelExtensionPoint.java
similarity index 71%
rename from src/main/java/com/github/thmarx/cms/modules/forms/FormsTemplateModelExtensionPoint.java
rename to src/main/java/com/condation/cms/modules/forms/FormsTemplateModelExtensionPoint.java
index c93b444..d4157a0 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/FormsTemplateModelExtensionPoint.java
+++ b/src/main/java/com/condation/cms/modules/forms/FormsTemplateModelExtensionPoint.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.forms;
+package com.condation.cms.modules.forms;
 
 /*-
  * #%L
@@ -22,10 +22,12 @@
  * #L%
  */
 
-import com.github.thmarx.cms.api.extensions.TemplateModelExtendingExtentionPoint;
-import com.github.thmarx.cms.api.template.TemplateEngine;
-import com.github.thmarx.cms.modules.forms.template.FormsTemplateModel;
-import com.github.thmarx.modules.api.annotation.Extension;
+import com.condation.cms.api.extensions.TemplateModelExtendingExtentionPoint;
+import com.condation.cms.api.template.TemplateEngine;
+import com.condation.cms.api.extensions.TemplateModelExtendingExtentionPoint;
+import com.condation.cms.modules.forms.template.FormsTemplateModel;
+import com.condation.modules.api.annotation.Extension;
+import com.condation.modules.api.annotation.Extension;
 
 /**
  *
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/handler/AjaxCaptchaValidationHandler.java b/src/main/java/com/condation/cms/modules/forms/handler/AjaxCaptchaValidationHandler.java
similarity index 92%
rename from src/main/java/com/github/thmarx/cms/modules/forms/handler/AjaxCaptchaValidationHandler.java
rename to src/main/java/com/condation/cms/modules/forms/handler/AjaxCaptchaValidationHandler.java
index 2349f0a..436c4e5 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/handler/AjaxCaptchaValidationHandler.java
+++ b/src/main/java/com/condation/cms/modules/forms/handler/AjaxCaptchaValidationHandler.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.forms.handler;
+package com.condation.cms.modules.forms.handler;
 
 /*-
  * #%L
@@ -22,8 +22,8 @@
  * #L%
  */
 
-import com.github.thmarx.cms.api.extensions.HttpHandler;
-import com.github.thmarx.cms.modules.forms.FormsLifecycleExtension;
+import com.condation.cms.api.extensions.HttpHandler;
+import com.condation.cms.modules.forms.FormsLifecycleExtension;
 import com.google.gson.Gson;
 import java.nio.charset.StandardCharsets;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/handler/AjaxSubmitFormHandler.java b/src/main/java/com/condation/cms/modules/forms/handler/AjaxSubmitFormHandler.java
similarity index 93%
rename from src/main/java/com/github/thmarx/cms/modules/forms/handler/AjaxSubmitFormHandler.java
rename to src/main/java/com/condation/cms/modules/forms/handler/AjaxSubmitFormHandler.java
index be6bb79..ad6cd20 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/handler/AjaxSubmitFormHandler.java
+++ b/src/main/java/com/condation/cms/modules/forms/handler/AjaxSubmitFormHandler.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.forms.handler;
+package com.condation.cms.modules.forms.handler;
 
 /*-
  * #%L
@@ -22,8 +22,8 @@
  * #L%
  */
 
-import com.github.thmarx.cms.api.extensions.HttpHandler;
-import com.github.thmarx.cms.modules.forms.FormsLifecycleExtension;
+import com.condation.cms.api.extensions.HttpHandler;
+import com.condation.cms.modules.forms.FormsLifecycleExtension;
 import com.google.gson.Gson;
 import java.nio.charset.StandardCharsets;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/handler/GenerateCaptchaHandler.java b/src/main/java/com/condation/cms/modules/forms/handler/GenerateCaptchaHandler.java
similarity index 92%
rename from src/main/java/com/github/thmarx/cms/modules/forms/handler/GenerateCaptchaHandler.java
rename to src/main/java/com/condation/cms/modules/forms/handler/GenerateCaptchaHandler.java
index 0ceea79..2309ef5 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/handler/GenerateCaptchaHandler.java
+++ b/src/main/java/com/condation/cms/modules/forms/handler/GenerateCaptchaHandler.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.forms.handler;
+package com.condation.cms.modules.forms.handler;
 
 /*-
  * #%L
@@ -22,9 +22,9 @@
  * #L%
  */
 
-import com.github.thmarx.cms.api.extensions.HttpHandler;
-import com.github.thmarx.cms.api.utils.HTTPUtil;
-import com.github.thmarx.cms.modules.forms.FormsLifecycleExtension;
+import com.condation.cms.api.extensions.HttpHandler;
+import com.condation.cms.api.utils.HTTPUtil;
+import com.condation.cms.modules.forms.FormsLifecycleExtension;
 import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;
 import java.util.List;
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/handler/SubmitFormHandler.java b/src/main/java/com/condation/cms/modules/forms/handler/SubmitFormHandler.java
similarity index 94%
rename from src/main/java/com/github/thmarx/cms/modules/forms/handler/SubmitFormHandler.java
rename to src/main/java/com/condation/cms/modules/forms/handler/SubmitFormHandler.java
index c141011..6710207 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/handler/SubmitFormHandler.java
+++ b/src/main/java/com/condation/cms/modules/forms/handler/SubmitFormHandler.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.forms.handler;
+package com.condation.cms.modules.forms.handler;
 
 /*-
  * #%L
@@ -21,10 +21,10 @@
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
  */
-import com.github.thmarx.cms.api.extensions.HttpHandler;
-import com.github.thmarx.cms.modules.forms.FormHandlingException;
-import com.github.thmarx.cms.modules.forms.FormsHandling;
-import com.github.thmarx.cms.modules.forms.FormsLifecycleExtension;
+import com.condation.cms.api.extensions.HttpHandler;
+import com.condation.cms.modules.forms.FormHandlingException;
+import com.condation.cms.modules.forms.FormsHandling;
+import com.condation.cms.modules.forms.FormsLifecycleExtension;
 import com.google.common.base.Strings;
 import com.google.gson.Gson;
 import java.nio.charset.StandardCharsets;
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/template/FormsTemplateModel.java b/src/main/java/com/condation/cms/modules/forms/template/FormsTemplateModel.java
similarity index 89%
rename from src/main/java/com/github/thmarx/cms/modules/forms/template/FormsTemplateModel.java
rename to src/main/java/com/condation/cms/modules/forms/template/FormsTemplateModel.java
index b02c113..07541b4 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/template/FormsTemplateModel.java
+++ b/src/main/java/com/condation/cms/modules/forms/template/FormsTemplateModel.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.forms.template;
+package com.condation.cms.modules.forms.template;
 
 /*-
  * #%L
@@ -22,7 +22,7 @@
  * #L%
  */
 
-import com.github.thmarx.cms.modules.forms.utils.StringUtil;
+import com.condation.cms.modules.forms.utils.StringUtil;
 
 /**
  *
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/utils/StringUtil.java b/src/main/java/com/condation/cms/modules/forms/utils/StringUtil.java
similarity index 96%
rename from src/main/java/com/github/thmarx/cms/modules/forms/utils/StringUtil.java
rename to src/main/java/com/condation/cms/modules/forms/utils/StringUtil.java
index 317f2aa..6f21e42 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/utils/StringUtil.java
+++ b/src/main/java/com/condation/cms/modules/forms/utils/StringUtil.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.forms.utils;
+package com.condation.cms.modules.forms.utils;
 
 /*-
  * #%L
diff --git a/src/test/java/com/github/thmarx/cms/modules/forms/CaptchaTest.java b/src/test/java/com/condation/cms/modules/forms/CaptchaTest.java
similarity index 96%
rename from src/test/java/com/github/thmarx/cms/modules/forms/CaptchaTest.java
rename to src/test/java/com/condation/cms/modules/forms/CaptchaTest.java
index f30f0f9..80cccb6 100644
--- a/src/test/java/com/github/thmarx/cms/modules/forms/CaptchaTest.java
+++ b/src/test/java/com/condation/cms/modules/forms/CaptchaTest.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.forms;
+package com.condation.cms.modules.forms;
 
 /*-
  * #%L
diff --git a/src/test/java/com/github/thmarx/cms/modules/forms/MailTest.java b/src/test/java/com/condation/cms/modules/forms/MailTest.java
similarity index 97%
rename from src/test/java/com/github/thmarx/cms/modules/forms/MailTest.java
rename to src/test/java/com/condation/cms/modules/forms/MailTest.java
index 5de21b0..aba8696 100644
--- a/src/test/java/com/github/thmarx/cms/modules/forms/MailTest.java
+++ b/src/test/java/com/condation/cms/modules/forms/MailTest.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.modules.forms;
+package com.condation.cms.modules.forms;
 
 /*-
  * #%L

From 65af8ef4e5184268a0dce42ca2f103e30039abdb Mon Sep 17 00:00:00 2001
From: Thorsten Marx <thmarx@gmx.net>
Date: Fri, 13 Sep 2024 12:25:52 +0200
Subject: [PATCH 2/2] update to condation cms 6.0.0

---
 .../com/condation/cms/modules/forms/FormHandlingException.java | 3 ++-
 src/main/java/com/condation/cms/modules/forms/FormsConfig.java | 3 ++-
 .../java/com/condation/cms/modules/forms/FormsHandling.java    | 3 ++-
 .../condation/cms/modules/forms/FormsHttpHandlerExtension.java | 3 ++-
 .../condation/cms/modules/forms/FormsLifecycleExtension.java   | 3 ++-
 .../cms/modules/forms/FormsTemplateModelExtensionPoint.java    | 3 ++-
 .../modules/forms/handler/AjaxCaptchaValidationHandler.java    | 3 ++-
 .../cms/modules/forms/handler/AjaxSubmitFormHandler.java       | 3 ++-
 .../cms/modules/forms/handler/GenerateCaptchaHandler.java      | 3 ++-
 .../condation/cms/modules/forms/handler/SubmitFormHandler.java | 3 ++-
 .../cms/modules/forms/template/FormsTemplateModel.java         | 3 ++-
 .../java/com/condation/cms/modules/forms/utils/StringUtil.java | 3 ++-
 src/test/java/com/condation/cms/modules/forms/CaptchaTest.java | 3 ++-
 src/test/java/com/condation/cms/modules/forms/MailTest.java    | 3 ++-
 14 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/condation/cms/modules/forms/FormHandlingException.java b/src/main/java/com/condation/cms/modules/forms/FormHandlingException.java
index 7789f22..9244ea5 100644
--- a/src/main/java/com/condation/cms/modules/forms/FormHandlingException.java
+++ b/src/main/java/com/condation/cms/modules/forms/FormHandlingException.java
@@ -4,7 +4,7 @@
  * #%L
  * forms-module
  * %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
  * #L%
  */
 
+
 import java.util.Optional;
 
 /**
diff --git a/src/main/java/com/condation/cms/modules/forms/FormsConfig.java b/src/main/java/com/condation/cms/modules/forms/FormsConfig.java
index 185458a..fc9e943 100644
--- a/src/main/java/com/condation/cms/modules/forms/FormsConfig.java
+++ b/src/main/java/com/condation/cms/modules/forms/FormsConfig.java
@@ -4,7 +4,7 @@
  * #%L
  * forms-module
  * %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
  * #L%
  */
 
+
 import java.util.List;
 import java.util.Optional;
 import lombok.Data;
diff --git a/src/main/java/com/condation/cms/modules/forms/FormsHandling.java b/src/main/java/com/condation/cms/modules/forms/FormsHandling.java
index 489a3cb..7b526e6 100644
--- a/src/main/java/com/condation/cms/modules/forms/FormsHandling.java
+++ b/src/main/java/com/condation/cms/modules/forms/FormsHandling.java
@@ -4,7 +4,7 @@
  * #%L
  * forms-module
  * %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
  * #L%
  */
 
+
 import java.util.function.Function;
 import lombok.extern.slf4j.Slf4j;
 import org.simplejavamail.email.EmailBuilder;
diff --git a/src/main/java/com/condation/cms/modules/forms/FormsHttpHandlerExtension.java b/src/main/java/com/condation/cms/modules/forms/FormsHttpHandlerExtension.java
index 9df2792..406585c 100644
--- a/src/main/java/com/condation/cms/modules/forms/FormsHttpHandlerExtension.java
+++ b/src/main/java/com/condation/cms/modules/forms/FormsHttpHandlerExtension.java
@@ -4,7 +4,7 @@
  * #%L
  * forms-module
  * %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
  * #L%
  */
 
+
 import com.condation.cms.api.extensions.HttpHandlerExtensionPoint;
 import com.condation.cms.api.extensions.Mapping;
 import com.condation.cms.modules.forms.handler.AjaxCaptchaValidationHandler;
diff --git a/src/main/java/com/condation/cms/modules/forms/FormsLifecycleExtension.java b/src/main/java/com/condation/cms/modules/forms/FormsLifecycleExtension.java
index 2083003..510cb46 100644
--- a/src/main/java/com/condation/cms/modules/forms/FormsLifecycleExtension.java
+++ b/src/main/java/com/condation/cms/modules/forms/FormsLifecycleExtension.java
@@ -4,7 +4,7 @@
  * #%L
  * forms-module
  * %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
  * #L%
  */
 
+
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.condation.cms.api.feature.features.DBFeature;
diff --git a/src/main/java/com/condation/cms/modules/forms/FormsTemplateModelExtensionPoint.java b/src/main/java/com/condation/cms/modules/forms/FormsTemplateModelExtensionPoint.java
index d4157a0..f58dc46 100644
--- a/src/main/java/com/condation/cms/modules/forms/FormsTemplateModelExtensionPoint.java
+++ b/src/main/java/com/condation/cms/modules/forms/FormsTemplateModelExtensionPoint.java
@@ -4,7 +4,7 @@
  * #%L
  * forms-module
  * %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
  * #L%
  */
 
+
 import com.condation.cms.api.extensions.TemplateModelExtendingExtentionPoint;
 import com.condation.cms.api.template.TemplateEngine;
 import com.condation.cms.api.extensions.TemplateModelExtendingExtentionPoint;
diff --git a/src/main/java/com/condation/cms/modules/forms/handler/AjaxCaptchaValidationHandler.java b/src/main/java/com/condation/cms/modules/forms/handler/AjaxCaptchaValidationHandler.java
index 436c4e5..dab482f 100644
--- a/src/main/java/com/condation/cms/modules/forms/handler/AjaxCaptchaValidationHandler.java
+++ b/src/main/java/com/condation/cms/modules/forms/handler/AjaxCaptchaValidationHandler.java
@@ -4,7 +4,7 @@
  * #%L
  * forms-module
  * %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
  * #L%
  */
 
+
 import com.condation.cms.api.extensions.HttpHandler;
 import com.condation.cms.modules.forms.FormsLifecycleExtension;
 import com.google.gson.Gson;
diff --git a/src/main/java/com/condation/cms/modules/forms/handler/AjaxSubmitFormHandler.java b/src/main/java/com/condation/cms/modules/forms/handler/AjaxSubmitFormHandler.java
index ad6cd20..25b86e5 100644
--- a/src/main/java/com/condation/cms/modules/forms/handler/AjaxSubmitFormHandler.java
+++ b/src/main/java/com/condation/cms/modules/forms/handler/AjaxSubmitFormHandler.java
@@ -4,7 +4,7 @@
  * #%L
  * forms-module
  * %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
  * #L%
  */
 
+
 import com.condation.cms.api.extensions.HttpHandler;
 import com.condation.cms.modules.forms.FormsLifecycleExtension;
 import com.google.gson.Gson;
diff --git a/src/main/java/com/condation/cms/modules/forms/handler/GenerateCaptchaHandler.java b/src/main/java/com/condation/cms/modules/forms/handler/GenerateCaptchaHandler.java
index 2309ef5..9161b86 100644
--- a/src/main/java/com/condation/cms/modules/forms/handler/GenerateCaptchaHandler.java
+++ b/src/main/java/com/condation/cms/modules/forms/handler/GenerateCaptchaHandler.java
@@ -4,7 +4,7 @@
  * #%L
  * forms-module
  * %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
  * #L%
  */
 
+
 import com.condation.cms.api.extensions.HttpHandler;
 import com.condation.cms.api.utils.HTTPUtil;
 import com.condation.cms.modules.forms.FormsLifecycleExtension;
diff --git a/src/main/java/com/condation/cms/modules/forms/handler/SubmitFormHandler.java b/src/main/java/com/condation/cms/modules/forms/handler/SubmitFormHandler.java
index 6710207..9efe42a 100644
--- a/src/main/java/com/condation/cms/modules/forms/handler/SubmitFormHandler.java
+++ b/src/main/java/com/condation/cms/modules/forms/handler/SubmitFormHandler.java
@@ -4,7 +4,7 @@
  * #%L
  * forms-module
  * %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -21,6 +21,7 @@
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
  */
+
 import com.condation.cms.api.extensions.HttpHandler;
 import com.condation.cms.modules.forms.FormHandlingException;
 import com.condation.cms.modules.forms.FormsHandling;
diff --git a/src/main/java/com/condation/cms/modules/forms/template/FormsTemplateModel.java b/src/main/java/com/condation/cms/modules/forms/template/FormsTemplateModel.java
index 07541b4..1c1addd 100644
--- a/src/main/java/com/condation/cms/modules/forms/template/FormsTemplateModel.java
+++ b/src/main/java/com/condation/cms/modules/forms/template/FormsTemplateModel.java
@@ -4,7 +4,7 @@
  * #%L
  * forms-module
  * %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
  * #L%
  */
 
+
 import com.condation.cms.modules.forms.utils.StringUtil;
 
 /**
diff --git a/src/main/java/com/condation/cms/modules/forms/utils/StringUtil.java b/src/main/java/com/condation/cms/modules/forms/utils/StringUtil.java
index 6f21e42..7fcd8e4 100644
--- a/src/main/java/com/condation/cms/modules/forms/utils/StringUtil.java
+++ b/src/main/java/com/condation/cms/modules/forms/utils/StringUtil.java
@@ -4,7 +4,7 @@
  * #%L
  * forms-module
  * %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
  * #L%
  */
 
+
 import java.util.Random;
 
 /**
diff --git a/src/test/java/com/condation/cms/modules/forms/CaptchaTest.java b/src/test/java/com/condation/cms/modules/forms/CaptchaTest.java
index 80cccb6..5f8816a 100644
--- a/src/test/java/com/condation/cms/modules/forms/CaptchaTest.java
+++ b/src/test/java/com/condation/cms/modules/forms/CaptchaTest.java
@@ -4,7 +4,7 @@
  * #%L
  * forms-module
  * %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
  * #L%
  */
 
+
 import java.io.File;
 import java.io.IOException;
 import javax.imageio.ImageIO;
diff --git a/src/test/java/com/condation/cms/modules/forms/MailTest.java b/src/test/java/com/condation/cms/modules/forms/MailTest.java
index aba8696..2fe16f0 100644
--- a/src/test/java/com/condation/cms/modules/forms/MailTest.java
+++ b/src/test/java/com/condation/cms/modules/forms/MailTest.java
@@ -4,7 +4,7 @@
  * #%L
  * forms-module
  * %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -23,6 +23,7 @@
  */
 
 
+
 import com.icegreen.greenmail.util.GreenMail;
 import com.icegreen.greenmail.util.ServerSetupTest;
 import org.assertj.core.api.Assertions;