Skip to content

Commit 9917aed

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)
1 parent e0e8704 commit 9917aed

File tree

7 files changed

+46
-82
lines changed

7 files changed

+46
-82
lines changed

‎.editorconfig‎

Lines changed: 16 additions & 10 deletions
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/strong_ci.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@ jobs:
3434
run: rm -rf $HOME/.m2/repository/com/alibaba/{transmittable-thread-local,ttl}*
3535

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

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

‎pom.xml‎

Lines changed: 21 additions & 35 deletions
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,21 +79,21 @@
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.3</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.22</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.0</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>
96+
<junit5.version>5.10.2</junit5.version>
9797
<kotest.version>5.8.0</kotest.version>
9898

9999
<!--
@@ -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.14.12</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>
@@ -441,19 +439,19 @@
441439
</plugin>
442440
<plugin>
443441
<artifactId>maven-compiler-plugin</artifactId>
444-
<version>3.11.0</version>
442+
<version>3.12.1</version>
445443
</plugin>
446444
<plugin>
447445
<artifactId>maven-surefire-plugin</artifactId>
448-
<version>3.2.2</version>
446+
<version>3.2.5</version>
449447
</plugin>
450448
<plugin>
451449
<artifactId>maven-jar-plugin</artifactId>
452450
<version>3.3.0</version>
453451
</plugin>
454452
<plugin>
455453
<artifactId>maven-shade-plugin</artifactId>
456-
<version>3.5.1</version>
454+
<version>3.5.2</version>
457455
<configuration>
458456
<shadeSourcesContent>true</shadeSourcesContent>
459457
<dependencyReducedPomLocation>
@@ -467,7 +465,7 @@
467465
</plugin>
468466
<plugin>
469467
<artifactId>maven-javadoc-plugin</artifactId>
470-
<version>3.6.2</version>
468+
<version>3.6.3</version>
471469
</plugin>
472470
<plugin>
473471
<groupId>org.jetbrains.dokka</groupId>
@@ -509,12 +507,12 @@
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>8.0.0</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>
@@ -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.2.0</version>
532530
<configuration>
533531
<executable>${java.home}/bin/java</executable>
534532
<classpathScope>test</classpathScope>
@@ -552,21 +550,10 @@
552550
<artifactId>nexus-staging-maven-plugin</artifactId>
553551
<version>1.6.13</version>
554552
</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>
566-
</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>

‎src/versions-rules.xml‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎ttl-bom/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
</plugin>
101101
<plugin>
102102
<artifactId>maven-javadoc-plugin</artifactId>
103-
<version>3.6.2</version>
103+
<version>3.6.3</version>
104104
</plugin>
105105
<plugin>
106106
<artifactId>maven-deploy-plugin</artifactId>

‎ttl-core/src/main/java/com/alibaba/ttl3/internal/util/ConcurrentReferenceHashMap.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@
7373
* @author Juergen Hoeller
7474
*/
7575
@SuppressWarnings("ALL")
76-
@SuppressFBWarnings("ALL")
76+
// Is there a class annotation in FindBugs to ignore all warning in a file
77+
// https://stackoverflow.com/questions/13398685
78+
@SuppressFBWarnings
7779
class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implements ConcurrentMap<K, V> {
7880

7981
private static final int DEFAULT_INITIAL_CAPACITY = 16;

‎ttl-integrations/sample-ttl-agent-extension-transformlet/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@
3838
<plugins>
3939
<plugin>
4040
<artifactId>maven-surefire-plugin</artifactId>
41-
<version>3.2.2</version>
41+
<version>3.2.5</version>
4242
</plugin>
4343
<plugin>
4444
<artifactId>maven-source-plugin</artifactId>
4545
<version>3.3.0</version>
4646
</plugin>
4747
<plugin>
4848
<artifactId>maven-javadoc-plugin</artifactId>
49-
<version>3.6.2</version>
49+
<version>3.6.3</version>
5050
</plugin>
5151
<plugin>
5252
<artifactId>maven-deploy-plugin</artifactId>

0 commit comments

Comments
 (0)