Merge pull request #2125 from openturing/0.3.9

0.3.9
openturing · Sep 9, 2024 · f4ead98 · f4ead98
2 parents 4d2116f + b187e02
commit f4ead98
Show file tree

Hide file tree

Showing 11 changed files with 4,109 additions and 3,260 deletions.
diff --git a/pom.xml b/pom.xml
@@ -127,7 +127,13 @@
         </profile>
     </profiles>
     <dependencyManagement>
+
         <dependencies>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-core</artifactId>
+                <version>1.5.8</version>
+            </dependency>
             <dependency>
                 <groupId>com.viglet.turing</groupId>
                 <artifactId>turing-java-sdk</artifactId>
@@ -136,7 +142,7 @@
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.5.7</version>
+                <version>1.5.8</version>
             </dependency>
             <dependency>
                 <groupId>org.json</groupId>
@@ -186,7 +192,7 @@
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-core</artifactId>
-                <version>2.23.1</version>
+                <version>2.24.0</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/turing-app/pom.xml b/turing-app/pom.xml
@@ -27,7 +27,10 @@
         </sonar.cpd.exclusions>
     </properties>
     <dependencies>
-        <!-- https://mvnrepository.com/artifact/org.apache.lucene/lucene-core -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>
             <artifactId>lucene-core</artifactId>
@@ -51,7 +54,7 @@
         <dependency>
             <groupId>co.elastic.clients</groupId>
             <artifactId>elasticsearch-java</artifactId>
-            <version>8.15.0</version>
+            <version>8.15.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/turing-app/src/main/java/com/viglet/turing/TuringES.java b/turing-app/src/main/java/com/viglet/turing/TuringES.java
@@ -44,17 +44,21 @@
 public class TuringES {
 
 	public static final String UTF_8 = "UTF-8";
+	public static final String CONSOLE = "console";
 
 	public static void main(String... args) {
-		if (args != null && args.length > 0 && args[0].equals("console")) {
+		if (isConsole(args)) {
 			new SpringApplicationBuilder(TurConsole.class).web(WebApplicationType.NONE).bannerMode(Banner.Mode.OFF)
 					.run(args);
 		} else {
-			log.info(":: Starting Turing ES ...");
 			SpringApplication.run(TuringES.class, args);
-			log.info(":: Started Turing ES");
 		}
 	}
+
+	private static boolean isConsole(String[] args) {
+		return args != null && args.length > 0 && args[0].equals(CONSOLE);
+	}
+
 	@Bean
 	FilterRegistrationBean<CharacterEncodingFilter> filterRegistrationBean() {
 		FilterRegistrationBean<CharacterEncodingFilter> registrationBean = new FilterRegistrationBean<>();

diff --git a/turing-app/src/main/resources/logback-spring.xml b/turing-app/src/main/resources/logback-spring.xml
@@ -1,29 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<appender name="CONSOLE"
-		class="ch.qos.logback.core.ConsoleAppender">
-		<layout class="ch.qos.logback.classic.PatternLayout">
-			<Pattern>
-				%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-			</Pattern>
-		</layout>
-	</appender>
-	<logger name="com.viglet.turing.TuringAI" level="info"
-		additivity="false">
-		<appender-ref ref="CONSOLE" />
-	</logger>
-	<logger name="com.viglet.turing.onstartup"
-		level="info" additivity="false">
-		<appender-ref ref="CONSOLE" />
-	</logger>
-
-	<include
-		resource="org/springframework/boot/logging/logback/defaults.xml" />
-	<property name="LOG_FILE"
-		value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}spring.log}" />
-	<include
-		resource="org/springframework/boot/logging/logback/file-appender.xml" />
-	<root level="INFO">
-		<appender-ref ref="FILE" />
-	</root>
+    <appender name="CONSOLE"
+              class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>
+                %msg%n
+            </Pattern>
+        </layout>
+    </appender>
+    <logger name="com.viglet.turing.TuringES" level="info"
+            additivity="false">
+        <appender-ref ref="CONSOLE"/>
+    </logger>
+    <logger name="com.viglet.turing.onstartup"
+            level="info" additivity="false">
+        <appender-ref ref="CONSOLE"/>
+    </logger>
+    <include
+            resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <property name="LOG_FILE"
+              value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}spring.log}"/>
+    <include
+            resource="org/springframework/boot/logging/logback/file-appender.xml"/>
+    <root level="INFO">
+        <appender-ref ref="FILE"/>
+    </root>
 </configuration>