From 705be11639d63a03af25b17163c5cf89a4c4d1d4 Mon Sep 17 00:00:00 2001
From: Thorsten Marx <t.marx@eggheads.de>
Date: Mon, 16 Sep 2024 14:49:59 +0200
Subject: [PATCH] fix sonar

---
 .../content/markdown/rules/inline/NewlineInlineRule.java  | 4 +---
 cms-server/nbactions-dist.xml                             | 8 ++++----
 cms-server/src/main/resources/log4j2.xml                  | 4 ++--
 distribution/build.xml                                    | 4 ++--
 .../condation/modules/manager/ModuleAPIClassLoader.java   | 2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/cms-content/src/main/java/com/condation/cms/content/markdown/rules/inline/NewlineInlineRule.java b/cms-content/src/main/java/com/condation/cms/content/markdown/rules/inline/NewlineInlineRule.java
index e7361d7e..d4183805 100644
--- a/cms-content/src/main/java/com/condation/cms/content/markdown/rules/inline/NewlineInlineRule.java
+++ b/cms-content/src/main/java/com/condation/cms/content/markdown/rules/inline/NewlineInlineRule.java
@@ -33,10 +33,8 @@
  */
 public class NewlineInlineRule implements InlineElementRule {
 	
-	private static final Pattern PATTERN = Pattern.compile(" {2,}\\n");
+	private static final Pattern PATTERN = Pattern.compile(" {2,}$", Pattern.MULTILINE);
 
-
-	
 	@Override
 	public InlineBlock next(String md) {
 		var matcher = PATTERN.matcher(md);
diff --git a/cms-server/nbactions-dist.xml b/cms-server/nbactions-dist.xml
index d129754c..c6755fb3 100644
--- a/cms-server/nbactions-dist.xml
+++ b/cms-server/nbactions-dist.xml
@@ -13,7 +13,7 @@
                 <exec.vmArgs></exec.vmArgs>
                 <exec.args>${exec.vmArgs} -classpath %classpath ${exec.mainClass} ${exec.appArgs}</exec.args>
                 <exec.appArgs>server start</exec.appArgs>
-                <exec.mainClass>com.github.thmarx.cms.cli.CMSCli</exec.mainClass>
+                <exec.mainClass>com.condation.cms.cli.CMSCli</exec.mainClass>
                 <exec.executable>java</exec.executable>
             </properties>
         </action>
@@ -30,7 +30,7 @@
                 <exec.vmArgs>-agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address}</exec.vmArgs>
                 <exec.args>${exec.vmArgs} -classpath %classpath ${exec.mainClass} ${exec.appArgs}</exec.args>
                 <exec.appArgs>server start</exec.appArgs>
-                <exec.mainClass>com.github.thmarx.cms.cli.CMSCli</exec.mainClass>
+                <exec.mainClass>com.condation.cms.cli.CMSCli</exec.mainClass>
                 <exec.executable>java</exec.executable>
                 <jpda.listen>true</jpda.listen>
             </properties>
@@ -47,7 +47,7 @@
             <properties>
                 <exec.vmArgs></exec.vmArgs>
                 <exec.args>${exec.vmArgs} -classpath %classpath ${exec.mainClass} ${exec.appArgs}</exec.args>
-                <exec.mainClass>com.github.thmarx.cms.cli.CMSCli</exec.mainClass>
+                <exec.mainClass>com.condation.cms.cli.CMSCli</exec.mainClass>
                 <exec.executable>java</exec.executable>
                 <exec.appArgs>server start</exec.appArgs>
             </properties>
@@ -63,7 +63,7 @@
                 <exec.vmArgs></exec.vmArgs>
                 <exec.args>${exec.vmArgs} -classpath %classpath ${exec.mainClass} ${exec.appArgs}</exec.args>
                 <exec.appArgs>stop</exec.appArgs>
-                <exec.mainClass>com.github.thmarx.cms.cli.CMSCli</exec.mainClass>
+                <exec.mainClass>com.condation.cms.cli.CMSCli</exec.mainClass>
                 <exec.executable>java</exec.executable>
             </properties>
         </action>
diff --git a/cms-server/src/main/resources/log4j2.xml b/cms-server/src/main/resources/log4j2.xml
index 0c914e3e..e688ba90 100644
--- a/cms-server/src/main/resources/log4j2.xml
+++ b/cms-server/src/main/resources/log4j2.xml
@@ -47,11 +47,11 @@
 	</Appenders>
  
 	<Loggers>
-		<Logger name="com.github.thmarx.cms" level="error" additivity="false">
+		<Logger name="com.condation.cms" level="error" additivity="false">
 			<AppenderRef ref="console"/>
 		</Logger>
 		<!---
-		<Logger name="com.github.thmarx.cms" level="debug" additivity="false">
+		<Logger name="com.condation.cms" level="debug" additivity="false">
 			<appender-ref ref="Routing" />
 		</Logger>
 		-->
diff --git a/distribution/build.xml b/distribution/build.xml
index 7f7bdb33..91ab4065 100644
--- a/distribution/build.xml
+++ b/distribution/build.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="distribution" default="distribution" basedir=".">
-	<property name="cms.version">5.3.1</property>
+	<property name="cms.version">6.0.0</property>
 	
-	<property name="thymeleaf.version">v1.2.0</property>
+	<property name="thymeleaf.version">v2.0.0</property>
 		
 	<target name="download-modules" description="--> download modules">
 		<echo>download template implementation modules</echo>
diff --git a/modules-framework/manager/src/main/java/com/condation/modules/manager/ModuleAPIClassLoader.java b/modules-framework/manager/src/main/java/com/condation/modules/manager/ModuleAPIClassLoader.java
index b44f2cfc..1fe454ac 100644
--- a/modules-framework/manager/src/main/java/com/condation/modules/manager/ModuleAPIClassLoader.java
+++ b/modules-framework/manager/src/main/java/com/condation/modules/manager/ModuleAPIClassLoader.java
@@ -50,7 +50,7 @@ public ModuleAPIClassLoader(ClassLoader classLoader, List<String> apiPackages) {
 		List<String> temp = apiPackages != null ? apiPackages : new ArrayList<>();
 		this.apiPackages = temp.stream().map(c -> !c.endsWith(".") ? c + "." : c).collect(Collectors.toList());
 
-		this.apiPackages.add("com.github.thmarx.modules.api.");
+		this.apiPackages.add("com.condation.modules.api.");
 		this.apiPackages.add("java.");
 		this.apiPackages.add("javax.");
 		this.apiPackages.add("com.sun.");