Skip to content

Commit da82340

Browse files
dgzpgdgzpg
authored
Merge pull request #77 from reactivegroup/feature/metrics
upgrade logback version
2 parents f10b608 + e873b73 commit da82340

File tree

10 files changed

+29
-28
lines changed

10 files changed

+29
-28
lines changed

‎examples/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>capa-parent</artifactId>
2525
<groupId>group.rxcloud</groupId>
26-
<version>1.0.9.RELEASE</version>
26+
<version>1.10.9.2.RELEASE</version>
2727
</parent>
2828

2929
<artifactId>capa-examples</artifactId>
@@ -32,7 +32,7 @@
3232

3333
<properties>
3434
<log4j.version>2.14.1</log4j.version>
35-
<logback.version>1.1.7</logback.version>
35+
<logback.version>1.2.3</logback.version>
3636
<slf4j-api.version>1.7.32</slf4j-api.version>
3737
</properties>
3838

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<groupId>group.rxcloud</groupId>
2424
<artifactId>capa-parent</artifactId>
2525
<packaging>pom</packaging>
26-
<version>1.0.9.RELEASE</version>
26+
<version>1.10.9.2.RELEASE</version>
2727
<name>capa-sdk-parent</name>
2828
<description>SDK for Capa.</description>
2929
<url>https://github.com/reactivegroup</url>

‎sdk-component/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>group.rxcloud</groupId>
2525
<artifactId>capa-parent</artifactId>
26-
<version>1.0.9.RELEASE</version>
26+
<version>1.10.9.2.RELEASE</version>
2727
</parent>
2828

2929
<artifactId>capa-sdk-component</artifactId>
@@ -34,7 +34,7 @@
3434
<okhttp.version>4.9.1</okhttp.version>
3535
<kotlin-stdlib.version>1.4.10</kotlin-stdlib.version>
3636
<log4j.version>2.14.1</log4j.version>
37-
<logback.version>1.1.7</logback.version>
37+
<logback.version>1.2.3</logback.version>
3838
</properties>
3939

4040
<dependencies>

‎sdk-infrastructure/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>capa-parent</artifactId>
2525
<groupId>group.rxcloud</groupId>
26-
<version>1.0.9.RELEASE</version>
26+
<version>1.10.9.2.RELEASE</version>
2727
</parent>
2828

2929
<artifactId>capa-sdk-infrastructure</artifactId>

‎sdk-spi-demo/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>capa-parent</artifactId>
2525
<groupId>group.rxcloud</groupId>
26-
<version>1.0.9.RELEASE</version>
26+
<version>1.10.9.2.RELEASE</version>
2727
</parent>
2828

2929
<artifactId>capa-sdk-spi-demo</artifactId>
@@ -32,7 +32,7 @@
3232

3333
<properties>
3434
<log4j.version>2.14.1</log4j.version>
35-
<logback.version>1.1.7</logback.version>
35+
<logback.version>1.2.3</logback.version>
3636
</properties>
3737

3838
<dependencies>

‎sdk-spi-demo/src/main/resources/capa-component-log-common.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
LOG_COMPONENT_CENTER_CONFIG_APPID=100035464

‎sdk-spi/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>capa-parent</artifactId>
2525
<groupId>group.rxcloud</groupId>
26-
<version>1.0.9.RELEASE</version>
26+
<version>1.10.9.2.RELEASE</version>
2727
</parent>
2828

2929
<artifactId>capa-sdk-spi</artifactId>
@@ -32,7 +32,7 @@
3232

3333
<properties>
3434
<log4j.version>2.14.1</log4j.version>
35-
<logback.version>1.1.7</logback.version>
35+
<logback.version>1.2.3</logback.version>
3636
</properties>
3737

3838
<dependencies>

‎sdk-spi/src/main/java/group/rxcloud/capa/spi/log/manager/LogManager.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -79,36 +79,36 @@ public static Boolean whetherLogsCanOutput(CapaLogLevel capaLogLevel) {
7979
switch (capaLogLevel) {
8080
case ALL:
8181
return LogConfiguration.containsKey(ALL_LEVEL_SWITCH_NAME)
82-
? Boolean.FALSE
83-
: Boolean.parseBoolean(LogConfiguration.get(ALL_LEVEL_SWITCH_NAME));
82+
? Boolean.parseBoolean(LogConfiguration.get(ALL_LEVEL_SWITCH_NAME))
83+
: Boolean.FALSE;
8484
case TRACE:
8585
return LogConfiguration.containsKey(TRACE_LEVEL_SWITCH_NAME)
86-
? Boolean.FALSE
87-
: Boolean.parseBoolean(LogConfiguration.get(TRACE_LEVEL_SWITCH_NAME));
86+
? Boolean.parseBoolean(LogConfiguration.get(TRACE_LEVEL_SWITCH_NAME))
87+
: Boolean.FALSE;
8888
case DEBUG:
8989
return LogConfiguration.containsKey(DEBUG_LEVEL_SWITCH_NAME)
90-
? Boolean.FALSE
91-
: Boolean.parseBoolean(LogConfiguration.get(DEBUG_LEVEL_SWITCH_NAME));
90+
? Boolean.parseBoolean(LogConfiguration.get(DEBUG_LEVEL_SWITCH_NAME))
91+
: Boolean.FALSE;
9292
case INFO:
9393
return LogConfiguration.containsKey(INFO_LEVEL_SWITCH_NAME)
94-
? Boolean.FALSE
95-
: Boolean.parseBoolean(LogConfiguration.get(INFO_LEVEL_SWITCH_NAME));
94+
? Boolean.parseBoolean(LogConfiguration.get(INFO_LEVEL_SWITCH_NAME))
95+
: Boolean.FALSE;
9696
case WARN:
9797
return LogConfiguration.containsKey(WARN_LEVEL_SWITCH_NAME)
98-
? Boolean.FALSE
99-
: Boolean.parseBoolean(LogConfiguration.get(WARN_LEVEL_SWITCH_NAME));
98+
? Boolean.parseBoolean(LogConfiguration.get(WARN_LEVEL_SWITCH_NAME))
99+
: Boolean.FALSE;
100100
case ERROR:
101101
return LogConfiguration.containsKey(ERROR_LEVEL_SWITCH_NAME)
102-
? Boolean.FALSE
103-
: Boolean.parseBoolean(LogConfiguration.get(ERROR_LEVEL_SWITCH_NAME));
102+
? Boolean.parseBoolean(LogConfiguration.get(ERROR_LEVEL_SWITCH_NAME))
103+
: Boolean.FALSE;
104104
case FATAL:
105105
return LogConfiguration.containsKey(FATAL_LEVEL_SWITCH_NAME)
106-
? Boolean.FALSE
107-
: Boolean.parseBoolean(LogConfiguration.get(FATAL_LEVEL_SWITCH_NAME));
106+
? Boolean.parseBoolean(LogConfiguration.get(FATAL_LEVEL_SWITCH_NAME))
107+
: Boolean.FALSE;
108108
case OFF:
109109
return LogConfiguration.containsKey(OFF_LEVEL_SWITCH_NAME)
110-
? Boolean.FALSE
111-
: Boolean.parseBoolean(LogConfiguration.get(OFF_LEVEL_SWITCH_NAME));
110+
? Boolean.parseBoolean(LogConfiguration.get(OFF_LEVEL_SWITCH_NAME))
111+
: Boolean.FALSE;
112112
default:
113113
return Boolean.FALSE;
114114
}

‎sdk-springboot/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>capa-parent</artifactId>
2525
<groupId>group.rxcloud</groupId>
26-
<version>1.0.9.RELEASE</version>
26+
<version>1.10.9.2.RELEASE</version>
2727
</parent>
2828

2929
<artifactId>sdk-springboot</artifactId>

‎sdk/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>group.rxcloud</groupId>
2525
<artifactId>capa-parent</artifactId>
26-
<version>1.0.9.RELEASE</version>
26+
<version>1.10.9.2.RELEASE</version>
2727
</parent>
2828

2929
<artifactId>capa-sdk</artifactId>

0 commit comments

Comments
 (0)