Skip to content

Commit 5b2e96c

Browse files
zihluwangzihluwang
committed
refactor: Upgrade version to 1.4.0
- Upgrade to 1.4.0 - Upgrade Spring Framework to 6.1.3 to prevent CVE-2024-22233 - Upgrade Spring Boot to 3.2.3 to prevent CVE-2024-22233
1 parent f764f9f commit 5b2e96c

File tree

10 files changed

+171
-52
lines changed

10 files changed

+171
-52
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-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"

‎gradle.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jacksonVersion=2.16.0
2323
javaJwtVersion=4.4.0
2424
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.4.0
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"

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
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

320
val sGroupId: String by project

‎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"

‎simple-jwt-facade/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"))
@@ -30,9 +47,9 @@ tasks.test {
3047
publishing {
3148
publications {
3249
create<MavenPublication>("simpleJwtFacade") {
33-
groupId = sGroupId
50+
groupId = buildGroupId
3451
artifactId = "simple-jwt-facade"
35-
version = sVersion
52+
version = buildVersion
3653

3754
pom {
3855
name = "Simple JWT :: Facade"

‎simple-jwt-jjwt/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 jjwtVersion: String by project
1229

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

1633
dependencies {
1734
implementation(project(":devkit-utils"))
@@ -37,9 +54,9 @@ tasks.test {
3754
publishing {
3855
publications {
3956
create<MavenPublication>("simpleJwtJjwt") {
40-
groupId = sGroupId
57+
groupId = buildGroupId
4158
artifactId = "simple-jwt-jjwt"
42-
version = sVersion
59+
version = buildVersion
4360

4461
pom {
4562
name = "Simple JWT :: JJWT"

‎simple-jwt-spring-boot-starter/build.gradle.kts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import java.net.URI
1919

20-
val sGroupId: String by project
21-
val sVersion: String by project
20+
val buildGroupId: String by project
21+
val buildVersion: String by project
2222
val projectUrl: String by project
2323
val projectGithubUrl: String by project
2424
val licenseName: String by project
@@ -28,8 +28,8 @@ val javaJwtVersion: String by project
2828
val jjwtVersion: String by project
2929
val springBootVersion: String by project
3030

31-
group = sGroupId
32-
version = sVersion
31+
group = buildGroupId
32+
version = buildVersion
3333

3434
dependencies {
3535
implementation(project(":guid"))
@@ -60,9 +60,9 @@ tasks.test {
6060
publishing {
6161
publications {
6262
create<MavenPublication>("simpleJwtSpringBootStarter") {
63-
groupId = sGroupId
63+
groupId = buildGroupId
6464
artifactId = "simple-jwt-spring-boot-starter"
65-
version = sVersion
65+
version = buildVersion
6666

6767
pom {
6868
name = "Simple JWT :: Spring Boot Starter"

‎webcal/build.gradle.kts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import java.net.URI
22

3-
val sGroupId: String by project
4-
val sVersion: String by project
3+
val buildGroupId: String by project
4+
val buildVersion: String by project
55
val projectUrl: String by project
66
val projectGithubUrl: String by project
77
val licenseName: String by project
88
val licenseUrl: String by project
99

10-
group = sGroupId
11-
version = sVersion
10+
group = buildGroupId
11+
version = buildVersion
1212

1313
dependencies {
1414
implementation(project(":devkit-core"))
@@ -28,9 +28,9 @@ tasks.test {
2828
publishing {
2929
publications {
3030
create<MavenPublication>("webcal") {
31-
groupId = sGroupId
31+
groupId = buildGroupId
3232
artifactId = "webcal"
33-
version = sVersion
33+
version = buildVersion
3434

3535
pom {
3636
name = "DevKit :: WebCal"

0 commit comments

Comments
 (0)