Skip to content

0.3.9 #2125

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
merged 8 commits into from
Sep 9, 2024
Merged

0.3.9 #2125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ca000f3
Bump the java group with 9 updates
dependabot[bot] Sep 9, 2024
f70cfe0
Bump the angular group in /turing-ui with 18 updates
dependabot[bot] Sep 9, 2024
53a0ca9
Bump the react group in /turing-react with 10 updates
dependabot[bot] Sep 9, 2024
ef2fc14
Merge pull request #2123 from openturing/dependabot/npm_and_yarn/turi…
alegauss Sep 9, 2024
c6ad677
Merge pull request #2124 from openturing/dependabot/npm_and_yarn/turi…
alegauss Sep 9, 2024
acc4aea
Merge pull request #2122 from openturing/dependabot/maven/0.3.9/java-…
alegauss Sep 9, 2024
d4e3ee0
- Turing Console Log, React Package
alegauss Sep 9, 2024
b187e02
Merge branch 'master' into 0.3.9
alegauss Sep 9, 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
10 changes: 8 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
7 changes: 5 additions & 2 deletions turing-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
10 changes: 7 additions & 3 deletions turing-app/src/main/java/com/viglet/turing/TuringES.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<>();
Expand Down
51 changes: 25 additions & 26 deletions turing-app/src/main/resources/logback-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Loading
Loading