fix sonar

CondationCMS · Sep 16, 2024 · 705be11 · 705be11
1 parent 3b58c81
commit 705be11
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/...tent/src/main/java/com/condation/cms/content/markdown/rules/inline/NewlineInlineRule.java b/...tent/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
@@ -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
@@ -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
@@ -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/...s-framework/manager/src/main/java/com/condation/modules/manager/ModuleAPIClassLoader.java b/...s-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.");