diff --git a/cms-api/pom.xml b/cms-api/pom.xml index f336ec9c7..a98953726 100644 --- a/cms-api/pom.xml +++ b/cms-api/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 7.5.0 + 7.6.0 cms-api jar diff --git a/cms-api/src/main/java/com/condation/cms/api/model/Parameter.java b/cms-api/src/main/java/com/condation/cms/api/model/Parameter.java index f5b834e13..b7a888c12 100644 --- a/cms-api/src/main/java/com/condation/cms/api/model/Parameter.java +++ b/cms-api/src/main/java/com/condation/cms/api/model/Parameter.java @@ -23,6 +23,7 @@ */ +import com.condation.cms.api.request.RequestContext; import java.util.HashMap; import java.util.Map; @@ -31,9 +32,26 @@ * @author t.marx */ public class Parameter extends HashMap { + + private RequestContext requestContext = null; + public Parameter () { } + + public Parameter (final RequestContext requestContext) { + this.requestContext = requestContext; + } + public Parameter (final Map parameters) { super(parameters); } + + public Parameter (final Map parameters, final RequestContext requestContext) { + super(parameters); + this.requestContext = requestContext; + } + + public RequestContext getRequestContext() { + return requestContext; + } } diff --git a/cms-auth/pom.xml b/cms-auth/pom.xml index 9931f6184..6f41740ca 100644 --- a/cms-auth/pom.xml +++ b/cms-auth/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 7.5.0 + 7.6.0 cms-auth jar diff --git a/cms-content/pom.xml b/cms-content/pom.xml index e517aa3f7..bf433cb96 100644 --- a/cms-content/pom.xml +++ b/cms-content/pom.xml @@ -6,7 +6,7 @@ com.condation.cms cms-parent - 7.5.0 + 7.6.0 cms-content jar diff --git a/cms-content/src/main/java/com/condation/cms/content/DefaultContentRenderer.java b/cms-content/src/main/java/com/condation/cms/content/DefaultContentRenderer.java index b1223fef0..550c280ef 100644 --- a/cms-content/src/main/java/com/condation/cms/content/DefaultContentRenderer.java +++ b/cms-content/src/main/java/com/condation/cms/content/DefaultContentRenderer.java @@ -298,7 +298,7 @@ public Map> renderSections(final List section } private ShortCodeTemplateFunction createShortCodeFunction(RequestContext context) { - return new ShortCodeTemplateFunction(context.get(RenderContext.class).shortCodes()); + return new ShortCodeTemplateFunction(context, context.get(RenderContext.class).shortCodes()); } } diff --git a/cms-content/src/main/java/com/condation/cms/content/pipeline/ContentPipeline.java b/cms-content/src/main/java/com/condation/cms/content/pipeline/ContentPipeline.java index f65082dbe..508b125cb 100644 --- a/cms-content/src/main/java/com/condation/cms/content/pipeline/ContentPipeline.java +++ b/cms-content/src/main/java/com/condation/cms/content/pipeline/ContentPipeline.java @@ -74,7 +74,7 @@ private String processMarkdown(FilterContext context) { } private String processShortCodes(FilterContext context) { - return requestContext.get(RenderContext.class).shortCodes().replace(context.value(), model.values); + return requestContext.get(RenderContext.class).shortCodes().replace(context.value(), model.values, requestContext); } private String processTemplate(FilterContext context) { diff --git a/cms-content/src/main/java/com/condation/cms/content/shortcodes/ShortCodes.java b/cms-content/src/main/java/com/condation/cms/content/shortcodes/ShortCodes.java index 87469d342..754e89649 100644 --- a/cms-content/src/main/java/com/condation/cms/content/shortcodes/ShortCodes.java +++ b/cms-content/src/main/java/com/condation/cms/content/shortcodes/ShortCodes.java @@ -24,6 +24,7 @@ import com.condation.cms.api.model.Parameter; +import com.condation.cms.api.request.RequestContext; import java.util.Collections; import java.util.Map; import java.util.Set; @@ -53,14 +54,18 @@ public Set getShortCodeNames () { } public String replace (final String content) { - return replace(content, Collections.emptyMap()); + return replace(content, Collections.emptyMap(), null); } public String replace (final String content, Map contextModel) { + return replace(content, contextModel, null); + } + + public String replace (final String content, Map contextModel, RequestContext requestContext) { return parser.parse(content, tagMap, contextModel); } - public String execute (String name, Map parameters) { + public String execute (String name, Map parameters, RequestContext requestContext) { if (!tagMap.has(name)) { return ""; } diff --git a/cms-content/src/main/java/com/condation/cms/content/template/functions/shortcode/ShortCodeTemplateFunction.java b/cms-content/src/main/java/com/condation/cms/content/template/functions/shortcode/ShortCodeTemplateFunction.java index 961b0f58c..76a356893 100644 --- a/cms-content/src/main/java/com/condation/cms/content/template/functions/shortcode/ShortCodeTemplateFunction.java +++ b/cms-content/src/main/java/com/condation/cms/content/template/functions/shortcode/ShortCodeTemplateFunction.java @@ -23,6 +23,7 @@ */ +import com.condation.cms.api.request.RequestContext; import com.condation.cms.content.shortcodes.ShortCodes; import java.util.Map; import lombok.Getter; @@ -37,14 +38,16 @@ public class ShortCodeTemplateFunction { public static final String KEY = "shortCodes"; + private final RequestContext requestContext; + @Getter private final ShortCodes shortCodes; public String call (String name, Map parameters) { - return shortCodes.execute(name, parameters); + return shortCodes.execute(name, parameters, requestContext); } public String call (String name) { - return shortCodes.execute(name, Map.of()); + return shortCodes.execute(name, Map.of(), requestContext); } } diff --git a/cms-content/src/test/java/com/condation/cms/content/template/shortcode/FreeMarkerShortCodeTemplateFunctionTest.java b/cms-content/src/test/java/com/condation/cms/content/template/shortcode/FreeMarkerShortCodeTemplateFunctionTest.java index 5a47cf8c6..14d3bf03f 100644 --- a/cms-content/src/test/java/com/condation/cms/content/template/shortcode/FreeMarkerShortCodeTemplateFunctionTest.java +++ b/cms-content/src/test/java/com/condation/cms/content/template/shortcode/FreeMarkerShortCodeTemplateFunctionTest.java @@ -68,7 +68,7 @@ public void testSomeMethod() throws Exception { Template template = new Template("templateName", new StringReader(templateString), cfg); Map model = new HashMap<>(); - model.put("shortCode", new ShortCodeTemplateFunction(shortCodes)); + model.put("shortCode", new ShortCodeTemplateFunction(null, shortCodes)); Writer out = new StringWriter(); template.process(model, out); @@ -82,7 +82,7 @@ public void test_greet() throws Exception { Template template = new Template("templateName", new StringReader(templateString), cfg); Map model = new HashMap<>(); - model.put("shortCode", new ShortCodeTemplateFunction(shortCodes)); + model.put("shortCode", new ShortCodeTemplateFunction(null, shortCodes)); Writer out = new StringWriter(); template.process(model, out); diff --git a/cms-content/src/test/java/com/condation/cms/content/template/shortcode/PebbleShortCodeTemplateFunctionTest.java b/cms-content/src/test/java/com/condation/cms/content/template/shortcode/PebbleShortCodeTemplateFunctionTest.java index 250c856f7..c8b0ef2d8 100644 --- a/cms-content/src/test/java/com/condation/cms/content/template/shortcode/PebbleShortCodeTemplateFunctionTest.java +++ b/cms-content/src/test/java/com/condation/cms/content/template/shortcode/PebbleShortCodeTemplateFunctionTest.java @@ -69,7 +69,7 @@ public void testSomeMethod() throws Exception { PebbleTemplate template = engine.getTemplate(templateString); Map context = new HashMap<>(); - context.put("shortCode", new ShortCodeTemplateFunction(shortCodes)); + context.put("shortCode", new ShortCodeTemplateFunction(null, shortCodes)); Writer writer = new StringWriter(); template.evaluate(writer, context); @@ -84,7 +84,7 @@ public void test_greet() throws Exception { PebbleTemplate template = engine.getTemplate(templateString); Map context = new HashMap<>(); - context.put("shortCode", new ShortCodeTemplateFunction(shortCodes)); + context.put("shortCode", new ShortCodeTemplateFunction(null, shortCodes)); Writer writer = new StringWriter(); template.evaluate(writer, context); diff --git a/cms-content/src/test/java/com/condation/cms/content/template/shortcode/ThymeleafShortCodeTemplateFunctionTest.java b/cms-content/src/test/java/com/condation/cms/content/template/shortcode/ThymeleafShortCodeTemplateFunctionTest.java index 31f902ae1..bda879c8a 100644 --- a/cms-content/src/test/java/com/condation/cms/content/template/shortcode/ThymeleafShortCodeTemplateFunctionTest.java +++ b/cms-content/src/test/java/com/condation/cms/content/template/shortcode/ThymeleafShortCodeTemplateFunctionTest.java @@ -68,7 +68,7 @@ public void testSomeMethod() throws Exception { String templateString = "[(${shortCode.call('echo')})]"; Context context = new Context(); - context.setVariable("shortCode", new ShortCodeTemplateFunction(shortCodes)); + context.setVariable("shortCode", new ShortCodeTemplateFunction(null, shortCodes)); String renderedString = templateEngine.process(templateString, context); Assertions.assertThat(renderedString).isEqualTo("Hello world"); } @@ -78,7 +78,7 @@ public void test_greet() throws Exception { String templateString = "[(${shortCode.call('greet', #{'name': 'CondationCMS'})})]"; Context context = new Context(); - context.setVariable("shortCode", new ShortCodeTemplateFunction(shortCodes)); + context.setVariable("shortCode", new ShortCodeTemplateFunction(null, shortCodes)); String renderedString = templateEngine.process(templateString, context); Assertions.assertThat(renderedString).isEqualTo("Hello CondationCMS"); } diff --git a/cms-core/pom.xml b/cms-core/pom.xml index 902ee4f77..f6dbd2c66 100644 --- a/cms-core/pom.xml +++ b/cms-core/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 7.5.0 + 7.6.0 cms-core jar diff --git a/cms-extensions/pom.xml b/cms-extensions/pom.xml index d7f3a59a6..b33c271f0 100644 --- a/cms-extensions/pom.xml +++ b/cms-extensions/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 7.5.0 + 7.6.0 cms-extensions jar diff --git a/cms-filesystem/pom.xml b/cms-filesystem/pom.xml index 72372143b..8a41bbae6 100644 --- a/cms-filesystem/pom.xml +++ b/cms-filesystem/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 7.5.0 + 7.6.0 cms-filesystem jar diff --git a/cms-git/pom.xml b/cms-git/pom.xml index 74aeec147..75113e329 100644 --- a/cms-git/pom.xml +++ b/cms-git/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 7.5.0 + 7.6.0 cms-git jar diff --git a/cms-media/pom.xml b/cms-media/pom.xml index ba41dc15a..fd3b406a7 100644 --- a/cms-media/pom.xml +++ b/cms-media/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 7.5.0 + 7.6.0 cms-media jar diff --git a/cms-server/pom.xml b/cms-server/pom.xml index db23703e8..77e6c5b61 100644 --- a/cms-server/pom.xml +++ b/cms-server/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 7.5.0 + 7.6.0 cms-server jar diff --git a/cms-templates/pom.xml b/cms-templates/pom.xml index b038adda4..fe12c1563 100644 --- a/cms-templates/pom.xml +++ b/cms-templates/pom.xml @@ -7,7 +7,7 @@ com.condation.cms cms-parent - 7.5.0 + 7.6.0 cms-templates diff --git a/cms-templates/src/main/java/com/condation/cms/templates/DefaultTemplate.java b/cms-templates/src/main/java/com/condation/cms/templates/DefaultTemplate.java index 073399dfd..52f38dd4e 100644 --- a/cms-templates/src/main/java/com/condation/cms/templates/DefaultTemplate.java +++ b/cms-templates/src/main/java/com/condation/cms/templates/DefaultTemplate.java @@ -45,11 +45,11 @@ public class DefaultTemplate implements Template { private final Renderer renderer; @Override - public void evaluate(Map context, Writer writer) throws IOException { + public void evaluate(Map context, Writer writer, DynamicConfiguration dynamicConfiguration) throws IOException { ScopeStack scopes = new ScopeStack(context); - evaluate(scopes, writer); + evaluate(scopes, writer, dynamicConfiguration); writer.flush(); } @@ -65,8 +65,8 @@ public String evaluate(Map context, DynamicConfiguration dynamic } } - public void evaluate (ScopeStack scopes, Writer writer) throws IOException { - renderer.render(rootNode, scopes, writer, null); + public void evaluate (ScopeStack scopes, Writer writer, DynamicConfiguration dynamicConfiguration) throws IOException { + renderer.render(rootNode, scopes, writer, dynamicConfiguration); } - + } diff --git a/cms-templates/src/main/java/com/condation/cms/templates/DynamicConfiguration.java b/cms-templates/src/main/java/com/condation/cms/templates/DynamicConfiguration.java index 65977de85..5329e73ab 100644 --- a/cms-templates/src/main/java/com/condation/cms/templates/DynamicConfiguration.java +++ b/cms-templates/src/main/java/com/condation/cms/templates/DynamicConfiguration.java @@ -21,10 +21,11 @@ * . * #L% */ - +import com.condation.cms.api.request.RequestContext; import com.condation.cms.content.shortcodes.ShortCodes; import com.condation.cms.templates.tags.component.EndComponentTag; import com.condation.cms.templates.tags.component.ComponentTag; +import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Optional; @@ -33,27 +34,33 @@ * * @author t.marx */ -public record DynamicConfiguration(ShortCodes shortCodes, Map components) { - - public DynamicConfiguration { +public record DynamicConfiguration(ShortCodes shortCodes, Map components, RequestContext requestContext) { + + public static final DynamicConfiguration EMPTY = new DynamicConfiguration( + new ShortCodes(Collections.emptyMap(), null), + Collections.emptyMap(), + null + ); + + public DynamicConfiguration { for (var tag : shortCodes.getShortCodeNames()) { var openTag = new ComponentTag(tag, shortCodes); var closeTag = new EndComponentTag(tag); - + components.put(openTag.getName(), openTag); components.put(closeTag.getName(), closeTag); } } - - public DynamicConfiguration(ShortCodes shortcodes) { - this(shortcodes, new HashMap<>()); + + public DynamicConfiguration(ShortCodes shortcodes, RequestContext requestContext) { + this(shortcodes, new HashMap<>(), requestContext); } - - public boolean hasComponent (String name) { + + public boolean hasComponent(String name) { return components.containsKey(name); } - - public Optional getComponent (String name) { + + public Optional getComponent(String name) { return Optional.ofNullable(components.get(name)); } } diff --git a/cms-templates/src/main/java/com/condation/cms/templates/Template.java b/cms-templates/src/main/java/com/condation/cms/templates/Template.java index ff0fa229c..45dcacf8c 100644 --- a/cms-templates/src/main/java/com/condation/cms/templates/Template.java +++ b/cms-templates/src/main/java/com/condation/cms/templates/Template.java @@ -39,11 +39,11 @@ default String evaluate () throws IOException { default String evaluate(Map context) throws IOException { var writer = new StringWriter(); - evaluate(context, writer); + evaluate(context, writer, DynamicConfiguration.EMPTY); return writer.toString(); } String evaluate(Map context, DynamicConfiguration dynamicConfiguration) throws IOException; - void evaluate (Map context, Writer writer) throws IOException; + void evaluate (Map context, Writer writer, DynamicConfiguration dynamicConfiguration) throws IOException; } diff --git a/cms-templates/src/main/java/com/condation/cms/templates/module/CMSModuleTemplateEngine.java b/cms-templates/src/main/java/com/condation/cms/templates/module/CMSModuleTemplateEngine.java index 4573fd2d0..f55e64243 100644 --- a/cms-templates/src/main/java/com/condation/cms/templates/module/CMSModuleTemplateEngine.java +++ b/cms-templates/src/main/java/com/condation/cms/templates/module/CMSModuleTemplateEngine.java @@ -116,7 +116,7 @@ public String render(String template, Model model) throws IOException { private DynamicConfiguration createDynamicConfiguration(Model model) { var shortCodes = model.requestContext.get(RenderContext.class).shortCodes(); - DynamicConfiguration dynamicConfig = new DynamicConfiguration(shortCodes); + DynamicConfiguration dynamicConfig = new DynamicConfiguration(shortCodes, model.requestContext); return dynamicConfig; } diff --git a/cms-templates/src/main/java/com/condation/cms/templates/renderer/Renderer.java b/cms-templates/src/main/java/com/condation/cms/templates/renderer/Renderer.java index 0c25c91e8..c44d8290b 100644 --- a/cms-templates/src/main/java/com/condation/cms/templates/renderer/Renderer.java +++ b/cms-templates/src/main/java/com/condation/cms/templates/renderer/Renderer.java @@ -21,6 +21,7 @@ * . * #L% */ +import com.condation.cms.api.request.RequestContext; import com.condation.cms.templates.DefaultTemplate; import com.condation.cms.templates.RenderFunction; import com.condation.cms.templates.TemplateConfiguration; @@ -59,13 +60,15 @@ public static record Context( ScopeStack scopes, RenderFunction renderer, CMSTemplateEngine templateEngine, - Map context) { + Map context, + DynamicConfiguration dynamicConfiguration) { public Context (JexlEngine engine, ScopeStack scopes, RenderFunction renderer, - CMSTemplateEngine templateEngine) { - this(engine, scopes, renderer, templateEngine, new HashMap<>()); + CMSTemplateEngine templateEngine, + DynamicConfiguration dynamicConfiguration) { + this(engine, scopes, renderer, templateEngine, new HashMap<>(), dynamicConfiguration); } public ScopeContext createEngineContext() { @@ -82,7 +85,12 @@ public void render(ASTNode node, final ScopeStack scopes, final Writer writer, f }; var contentWriter = new StringWriter(); - final Context renderContext = new Context(engine, scopes, renderFunction, templateEngine); + final Context renderContext = new Context( + engine, + scopes, + renderFunction, + templateEngine, + dynamicConfiguration); renderFunction.render(node, renderContext, contentWriter); if (renderContext.context().containsKey("_extends")) { diff --git a/cms-templates/src/main/java/com/condation/cms/templates/tags/component/ComponentTag.java b/cms-templates/src/main/java/com/condation/cms/templates/tags/component/ComponentTag.java index 96cf57512..c8760c187 100644 --- a/cms-templates/src/main/java/com/condation/cms/templates/tags/component/ComponentTag.java +++ b/cms-templates/src/main/java/com/condation/cms/templates/tags/component/ComponentTag.java @@ -65,8 +65,8 @@ public void render(ComponentNode node, Renderer.Context context, Writer writer) var content = renderChildren(node, context); params.put("_content", content); - - var shortCodeResult = shortCodes.execute(shortCodeName, params); + + var shortCodeResult = shortCodes.execute(shortCodeName, params, context.dynamicConfiguration().requestContext()); if (!Strings.isNullOrEmpty(shortCodeResult)) { writer.write(shortCodeResult); } diff --git a/cms-templates/src/main/java/com/condation/cms/templates/tags/layout/IncludeTag.java b/cms-templates/src/main/java/com/condation/cms/templates/tags/layout/IncludeTag.java index 23a948ffa..ea2e6ab27 100644 --- a/cms-templates/src/main/java/com/condation/cms/templates/tags/layout/IncludeTag.java +++ b/cms-templates/src/main/java/com/condation/cms/templates/tags/layout/IncludeTag.java @@ -53,7 +53,7 @@ public void render(TagNode node, Renderer.Context context, Writer writer) { var template = (DefaultTemplate)context.templateEngine().getTemplate(templateString); if (template != null) { StringWriter childWriter = new StringWriter(); - template.evaluate(context.scopes(), childWriter); + template.evaluate(context.scopes(), childWriter, context.dynamicConfiguration()); writer.write(childWriter.toString()); } } catch (Exception e) { diff --git a/cms-templates/src/main/java/com/condation/cms/templates/tags/macro/ImportTag.java b/cms-templates/src/main/java/com/condation/cms/templates/tags/macro/ImportTag.java index 944d0f5bb..de276f939 100644 --- a/cms-templates/src/main/java/com/condation/cms/templates/tags/macro/ImportTag.java +++ b/cms-templates/src/main/java/com/condation/cms/templates/tags/macro/ImportTag.java @@ -69,7 +69,7 @@ public void render(TagNode node, Renderer.Context context, Writer writer) { var template = (DefaultTemplate) context.templateEngine().getTemplate(templateString); if (template != null) { CustomScopeStack scopeStack = new CustomScopeStack(); - template.evaluate(scopeStack, new NullWriter()); + template.evaluate(scopeStack, new NullWriter(), context.dynamicConfiguration()); var namespace = new HashMap(); scopeStack.macros().forEach(macro -> { diff --git a/cms-templates/src/main/java/com/condation/cms/templates/tags/macro/MacroTag.java b/cms-templates/src/main/java/com/condation/cms/templates/tags/macro/MacroTag.java index f26ac2365..52150fce6 100644 --- a/cms-templates/src/main/java/com/condation/cms/templates/tags/macro/MacroTag.java +++ b/cms-templates/src/main/java/com/condation/cms/templates/tags/macro/MacroTag.java @@ -109,7 +109,13 @@ public Object invoke(Object obj, Object... params) throws Exception { } StringWriter writer = new StringWriter(); - var newContext = new Renderer.Context(context.engine(), scope, context.renderer(), context.templateEngine()); + var newContext = new Renderer.Context( + context.engine(), + scope, + context.renderer(), + context.templateEngine(), + context.dynamicConfiguration() + ); for (var child : macro.children) { context.renderer().render(child, newContext, writer); } diff --git a/cms-templates/src/test/java/com/condation/cms/templates/TemplateEngineComponentTest.java b/cms-templates/src/test/java/com/condation/cms/templates/TemplateEngineComponentTest.java index 6c49c3109..f1c94cde3 100644 --- a/cms-templates/src/test/java/com/condation/cms/templates/TemplateEngineComponentTest.java +++ b/cms-templates/src/test/java/com/condation/cms/templates/TemplateEngineComponentTest.java @@ -56,7 +56,7 @@ public void setupShortCodes() { }), new TagParser(null) ); - dynamicConfiguration = new DynamicConfiguration(shortCodes); + dynamicConfiguration = new DynamicConfiguration(shortCodes, null); } @Override diff --git a/cms-templates/src/test/java/com/condation/cms/templates/TemplateFeatureTest.java b/cms-templates/src/test/java/com/condation/cms/templates/TemplateFeatureTest.java index 513da71bd..0576e5574 100644 --- a/cms-templates/src/test/java/com/condation/cms/templates/TemplateFeatureTest.java +++ b/cms-templates/src/test/java/com/condation/cms/templates/TemplateFeatureTest.java @@ -82,7 +82,7 @@ private DynamicConfiguration createDynamicConfig () { "hello", (params) -> "hello " + params.get("name") ), new TagParser(null)); - return new DynamicConfiguration(shortCodes); + return new DynamicConfiguration(shortCodes, null); } private Map getData (String filename) throws IOException { diff --git a/cms-test/pom.xml b/cms-test/pom.xml index a2a37478d..daf5f2255 100644 --- a/cms-test/pom.xml +++ b/cms-test/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 7.5.0 + 7.6.0 cms-test jar diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index ae6d5fcd8..283319b2f 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 7.5.0 + 7.6.0 integration-tests jar diff --git a/modules/example-module/pom.xml b/modules/example-module/pom.xml index d9a68f7c0..0262b75f7 100644 --- a/modules/example-module/pom.xml +++ b/modules/example-module/pom.xml @@ -4,7 +4,7 @@ com.condation.cms.modules cms-modules - 7.5.0 + 7.6.0 example-module jar diff --git a/modules/pom.xml b/modules/pom.xml index 68caa3783..3180192f8 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -4,7 +4,7 @@ com.condation.cms cms-parent - 7.5.0 + 7.6.0 com.condation.cms.modules cms-modules diff --git a/modules/system-modules/pom.xml b/modules/system-modules/pom.xml index 83de8a4c1..610d6ebae 100644 --- a/modules/system-modules/pom.xml +++ b/modules/system-modules/pom.xml @@ -4,7 +4,7 @@ com.condation.cms.modules cms-modules - 7.5.0 + 7.6.0 cms-system-modules jar diff --git a/pom.xml b/pom.xml index 649f8d391..45c575fbb 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.condation.cms cms-parent - 7.5.0 + 7.6.0 pom UTF-8