Skip to content

update for 6.0.0 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thmarx merged 2 commits into from
Sep 16, 2024
Merged

update for 6.0.0 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c41a9d1
update to condation cms 6.0.0
thmarx Sep 13, 2024
65af8ef
update to condation cms 6.0.0
thmarx Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 50 additions & 13 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -79,35 +90,35 @@
<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>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.30</version>
<version>1.18.34</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<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>
Expand All @@ -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>
5 changes: 3 additions & 2 deletions .../modules/forms/FormHandlingException.java → .../modules/forms/FormHandlingException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.github.thmarx.cms.modules.forms;
package com.condation.cms.modules.forms;

/*-
* #%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
Expand All @@ -22,6 +22,7 @@
* #L%
*/


import java.util.Optional;

/**
Expand Down
5 changes: 3 additions & 2 deletions ...thmarx/cms/modules/forms/FormsConfig.java → ...dation/cms/modules/forms/FormsConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.github.thmarx.cms.modules.forms;
package com.condation.cms.modules.forms;

/*-
* #%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
Expand All @@ -22,6 +22,7 @@
* #L%
*/


import java.util.List;
import java.util.Optional;
import lombok.Data;
Expand Down
5 changes: 3 additions & 2 deletions ...marx/cms/modules/forms/FormsHandling.java → ...tion/cms/modules/forms/FormsHandling.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.github.thmarx.cms.modules.forms;
package com.condation.cms.modules.forms;

/*-
* #%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
Expand All @@ -22,6 +22,7 @@
* #L%
*/


import java.util.function.Function;
import lombok.extern.slf4j.Slf4j;
import org.simplejavamail.email.EmailBuilder;
Expand Down
19 changes: 10 additions & 9 deletions ...ules/forms/FormsHttpHandlerExtension.java → ...ules/forms/FormsHttpHandlerExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.github.thmarx.cms.modules.forms;
package com.condation.cms.modules.forms;

/*-
* #%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
Expand All @@ -22,13 +22,14 @@
* #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;

/**
Expand Down
15 changes: 8 additions & 7 deletions ...odules/forms/FormsLifecycleExtension.java → ...odules/forms/FormsLifecycleExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.github.thmarx.cms.modules.forms;
package com.condation.cms.modules.forms;

/*-
* #%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
Expand All @@ -22,13 +22,14 @@
* #L%
*/


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;
Expand Down
15 changes: 9 additions & 6 deletions ...rms/FormsTemplateModelExtensionPoint.java → ...rms/FormsTemplateModelExtensionPoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.github.thmarx.cms.modules.forms;
package com.condation.cms.modules.forms;

/*-
* #%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
Expand All @@ -22,10 +22,13 @@
* #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;

/**
*
Expand Down
9 changes: 5 additions & 4 deletions ...handler/AjaxCaptchaValidationHandler.java → ...handler/AjaxCaptchaValidationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.github.thmarx.cms.modules.forms.handler;
package com.condation.cms.modules.forms.handler;

/*-
* #%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
Expand All @@ -22,8 +22,9 @@
* #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;
Expand Down
9 changes: 5 additions & 4 deletions .../forms/handler/AjaxSubmitFormHandler.java → .../forms/handler/AjaxSubmitFormHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.github.thmarx.cms.modules.forms.handler;
package com.condation.cms.modules.forms.handler;

/*-
* #%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
Expand All @@ -22,8 +22,9 @@
* #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;
Expand Down
11 changes: 6 additions & 5 deletions ...forms/handler/GenerateCaptchaHandler.java → ...forms/handler/GenerateCaptchaHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.github.thmarx.cms.modules.forms.handler;
package com.condation.cms.modules.forms.handler;

/*-
* #%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
Expand All @@ -22,9 +22,10 @@
* #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;
Expand Down
Loading