Skip to content

Commit cb537a6

Browse files
author
Zihlu Wang
committed
Merge branch 'main' into development
# Conflicts: # devkit-core/src/main/resources/logback.xml # devkit-utils/src/main/resources/logback.xml # guid/src/main/resources/logback.xml # property-guard-spring-boot-starter/src/main/resources/logback.xml # simple-jwt-authzero/src/main/resources/logback.xml # simple-jwt-facade/src/main/resources/logback.xml # simple-jwt-jjwt/src/main/resources/logback.xml # simple-jwt-spring-boot-starter/src/main/resources/logback.xml # webcal/src/main/resources/logback.xml
2 parents bb79c12 + 9975d25 commit cb537a6

File tree

22 files changed

+289
-173
lines changed

22 files changed

+289
-173
lines changed

‎README.md‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,55 +6,39 @@ JDevKit is a Java Development Kit that offers a set of convenient tools for writ
66

77
> For more information, please visit the README file of each module.
88
9-
### `devkit-core`
10-
11-
<span style="font-size: 14px;">_[Learn more](https://github.com/CodeCraftersCN/jdevkit/devkit-core/README.md)_</span>
9+
### `devkit-core` <span style="font-size: 14px;">_[Learn more](https://github.com/CodeCraftersCN/jdevkit/devkit-core/README.md)_</span>
1210

1311
The core module for `JDevKit`, by now, this module contains the commonly used classes of the whole `dev-kit`.
1412

15-
### `devkit-utils`
16-
17-
<span style="font-size: 14px;">_[Learn more](https://github.com/CodeCraftersCN/jdevkit/devkit-utils/README.md)_</span>
13+
### `devkit-utils` <span style="font-size: 14px;">_[Learn more](https://github.com/CodeCraftersCN/jdevkit/devkit-utils/README.md)_</span>
1814

1915
A collection of common utility classes to simplify Java development. It includes tools for Base64 encoding/decoding of strings, reducing if-else code blocks using Lambda expressions, converting between maps and arbitrary objects, high-precision chained mathematical calculations, and string hashing or message digest calculations.
2016

21-
### `guid`
22-
23-
<span style="font-size: 14px;">_[Learn more](https://github.com/CodeCraftersCN/jdevkit/guid/README.md)_</span>
17+
### `guid` <span style="font-size: 14px;">_[Learn more](https://github.com/CodeCraftersCN/jdevkit/guid/README.md)_</span>
2418

2519
A module for generating globally unique IDs. It includes a facade interface and an implementation of GUID generation using the Snowflake algorithm. More globally unique ID generation modes will be added in the future.
2620

27-
### `WebCal`
28-
29-
<span style="font-size: 14px;">_[Learn more](https://github.com/CodeCraftersCN/jdevkit/webcal/README.md)_</span>
21+
### `WebCal` <span style="font-size: 14px;">_[Learn more](https://github.com/CodeCraftersCN/jdevkit/webcal/README.md)_</span>
3022

3123
The module `webcal` is a Java library that facilitates the generation and resolution of iCalendar content for web-based calendar applications. It provides a flexible and easy-to-use API for creating web calendars with customisable settings and events.
3224

3325
With the `webcal` module, developers can easily integrate calendar functionality into web applications, enabling users to view, add, and manage events in a structured and standardized format. It is designed to simplify calendar-related tasks and enhance the overall user experience when dealing with calendar data on the web.
3426

3527
Please note that the `webcal` module adheres to the iCalendar standard specified in RFC 5545, ensuring compatibility with other calendar applications that support this format.
3628

37-
### `simple-jwt-facade`
38-
39-
<span style="font-size: 14px;">_[Learn more](https://github.com/CodeCraftersCN/jdevkit/simple-jwt-facade/README.md)_</span>
29+
### `simple-jwt-facade` <span style="font-size: 14px;">_[Learn more](https://github.com/CodeCraftersCN/jdevkit/simple-jwt-facade/README.md)_</span>
4030

4131
A facade for Simple JWT (JSON Web Token) implementations in Java. This module provides a unified interface to work with JWTs regardless of the underlying implementation.
4232

43-
### `simple-jwt-authzero`
44-
45-
<span style="font-size: 14px;">_[Learn more](https://github.com/CodeCraftersCN/jdevkit/simple-jwt-authzero/README.md)_</span>
33+
### `simple-jwt-authzero` <span style="font-size: 14px;">_[Learn more](https://github.com/CodeCraftersCN/jdevkit/simple-jwt-authzero/README.md)_</span>
4634

4735
A Simple JWT implementation using the com.auth0:java-jwt library.
4836

49-
### `simple-jwt-jjwt`
50-
51-
<span style="font-size: 14px;">_[Learn more](https://github.com/CodeCraftersCN/jdevkit/simple-jwt-jjwt/README.md)_</span>
37+
### `simple-jwt-jjwt` <span style="font-size: 14px;">_[Learn more](https://github.com/CodeCraftersCN/jdevkit/simple-jwt-jjwt/README.md)_</span>
5238

5339
A Simple JWT implementation using the `io.jsonwebtoken:jjwt-api` library.
5440

55-
### `simple-jwt-spring-boot-starter`
56-
57-
<span style="font-size: 14px;">_[Learn more](https://github.com/CodeCraftersCN/jdevkit/simple-jwt-spring-boot-starter/README.md)_</span>
41+
### `simple-jwt-spring-boot-starter` <span style="font-size: 14px;">_[Learn more](https://github.com/CodeCraftersCN/jdevkit/simple-jwt-spring-boot-starter/README.md)_</span>
5842

5943
A Spring Boot autoconfiguration wrapper for the simple-jwt module, making it easier to integrate JWT functionality into Spring Boot applications.
6044

‎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: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@
1717
-->
1818

1919
<configuration>
20-
<property name="COLOURFUL_OUTPUT"
21-
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"/>
22-
<property name="STANDARD_OUTPUT"
23-
value="%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK} %-5level %black(---) [%10.10t] %-20.20logger{20} : %msg%n"/>
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"/>
2422

25-
<statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
23+
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
2624
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
2725
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
2826
<pattern>${COLOURFUL_OUTPUT}</pattern>

‎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: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@
1717
-->
1818

1919
<configuration>
20-
<property name="COLOURFUL_OUTPUT"
21-
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"/>
22-
<property name="STANDARD_OUTPUT"
23-
value="%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK} %-5level %black(---) [%10.10t] %-20.20logger{20} : %msg%n"/>
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"/>
2422

25-
<statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
23+
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
2624
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
2725
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
2826
<pattern>${COLOURFUL_OUTPUT}</pattern>

‎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: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@
1515
~ See the License for the specific language governing permissions and
1616
~ limitations under the License.
1717
-->
18-
1918
<configuration>
20-
<property name="COLOURFUL_OUTPUT"
21-
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"/>
22-
<property name="STANDARD_OUTPUT"
23-
value="%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK} %-5level %black(---) [%10.10t] %-20.20logger{20} : %msg%n"/>
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"/>
2421

25-
<statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
22+
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
2623
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
2724
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
2825
<pattern>${COLOURFUL_OUTPUT}</pattern>

‎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: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@
1717
-->
1818

1919
<configuration>
20-
<property name="COLOURFUL_OUTPUT"
21-
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"/>
22-
<property name="STANDARD_OUTPUT"
23-
value="%date{'dd MMM, yyyy HH:mm:ss', Asia/Hong_Kong, en-UK} %-5level %black(---) [%10.10t] %-20.20logger{20} : %msg%n"/>
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"/>
2422

25-
<statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
23+
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
2624
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
2725
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
2826
<pattern>${COLOURFUL_OUTPUT}</pattern>

0 commit comments

Comments
 (0)