Skip to content

Commit 9975d25

Browse files
author
Zihlu Wang
committed
Merge remote-tracking branch 'origin/main'
2 parents c1869dd + 1018c22 commit 9975d25

File tree

21 files changed

+353
-181
lines changed

21 files changed

+353
-181
lines changed

‎devkit-core/build.gradle.kts‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,31 @@
1+
/*
2+
* Copyright (C) 2023 CodeCraftersCN.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
*
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
118
import java.net.URI
219

3-
val sGroupId: String by project
4-
val sVersion: String by project
20+
val buildGroupId: String by project
21+
val buildVersion: String by project
522
val projectUrl: String by project
623
val projectGithubUrl: String by project
724
val licenseName: String by project
825
val licenseUrl: String by project
926

10-
group = sGroupId
11-
version = sVersion
27+
group = buildGroupId
28+
version = buildVersion
1229

1330
java {
1431
sourceCompatibility = JavaVersion.VERSION_17
@@ -24,9 +41,9 @@ tasks.test {
2441
publishing {
2542
publications {
2643
create<MavenPublication>("devkitCore") {
27-
groupId = sGroupId
44+
groupId = buildGroupId
2845
artifactId = "devkit-core"
29-
version = sVersion
46+
version = buildVersion
3047

3148
pom {
3249
name = "DevKit - Core"

‎devkit-core/src/main/resources/logback.xml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,16 @@
1717
-->
1818

1919
<configuration>
20+
<property name="COLOURFUL_OUTPUT" value="%black(%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK}) %highlight(%-5level) %black(---) %black([%10.10t]) %cyan(%-20.20logger{20}) %black(:) %msg%n"/>
21+
<property name="STANDARD_OUTPUT" value="%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK} %-5level %black(---) [%10.10t] %-20.20logger{20} : %msg%n"/>
2022

2123
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
22-
2324
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
24-
<encoder>
25-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} : %msg%n</pattern>
25+
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
26+
<pattern>${COLOURFUL_OUTPUT}</pattern>
2627
</encoder>
2728
</appender>
28-
29-
<appender name="STDOUT-C" class="ch.qos.logback.core.ConsoleAppender">
30-
<encoder>
31-
<pattern>%date{yyyy-MM-dd HH:mm:ss} [%thread] %highlight(%-5level) %cyan(%logger{50}) : %msg%n</pattern>
32-
</encoder>
33-
</appender>
34-
3529
<root level="INFO">
36-
<appender-ref ref="STDOUT-C"/>
30+
<appender-ref ref="STDOUT"/>
3731
</root>
3832
</configuration>

‎devkit-utils/build.gradle.kts‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,31 @@
1+
/*
2+
* Copyright (C) 2023 CodeCraftersCN.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
*
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
118
import java.net.URI
219

3-
val sGroupId: String by project
4-
val sVersion: String by project
20+
val buildGroupId: String by project
21+
val buildVersion: String by project
522
val projectUrl: String by project
623
val projectGithubUrl: String by project
724
val licenseName: String by project
825
val licenseUrl: String by project
926

10-
group = sGroupId
11-
version = sVersion
27+
group = buildGroupId
28+
version = buildVersion
1229

1330
dependencies {
1431
implementation(project(":devkit-core"))
@@ -28,9 +45,9 @@ tasks.test {
2845
publishing {
2946
publications {
3047
create<MavenPublication>("devkitUtils") {
31-
groupId = sGroupId
48+
groupId = buildGroupId
3249
artifactId = "devkit-utils"
33-
version = sVersion
50+
version = buildVersion
3451

3552
pom {
3653
name = "DevKit - Utils"

‎devkit-utils/src/main/resources/logback.xml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,16 @@
1717
-->
1818

1919
<configuration>
20+
<property name="COLOURFUL_OUTPUT" value="%black(%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK}) %highlight(%-5level) %black(---) %black([%10.10t]) %cyan(%-20.20logger{20}) %black(:) %msg%n"/>
21+
<property name="STANDARD_OUTPUT" value="%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK} %-5level %black(---) [%10.10t] %-20.20logger{20} : %msg%n"/>
2022

2123
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
22-
2324
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
24-
<encoder>
25-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} : %msg%n</pattern>
25+
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
26+
<pattern>${COLOURFUL_OUTPUT}</pattern>
2627
</encoder>
2728
</appender>
28-
29-
<appender name="STDOUT-C" class="ch.qos.logback.core.ConsoleAppender">
30-
<encoder>
31-
<pattern>%date{yyyy-MM-dd HH:mm:ss} [%thread] %highlight(%-5level) %cyan(%logger{50}) : %msg%n</pattern>
32-
</encoder>
33-
</appender>
34-
3529
<root level="INFO">
36-
<appender-ref ref="STDOUT-C"/>
30+
<appender-ref ref="STDOUT"/>
3731
</root>
3832
</configuration>

‎gradle.properties‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ slf4jVersion=2.0.9
2121
lombokVersion=1.18.30
2222
jacksonVersion=2.16.0
2323
javaJwtVersion=4.4.0
24-
jjwtVersion=0.11.5
24+
jjwtVersion=0.12.5
2525
okhttpVersion=4.12.0
26-
springVersion=6.1.1
27-
springBootVersion=3.2.0
26+
springVersion=6.1.3
27+
springBootVersion=3.2.3
2828

29-
sGroupId=cn.org.codecrafters
30-
sVersion=1.3.2
29+
buildGroupId=cn.org.codecrafters
30+
buildVersion=1.4.0
3131
projectUrl=https://codecrafters.org.cn/JDevKit
3232
projectGithubUrl=https://github.com/CodeCraftersCN/JDevKit
3333
licenseName=The Apache License, Version 2.0

‎guid/build.gradle.kts‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,31 @@
1+
/*
2+
* Copyright (C) 2023 CodeCraftersCN.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
*
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
118
import java.net.URI
219

3-
val sGroupId: String by project
4-
val sVersion: String by project
20+
val buildGroupId: String by project
21+
val buildVersion: String by project
522
val projectUrl: String by project
623
val projectGithubUrl: String by project
724
val licenseName: String by project
825
val licenseUrl: String by project
926

10-
group = sGroupId
11-
version = sVersion
27+
group = buildGroupId
28+
version = buildVersion
1229

1330
dependencies {
1431
implementation(project(":devkit-core"))
@@ -28,9 +45,9 @@ tasks.test {
2845
publishing {
2946
publications {
3047
create<MavenPublication>("guid") {
31-
groupId = sGroupId
48+
groupId = buildGroupId
3249
artifactId = "guid"
33-
version = sVersion
50+
version = buildVersion
3451

3552
pom {
3653
name = "DevKit - GUID"

‎guid/src/main/resources/logback.xml‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,17 @@
1515
~ See the License for the specific language governing permissions and
1616
~ limitations under the License.
1717
-->
18-
1918
<configuration>
19+
<property name="COLOURFUL_OUTPUT" value="%black(%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK}) %highlight(%-5level) %black(---) %black([%10.10t]) %cyan(%-20.20logger{20}) %black(:) %msg%n"/>
20+
<property name="STANDARD_OUTPUT" value="%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK} %-5level %black(---) [%10.10t] %-20.20logger{20} : %msg%n"/>
2021

2122
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
22-
2323
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
24-
<encoder>
25-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} : %msg%n</pattern>
26-
</encoder>
27-
</appender>
28-
29-
<appender name="STDOUT-C" class="ch.qos.logback.core.ConsoleAppender">
30-
<encoder>
31-
<pattern>%date{yyyy-MM-dd HH:mm:ss} [%thread] %highlight(%-5level) %cyan(%logger{50}) : %msg%n</pattern>
24+
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
25+
<pattern>${COLOURFUL_OUTPUT}</pattern>
3226
</encoder>
3327
</appender>
34-
3528
<root level="INFO">
36-
<appender-ref ref="STDOUT-C"/>
29+
<appender-ref ref="STDOUT"/>
3730
</root>
3831
</configuration>

‎property-guard-spring-boot-starter/build.gradle.kts‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,33 @@
1+
/*
2+
* Copyright (C) 2023 CodeCraftersCN.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
*
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
118
import java.net.URI
219

3-
val sGroupId: String by project
4-
val sVersion: String by project
20+
val buildGroupId: String by project
21+
val buildVersion: String by project
522
val projectUrl: String by project
623
val projectGithubUrl: String by project
724
val licenseName: String by project
825
val licenseUrl: String by project
926

1027
val springBootVersion: String by project
1128

12-
group = sGroupId
13-
version = sVersion
29+
group = buildGroupId
30+
version = buildVersion
1431

1532
dependencies {
1633
implementation(project(":devkit-utils"))
@@ -34,9 +51,9 @@ tasks.test {
3451
publishing {
3552
publications {
3653
create<MavenPublication>("propertyGuardSpringBootStarter") {
37-
groupId = sGroupId
54+
groupId = buildGroupId
3855
artifactId = "property-guard-spring-boot-starter"
39-
version = sVersion
56+
version = buildVersion
4057

4158
pom {
4259
name = "Property Guard Spring Boot Starter"

‎property-guard-spring-boot-starter/src/main/resources/logback.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright (C) 2023 CodeCraftersCN.
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
19+
<configuration>
20+
<property name="COLOURFUL_OUTPUT" value="%black(%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK}) %highlight(%-5level) %black(---) %black([%10.10t]) %cyan(%-20.20logger{20}) %black(:) %msg%n"/>
21+
<property name="STANDARD_OUTPUT" value="%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK} %-5level %black(---) [%10.10t] %-20.20logger{20} : %msg%n"/>
22+
23+
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
24+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
25+
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
26+
<pattern>${COLOURFUL_OUTPUT}</pattern>
27+
</encoder>
28+
</appender>
29+
<root level="INFO">
30+
<appender-ref ref="STDOUT"/>
31+
</root>
32+
</configuration>

‎simple-jwt-authzero/build.gradle.kts‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,24 @@
1+
/*
2+
* Copyright (C) 2023 CodeCraftersCN.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
*
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
118
import java.net.URI
219

3-
val sGroupId: String by project
4-
val sVersion: String by project
20+
val buildGroupId: String by project
21+
val buildVersion: String by project
522
val projectUrl: String by project
623
val projectGithubUrl: String by project
724
val licenseName: String by project
@@ -10,8 +27,8 @@ val licenseUrl: String by project
1027
val jacksonVersion: String by project
1128
val javaJwtVersion: String by project
1229

13-
group = sGroupId
14-
version = sVersion
30+
group = buildGroupId
31+
version = buildVersion
1532

1633
dependencies {
1734
implementation(project(":devkit-utils"))
@@ -35,9 +52,9 @@ tasks.test {
3552
publishing {
3653
publications {
3754
create<MavenPublication>("simpleJwtAuthzero") {
38-
groupId = sGroupId
55+
groupId = buildGroupId
3956
artifactId = "simple-jwt-authzero"
40-
version = sVersion
57+
version = buildVersion
4158

4259
pom {
4360
name = "Simple JWT :: Auth0"

0 commit comments

Comments
 (0)