Skip to content

Commit

Permalink
chore(deps): upgrade dependencies/plugins 🛠️
Browse files Browse the repository at this point in the history
bump com.github.spotbugs:spotbugs-annotations from 4.8.1 to 4.8.2 (#580)
bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.1.0 to 4.8.2.0 (#581)
bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3 (#582)
bump com.github.spotbugs:spotbugs-annotations from 4.8.2 to 4.8.3 (#587)
bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.2 to 3.2.3 (#588)
bump org.apache.maven.plugins:maven-compiler-plugin 3.11.0 to 3.12.0 (#589)
bump net.bytebuddy: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 org.apache.maven.plugins:maven-compiler-plugin from 3.12.0 to 3.12.1 (#593)
bump org.javassist:javassist from 3.29.2-GA to 3.30.2-GA (#594)
bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.3 to 3.2.5 (#596)
bump com.github.spotbugs:spotbugs-maven-plugin 4.8.2.0 to 4.8.3.0 (#598)
bump codecov/codecov-action from 3 to 4 (#600)
bump org.junit:junit-bom from 5.10.1 to 5.10.2 (#601)
chore(deps): bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.3.0 to 4.8.3.1 (#602)
bump org.jetbrains.kotlinx:kotlinx-coroutines-bom from 1.7.3 to 1.8.0.(#603)
bump net.bytebuddy:byte-buddy-parent from 1.14.11 to 1.14.12 (#604)
bump org.apache.maven.plugins:maven-shade-plugin from 3.5.1 to 3.5.2 (#606)
bump org.codehaus.mojo:exec-maven-plugin from 3.1.1 to 3.2.0 (#607)
  • Loading branch information
dependabot[bot] authored and oldratlee committed Feb 22, 2024
1 parent 7ed9061 commit 5ef8ac4
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 80 deletions.
26 changes: 16 additions & 10 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,28 @@ root = true
charset = utf-8
end_of_line = lf
insert_final_newline = true
tab_width = 4
indent_size = 4
ij_continuation_indent_size = 8

tab_width = 2
indent_size = 2
ij_continuation_indent_size = 4
indent_style = space
trim_trailing_whitespace = true

[*.xml]
indent_style = tab
ij_any_blank_lines_after_imports = 2
ij_markdown_wrap_text_if_long = false

[*.{yml,yaml}]
indent_size = 2
ij_continuation_indent_size = 4

[*.{java,kt}]
ij_java_wrap_long_lines = false
indent_size = 4
ij_continuation_indent_size = 8


[*.{md,mkd,markdown}]
indent_size = 4
ij_continuation_indent_size = 8
trim_trailing_whitespace = false
ij_markdown_wrap_text_if_long = false


[*.xml]
indent_style = tab

7 changes: 3 additions & 4 deletions .github/workflows/strong_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@ jobs:
run: rm -rf $HOME/.m2/repository/com/alibaba/{transmittable-thread-local,ttl}*

- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
with:
name: codecov-umbrella
token: ${{ secrets.CODECOV_TOKEN }}
uses: codecov/codecov-action@v4
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

# https://remarkablemark.org/blog/2017/10/12/check-git-dirty/
- name: Check git dirty
Expand Down
52 changes: 19 additions & 33 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.alibaba.ttl3</groupId>
Expand Down Expand Up @@ -28,8 +28,8 @@
<url>https://github.com/alibaba/transmittable-thread-local</url>
</scm>
<issueManagement>
<url>https://github.com/alibaba/transmittable-thread-local/issues</url>
<system>GitHub Issues</system>
<url>https://github.com/alibaba/transmittable-thread-local/issues</url>
</issueManagement>
<ciManagement>
<system>GitHub Actions</system>
Expand Down Expand Up @@ -79,21 +79,21 @@
https://alibaba.github.io/transmittable-thread-local/apidocs/${project.version}
</javadoc.ttl.base.link>

<spotbugs.annotations.version>4.8.1</spotbugs.annotations.version>
<spotbugs.annotations.version>4.8.3</spotbugs.annotations.version>
<jsr305.version>3.0.2</jsr305.version>
<jetbrains.annotations.version>24.1.0</jetbrains.annotations.version>

<kotlin.version>1.9.21</kotlin.version>
<kotlin.version>1.9.22</kotlin.version>
<kotlin.compiler.jvmTarget>${maven.compiler.source}</kotlin.compiler.jvmTarget>
<kotlin.coroutine.version>1.7.3</kotlin.coroutine.version>
<kotlin.coroutine.version>1.8.0</kotlin.coroutine.version>
<!-- https://kotlin.github.io/dokka/1.7.10/user_guide/maven/usage/ -->
<dokka.version>1.9.10</dokka.version>
<dokka.link.jdk.version>8</dokka.link.jdk.version>

<slf4j.version>2.0.7</slf4j.version>

<!-- testing dependencies versions -->
<junit5.version>5.10.1</junit5.version>
<junit5.version>5.10.2</junit5.version>
<kotest.version>5.8.0</kotest.version>

<!--
Expand Down Expand Up @@ -196,7 +196,7 @@
<!-- https://github.com/raphw/byte-buddy/issues/1264 -->
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-parent</artifactId>
<version>1.14.10</version>
<version>1.14.12</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -255,7 +255,7 @@
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.29.2-GA</version>
<version>3.30.2-GA</version>
<optional>true</optional>
</dependency>
<dependency>
Expand Down Expand Up @@ -402,9 +402,6 @@
</execution>
</executions>
</plugin>
<!--
official docs: https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html
-->
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
Expand All @@ -415,6 +412,7 @@
</goals>
<configuration>
<rules>
<!-- official docs: https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html -->
<requireMavenVersion>
<version>3.3.9</version>
</requireMavenVersion>
Expand All @@ -441,19 +439,19 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.12.1</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.2</version>
<version>3.2.5</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.1</version>
<version>3.5.2</version>
<configuration>
<shadeSourcesContent>true</shadeSourcesContent>
<dependencyReducedPomLocation>
Expand All @@ -467,7 +465,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.2</version>
<version>3.6.3</version>
</plugin>
<plugin>
<groupId>org.jetbrains.dokka</groupId>
Expand Down Expand Up @@ -514,7 +512,7 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.8.1.0</version>
<version>4.8.3.1</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
Expand All @@ -528,7 +526,7 @@
-->
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.1.1</version>
<version>3.2.0</version>
<configuration>
<executable>${java.home}/bin/java</executable>
<classpathScope>test</classpathScope>
Expand All @@ -552,21 +550,10 @@
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
</plugin>
<plugin>
<!--
config example: https://github.com/mojohaus/versions-maven-plugin/issues/157#issuecomment-306041074
-->
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.16.2</version>
<configuration>
<rulesUri>file://${maven.multiModuleProjectDirectory}/src/versions-rules.xml</rulesUri>
<generateBackupPoms>false</generateBackupPoms>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<profiles>
<profile>
<id>gen-src</id>
Expand Down Expand Up @@ -607,10 +594,10 @@
About package-list vs.element-list
- Can't link to JDK10 in Javadoc comments
https://stackoverflow.com/a/49498219/922688
https://stackoverflow.com/a/49498219/922688
- Missing javadoc/package-list for release 5.1
https://github.com/gradle/gradle/issues/8183
https://github.com/gradle/gradle/commit/5e88351dd456a5252d21f3a7ad25bff1b62a2fd2
https://github.com/gradle/gradle/issues/8183
https://github.com/gradle/gradle/commit/5e88351dd456a5252d21f3a7ad25bff1b62a2fd2
Using the linkoffline Option
Expand All @@ -625,7 +612,6 @@
<plugin>
<!--
https://maven.apache.org/plugins/maven-javadoc-plugin/javadoc-mojo.html
https://docs.oracle.com/en/java/javase/21/javadoc/javadoc-command.html
-->
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down
29 changes: 0 additions & 29 deletions src/versions-rules.xml

This file was deleted.

2 changes: 1 addition & 1 deletion ttl-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.2</version>
<version>3.6.3</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@
* @author Juergen Hoeller
*/
@SuppressWarnings("ALL")
@SuppressFBWarnings("ALL")
// Is there a class annotation in FindBugs to ignore all warning in a file
// https://stackoverflow.com/questions/13398685
@SuppressFBWarnings
class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implements ConcurrentMap<K, V> {

private static final int DEFAULT_INITIAL_CAPACITY = 16;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.2</version>
<version>3.2.5</version>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.2</version>
<version>3.6.3</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
Expand Down

0 comments on commit 5ef8ac4

Please sign in to comment.