Skip to content

Commit 357cf9a

Browse files
dependabot[bot]oldratlee
dependabot[bot]
authored and
oldratlee
committed
chore(deps): upgrade dependencies/plugins 🛠️
bump spotbugs-annotations from 4.8.1 to 4.8.2 (#580) bump spotbugs-maven-plugin from 4.8.1.0 to 4.8.2.0 (#581) bump maven-javadoc-plugin from 3.6.2 to 3.6.3 (#582) bump spotbugs-annotations from 4.8.2 to 4.8.3 (#587) bump maven-surefire-plugin from 3.2.2 to 3.2.3 (#588) bump maven-compiler-plugin 3.11.0 to 3.12.0 (#589) bump byte-buddy-parent from 1.14.10 to 1.14.11 (#591) bump kotlin.version from 1.9.21 to 1.9.22 (#592) bump maven-compiler-plugin from 3.12.0 to 3.12.1 (#593) bump javassist from 3.29.2-GA to 3.30.2-GA (#594) bump maven-surefire-plugin from 3.2.3 to 3.2.5 (#596) bump spotbugs-maven-plugin 4.8.2.0 to 4.8.3.0 (#598) bump codecov/codecov-action from 3 to 4 (#600) bump junit-bom from 5.10.1 to 5.10.2 (#601) bump spotbugs-maven-plugin from 4.8.3.0 to 4.8.3.1 (#602) bump kotlinx-coroutines-bom from 1.7.3 to 1.8.0.(#603) bump byte-buddy-parent from 1.14.11 to 1.14.12 (#604) bump maven-shade-plugin from 3.5.1 to 3.5.2 (#606) bump exec-maven-plugin from 3.1.1 to 3.2.0 (#607) bump dokka-maven-plugin from 1.9.10 to 1.9.20 (#609) bump git-commit-id-maven-plugin from 7.0.0 to 8.0.0 (#610) bump kotlin.version from 1.9.22 to 1.9.23 (#611) bump git-commit-id-maven-plugin from 8.0.0 to 8.0.1 (#612) bump extra-enforcer-rules from 1.7.0 to 1.8.0 (#613) bump kotest.version from 5.8.0 to 5.8.1 (#614) bump maven-gpg-plugin from 3.1.0 to 3.2.0 (#615) bump maven-gpg-plugin from 3.2.0 to 3.2.1 (#616) bump maven-compiler-plugin from 3.12.1 to 3.13.0 (#617) bump git-commit-id-maven-plugin from 8.0.1 to 8.0.2 (#618) bump maven-gpg-plugin from 3.2.1 to 3.2.2 (#619) bump byte-buddy-parent from 1.14.12 to 1.14.13 (#620) bump jacoco-maven-plugin from 0.8.11 to 0.8.12 (#621) bump maven-source-plugin from 3.3.0 to 3.3.1 (#622) bump spotbugs-annotations from 4.8.3 to 4.8.4 (#623) bump maven-gpg-plugin from 3.2.2 to 3.2.3 (#627) bump maven-jar-plugin from 3.3.0 to 3.4.0 (#628) bump maven-gpg-plugin from 3.2.3 to 3.2.4 (#630) bump maven-jar-plugin from 3.4.0 to 3.4.1 (#631) bump byte-buddy-parent from 1.14.13 to 1.14.14 (#632) bump maven-shade-plugin from 3.5.2 to 3.5.3 (#633) bump maven-install-plugin from 3.1.1 to 3.1.2 (#636) bump maven-deploy-plugin from 3.1.1 to 3.1.2 (#637) bump spotbugs-annotations from 4.8.4 to 4.8.5 (#639) bump kotlin.version from 1.9.23 to 1.9.24 (#643) bump byte-buddy-parent from 1.14.14 to 1.14.15 (#644) bump kotest.version from 5.8.1 to 5.9.0 (#645) bump kotlinx-coroutines-bom from 1.8.0 to 1.8.1 (#646) bump exec-maven-plugin from 3.2.0 to 3.3.0 (#650) bump byte-buddy-parent from 1.14.15 to 1.14.16 (#651) bump nexus-staging-maven-plugin from 1.6.13 to 1.7.0 (#652) bump byte-buddy-parent from 1.14.16 to 1.14.17 (#654) bump maven-enforcer-plugin from 3.4.1 to 3.5.0 (#655) bump maven-javadoc-plugin from 3.6.3 to 3.7.0 (#656) bump maven-shade-plugin from 3.5.3 to 3.6.0 (#657) bump kotest.version from 5.9.0 to 5.9.1 (#658) bump git-commit-id-maven-plugin from 8.0.2 to 9.0.0 (#659) bump maven-dependency-plugin from 3.6.1 to 3.7.0 (#660) bump maven-surefire-plugin from 3.2.5 to 3.3.0.(#661) bump spotbugs-annotations from 4.8.5 to 4.8.6 (#662) bump maven-jar-plugin from 3.4.1 to 3.4.2 (#663) bump maven-clean-plugin from 3.3.2 to 3.4.0 (#664) bump maven-dependency-plugin from 3.7.0 to 3.7.1 (#666) bump junit-bom from 5.10.2 to 5.10.3 (#670) bump git-commit-id-maven-plugin from 9.0.0 to 9.0.1 (#672) bump byte-buddy-parent from 1.14.17 to 1.14.18 (#673) bump maven-surefire-plugin from 3.3.0 to 3.3.1 (#674) bump maven-javadoc-plugin from 3.7.0 to 3.8.0 (#675) bump kotlin.version from 1.9.24 to 1.9.25 (#676) bump exec-maven-plugin from 3.3.0 to 3.4.0 (#678) bump maven-gpg-plugin from 3.2.4 to 3.2.5 (#680) bump exec-maven-plugin from 3.4.0 to 3.4.1 (#681) bump junit-bom from 5.10.3 to 5.11.0 (#683) bump byte-buddy-parent from 1.14.18 to 1.14.19 (#684) bump maven-site-plugin from 3.12.1 to 3.20.0 (#685) bump maven-surefire-plugin from 3.3.1 to 3.4.0 (#686) bump maven-install-plugin from 3.1.2 to 3.1.3 (#687) bump maven-deploy-plugin from 3.1.2 to 3.1.3 (#688) bump maven-dependency-plugin from 3.7.1 to 3.8.0 (#689) bump byte-buddy-parent from 1.14.19 to 1.15.0 (#691) bump maven-surefire-plugin from 3.4.0 to 3.5.0 (#692) bump byte-buddy-parent from 1.15.0 to 1.15.1 (#694)
1 parent 5e26312 commit 357cf9a

File tree

11 files changed

+72
-106
lines changed

11 files changed

+72
-106
lines changed

‎.editorconfig

+16-10
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,28 @@ root = true
44
charset = utf-8
55
end_of_line = lf
66
insert_final_newline = true
7-
tab_width = 4
8-
indent_size = 4
9-
ij_continuation_indent_size = 8
7+
8+
tab_width = 2
9+
indent_size = 2
10+
ij_continuation_indent_size = 4
1011
indent_style = space
1112
trim_trailing_whitespace = true
1213

13-
[*.xml]
14-
indent_style = tab
14+
ij_any_blank_lines_after_imports = 2
15+
ij_markdown_wrap_text_if_long = false
1516

16-
[*.{yml,yaml}]
17-
indent_size = 2
18-
ij_continuation_indent_size = 4
1917

2018
[*.{java,kt}]
21-
ij_java_wrap_long_lines = false
19+
indent_size = 4
20+
ij_continuation_indent_size = 8
21+
2222

2323
[*.{md,mkd,markdown}]
24+
indent_size = 4
25+
ij_continuation_indent_size = 8
2426
trim_trailing_whitespace = false
25-
ij_markdown_wrap_text_if_long = false
27+
28+
29+
[*.xml]
30+
indent_style = tab
31+

‎.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
os: [ ubuntu-latest, windows-latest ]
13-
java: [ 8, 11, 17, 21 ]
13+
java: [ 8, 11, 17, 21, 22 ]
1414
fail-fast: false
1515
max-parallel: 64
1616
name: Fast CI on Java ${{ matrix.java }} OS ${{ matrix.os }}

‎.github/workflows/strong_ci.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
11
2525
17
2626
21
27+
22
2728
distribution: zulu
2829
cache: maven
2930

@@ -34,10 +35,9 @@ jobs:
3435
run: rm -rf $HOME/.m2/repository/com/alibaba/{transmittable-thread-local,ttl}*
3536

3637
- name: Upload coverage reports to Codecov
37-
uses: codecov/codecov-action@v3
38-
with:
39-
name: codecov-umbrella
40-
token: ${{ secrets.CODECOV_TOKEN }}
38+
uses: codecov/codecov-action@v4
39+
env:
40+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
4141

4242
# https://remarkablemark.org/blog/2017/10/12/check-git-dirty/
4343
- name: Check git dirty

‎pom.xml

+33-47
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

55
<groupId>com.alibaba.ttl3</groupId>
@@ -28,8 +28,8 @@
2828
<url>https://github.com/alibaba/transmittable-thread-local</url>
2929
</scm>
3030
<issueManagement>
31-
<url>https://github.com/alibaba/transmittable-thread-local/issues</url>
3231
<system>GitHub Issues</system>
32+
<url>https://github.com/alibaba/transmittable-thread-local/issues</url>
3333
</issueManagement>
3434
<ciManagement>
3535
<system>GitHub Actions</system>
@@ -79,22 +79,22 @@
7979
https://alibaba.github.io/transmittable-thread-local/apidocs/${project.version}
8080
</javadoc.ttl.base.link>
8181

82-
<spotbugs.annotations.version>4.8.1</spotbugs.annotations.version>
82+
<spotbugs.annotations.version>4.8.6</spotbugs.annotations.version>
8383
<jsr305.version>3.0.2</jsr305.version>
8484
<jetbrains.annotations.version>24.1.0</jetbrains.annotations.version>
8585

86-
<kotlin.version>1.9.21</kotlin.version>
86+
<kotlin.version>1.9.25</kotlin.version>
8787
<kotlin.compiler.jvmTarget>${maven.compiler.source}</kotlin.compiler.jvmTarget>
88-
<kotlin.coroutine.version>1.7.3</kotlin.coroutine.version>
88+
<kotlin.coroutine.version>1.8.1</kotlin.coroutine.version>
8989
<!-- https://kotlin.github.io/dokka/1.7.10/user_guide/maven/usage/ -->
90-
<dokka.version>1.9.10</dokka.version>
90+
<dokka.version>1.9.20</dokka.version>
9191
<dokka.link.jdk.version>8</dokka.link.jdk.version>
9292

9393
<slf4j.version>2.0.7</slf4j.version>
9494

9595
<!-- testing dependencies versions -->
96-
<junit5.version>5.10.1</junit5.version>
97-
<kotest.version>5.8.0</kotest.version>
96+
<junit5.version>5.11.0</junit5.version>
97+
<kotest.version>5.9.1</kotest.version>
9898

9999
<!--
100100
slf4j simple logger configuration for test
@@ -196,7 +196,7 @@
196196
<!-- https://github.com/raphw/byte-buddy/issues/1264 -->
197197
<groupId>net.bytebuddy</groupId>
198198
<artifactId>byte-buddy-parent</artifactId>
199-
<version>1.14.10</version>
199+
<version>1.15.1</version>
200200
<type>pom</type>
201201
<scope>import</scope>
202202
</dependency>
@@ -255,7 +255,7 @@
255255
<dependency>
256256
<groupId>org.javassist</groupId>
257257
<artifactId>javassist</artifactId>
258-
<version>3.29.2-GA</version>
258+
<version>3.30.2-GA</version>
259259
<optional>true</optional>
260260
</dependency>
261261
<dependency>
@@ -402,9 +402,6 @@
402402
</execution>
403403
</executions>
404404
</plugin>
405-
<!--
406-
official docs: https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html
407-
-->
408405
<plugin>
409406
<artifactId>maven-enforcer-plugin</artifactId>
410407
<executions>
@@ -415,6 +412,7 @@
415412
</goals>
416413
<configuration>
417414
<rules>
415+
<!-- official docs: https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html -->
418416
<requireMavenVersion>
419417
<version>3.3.9</version>
420418
</requireMavenVersion>
@@ -428,7 +426,7 @@
428426
<plugins>
429427
<plugin>
430428
<artifactId>maven-clean-plugin</artifactId>
431-
<version>3.3.2</version>
429+
<version>3.4.0</version>
432430
</plugin>
433431
<plugin>
434432
<artifactId>maven-resources-plugin</artifactId>
@@ -441,19 +439,19 @@
441439
</plugin>
442440
<plugin>
443441
<artifactId>maven-compiler-plugin</artifactId>
444-
<version>3.11.0</version>
442+
<version>3.13.0</version>
445443
</plugin>
446444
<plugin>
447445
<artifactId>maven-surefire-plugin</artifactId>
448-
<version>3.2.2</version>
446+
<version>3.5.0</version>
449447
</plugin>
450448
<plugin>
451449
<artifactId>maven-jar-plugin</artifactId>
452-
<version>3.3.0</version>
450+
<version>3.4.2</version>
453451
</plugin>
454452
<plugin>
455453
<artifactId>maven-shade-plugin</artifactId>
456-
<version>3.5.1</version>
454+
<version>3.6.0</version>
457455
<configuration>
458456
<shadeSourcesContent>true</shadeSourcesContent>
459457
<dependencyReducedPomLocation>
@@ -463,11 +461,11 @@
463461
</plugin>
464462
<plugin>
465463
<artifactId>maven-source-plugin</artifactId>
466-
<version>3.3.0</version>
464+
<version>3.3.1</version>
467465
</plugin>
468466
<plugin>
469467
<artifactId>maven-javadoc-plugin</artifactId>
470-
<version>3.6.2</version>
468+
<version>3.8.0</version>
471469
</plugin>
472470
<plugin>
473471
<groupId>org.jetbrains.dokka</groupId>
@@ -488,38 +486,38 @@
488486
</plugin>
489487
<plugin>
490488
<artifactId>maven-gpg-plugin</artifactId>
491-
<version>3.1.0</version>
489+
<version>3.2.5</version>
492490
</plugin>
493491
<plugin>
494492
<artifactId>maven-site-plugin</artifactId>
495-
<version>3.12.1</version>
493+
<version>3.20.0</version>
496494
</plugin>
497495
<plugin>
498496
<artifactId>maven-install-plugin</artifactId>
499-
<version>3.1.1</version>
497+
<version>3.1.3</version>
500498
</plugin>
501499
<plugin>
502500
<artifactId>maven-deploy-plugin</artifactId>
503-
<version>3.1.1</version>
501+
<version>3.1.3</version>
504502
</plugin>
505503
<plugin>
506504
<artifactId>maven-enforcer-plugin</artifactId>
507-
<version>3.4.1</version>
505+
<version>3.5.0</version>
508506
</plugin>
509507
<plugin>
510508
<groupId>io.github.git-commit-id</groupId>
511509
<artifactId>git-commit-id-maven-plugin</artifactId>
512-
<version>7.0.0</version>
510+
<version>9.0.1</version>
513511
</plugin>
514512
<plugin>
515513
<groupId>com.github.spotbugs</groupId>
516514
<artifactId>spotbugs-maven-plugin</artifactId>
517-
<version>4.8.1.0</version>
515+
<version>4.8.3.1</version>
518516
</plugin>
519517
<plugin>
520518
<groupId>org.jacoco</groupId>
521519
<artifactId>jacoco-maven-plugin</artifactId>
522-
<version>0.8.11</version>
520+
<version>0.8.12</version>
523521
</plugin>
524522
<plugin>
525523
<!--
@@ -528,7 +526,7 @@
528526
-->
529527
<groupId>org.codehaus.mojo</groupId>
530528
<artifactId>exec-maven-plugin</artifactId>
531-
<version>3.1.1</version>
529+
<version>3.4.1</version>
532530
<configuration>
533531
<executable>${java.home}/bin/java</executable>
534532
<classpathScope>test</classpathScope>
@@ -550,23 +548,12 @@
550548
<plugin>
551549
<groupId>org.sonatype.plugins</groupId>
552550
<artifactId>nexus-staging-maven-plugin</artifactId>
553-
<version>1.6.13</version>
554-
</plugin>
555-
<plugin>
556-
<!--
557-
config example: https://github.com/mojohaus/versions-maven-plugin/issues/157#issuecomment-306041074
558-
-->
559-
<groupId>org.codehaus.mojo</groupId>
560-
<artifactId>versions-maven-plugin</artifactId>
561-
<version>2.16.2</version>
562-
<configuration>
563-
<rulesUri>file://${maven.multiModuleProjectDirectory}/src/versions-rules.xml</rulesUri>
564-
<generateBackupPoms>false</generateBackupPoms>
565-
</configuration>
551+
<version>1.7.0</version>
566552
</plugin>
567553
</plugins>
568554
</pluginManagement>
569555
</build>
556+
570557
<profiles>
571558
<profile>
572559
<id>gen-src</id>
@@ -607,10 +594,10 @@
607594
608595
About package-list vs.element-list
609596
- Can't link to JDK10 in Javadoc comments
610-
https://stackoverflow.com/a/49498219/922688
597+
https://stackoverflow.com/a/49498219/922688
611598
- Missing javadoc/package-list for release 5.1
612-
https://github.com/gradle/gradle/issues/8183
613-
https://github.com/gradle/gradle/commit/5e88351dd456a5252d21f3a7ad25bff1b62a2fd2
599+
https://github.com/gradle/gradle/issues/8183
600+
https://github.com/gradle/gradle/commit/5e88351dd456a5252d21f3a7ad25bff1b62a2fd2
614601
615602
616603
Using the linkoffline Option
@@ -625,7 +612,6 @@
625612
<plugin>
626613
<!--
627614
https://maven.apache.org/plugins/maven-javadoc-plugin/javadoc-mojo.html
628-
629615
https://docs.oracle.com/en/java/javase/21/javadoc/javadoc-command.html
630616
-->
631617
<artifactId>maven-javadoc-plugin</artifactId>
@@ -873,7 +859,7 @@
873859
<dependency>
874860
<groupId>org.codehaus.mojo</groupId>
875861
<artifactId>extra-enforcer-rules</artifactId>
876-
<version>1.7.0</version>
862+
<version>1.8.0</version>
877863
</dependency>
878864
</dependencies>
879865
</plugin>

‎scripts/integration-test.sh

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ readonly JDK_VERSIONS=(
2020
11
2121
"$default_build_jdk_version"
2222
21
23+
22
2324
)
2425

2526
# here use `install` and `-D performRelease` intended

‎src/versions-rules.xml

-29
This file was deleted.

‎ttl-bom/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,20 @@
9696
<plugins>
9797
<plugin>
9898
<artifactId>maven-source-plugin</artifactId>
99-
<version>3.3.0</version>
99+
<version>3.3.1</version>
100100
</plugin>
101101
<plugin>
102102
<artifactId>maven-javadoc-plugin</artifactId>
103-
<version>3.6.2</version>
103+
<version>3.8.0</version>
104104
</plugin>
105105
<plugin>
106106
<artifactId>maven-deploy-plugin</artifactId>
107-
<version>3.1.1</version>
107+
<version>3.1.3</version>
108108
</plugin>
109109
<plugin>
110110
<groupId>org.jacoco</groupId>
111111
<artifactId>jacoco-maven-plugin</artifactId>
112-
<version>0.8.11</version>
112+
<version>0.8.12</version>
113113
</plugin>
114114
</plugins>
115115
</pluginManagement>
@@ -128,7 +128,7 @@
128128
<plugins>
129129
<plugin>
130130
<artifactId>maven-gpg-plugin</artifactId>
131-
<version>3.1.0</version>
131+
<version>3.2.5</version>
132132
<executions>
133133
<execution>
134134
<id>sign-artifacts</id>
@@ -155,7 +155,7 @@
155155
<plugin>
156156
<groupId>org.sonatype.plugins</groupId>
157157
<artifactId>nexus-staging-maven-plugin</artifactId>
158-
<version>1.6.13</version>
158+
<version>1.7.0</version>
159159
<extensions>true</extensions>
160160
<configuration>
161161
<serverId>ossrh</serverId>

0 commit comments

Comments
 (0)